svn commit: r1502850 - in /commons/proper/configuration/trunk/src: main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java test/java/org/apache/commons/configuration/TestDynamicCombinedConfiguration.java

[oh...@apache.org]

Author: oheger
Date: Sat Jul 13 19:30:31 2013
New Revision: 1502850

URL: http://svn.apache.org/r1502850
Log:
DynamicCombinedConfiguration no longer uses the properties for the list delimiter and for disabling list delimiter parsing.

Modified:
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDynamicCombinedConfiguration.java

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java?rev=1502850&r1=1502849&r2=1502850&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java Sat Jul 13 19:30:31 2013
@@ -1017,9 +1017,8 @@ public class DynamicCombinedConfiguratio
             }
         }
         config.setExpressionEngine(this.getExpressionEngine());
-        config.setDelimiterParsingDisabled(isDelimiterParsingDisabled());
         config.setConversionExpressionEngine(getConversionExpressionEngine());
-        config.setListDelimiter(getListDelimiter());
+        config.setListDelimiterHandler(getListDelimiterHandler());
         for (ConfigurationErrorListener listener : getErrorListeners())
         {
             config.addErrorListener(listener);

Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDynamicCombinedConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDynamicCombinedConfiguration.java?rev=1502850&r1=1502849&r2=1502850&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDynamicCombinedConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDynamicCombinedConfiguration.java Sat Jul 13 19:30:31 2013
@@ -68,10 +68,11 @@ public class TestDynamicCombinedConfigur
     public void testConfiguration() throws Exception
     {
         DynamicCombinedConfiguration config = new DynamicCombinedConfiguration();
+        DefaultListDelimiterHandler listHandler = new DefaultListDelimiterHandler(',');
+        config.setListDelimiterHandler(listHandler);
         XPathExpressionEngine engine = new XPathExpressionEngine();
         config.setExpressionEngine(engine);
         config.setKeyPattern(PATTERN);
-        config.setDelimiterParsingDisabled(true);
         ConfigurationBuilder<XMLConfiguration> multiBuilder =
                 new MultiFileConfigurationBuilder<XMLConfiguration>(
                         XMLConfiguration.class).configure(Parameters
@@ -81,14 +82,14 @@ public class TestDynamicCombinedConfigur
                                 ConfigurationInterpolator
                                         .getDefaultPrefixLookups())
                         .setManagedBuilderParameters(
-                                Parameters.xml().setExpressionEngine(engine)));
+                                Parameters.xml().setExpressionEngine(engine)
+                                        .setListDelimiterHandler(listHandler)));
         BuilderConfigurationWrapperFactory wrapFactory =
                 new BuilderConfigurationWrapperFactory();
         config.addConfiguration(wrapFactory.createBuilderConfigurationWrapper(
                 HierarchicalConfiguration.class, multiBuilder), "Multi");
         XMLConfiguration xml = new XMLConfiguration();
         xml.setExpressionEngine(engine);
-        xml.setDelimiterParsingDisabled(true);
         FileHandler handler = new FileHandler(xml);
         handler.setFile(new File(DEFAULT_FILE));
         handler.load();
@@ -101,9 +102,11 @@ public class TestDynamicCombinedConfigur
         assertEquals("a,b,c", config.getString("split/list3/@values"));
         assertEquals(0, config.getMaxIndex("split/list3/@values"));
         assertEquals("a\\,b\\,c", config.getString("split/list4/@values"));
-        assertEquals("a,b,c", config.getString("split/list1"));
-        assertEquals(0, config.getMaxIndex("split/list1"));
+        assertEquals("OK-1", config.getString("buttons/name"));
+        assertEquals(3, config.getMaxIndex("buttons/name"));
         assertEquals("a\\,b\\,c", config.getString("split/list2"));
+        config.addProperty("listDelimiterTest", "1,2,3");
+        assertEquals("List delimiter not detected", "1", config.getString("listDelimiterTest"));
     }
 
     /**