svn commit: r1206480 - /commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/MergeCombiner.java

[oh...@apache.org]

Author: oheger
Date: Sat Nov 26 16:28:58 2011
New Revision: 1206480

URL: http://svn.apache.org/viewvc?rev=1206480&view=rev
Log:
Java 1.5 compatibility: Javadocs, raw types, for loops, etc.

Modified:
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/MergeCombiner.java

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/MergeCombiner.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/MergeCombiner.java?rev=1206480&r1=1206479&r2=1206480&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/MergeCombiner.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/tree/MergeCombiner.java Sat Nov 26 16:28:58 2011
@@ -16,14 +16,14 @@
  */
 package org.apache.commons.configuration.tree;
 
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.ArrayList;
 
 /**
  * <p>
- * A specialized implementation of the <code>NodeCombiner</code> interface
+ * A specialized implementation of the {@code NodeCombiner} interface
  * that performs a merge from two passed in node hierarchies.
  * </p>
  * <p>
@@ -52,6 +52,7 @@ public class MergeCombiner extends NodeC
      * @return the union node
      */
 
+    @Override
     public ConfigurationNode combine(ConfigurationNode node1, ConfigurationNode node2)
     {
         ViewNode result = createViewNode();
@@ -60,10 +61,9 @@ public class MergeCombiner extends NodeC
         addAttributes(result, node1, node2);
 
         // Check if nodes can be combined
-        List children2 = new LinkedList(node2.getChildren());
-        for (Iterator it = node1.getChildren().iterator(); it.hasNext();)
+        List<ConfigurationNode> children2 = new LinkedList<ConfigurationNode>(node2.getChildren());
+        for (ConfigurationNode child1 : node1.getChildren())
         {
-            ConfigurationNode child1 = (ConfigurationNode) it.next();
             ConfigurationNode child2 = canCombine(node1, node2, child1, children2);
             if (child2 != null)
             {
@@ -77,9 +77,9 @@ public class MergeCombiner extends NodeC
         }
 
         // Add remaining children of node 2
-        for (Iterator it = children2.iterator(); it.hasNext();)
+        for (ConfigurationNode c : children2)
         {
-            result.addChild((ConfigurationNode) it.next());
+            result.addChild(c);
         }
         return result;
     }
@@ -98,9 +98,8 @@ public class MergeCombiner extends NodeC
             ConfigurationNode node2)
     {
         result.appendAttributes(node1);
-        for (Iterator it = node2.getAttributes().iterator(); it.hasNext();)
+        for (ConfigurationNode attr : node2.getAttributes())
         {
-            ConfigurationNode attr = (ConfigurationNode) it.next();
             if (node1.getAttributeCount(attr.getName()) == 0)
             {
                 result.addAttribute(attr);
@@ -119,23 +118,23 @@ public class MergeCombiner extends NodeC
      * @return a child of the second node, with which a combination is possible
      */
     protected ConfigurationNode canCombine(ConfigurationNode node1,
-            ConfigurationNode node2, ConfigurationNode child, List children2)
+            ConfigurationNode node2, ConfigurationNode child, List<ConfigurationNode> children2)
     {
-        List attrs1 = child.getAttributes();
-        List nodes = new ArrayList();
+        List<ConfigurationNode> attrs1 = child.getAttributes();
+        List<ConfigurationNode> nodes = new ArrayList<ConfigurationNode>();
 
-        List children = node2.getChildren(child.getName());
-        Iterator it = children.iterator();
+        List<ConfigurationNode> children = node2.getChildren(child.getName());
+        Iterator<ConfigurationNode> it = children.iterator();
         while (it.hasNext())
         {
-            ConfigurationNode node = (ConfigurationNode) it.next();
-            Iterator iter = attrs1.iterator();
+            ConfigurationNode node = it.next();
+            Iterator<ConfigurationNode> iter = attrs1.iterator();
             while (iter.hasNext())
             {
-                ConfigurationNode attr1 = (ConfigurationNode) iter.next();
-                List list2 = node.getAttributes(attr1.getName());
+                ConfigurationNode attr1 = iter.next();
+                List<ConfigurationNode> list2 = node.getAttributes(attr1.getName());
                 if (list2.size() == 1
-                    && !attr1.getValue().equals(((ConfigurationNode) list2.get(0)).getValue()))
+                    && !attr1.getValue().equals(list2.get(0).getValue()))
                 {
                     node = null;
                     break;
@@ -153,7 +152,7 @@ public class MergeCombiner extends NodeC
         }
         if (nodes.size() > 1 && !isListNode(child))
         {
-            Iterator iter = nodes.iterator();
+            Iterator<ConfigurationNode> iter = nodes.iterator();
             while (iter.hasNext())
             {
                 children2.remove(iter.next());