Author: oheger
Date: Sun Apr 20 19:32:08 2014
New Revision: 1588831
URL: http://svn.apache.org/r1588831
Log:
Reintegrated immutableNodes branch. The refactoring towards immutable nodes is
now complete.
Added:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/AbstractHierarchicalConfiguration.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/AbstractHierarchicalConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/FindNodeVisitor.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/FindNodeVisitor.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/XMLDocumentHelper.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/XMLDocumentHelper.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/AbstractImmutableNodeHandler.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/AbstractImmutableNodeHandler.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/InMemoryNodeModel.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/InMemoryNodeModel.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/InMemoryNodeModelSupport.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/InMemoryNodeModelSupport.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/ModelTransaction.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/ModelTransaction.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/NodeHandlerDecorator.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/NodeHandlerDecorator.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/NodeKeyResolver.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/NodeKeyResolver.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/NodeModel.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/NodeModel.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/NodeModelSupport.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/NodeModelSupport.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/NodeSelector.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/NodeSelector.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/NodeTracker.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/NodeTracker.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/NodeTreeWalker.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/NodeTreeWalker.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/NodeUpdateData.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/NodeUpdateData.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/QueryResult.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/QueryResult.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/ReferenceNodeHandler.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/ReferenceNodeHandler.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/ReferenceTracker.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/ReferenceTracker.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/TrackedNodeHandler.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/TrackedNodeHandler.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/TrackedNodeModel.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/TrackedNodeModel.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/TreeData.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/TreeData.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/xpath/ConfigurationAttributePointer.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/xpath/ConfigurationAttributePointer.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/xpath/XPathContextFactory.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/xpath/XPathContextFactory.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestAbstractHierarchicalConfiguration.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestAbstractHierarchicalConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestXMLDocumentHelper.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestXMLDocumentHelper.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/AbstractImmutableNodeHandlerTest.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/AbstractImmutableNodeHandlerTest.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/NodeStructureHelper.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/NodeStructureHelper.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/TestInMemoryNodeModel.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/TestInMemoryNodeModel.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/TestInMemoryNodeModelReferences.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/TestInMemoryNodeModelReferences.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/TestInMemoryNodeModelTrackedNodes.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/TestInMemoryNodeModelTrackedNodes.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/TestNodeHandlerDecorator.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/TestNodeHandlerDecorator.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/TestNodeSelector.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/TestNodeSelector.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/TestNodeTreeWalker.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/TestNodeTreeWalker.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/TestNodeUpdateData.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/TestNodeUpdateData.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/TestQueryResult.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/TestQueryResult.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/TestTrackedNodeHandler.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/TestTrackedNodeHandler.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/TestTrackedNodeModel.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/TestTrackedNodeModel.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/TestTreeData.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/TestTreeData.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/xpath/TestConfigurationAttributePointer.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/xpath/TestConfigurationAttributePointer.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/xpath/TestXPathContextFactory.java
- copied unchanged from r1588830,
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/xpath/TestXPathContextFactory.java
Removed:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/ConfigurationNode.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/DefaultConfigurationNode.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/ViewNode.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/TestDefaultConfigurationNode.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/TestViewNode.java
Modified:
commons/proper/configuration/trunk/ (props changed)
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/
(props changed)
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/AbstractConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/BaseHierarchicalConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/CombinedConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DatabaseConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/HierarchicalConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/HierarchicalConfigurationXMLReader.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/INIConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PatternSubtreeConfigurationWrapper.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/SubnodeConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/XMLConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/XMLBeanDeclaration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/CombinedBuilderParametersImpl.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/CombinedBuilderProperties.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/CombinedConfigurationBuilder.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/ConfigurationDeclaration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/ReloadingCombinedConfigurationBuilder.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/AbstractListDelimiterHandler.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/convert/ListDelimiterHandler.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/plist/PropertyListConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/plist/XMLPropertyListConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/ConfigurationNodeVisitor.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/ConfigurationNodeVisitorAdapter.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/DefaultExpressionEngine.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/ExpressionEngine.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/ImmutableNode.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/MergeCombiner.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/NodeAddData.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/NodeCombiner.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/NodeHandler.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/OverrideCombiner.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/TreeUtils.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/UnionCombiner.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/xpath/ConfigurationNodeIteratorAttribute.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/xpath/ConfigurationNodeIteratorBase.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/xpath/ConfigurationNodeIteratorChildren.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/xpath/ConfigurationNodePointer.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/xpath/ConfigurationNodePointerFactory.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/xpath/XPathExpressionEngine.java
commons/proper/configuration/trunk/src/main/javacc/PropertyListParser.jj
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/
(props changed)
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestBaseHierarchicalConfigurationSynchronization.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestCombinedConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestHierarchicalConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestHierarchicalConfigurationXMLReader.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestINIConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestSubnodeConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestXMLConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/beanutils/TestXMLBeanDeclaration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedConfigurationBuilder.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedConfigurationBuilderVFS.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestConfigurationDeclaration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/convert/TestDisabledListDelimiterHandler.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestHierarchicalConfigurationEvents.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/plist/TestPropertyListConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/AbstractCombinerTest.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/TestDefaultExpressionEngine.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/TestImmutableNode.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/TestMergeCombiner.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/TestNodeAddData.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/TestOverrideCombiner.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/TestUnionCombiner.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/xpath/AbstractXPathTest.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/xpath/TestConfigurationIteratorAttributes.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/xpath/TestConfigurationNodeIteratorChildren.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/xpath/TestConfigurationNodePointer.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/xpath/TestConfigurationNodePointerFactory.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/xpath/TestXPathExpressionEngine.java
Propchange: commons/proper/configuration/trunk/
------------------------------------------------------------------------------
Merged /commons/proper/configuration/branches/immutableNodes:r1561338-1588830
Propchange:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/
------------------------------------------------------------------------------
Merged
/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration:r1561338-1588830
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/AbstractConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/AbstractConfiguration.java?rev=1588831&r1=1588830&r2=1588831&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/AbstractConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/AbstractConfiguration.java
Sun Apr 20 19:32:08 2014
@@ -728,10 +728,9 @@ public abstract class AbstractConfigurat
*/
protected void addPropertyInternal(String key, Object value)
{
- for (Iterator<?> it = getListDelimiterHandler().parse(value); it
- .hasNext();)
+ for (Object obj : getListDelimiterHandler().parse(value))
{
- addPropertyDirect(key, it.next());
+ addPropertyDirect(key, obj);
}
}
