commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ohe...@apache.org
Subject svn commit: r1587027 - in /commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration: DynamicCombinedConfiguration.java HierarchicalConfigurationXMLReader.java
Date Sun, 13 Apr 2014 16:07:35 GMT
Author: oheger
Date: Sun Apr 13 16:07:35 2014
New Revision: 1587027

URL: http://svn.apache.org/r1587027
Log:
Fixed compilation failures.

Modified:
    commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java
    commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/HierarchicalConfigurationXMLReader.java

Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java?rev=1587027&r1=1587026&r2=1587027&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java
(original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java
Sun Apr 13 16:07:35 2014
@@ -380,7 +380,7 @@ public class DynamicCombinedConfiguratio
      * @return the combined root node
      */
     @Override
-    public ConfigurationNode getRootNode()
+    public ImmutableNode getRootNode()
     {
         return getCurrentConfig().getRootNode();
     }

Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/HierarchicalConfigurationXMLReader.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/HierarchicalConfigurationXMLReader.java?rev=1587027&r1=1587026&r2=1587027&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/HierarchicalConfigurationXMLReader.java
(original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/HierarchicalConfigurationXMLReader.java
Sun Apr 13 16:07:35 2014
@@ -109,7 +109,7 @@ public class HierarchicalConfigurationXM
     protected void processKeys()
     {
         NodeHandler<T> nodeHandler =
-                getConfiguration().getModel().getNodeHandler();
+                getConfiguration().getNodeModel().getNodeHandler();
         NodeTreeWalker.INSTANCE.walkDFS(nodeHandler.getRootNode(),
                 new SAXVisitor(), nodeHandler);
     }



Mime
View raw message