[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jakarta-commons-dev
Subject:    svn commit: r1614980 - in /commons/proper/configuration/trunk/src/main/java/org/apache/commons/confi
From:       oheger () apache ! org
Date:       2014-07-31 20:06:02
Message-ID: 20140731200602.501C52389210 () eris ! apache ! org
[Download RAW message or body]

Author: oheger
Date: Thu Jul 31 20:06:01 2014
New Revision: 1614980

URL: http://svn.apache.org/r1614980
Log:
Removed setRootNode() method from AbstractHierarchicalConfiguration.

The protected setRootNodeInternal() method was removed, too.

Modified:
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/AbstractHierarchicalConfiguration.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/PatternSubtreeConfigurationWrapper.java


Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/AbstractHierarchicalConfiguration.java
                
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org \
/apache/commons/configuration/AbstractHierarchicalConfiguration.java?rev=1614980&r1=1614979&r2=1614980&view=diff
 ==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/AbstractHierarchicalConfiguration.java \
                (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/AbstractHierarchicalConfiguration.java \
Thu Jul 31 20:06:01 2014 @@ -191,41 +191,6 @@ public abstract class \
AbstractHierarchic  }
 
     /**
-     * Sets the root node of this hierarchical configuration.
-     *
-     * @param rootNode the root node
-     */
-    public final void setRootNode(T rootNode)
-    {
-        if (rootNode == null)
-        {
-            throw new IllegalArgumentException("Root node must not be null!");
-        }
-
-        beginWrite(false);
-        try
-        {
-            setRootNodeInternal(rootNode);
-        }
-        finally
-        {
-            endWrite();
-        }
-    }
-
-    /**
-     * Actually sets the root node of this configuration. This method is called
-     * by {@code setRootNode()}. Subclasses that need to adapt this operation
-     * can override it.
-     *
-     * @param rootNode the new root node of this configuration
-     */
-    protected void setRootNodeInternal(T rootNode)
-    {
-        getModel().setRootNode(rootNode);
-    }
-
-    /**
      * {@inheritDoc} This implementation handles synchronization and delegates
      * to {@code getRootElementNameInternal()}.
      */

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=1614980&r1=1614979&r2=1614980&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 \
Thu Jul 31 20:06:01 2014 @@ -386,19 +386,6 @@ public class \
DynamicCombinedConfiguratio  }
 
     @Override
-    protected void setRootNodeInternal(ImmutableNode rootNode)
-    {
-        if (configs != null)
-        {
-            this.getCurrentConfig().setRootNode(rootNode);
-        }
-        else
-        {
-            super.setRootNodeInternal(rootNode);
-        }
-    }
-
-    @Override
     protected void addPropertyInternal(String key, Object value)
     {
         this.getCurrentConfig().addProperty(key, value);

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PatternSubtreeConfigurationWrapper.java
                
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org \
/apache/commons/configuration/PatternSubtreeConfigurationWrapper.java?rev=1614980&r1=1614979&r2=1614980&view=diff
 ==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PatternSubtreeConfigurationWrapper.java \
                (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PatternSubtreeConfigurationWrapper.java \
Thu Jul 31 20:06:01 2014 @@ -329,19 +329,6 @@ public class \
PatternSubtreeConfiguration  }
 
     @Override
-    protected void setRootNodeInternal(ImmutableNode rootNode)
-    {
-        if (init)
-        {
-            getConfig().setRootNode(rootNode);
-        }
-        else
-        {
-            super.setRootNodeInternal(rootNode);
-        }
-    }
-
-    @Override
     public ExpressionEngine getExpressionEngine()
     {
         return config.getExpressionEngine();


[prev in list] [next in list] [prev in thread] [next in thread]