commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ohe...@apache.org
Subject svn commit: r641455 - in /commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/combined: NodeCombiner.java OverrideCombiner.java UnionCombiner.java
Date Wed, 26 Mar 2008 18:16:58 GMT
Author: oheger
Date: Wed Mar 26 11:16:54 2008
New Revision: 641455

URL: http://svn.apache.org/viewvc?rev=641455&view=rev
Log:
Renamed createViewNode() method to createCombinedNode(), which makes more sense

Modified:
    commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/combined/NodeCombiner.java
    commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/combined/OverrideCombiner.java
    commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/combined/UnionCombiner.java

Modified: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/combined/NodeCombiner.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/combined/NodeCombiner.java?rev=641455&r1=641454&r2=641455&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/combined/NodeCombiner.java
(original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/combined/NodeCombiner.java
Wed Mar 26 11:16:54 2008
@@ -111,14 +111,14 @@
             U node2, NodeHandler<U> handler2);
 
     /**
-     * Creates a new view node. This method will be called whenever a new view
-     * node is to be created. It can be overridden to create special view nodes.
+     * Creates a new combined node. This method will be called whenever a new combined
+     * node is to be created. It can be overridden to create special combined nodes.
      * This base implementation returns a new instance of
      * <code>{@link CombinedNode}</code>.
      *
-     * @return the new view node
+     * @return the new combined node
      */
-    protected CombinedNode createViewNode()
+    protected CombinedNode createCombinedNode()
     {
         return new CombinedNode();
     }

Modified: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/combined/OverrideCombiner.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/combined/OverrideCombiner.java?rev=641455&r1=641454&r2=641455&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/combined/OverrideCombiner.java
(original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/combined/OverrideCombiner.java
Wed Mar 26 11:16:54 2008
@@ -68,7 +68,7 @@
     public <T, U> CombinedNode combine(T node1, NodeHandler<T> handler1,
             U node2, NodeHandler<U> handler2)
     {
-        CombinedNode result = createViewNode();
+        CombinedNode result = createCombinedNode();
         result.setName(handler1.nodeName(node1));
 
         // Process nodes from the first structure, which override the second

Modified: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/combined/UnionCombiner.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/combined/UnionCombiner.java?rev=641455&r1=641454&r2=641455&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/combined/UnionCombiner.java
(original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/combined/UnionCombiner.java
Wed Mar 26 11:16:54 2008
@@ -130,7 +130,7 @@
      */
     public <T, U> CombinedNode combine(T node1, NodeHandler<T> handler1, U node2,
NodeHandler<U> handler2)
     {
-        CombinedNode result = createViewNode();
+        CombinedNode result = createCombinedNode();
         result.setName(handler1.nodeName(node1));
         appendAttributes(result, node1, handler1);
         appendAttributes(result, node2, handler2);



Mime
View raw message