You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2013/07/13 21:21:29 UTC

svn commit: r1502839 - in /commons/proper/configuration/trunk/src: main/java/org/apache/commons/configuration/BaseHierarchicalConfiguration.java test/java/org/apache/commons/configuration/TestHierarchicalConfiguration.java

Author: oheger
Date: Sat Jul 13 19:21:28 2013
New Revision: 1502839

URL: http://svn.apache.org/r1502839
Log:
Integrated ListDelimiterHandler with BaseHierarchicalConfiguration.

Splitting of property values in setProperty() is now done by calling the
ListDelimiterHandler rather than calling static methods of
PropertyConverter.

Modified:
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/BaseHierarchicalConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestHierarchicalConfiguration.java

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/BaseHierarchicalConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/BaseHierarchicalConfiguration.java?rev=1502839&r1=1502838&r2=1502839&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/BaseHierarchicalConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/BaseHierarchicalConfiguration.java Sat Jul 13 19:21:28 2013
@@ -1021,15 +1021,7 @@ public class BaseHierarchicalConfigurati
     {
         // Update the existing nodes for this property
         Iterator<ConfigurationNode> itNodes = fetchNodeList(key).iterator();
-        Iterator<?> itValues;
-        if (!isDelimiterParsingDisabled() || !(value instanceof String))
-        {
-            itValues = PropertyConverter.toIterator(value, getListDelimiter());
-        }
-        else
-        {
-            itValues = Collections.singleton(value).iterator();
-        }
+        Iterator<?> itValues = getListDelimiterHandler().parse(value);
 
         while (itNodes.hasNext() && itValues.hasNext())
         {

Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestHierarchicalConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestHierarchicalConfiguration.java?rev=1502839&r1=1502838&r2=1502839&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestHierarchicalConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestHierarchicalConfiguration.java Sat Jul 13 19:21:28 2013
@@ -157,6 +157,7 @@ public class TestHierarchicalConfigurati
     @Test
     public void testSetProperty()
     {
+        config.setListDelimiterHandler(new DefaultListDelimiterHandler(','));
         config.setProperty("tables.table(0).name", "resources");
         assertEquals("resources", config.getString("tables.table(0).name"));
         config.setProperty("tables.table.name", "tab1,tab2");
@@ -1028,6 +1029,7 @@ public class TestHierarchicalConfigurati
     @Test
     public void testInterpolatedConfiguration()
     {
+        config.setListDelimiterHandler(new DefaultListDelimiterHandler(','));
         BaseHierarchicalConfiguration c = (BaseHierarchicalConfiguration) InterpolationTestHelper
                 .testInterpolatedConfiguration(config);