svn commit: r1581047 - /commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/PatternSubtreeConfigurationWrapper.java

[oh...@apache.org]

Author: oheger
Date: Mon Mar 24 20:36:11 2014
New Revision: 1581047

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

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

Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/PatternSubtreeConfigurationWrapper.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/PatternSubtreeConfigurationWrapper.java?rev=1581047&r1=1581046&r2=1581047&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/PatternSubtreeConfigurationWrapper.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/PatternSubtreeConfigurationWrapper.java Mon Mar 24 20:36:11 2014
@@ -33,6 +33,7 @@ import org.apache.commons.configuration.
 import org.apache.commons.configuration.io.FileBased;
 import org.apache.commons.configuration.tree.ConfigurationNode;
 import org.apache.commons.configuration.tree.ExpressionEngine;
+import org.apache.commons.configuration.tree.ImmutableNode;
 
 /**
  * Wraps a BaseHierarchicalConfiguration and allows subtrees to be accessed via a configured path with
@@ -48,7 +49,7 @@ public class PatternSubtreeConfiguration
     implements FileBasedConfiguration
 {
     /** The wrapped configuration */
-    private final HierarchicalConfiguration config;
+    private final HierarchicalConfiguration<ImmutableNode> config;
 
     /** The path to the subtree */
     private final String path;
@@ -64,7 +65,8 @@ public class PatternSubtreeConfiguration
      * @param config The Configuration to be wrapped.
      * @param path The base path pattern.
      */
-    public PatternSubtreeConfigurationWrapper(HierarchicalConfiguration config, String path)
+    public PatternSubtreeConfigurationWrapper(
+            HierarchicalConfiguration<ImmutableNode> config, String path)
     {
         this.config = config;
         this.path = path;
@@ -319,13 +321,13 @@ public class PatternSubtreeConfiguration
     }
 
     @Override
-    public ConfigurationNode getRootNode()
+    public ImmutableNode getRootNode()
     {
         return getConfig().getRootNode();
     }
 
     @Override
-    protected void setRootNodeInternal(ConfigurationNode rootNode)
+    protected void setRootNodeInternal(ImmutableNode rootNode)
     {
         if (init)
         {
@@ -357,25 +359,25 @@ public class PatternSubtreeConfiguration
     }
 
     @Override
-    protected void addNodesInternal(String key, Collection<? extends ConfigurationNode> nodes)
+    protected void addNodesInternal(String key, Collection<? extends ImmutableNode> nodes)
     {
         getConfig().addNodes(key, nodes);
     }
 
     @Override
-    public SubnodeConfiguration configurationAt(String key, boolean supportUpdates)
+    public HierarchicalConfiguration<ImmutableNode> configurationAt(String key, boolean supportUpdates)
     {
         return config.configurationAt(makePath(key), supportUpdates);
     }
 
     @Override
-    public SubnodeConfiguration configurationAt(String key)
+    public HierarchicalConfiguration<ImmutableNode> configurationAt(String key)
     {
         return config.configurationAt(makePath(key));
     }
 
     @Override
-    public List<SubnodeConfiguration> configurationsAt(String key)
+    public List<HierarchicalConfiguration<ImmutableNode>> configurationsAt(String key)
     {
         return config.configurationsAt(makePath(key));
     }
@@ -459,7 +461,7 @@ public class PatternSubtreeConfiguration
 
     private BaseHierarchicalConfiguration getConfig()
     {
-        return config.configurationAt(makePath());
+        return (BaseHierarchicalConfiguration) config.configurationAt(makePath());
     }
 
     private String makePath()