commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ohe...@apache.org
Subject svn commit: r1581069 [3/4] - in /commons/proper/configuration/branches/immutableNodes: ./ src/main/java/org/apache/commons/configuration/ src/main/java/org/apache/commons/configuration/beanutils/ src/main/java/org/apache/commons/configuration/builder/ ...
Date Mon, 24 Mar 2014 21:20:13 GMT
Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/DefaultExpressionEngine.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/DefaultExpressionEngine.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/DefaultExpressionEngine.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/DefaultExpressionEngine.java Mon Mar 24 21:20:10 2014
@@ -158,26 +158,35 @@ public class DefaultExpressionEngine imp
     }
 
     /**
-     * {@inheritDoc} This method supports the syntax as described in the class
-     * comment.
+     * Evaluates the given key and returns all matching nodes. This method
+     * supports the syntax as described in the class comment.
+     *
+     * @param root the root node
+     * @param key the key
+     * @return a list with the matching nodes
      */
-    public <T> List<QueryResult<T>> query(T root, String key,
-            NodeHandler<T> handler)
+    @Override
+    public List<ConfigurationNode> query(ConfigurationNode root, String key)
     {
-        List<QueryResult<T>> results = new LinkedList<QueryResult<T>>();
+        List<ConfigurationNode> nodes = new LinkedList<ConfigurationNode>();
         findNodesForKey(new DefaultConfigurationKey(this, key).iterator(),
-                root, results, handler);
-        return results;
+                root, nodes);
+        return nodes;
     }
 
     /**
-     * {@inheritDoc} This implementation takes the
+     * Determines the key of the passed in node. This implementation takes the
      * given parent key, adds a property delimiter, and then adds the node's
-     * name.
-     * The name of the root node is a blank string. Note that no indices are
+     * name. (For attribute nodes the attribute delimiters are used instead.)
+     * The name of the root node is a blanc string. Note that no indices will be
      * returned.
+     *
+     * @param node the node whose key is to be determined
+     * @param parentKey the key of this node's parent
+     * @return the key for the given node
      */
-    public <T> String nodeKey(T node, String parentKey, NodeHandler<T> handler)
+    @Override
+    public String nodeKey(ConfigurationNode node, String parentKey)
     {
         if (parentKey == null)
         {
@@ -189,43 +198,18 @@ public class DefaultExpressionEngine imp
         {
             DefaultConfigurationKey key = new DefaultConfigurationKey(this,
                     parentKey);
-                key.append(handler.nodeName(node), true);
+            if (node.isAttribute())
+            {
+                key.appendAttribute(node.getName());
+            }
+            else
+            {
+                key.append(node.getName(), true);
+            }
             return key.toString();
         }
     }
 
-    public String attributeKey(String parentKey, String attributeName)
-    {
-        DefaultConfigurationKey key =
-                new DefaultConfigurationKey(this, parentKey);
-        key.appendAttribute(attributeName);
-        return key.toString();
-    }
-
-    /**
-     * {@inheritDoc} This implementation works similar to {@code nodeKey()};
-     * however, each key returned by this method has an index (except for the
-     * root node). The parent key is prepended to the name of the current node
-     * in any case and without further checks. If it is <b>null</b>, only the
-     * name of the current node with its index is returned.
-     */
-    public <T> String canonicalKey(T node, String parentKey,
-            NodeHandler<T> handler)
-    {
-        String nodeName = handler.nodeName(node);
-        T parent = handler.getParent(node);
-        DefaultConfigurationKey key =
-                new DefaultConfigurationKey(this, parentKey);
-        key.append(StringUtils.defaultString(nodeName));
-
-        if (parent != null)
-        {
-            // this is not the root key
-            key.appendIndex(determineIndex(node, parent, nodeName, handler));
-        }
-        return key.toString();
-    }
-
     /**
      * <p>
      * Prepares Adding the property with the specified key.
@@ -234,7 +218,7 @@ public class DefaultExpressionEngine imp
      * To be able to deal with the structure supported by hierarchical
      * configuration implementations the passed in key is of importance,
      * especially the indices it might contain. The following example should
-     * clarify this: Suppose the current node structure looks like the
+     * clarify this: Suppose the actual node structure looks like the
      * following:
      * </p>
      * <p>
@@ -309,13 +293,12 @@ public class DefaultExpressionEngine imp
      * so there cannot be any ambiguities.)
      * </p>
      *
-     * @param <T> the type of the nodes to be dealt with
      * @param root the root node of the nodes hierarchy
      * @param key the key of the new property
-     * @param handler the node handler
      * @return a data object with information needed for the add operation
      */
-    public <T> NodeAddData<T> prepareAdd(T root, String key, NodeHandler<T> handler)
+    @Override
+    public NodeAddData prepareAdd(ConfigurationNode root, String key)
     {
         DefaultConfigurationKey.KeyIterator it = new DefaultConfigurationKey(
                 this, key).iterator();
@@ -325,8 +308,8 @@ public class DefaultExpressionEngine imp
                     "Key for add operation must be defined!");
         }
 
-        T parent = findLastPathNode(it, root, handler);
-        List<String> pathNodes = new LinkedList<String>();
+        NodeAddData result = new NodeAddData();
+        result.setParent(findLastPathNode(it, root));
 
         while (it.hasNext())
         {
@@ -336,32 +319,30 @@ public class DefaultExpressionEngine imp
                         "Invalid key for add operation: " + key
                                 + " (Attribute key in the middle.)");
             }
-            pathNodes.add(it.currentKey());
+            result.addPathNode(it.currentKey());
             it.next();
         }
 
-        return new NodeAddData<T>(parent, it.currentKey(), !it.isPropertyKey(),
-                pathNodes);
+        result.setNewNodeName(it.currentKey());
+        result.setAttribute(!it.isPropertyKey());
+        return result;
     }
 
     /**
      * Recursive helper method for evaluating a key. This method processes all
      * facets of a configuration key, traverses the tree of properties and
-     * fetches the results of all matching properties.
+     * fetches the the nodes of all matching properties.
      *
-     * @param <T> the type of nodes to be dealt with
      * @param keyPart the configuration key iterator
-     * @param node the current node
-     * @param results here the found results are stored
-     * @param handler the node handler
+     * @param node the actual node
+     * @param nodes here the found nodes are stored
      */
-    protected <T> void findNodesForKey(
-            DefaultConfigurationKey.KeyIterator keyPart, T node,
-            Collection<QueryResult<T>> results, NodeHandler<T> handler)
+    protected void findNodesForKey(DefaultConfigurationKey.KeyIterator keyPart,
+            ConfigurationNode node, Collection<ConfigurationNode> nodes)
     {
         if (!keyPart.hasNext())
         {
-            results.add(QueryResult.createNodeResult(node));
+            nodes.add(node);
         }
 
         else
@@ -369,32 +350,26 @@ public class DefaultExpressionEngine imp
             String key = keyPart.nextKey(false);
             if (keyPart.isPropertyKey())
             {
-                processSubNodes(keyPart, handler.getChildren(node, key),
-                        results, handler);
+                processSubNodes(keyPart, node.getChildren(key), nodes);
             }
-            if (keyPart.isAttribute() && !keyPart.hasNext())
+            if (keyPart.isAttribute())
             {
-                if (handler.getAttributeValue(node, key) != null)
-                {
-                    results.add(QueryResult.createAttributeResult(node, key));
-                }
+                processSubNodes(keyPart, node.getAttributes(key), nodes);
             }
         }
     }
 
     /**
      * Finds the last existing node for an add operation. This method traverses
-     * the node tree along the specified key. The last existing node on this
-     * path is returned.
+     * the configuration node tree along the specified key. The last existing
+     * node on this path is returned.
      *
-     * @param <T> the type of the nodes to be dealt with
      * @param keyIt the key iterator
-     * @param node the current node
-     * @param handler the node handler
+     * @param node the actual node
      * @return the last existing node on the given path
      */
-    protected <T> T findLastPathNode(DefaultConfigurationKey.KeyIterator keyIt,
-            T node, NodeHandler<T> handler)
+    protected ConfigurationNode findLastPathNode(
+            DefaultConfigurationKey.KeyIterator keyIt, ConfigurationNode node)
     {
         String keyPart = keyIt.nextKey(false);
 
@@ -407,17 +382,15 @@ public class DefaultExpressionEngine imp
                         "Invalid path for add operation: "
                                 + "Attribute key in the middle!");
             }
-            int idx =
-                    keyIt.hasIndex() ? keyIt.getIndex() : handler
-                            .getChildrenCount(node, keyPart) - 1;
-            if (idx < 0 || idx >= handler.getChildrenCount(node, keyPart))
+            int idx = keyIt.hasIndex() ? keyIt.getIndex() : node
+                    .getChildrenCount(keyPart) - 1;
+            if (idx < 0 || idx >= node.getChildrenCount(keyPart))
             {
                 return node;
             }
             else
             {
-                return findLastPathNode(keyIt,
-                        handler.getChildren(node, keyPart).get(idx), handler);
+                return findLastPathNode(keyIt, node.getChildren(keyPart).get(idx));
             }
         }
 
@@ -432,46 +405,28 @@ public class DefaultExpressionEngine imp
      * the current node depending on the type of the current key part (children,
      * attributes, or both).
      *
-     * @param <T> the type of the nodes to be dealt with
      * @param keyPart the key part
      * @param subNodes a list with the sub nodes to process
      * @param nodes the target collection
-     * @param handler the node handler
      */
-    private <T> void processSubNodes(DefaultConfigurationKey.KeyIterator keyPart,
-            List<T> subNodes, Collection<QueryResult<T>> nodes, NodeHandler<T> handler)
+    private void processSubNodes(DefaultConfigurationKey.KeyIterator keyPart,
+            List<ConfigurationNode> subNodes, Collection<ConfigurationNode> nodes)
     {
         if (keyPart.hasIndex())
         {
             if (keyPart.getIndex() >= 0 && keyPart.getIndex() < subNodes.size())
             {
                 findNodesForKey((DefaultConfigurationKey.KeyIterator) keyPart
-                        .clone(), subNodes.get(keyPart.getIndex()), nodes, handler);
+                        .clone(), subNodes.get(keyPart.getIndex()), nodes);
             }
         }
         else
         {
-            for (T node : subNodes)
+            for (ConfigurationNode node : subNodes)
             {
                 findNodesForKey((DefaultConfigurationKey.KeyIterator) keyPart
-                        .clone(), node, nodes, handler);
+                        .clone(), node, nodes);
             }
         }
     }
-
-    /**
-     * Determines the index of the given node based on its parent node.
-     *
-     * @param node the current node
-     * @param parent the parent node
-     * @param nodeName the name of the current node
-     * @param handler the node handler
-     * @param <T> the type of the nodes to be dealt with
-     * @return the index of this node
-     */
-    private static <T> int determineIndex(T node, T parent, String nodeName,
-                                          NodeHandler<T> handler)
-    {
-        return handler.getChildren(parent, nodeName).indexOf(node);
-    }
 }

Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/ExpressionEngine.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/ExpressionEngine.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/ExpressionEngine.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/ExpressionEngine.java Mon Mar 24 21:20:10 2014
@@ -27,93 +27,56 @@ import java.util.List;
  * An <em>expression engine</em> knows how to map a key for a configuration's
  * property to a single or a set of configuration nodes. Thus it defines the way
  * how properties are addressed in this configuration. Methods of a
- * configuration that have to handle property keys (e.g. {@code getProperty()}
- * or {@code addProperty()} do not interpret the passed in keys on their own,
- * but delegate this task to an associated expression engine. This expression
- * engine will then find out, which configuration nodes are addressed by the
- * key.
+ * configuration that have to handle property key (e.g.
+ * {@code getProperty()} or {@code addProperty()} do not interpret
+ * the passed in keys on their own, but delegate this task to an associated
+ * expression engine. This expression engine will then find out, which
+ * configuration nodes are addressed by the key.
  * </p>
  * <p>
  * Separating the task of evaluating property keys from the configuration object
- * has the advantage that multiple different expression languages (i.e. ways for
+ * has the advantage that many different expression languages (i.e. ways for
  * querying or setting properties) can be supported. Just set a suitable
  * implementation of this interface as the configuration's expression engine,
  * and you can use the syntax provided by this implementation.
  * </p>
- * <p>
- * An {@code ExpressionEngine} can deal with nodes of different types. To
- * achieve this, a {@link NodeHandler} for the desired type must be passed to
- * the methods.
- * </p>
  *
  * @since 1.3
+ * @author <a
+ * href="http://commons.apache.org/configuration/team-list.html">Commons
+ * Configuration team</a>
  * @version $Id$
  */
 public interface ExpressionEngine
 {
     /**
-     * Finds the nodes and/or attributes that are matched by the specified key.
-     * This is the main method for interpreting property keys. An implementation
-     * must traverse the given root node and its children to find all results
-     * that are matched by the given key. If the key is not correct in the
-     * syntax provided by that implementation, it is free to throw a (runtime)
-     * exception indicating this error condition. The passed in
-     * {@code NodeHandler} can be used to gather the required information from
-     * the node object.
+     * Finds the node(s) that is (are) matched by the specified key. This is the
+     * main method for interpreting property keys. An implementation must
+     * traverse the given root node and its children to find all nodes that are
+     * matched by the given key. If the key is not correct in the syntax
+     * provided by that implementation, it is free to throw a (runtime)
+     * exception indicating this error condition.
      *
-     * @param <T> the type of the node to be processed
-     * @param root the root node of a hierarchy of nodes
+     * @param root the root node of a hierarchy of configuration nodes
      * @param key the key to be evaluated
-     * @param handler the {@code NodeHandler} for accessing the node
-     * @return a list with the results that are matched by the key (should never
-     *         be <b>null</b>)
+     * @return a list with the nodes that are matched by the key (should never
+     * be <b>null</b>)
      */
-    <T> List<QueryResult<T>> query(T root, String key, NodeHandler<T> handler);
+    List<ConfigurationNode> query(ConfigurationNode root, String key);
 
     /**
      * Returns the key for the specified node in the expression language
      * supported by an implementation. This method is called whenever a property
      * key for a node has to be constructed, e.g. by the
-     * {@link org.apache.commons.configuration.Configuration#getKeys()
-     * getKeys()} method.
+     * {@link org.apache.commons.configuration.Configuration#getKeys() getKeys()}
+     * method.
      *
-     * @param <T> the type of the node to be processed
      * @param node the node, for which the key must be constructed
      * @param parentKey the key of this node's parent (can be <b>null</b> for
-     *        the root node)
-     * @param handler the {@code NodeHandler} for accessing the node
+     * the root node)
      * @return this node's key
      */
-    <T> String nodeKey(T node, String parentKey, NodeHandler<T> handler);
-
-    /**
-     * Returns the key of an attribute. The passed in {@code parentKey} must
-     * reference the parent node of the attribute. A concrete implementation
-     * must concatenate this parent key with the attribute name to a valid key
-     * for this attribute.
-     *
-     * @param parentKey the key to the node owning this attribute
-     * @param attributeName the name of the attribute in question
-     * @return the resulting key referencing this attribute
-     */
-    String attributeKey(String parentKey, String attributeName);
-
-    /**
-     * Determines a &quot;canonical&quot; key for the specified node in the
-     * expression language supported by this implementation. This means that
-     * always a unique key if generated pointing to this specific node. For most
-     * concrete implementations, this means that an index is added to the node
-     * name to ensure that there are no ambiguities with child nodes having the
-     * same names.
-     *
-     * @param <T> the type of the node to be processed
-     * @param node the node, for which the key must be constructed
-     * @param parentKey the key of this node's parent (can be <b>null</b> for
-     *        the root node)
-     * @param handler the {@code NodeHandler} for accessing the node
-     * @return the canonical key of this node
-     */
-    <T> String canonicalKey(T node, String parentKey, NodeHandler<T> handler);
+    String nodeKey(ConfigurationNode node, String parentKey);
 
     /**
      * Returns information needed for an add operation. This method gets called
@@ -121,11 +84,9 @@ public interface ExpressionEngine
      * has to interpret the specified key, find the parent node for the new
      * elements, and provide all information about new nodes to be added.
      *
-     * @param <T> the type of the node to be processed
      * @param root the root node
      * @param key the key for the new property
-     * @param handler the {@code NodeHandler} for accessing the node
      * @return an object with all information needed for the add operation
      */
-    <T> NodeAddData<T> prepareAdd(T root, String key, NodeHandler<T> handler);
+    NodeAddData prepareAdd(ConfigurationNode root, String key);
 }

Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/NodeAddData.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/NodeAddData.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/NodeAddData.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/NodeAddData.java Mon Mar 24 21:20:10 2014
@@ -16,9 +16,8 @@
  */
 package org.apache.commons.configuration.tree;
 
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
+import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -47,41 +46,47 @@ import java.util.List;
  * </p>
  *
  * @since 1.3
+ * @author <a
+ * href="http://commons.apache.org/configuration/team-list.html">Commons
+ * Configuration team</a>
  * @version $Id$
- * @param <T> the type of nodes this class can handle
  */
-public class NodeAddData<T>
+public class NodeAddData
 {
     /** Stores the parent node of the add operation. */
-    private final T parent;
+    private ConfigurationNode parent;
 
     /**
-     * Stores a list with the names of nodes that are on the path between the
-     * parent node and the new node.
+     * Stores a list with nodes that are on the path between the parent node and
+     * the new node.
      */
-    private final List<String> pathNodes;
+    private List<String> pathNodes;
 
     /** Stores the name of the new node. */
-    private final String newNodeName;
+    private String newNodeName;
 
     /** Stores the attribute flag. */
-    private final boolean attribute;
+    private boolean attribute;
 
     /**
-     * Creates a new instance of {@code NodeAddData} and initializes it.
+     * Creates a new, uninitialized instance of {@code NodeAddData}.
+     */
+    public NodeAddData()
+    {
+        this(null, null);
+    }
+
+    /**
+     * Creates a new instance of {@code NodeAddData} and sets the most
+     * important data fields.
      *
-     * @param parentNode the parent node of the add operation
-     * @param newName the name of the new node
-     * @param isAttr flag whether the new node is an attribute
-     * @param intermediateNodes an optional collection with path nodes
+     * @param parent the parent node
+     * @param nodeName the name of the new node
      */
-    public NodeAddData(T parentNode, String newName, boolean isAttr,
-            Collection<String> intermediateNodes)
+    public NodeAddData(ConfigurationNode parent, String nodeName)
     {
-        parent = parentNode;
-        newNodeName = newName;
-        attribute = isAttr;
-        pathNodes = createPathNodes(intermediateNodes);
+        setParent(parent);
+        setNewNodeName(nodeName);
     }
 
     /**
@@ -96,6 +101,17 @@ public class NodeAddData<T>
     }
 
     /**
+     * Sets the attribute flag. This flag determines whether an attribute or a
+     * child node will be added.
+     *
+     * @param attribute the attribute flag
+     */
+    public void setAttribute(boolean attribute)
+    {
+        this.attribute = attribute;
+    }
+
+    /**
      * Returns the name of the new node.
      *
      * @return the new node's name
@@ -106,18 +122,39 @@ public class NodeAddData<T>
     }
 
     /**
+     * Sets the name of the new node. A node with this name will be added to the
+     * configuration's node hierarchy.
+     *
+     * @param newNodeName the name of the new node
+     */
+    public void setNewNodeName(String newNodeName)
+    {
+        this.newNodeName = newNodeName;
+    }
+
+    /**
      * Returns the parent node.
      *
      * @return the parent node
      */
-    public T getParent()
+    public ConfigurationNode getParent()
     {
         return parent;
     }
 
     /**
+     * Sets the parent node. New nodes will be added to this node.
+     *
+     * @param parent the parent node
+     */
+    public void setParent(ConfigurationNode parent)
+    {
+        this.parent = parent;
+    }
+
+    /**
      * Returns a list with further nodes that must be added. This is needed if a
-     * complete branch is to be added at once. For instance, imagine that there
+     * complete branch is to be added at once. For instance imagine that there
      * exists only a node {@code database}. Now the key
      * {@code database.connection.settings.username} (assuming the syntax
      * of the default expression engine) is to be added. Then
@@ -131,26 +168,29 @@ public class NodeAddData<T>
      */
     public List<String> getPathNodes()
     {
-        return pathNodes;
+        if (pathNodes != null)
+        {
+            return Collections.unmodifiableList(pathNodes);
+        }
+        else
+        {
+            return Collections.emptyList();
+        }
     }
 
     /**
-     * Creates the list with path nodes. Handles null input.
+     * Adds the name of a path node. With this method an additional node to be
+     * added can be defined.
      *
-     * @param intermediateNodes the nodes passed to the constructor
-     * @return an unmodifiable list of path nodes
+     * @param nodeName the name of the node
+     * @see #getPathNodes()
      */
-    private static List<String> createPathNodes(
-            Collection<String> intermediateNodes)
+    public void addPathNode(String nodeName)
     {
-        if (intermediateNodes == null)
-        {
-            return Collections.emptyList();
-        }
-        else
+        if (pathNodes == null)
         {
-            return Collections.unmodifiableList(new ArrayList<String>(
-                    intermediateNodes));
+            pathNodes = new LinkedList<String>();
         }
+        pathNodes.add(nodeName);
     }
 }

Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/NodeHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/NodeHandler.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/NodeHandler.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/NodeHandler.java Mon Mar 24 21:20:10 2014
@@ -17,7 +17,6 @@
 package org.apache.commons.configuration.tree;
 
 import java.util.List;
-import java.util.Set;
 
 /**
  * <p>
@@ -29,15 +28,15 @@ import java.util.Set;
  * {@code NodeHandler} is used. The handler provides a number of methods for
  * querying the internal state of a node in a read-only way.
  * </p>
- *
+ * 
  * @version $Id$
- * @param <T> the type of the nodes this handler deals with
+ * @param T the type of the nodes this handler deals with
  */
 public interface NodeHandler<T>
 {
     /**
      * Returns the name of the specified node
-     *
+     * 
      * @param node the node
      * @return the name of this node
      */
@@ -45,7 +44,7 @@ public interface NodeHandler<T>
 
     /**
      * Returns the value of the specified node.
-     *
+     * 
      * @param node the node
      * @return the value of this node
      */
@@ -53,7 +52,7 @@ public interface NodeHandler<T>
 
     /**
      * Returns the parent of the specified node.
-     *
+     * 
      * @param node the node
      * @return the parent node
      */
@@ -61,7 +60,7 @@ public interface NodeHandler<T>
 
     /**
      * Returns an unmodifiable list with all children of the specified node.
-     *
+     * 
      * @param node the node
      * @return a list with the child nodes of this node
      */
@@ -70,7 +69,7 @@ public interface NodeHandler<T>
     /**
      * Returns an unmodifiable list of all children of the specified node with
      * the given name.
-     *
+     * 
      * @param node the node
      * @param name the name of the desired child nodes
      * @return a list with all children with the given name
@@ -79,7 +78,7 @@ public interface NodeHandler<T>
 
     /**
      * Returns the child with the given index of the specified node.
-     *
+     * 
      * @param node the node
      * @param index the index (0-based)
      * @return the child with the given index
@@ -87,18 +86,18 @@ public interface NodeHandler<T>
     T getChild(T node, int index);
 
     /**
-     * Returns the index of the given child node in the list of children of its
-     * parent. This method is the opposite operation of
-     * {@link #getChild(Object, int)}. This method returns 0 if the given node
-     * is the first child node with this name, 1 for the second child node and
-     * so on. If the node has no parent node or if it is an attribute, -1 is
-     * returned.
-     *
-     * @param parent the parent node
-     * @param child a child node whose index is to be retrieved
+     * Returns the index of the given child node relative to its name. This
+     * method can be called when a unique identifier for a specific node is
+     * needed. The node name alone might not be sufficient because there may be
+     * multiple child nodes with the same name. This method returns 0 if the
+     * given node is the first child node with this name, 1 for the second child
+     * node and so on. If the node has no parent node or if it is an attribute,
+     * -1 is returned.
+     * 
+     * @param node a child node whose index is to be retrieved
      * @return the index of this child node
      */
-    int indexOfChild(T parent, T child);
+    int indexOfChild(T node);
 
     /**
      * Returns the number of children of the specified node with the given name.
@@ -109,7 +108,7 @@ public interface NodeHandler<T>
      * a child name is passed in, only the children with this name are taken
      * into account. If the name <b>null</b> is passed, the total number of
      * children must be returned.
-     *
+     * 
      * @param node the node
      * @param name the name of the children in question (can be <b>null</b> for
      *        all children)
@@ -118,17 +117,17 @@ public interface NodeHandler<T>
     int getChildrenCount(T node, String name);
 
     /**
-     * Returns an unmodifiable set with the names of all attributes of the
+     * Returns an unmodifiable list with the names of all attributes of the
      * specified node.
-     *
+     * 
      * @param node the node
-     * @return a set with the names of all attributes of this node
+     * @return a list with the names of all attributes of this node
      */
-    Set<String> getAttributes(T node);
+    List<String> getAttributes(T node);
 
     /**
      * Returns a flag whether the passed in node has any attributes.
-     *
+     * 
      * @param node the node
      * @return a flag whether this node has any attributes
      */
@@ -138,7 +137,7 @@ public interface NodeHandler<T>
      * Returns the value of the specified attribute from the given node. If a
      * concrete {@code NodeHandler} supports attributes with multiple values,
      * result might be a collection.
-     *
+     * 
      * @param node the node
      * @param name the name of the attribute
      * @return the value of this attribute
@@ -149,7 +148,7 @@ public interface NodeHandler<T>
      * Checks whether the specified node is defined. Nodes are
      * &quot;defined&quot; if they contain any data, e.g. a value, or
      * attributes, or defined children.
-     *
+     * 
      * @param node the node to test
      * @return a flag whether the passed in node is defined
      */

Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/xpath/ConfigurationNodePointerFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/xpath/ConfigurationNodePointerFactory.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/xpath/ConfigurationNodePointerFactory.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/xpath/ConfigurationNodePointerFactory.java Mon Mar 24 21:20:10 2014
@@ -53,6 +53,7 @@ public class ConfigurationNodePointerFac
      *
      * @return this order's factory
      */
+    @Override
     public int getOrder()
     {
         return CONFIGURATION_NODE_POINTER_FACTORY_ORDER;
@@ -68,6 +69,7 @@ public class ConfigurationNodePointerFac
      * @param locale the locale
      * @return a pointer for a configuration node if the bean is such a node
      */
+    @Override
     @SuppressWarnings("unchecked")
     /* Type casts are safe here; because of the way the NodeWrapper was
        constructed the node handler must be compatible with the node.
@@ -92,6 +94,7 @@ public class ConfigurationNodePointerFac
      * @param bean the bean
      * @return a pointer for a configuration node if the bean is such a node
      */
+    @Override
     @SuppressWarnings("unchecked")
     /* Type casts are safe here, see above. Also, the hierarchy of node
        pointers is consistent, so a parent is compatible to a child.

Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/web/ServletRequestConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/web/ServletRequestConfiguration.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/web/ServletRequestConfiguration.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/web/ServletRequestConfiguration.java Mon Mar 24 21:20:10 2014
@@ -66,9 +66,8 @@ public class ServletRequestConfiguration
         {
             // ensure that escape characters in all list elements are removed
             List<Object> result = new ArrayList<Object>(values.length);
-            for (int i = 0; i < values.length; i++)
-            {
-                Object val = handleDelimiters(values[i]);
+            for (String value : values) {
+                Object val = handleDelimiters(value);
                 if (val instanceof Collection)
                 {
                     result.addAll((Collection<?>) val);

Propchange: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/
------------------------------------------------------------------------------
  Merged /commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration:r1563461-1581056

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/ConfigurationErrorListenerImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/ConfigurationErrorListenerImpl.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/ConfigurationErrorListenerImpl.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/ConfigurationErrorListenerImpl.java Mon Mar 24 21:20:10 2014
@@ -47,6 +47,7 @@ public class ConfigurationErrorListenerI
      *
      * @param event the error event
      */
+    @Override
     public void configurationError(ConfigurationErrorEvent event)
     {
         this.event = event;

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/InterpolationTestHelper.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/InterpolationTestHelper.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/InterpolationTestHelper.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/InterpolationTestHelper.java Mon Mar 24 21:20:10 2014
@@ -225,6 +225,7 @@ public class InterpolationTestHelper
         ConfigurationInterpolator interpol = config.getInterpolator();
         interpol.registerLookup("echo", new Lookup()
         {
+            @Override
             public Object lookup(String varName)
             {
                 return "Value of variable " + varName;

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/Logging.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/Logging.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/Logging.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/Logging.java Mon Mar 24 21:20:10 2014
@@ -31,6 +31,8 @@ import org.apache.log4j.ConsoleAppender;
  */
 public class Logging extends Log4JLogger
 {
+    private static final long serialVersionUID = 8619242753795694874L;
+
     /**
      * The fully qualified name of the Log4JLogger class.
      */

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/MockInitialContextFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/MockInitialContextFactory.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/MockInitialContextFactory.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/MockInitialContextFactory.java Mon Mar 24 21:20:10 2014
@@ -82,6 +82,7 @@ public class MockInitialContextFactory i
      * @param env the environment
      * @return the context mock
      */
+    @Override
     public Context getInitialContext(@SuppressWarnings("rawtypes") Hashtable env) throws NamingException
     {
         boolean useCycles = env.containsKey(PROP_CYCLES);
@@ -141,9 +142,8 @@ public class MockInitialContextFactory i
                     + PROP_NAMES[i];
             bindError(mockCtx, errProp);
         }
-        for (int i = 0; i < MISSING_NAMES.length; i++)
-        {
-            bindError(mockCtx, MISSING_NAMES[i]);
+        for (String element : MISSING_NAMES) {
+            bindError(mockCtx, element);
         }
         mockCtx.matchAndReturn("hashCode", System.identityHashCode(mockCtx.proxy()));
 

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/SynchronizerTestImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/SynchronizerTestImpl.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/SynchronizerTestImpl.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/SynchronizerTestImpl.java Mon Mar 24 21:20:10 2014
@@ -35,6 +35,7 @@ public class SynchronizerTestImpl implem
     /**
      * {@inheritDoc} Registers this invocation.
      */
+    @Override
     public void beginRead()
     {
         append(Methods.BEGIN_READ);
@@ -43,6 +44,7 @@ public class SynchronizerTestImpl implem
     /**
      * {@inheritDoc} Registers this invocation.
      */
+    @Override
     public void endRead()
     {
         append(Methods.END_READ);
@@ -51,6 +53,7 @@ public class SynchronizerTestImpl implem
     /**
      * {@inheritDoc} Registers this invocation.
      */
+    @Override
     public void beginWrite()
     {
         append(Methods.BEGIN_WRITE);
@@ -59,6 +62,7 @@ public class SynchronizerTestImpl implem
     /**
      * {@inheritDoc} Registers this invocation.
      */
+    @Override
     public void endWrite()
     {
         append(Methods.END_WRITE);

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestAbstractConfigurationBasicFeatures.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestAbstractConfigurationBasicFeatures.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestAbstractConfigurationBasicFeatures.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestAbstractConfigurationBasicFeatures.java Mon Mar 24 21:20:10 2014
@@ -1052,7 +1052,7 @@ public class TestAbstractConfigurationBa
     static class TestConfigurationImpl extends AbstractConfiguration
     {
         /** Stores the underlying configuration. */
-        private AbstractConfiguration config;
+        private final AbstractConfiguration config;
 
         public AbstractConfiguration getUnderlyingConfiguration()
         {
@@ -1110,6 +1110,7 @@ public class TestAbstractConfigurationBa
     {
         List<ConfigurationEvent> events = new ArrayList<ConfigurationEvent>();
 
+        @Override
         public void configurationChanged(ConfigurationEvent event)
         {
             events.add(event);

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestBaseConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestBaseConfiguration.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestBaseConfiguration.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestBaseConfiguration.java Mon Mar 24 21:20:10 2014
@@ -718,6 +718,7 @@ public class TestBaseConfiguration
     {
         ConfigurationListener l = new ConfigurationListener()
         {
+            @Override
             public void configurationChanged(ConfigurationEvent event)
             {
                 // just a dummy

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestBaseConfigurationXMLReader.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestBaseConfigurationXMLReader.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestBaseConfigurationXMLReader.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestBaseConfigurationXMLReader.java Mon Mar 24 21:20:10 2014
@@ -134,10 +134,9 @@ public class TestBaseConfigurationXMLRea
     private void check(JXPathContext ctx, String path, String[] values)
     {
         Iterator<?> it = ctx.iterate(path);
-        for (int i = 0; i < values.length; i++)
-        {
+        for (String value : values) {
             assertTrue("Too few values", it.hasNext());
-            assertEquals("Wrong property value", values[i], it.next());
+            assertEquals("Wrong property value", value, it.next());
         }
         assertFalse("Too many values", it.hasNext());
     }

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestCombinedConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestCombinedConfiguration.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestCombinedConfiguration.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestCombinedConfiguration.java Mon Mar 24 21:20:10 2014
@@ -984,6 +984,7 @@ public class TestCombinedConfiguration
 
         int otherEvents;
 
+        @Override
         public void configurationChanged(ConfigurationEvent event)
         {
             if (event.getType() == CombinedConfiguration.EVENT_COMBINED_INVALIDATE)

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestCompositeConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestCompositeConfiguration.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestCompositeConfiguration.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestCompositeConfiguration.java Mon Mar 24 21:20:10 2014
@@ -63,9 +63,9 @@ public class TestCompositeConfiguration
     /**
      * The File that we test with
      */
-    private String testProperties = ConfigurationAssert.getTestFile("test.properties").getAbsolutePath();
-    private String testProperties2 = ConfigurationAssert.getTestFile("test2.properties").getAbsolutePath();
-    private String testPropertiesXML = ConfigurationAssert.getTestFile("test.xml").getAbsolutePath();
+    private final String testProperties = ConfigurationAssert.getTestFile("test.properties").getAbsolutePath();
+    private final String testProperties2 = ConfigurationAssert.getTestFile("test2.properties").getAbsolutePath();
+    private final String testPropertiesXML = ConfigurationAssert.getTestFile("test.xml").getAbsolutePath();
 
     @Before
     public void setUp() throws Exception
@@ -920,6 +920,7 @@ public class TestCompositeConfiguration
         /** The number of received events.*/
         int eventCount;
 
+        @Override
         public void configurationChanged(ConfigurationEvent event)
         {
             eventCount++;

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestCompositeConfigurationNonStringProperties.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestCompositeConfigurationNonStringProperties.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestCompositeConfigurationNonStringProperties.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestCompositeConfigurationNonStringProperties.java Mon Mar 24 21:20:10 2014
@@ -29,7 +29,7 @@ import org.junit.Before;
 public class TestCompositeConfigurationNonStringProperties extends BaseNonStringProperties
 {
     /** The File that we test with */
-    private String testProperties = ConfigurationAssert.getTestFile("test.properties").getAbsolutePath();
+    private final String testProperties = ConfigurationAssert.getTestFile("test.properties").getAbsolutePath();
 
     @Before
     public void setUp() throws Exception

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestConfigurationConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestConfigurationConverter.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestConfigurationConverter.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestConfigurationConverter.java Mon Mar 24 21:20:10 2014
@@ -153,6 +153,7 @@ public class TestConfigurationConverter
         src.getList(EasyMock.anyObject(String.class));
         EasyMock.expectLastCall().andAnswer(new IAnswer<Object>()
         {
+            @Override
             public Object answer() throws Throwable
             {
                 String key = (String) EasyMock.getCurrentArguments()[0];

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestConfigurationMap.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestConfigurationMap.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestConfigurationMap.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestConfigurationMap.java Mon Mar 24 21:20:10 2014
@@ -59,8 +59,9 @@ public class TestConfigurationMap
     public void setUp() throws Exception
     {
         BaseConfiguration configuration = new BaseConfiguration();
-        for(int i = 0; i < properties.length ; i++)
+        for(int i = 0; i < properties.length ; i++) {
             configuration.setProperty(properties[i], values[i]);
+        }
         map = new ConfigurationMap(configuration);
     }
 

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestConfigurationSet.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestConfigurationSet.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestConfigurationSet.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestConfigurationSet.java Mon Mar 24 21:20:10 2014
@@ -61,8 +61,9 @@ public class TestConfigurationSet {
     public void setUp() throws Exception
     {
         BaseConfiguration configuration = new BaseConfiguration();
-        for(int i = 0; i < properties.length ; i++)
+        for(int i = 0; i < properties.length ; i++) {
             configuration.setProperty(properties[i], values[i]);
+        }
         set = new ConfigurationMap.ConfigurationSet(configuration);
     }
 

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestDynamicCombinedConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestDynamicCombinedConfiguration.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestDynamicCombinedConfiguration.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestDynamicCombinedConfiguration.java Mon Mar 24 21:20:10 2014
@@ -387,14 +387,12 @@ public class TestDynamicCombinedConfigur
         String rows = config.getString("rowsPerPage");
         assertEquals("Incorrect value for rowsPerPage", "25", rows);
 
-        for (int i = 0; i < testThreads.length; ++i)
-        {
-            testThreads[i].shutdown();
-            testThreads[i].join();
+        for (ReaderThread testThread : testThreads) {
+            testThread.shutdown();
+            testThread.join();
         }
-        for (int i = 0; i < testThreads.length; ++i)
-        {
-            assertFalse(testThreads[i].failed());
+        for (ReaderThread testThread : testThreads) {
+            assertFalse(testThread.failed());
         }
         assertEquals("ID0002", config.getString("Product/FIIndex/FI[@id='123456782']"));
         output.delete();
@@ -553,6 +551,7 @@ public class TestDynamicCombinedConfigur
             id.set(value);
         }
 
+        @Override
         public String lookup(String key)
         {
             if (key == null || !key.equals("Id"))

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestEqualsProperty.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestEqualsProperty.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestEqualsProperty.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestEqualsProperty.java Mon Mar 24 21:20:10 2014
@@ -30,7 +30,7 @@ import org.junit.Test;
 public class TestEqualsProperty
 {
     /** The File that we test with */
-    private String testProperties = ConfigurationAssert.getTestFile("test.properties").getAbsolutePath();
+    private final String testProperties = ConfigurationAssert.getTestFile("test.properties").getAbsolutePath();
 
     @Test
     public void testEquals() throws Exception

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestMapConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestMapConfiguration.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestMapConfiguration.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestMapConfiguration.java Mon Mar 24 21:20:10 2014
@@ -95,6 +95,7 @@ public class TestMapConfiguration extend
         MapConfiguration config = (MapConfiguration) getConfiguration();
         config.addConfigurationListener(new ConfigurationListener()
         {
+            @Override
             public void configurationChanged(ConfigurationEvent event)
             {
                 // Just a dummy

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestNonStringProperties.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestNonStringProperties.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestNonStringProperties.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestNonStringProperties.java Mon Mar 24 21:20:10 2014
@@ -28,7 +28,7 @@ import org.junit.Before;
 public class TestNonStringProperties extends BaseNonStringProperties
 {
     /** The File that we test with */
-    private String testProperties = ConfigurationAssert.getTestFile("test.properties").getAbsolutePath();
+    private final String testProperties = ConfigurationAssert.getTestFile("test.properties").getAbsolutePath();
 
     @Before
     public void setUp() throws Exception

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestNullCompositeConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestNullCompositeConfiguration.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestNullCompositeConfiguration.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestNullCompositeConfiguration.java Mon Mar 24 21:20:10 2014
@@ -47,9 +47,9 @@ public class TestNullCompositeConfigurat
     protected CompositeConfiguration cc;
 
     /** The File that we test with */
-    private String testProperties = ConfigurationAssert.getTestFile("test.properties").getAbsolutePath();
-    private String testProperties2 = ConfigurationAssert.getTestFile("test2.properties").getAbsolutePath();
-    private String testPropertiesXML = ConfigurationAssert.getTestFile("test.xml").getAbsolutePath();
+    private final String testProperties = ConfigurationAssert.getTestFile("test.properties").getAbsolutePath();
+    private final String testProperties2 = ConfigurationAssert.getTestFile("test2.properties").getAbsolutePath();
+    private final String testPropertiesXML = ConfigurationAssert.getTestFile("test.xml").getAbsolutePath();
 
     @Before
     public void setUp() throws Exception

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestPropertiesConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestPropertiesConfiguration.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestPropertiesConfiguration.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestPropertiesConfiguration.java Mon Mar 24 21:20:10 2014
@@ -847,12 +847,14 @@ public class TestPropertiesConfiguration
         conf.clear();
         conf.setIOFactory(new PropertiesConfiguration.IOFactory()
         {
+            @Override
             public PropertiesConfiguration.PropertiesReader createPropertiesReader(
                     Reader in)
             {
                 return new PropertiesReaderTestImpl(in, propertyCount);
             }
 
+            @Override
             public PropertiesConfiguration.PropertiesWriter createPropertiesWriter(
                     Writer out, ListDelimiterHandler handler)
             {
@@ -876,12 +878,14 @@ public class TestPropertiesConfiguration
         final MutableObject<Writer> propertiesWriter = new MutableObject<Writer>();
         conf.setIOFactory(new PropertiesConfiguration.IOFactory()
         {
+            @Override
             public PropertiesConfiguration.PropertiesReader createPropertiesReader(
                     Reader in)
             {
                 throw new UnsupportedOperationException("Unexpected call!");
             }
 
+            @Override
             public PropertiesConfiguration.PropertiesWriter createPropertiesWriter(
                     Writer out, ListDelimiterHandler handler)
             {
@@ -923,9 +927,8 @@ public class TestPropertiesConfiguration
             String s;
             while ((s = in.readLine()) != null)
             {
-                for (int i = 0; i < separatorTests.length; i++)
-                {
-                    if (separatorTests[i].equals(s))
+                for (String separatorTest : separatorTests) {
+                    if (separatorTest.equals(s))
                     {
                         foundLines.add(s);
                     }
@@ -1229,10 +1232,10 @@ public class TestPropertiesConfiguration
     static class MockHttpURLStreamHandler extends URLStreamHandler
     {
         /** Stores the response code.*/
-        private int responseCode;
+        private final int responseCode;
 
         /** Stores the output file.*/
-        private File outputFile;
+        private final File outputFile;
 
         /** Stores the connection.*/
         private MockHttpURLConnection connection;

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestPropertiesConfigurationLayout.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestPropertiesConfigurationLayout.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestPropertiesConfigurationLayout.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestPropertiesConfigurationLayout.java Mon Mar 24 21:20:10 2014
@@ -715,7 +715,7 @@ public class TestPropertiesConfiguration
     static class PropertiesBuilder
     {
         /** A buffer for storing the data. */
-        private StringBuilder buf = new StringBuilder();
+        private final StringBuilder buf = new StringBuilder();
 
         /** A counter for varying the comment character. */
         private int commentCounter;

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestSubsetConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestSubsetConfiguration.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestSubsetConfiguration.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestSubsetConfiguration.java Mon Mar 24 21:20:10 2014
@@ -350,6 +350,7 @@ public class TestSubsetConfiguration
         ConfigurationInterpolator interpolator = config.getInterpolator();
         interpolator.registerLookup("brackets", new Lookup(){
 
+            @Override
             public String lookup(String key) {
                 return "(" + key +")";
             }

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestXMLConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestXMLConfiguration.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestXMLConfiguration.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestXMLConfiguration.java Mon Mar 24 21:20:10 2014
@@ -88,11 +88,11 @@ public class TestXMLConfiguration
     static final String PROP_FACTORY = "javax.xml.transform.TransformerFactory";
 
     /** The File that we test with */
-    private String testProperties = ConfigurationAssert.getTestFile("test.xml").getAbsolutePath();
-    private String testProperties2 = ConfigurationAssert.getTestFile("testDigesterConfigurationInclude1.xml").getAbsolutePath();
-    private File testSaveConf = ConfigurationAssert.getOutFile("testsave.xml");
-    private File testSaveFile = ConfigurationAssert.getOutFile("testsample2.xml");
-    private String testFile2 = ConfigurationAssert.getTestFile("sample.xml").getAbsolutePath();
+    private final String testProperties = ConfigurationAssert.getTestFile("test.xml").getAbsolutePath();
+    private final String testProperties2 = ConfigurationAssert.getTestFile("testDigesterConfigurationInclude1.xml").getAbsolutePath();
+    private final File testSaveConf = ConfigurationAssert.getOutFile("testsave.xml");
+    private final File testSaveFile = ConfigurationAssert.getOutFile("testsample2.xml");
+    private final String testFile2 = ConfigurationAssert.getTestFile("sample.xml").getAbsolutePath();
 
     /** Constant for the number of test threads. */
     private static final int THREAD_COUNT = 5;
@@ -1540,9 +1540,8 @@ public class TestXMLConfiguration
             assertTrue("Property not found", config.getProperty("test.short") != null);
         }
 
-        for (int i = 0; i < testThreads.length; ++i)
-        {
-            testThreads[i].join();
+        for (Thread testThread : testThreads) {
+            testThread.join();
         }
     }
 

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/BeanCreationTestBeanWithListChild.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/BeanCreationTestBeanWithListChild.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/BeanCreationTestBeanWithListChild.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/BeanCreationTestBeanWithListChild.java Mon Mar 24 21:20:10 2014
@@ -31,7 +31,7 @@ public class BeanCreationTestBeanWithLis
 
     private int intValue;
 
-    private List<BeanCreationTestBean> children = new ArrayList<BeanCreationTestBean>();
+    private final List<BeanCreationTestBean> children = new ArrayList<BeanCreationTestBean>();
 
     public List<BeanCreationTestBean> getChildren()
     {

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/BeanDeclarationTestImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/BeanDeclarationTestImpl.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/BeanDeclarationTestImpl.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/BeanDeclarationTestImpl.java Mon Mar 24 21:20:10 2014
@@ -41,6 +41,7 @@ class BeanDeclarationTestImpl implements
 
     private Collection<ConstructorArg> constructorArgs;
 
+    @Override
     public String getBeanClassName()
     {
         return beanClassName;
@@ -51,6 +52,7 @@ class BeanDeclarationTestImpl implements
         this.beanClassName = beanClassName;
     }
 
+    @Override
     public String getBeanFactoryName()
     {
         return beanFactoryName;
@@ -61,6 +63,7 @@ class BeanDeclarationTestImpl implements
         this.beanFactoryName = beanFactoryName;
     }
 
+    @Override
     public Object getBeanFactoryParameter()
     {
         return beanFactoryParameter;
@@ -71,6 +74,7 @@ class BeanDeclarationTestImpl implements
         this.beanFactoryParameter = beanFactoryParameter;
     }
 
+    @Override
     public Map<String, Object> getBeanProperties()
     {
         return beanProperties;
@@ -81,6 +85,7 @@ class BeanDeclarationTestImpl implements
         this.beanProperties = beanProperties;
     }
 
+    @Override
     public Map<String, Object> getNestedBeanDeclarations()
     {
         return nestedBeanDeclarations;
@@ -92,6 +97,7 @@ class BeanDeclarationTestImpl implements
         this.nestedBeanDeclarations = nestedBeanDeclarations;
     }
 
+    @Override
     public Collection<ConstructorArg> getConstructorArgs()
     {
         return constructorArgs;

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/TestBeanHelper.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/TestBeanHelper.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/TestBeanHelper.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/TestBeanHelper.java Mon Mar 24 21:20:10 2014
@@ -523,6 +523,7 @@ public class TestBeanHelper
         /** A counter for the created instances. */
         private int createBeanCount;
 
+        @Override
         public Object createBean(BeanCreationContext bcc) throws Exception
         {
             createBeanCount++;
@@ -552,6 +553,7 @@ public class TestBeanHelper
          * Returns the default class, but only if the supportsDefaultClass flag
          * is set.
          */
+        @Override
         public Class<?> getDefaultBeanClass()
         {
             return supportsDefaultClass ? BeanCreationTestBean.class : null;

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/TestConfigurationDynaBean.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/TestConfigurationDynaBean.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/TestConfigurationDynaBean.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/TestConfigurationDynaBean.java Mon Mar 24 21:20:10 2014
@@ -115,14 +115,12 @@ public class TestConfigurationDynaBean
             configuration.setProperty(properties[i], values[i]);
         }
 
-        for (int a = 0; a < intArray.length; a++)
-        {
-            configuration.addProperty("intIndexed", new Integer(intArray[a]));
+        for (int element : intArray) {
+            configuration.addProperty("intIndexed", new Integer(element));
         }
 
-        for (int a = 0; a < stringArray.length; a++)
-        {
-            configuration.addProperty("stringIndexed", stringArray[a]);
+        for (String element : stringArray) {
+            configuration.addProperty("stringIndexed", element);
         }
 
         List<String> list = Arrays.asList(stringArray);
@@ -245,9 +243,8 @@ public class TestConfigurationDynaBean
         DynaProperty pd[] = bean.getDynaClass().getDynaProperties();
         assertNotNull("Got descriptors", pd);
         int count[] = new int[properties.length];
-        for (int i = 0; i < pd.length; i++)
-        {
-            String name = pd[i].getName();
+        for (DynaProperty element : pd) {
+            String name = element.getName();
             for (int j = 0; j < properties.length; j++)
             {
                 if (name.equals(properties[j]))

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/TestDefaultBeanFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/TestDefaultBeanFactory.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/TestDefaultBeanFactory.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/TestDefaultBeanFactory.java Mon Mar 24 21:20:10 2014
@@ -78,26 +78,31 @@ public class TestDefaultBeanFactory
         {
             private final BeanHelper beanHelper = new BeanHelper();
 
+            @Override
             public void initBean(Object bean, BeanDeclaration data)
             {
                 beanHelper.initBean(bean, data);
             }
 
+            @Override
             public Object getParameter()
             {
                 return null;
             }
 
+            @Override
             public BeanDeclaration getBeanDeclaration()
             {
                 return decl;
             }
 
+            @Override
             public Class<?> getBeanClass()
             {
                 return cls;
             }
 
+            @Override
             public Object createBean(BeanDeclaration data)
             {
                 return beanHelper.createBean(data);

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/TestXMLBeanDeclaration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/TestXMLBeanDeclaration.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/TestXMLBeanDeclaration.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/TestXMLBeanDeclaration.java Mon Mar 24 21:20:10 2014
@@ -345,9 +345,8 @@ public class TestXMLBeanDeclaration
             }
         };
         Map<String, Object> nested = decl.getNestedBeanDeclarations();
-        for (int i = 0; i < COMPLEX_PROPS.length; i++)
-        {
-            Object d = nested.get(COMPLEX_PROPS[i]);
+        for (String element : COMPLEX_PROPS) {
+            Object d = nested.get(element);
             assertTrue("Wrong class for bean declaration: " + d,
                     d instanceof XMLBeanDeclarationTestImpl);
         }

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/TestBasicConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/TestBasicConfigurationBuilder.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/TestBasicConfigurationBuilder.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/TestBasicConfigurationBuilder.java Mon Mar 24 21:20:10 2014
@@ -658,6 +658,7 @@ public class TestBasicConfigurationBuild
          * This tests whether the method is called after other properties have
          * been set.
          */
+        @Override
         public void initialize()
         {
             initProperty =

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/TestDefaultParametersManager.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/TestDefaultParametersManager.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/TestDefaultParametersManager.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/TestDefaultParametersManager.java Mon Mar 24 21:20:10 2014
@@ -177,6 +177,7 @@ public class TestDefaultParametersManage
         manager.registerDefaultsHandler(XMLBuilderParameters.class,
                 new DefaultParametersHandler<XMLBuilderParameters>()
                 {
+                    @Override
                     public void initializeDefaults(
                             XMLBuilderParameters parameters)
                     {
@@ -259,6 +260,7 @@ public class TestDefaultParametersManage
     private static class FileBasedDefaultsHandler implements
             DefaultParametersHandler<FileBasedBuilderParameters>
     {
+        @Override
         public void initializeDefaults(FileBasedBuilderParameters parameters)
         {
             parameters.setThrowExceptionOnMissing(true)

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedConfigurationBuilder.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedConfigurationBuilder.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedConfigurationBuilder.java Mon Mar 24 21:20:10 2014
@@ -628,6 +628,7 @@ public class TestCombinedConfigurationBu
                                 attrs))).registerProvider(tagName,
                         new ConfigurationBuilderProvider()
                         {
+                            @Override
                             public ConfigurationBuilder<? extends Configuration> getConfigurationBuilder(
                                     ConfigurationDeclaration decl)
                                     throws ConfigurationException
@@ -1322,6 +1323,7 @@ public class TestCombinedConfigurationBu
             this.propertyKey = propertyKey;
         }
 
+        @Override
         public ConfigurationBuilder<? extends Configuration> getConfigurationBuilder(
                 ConfigurationDeclaration decl) throws ConfigurationException
         {
@@ -1444,6 +1446,7 @@ public class TestCombinedConfigurationBu
             map.put("test_key", "test.value");
         }
 
+        @Override
         public String lookup(String key)
         {
             return map.get(key);
@@ -1459,6 +1462,7 @@ public class TestCombinedConfigurationBu
         private final List<ConfigurationBuilder<? extends Configuration>> builders =
                 new LinkedList<ConfigurationBuilder<? extends Configuration>>();
 
+        @Override
         public void builderReset(
                 ConfigurationBuilder<? extends Configuration> builder)
         {

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java Mon Mar 24 21:20:10 2014
@@ -182,6 +182,7 @@ public class TestReloadingCombinedConfig
         ReloadingDetectorFactory detectorFactory =
                 new ReloadingDetectorFactory()
                 {
+                    @Override
                     public ReloadingDetector createReloadingDetector(
                             FileHandler handler,
                             FileBasedBuilderParametersImpl params)
@@ -235,6 +236,7 @@ public class TestReloadingCombinedConfig
         ReloadingDetectorFactory detectorFactory =
                 new ReloadingDetectorFactory()
                 {
+                    @Override
                     public ReloadingDetector createReloadingDetector(
                             FileHandler handler,
                             FileBasedBuilderParametersImpl params)

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/fluent/TestParameters.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/fluent/TestParameters.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/fluent/TestParameters.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/fluent/TestParameters.java Mon Mar 24 21:20:10 2014
@@ -375,6 +375,7 @@ public class TestParameters
                 .anyObject(BuilderParameters.class));
         EasyMock.expectLastCall().andAnswer(new IAnswer<Object>()
         {
+            @Override
             public Object answer() throws Throwable
             {
                 initializedParams.add(EasyMock.getCurrentArguments()[0]);

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/convert/TestDefaultListDelimiterHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/convert/TestDefaultListDelimiterHandler.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/convert/TestDefaultListDelimiterHandler.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/convert/TestDefaultListDelimiterHandler.java Mon Mar 24 21:20:10 2014
@@ -106,6 +106,7 @@ public class TestDefaultListDelimiterHan
     {
         ValueTransformer trans = new ValueTransformer()
         {
+            @Override
             public Object transformValue(Object value)
             {
                 return String.valueOf(value) + "_trans";

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/event/ConfigurationListenerTestImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/event/ConfigurationListenerTestImpl.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/event/ConfigurationListenerTestImpl.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/event/ConfigurationListenerTestImpl.java Mon Mar 24 21:20:10 2014
@@ -53,6 +53,7 @@ public class ConfigurationListenerTestIm
         events = new LinkedList<ConfigurationEvent>();
     }
 
+    @Override
     public void configurationChanged(ConfigurationEvent event)
     {
         events.add(event);

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/event/TestEventSource.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/event/TestEventSource.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/event/TestEventSource.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/event/TestEventSource.java Mon Mar 24 21:20:10 2014
@@ -210,6 +210,7 @@ public class TestEventSource
     {
         ConfigurationListener lstRemove = new ConfigurationListener()
         {
+            @Override
             public void configurationChanged(ConfigurationEvent event)
             {
                 source.removeConfigurationListener(this);
@@ -350,12 +351,14 @@ public class TestEventSource
 
         int numberOfErrors;
 
+        @Override
         public void configurationChanged(ConfigurationEvent event)
         {
             lastEvent = event;
             numberOfCalls++;
         }
 
+        @Override
         public void configurationError(ConfigurationErrorEvent event)
         {
             lastEvent = event;

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/event/TestHierarchicalConfigurationEvents.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/event/TestHierarchicalConfigurationEvents.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/event/TestHierarchicalConfigurationEvents.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/event/TestHierarchicalConfigurationEvents.java Mon Mar 24 21:20:10 2014
@@ -138,7 +138,7 @@ public class TestHierarchicalConfigurati
         ConfigurationEvent evSub = (ConfigurationEvent) event
                 .getPropertyValue();
         assertEquals("Wrong event type",
-                BaseHierarchicalConfiguration.EVENT_ADD_PROPERTY, evSub.getType());
+                AbstractConfiguration.EVENT_ADD_PROPERTY, evSub.getType());
         assertEquals("Wrong property name", "newProp", evSub.getPropertyName());
         assertEquals("Wrong property value", "newValue", evSub
                 .getPropertyValue());

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/interpol/TestConfigurationInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/interpol/TestConfigurationInterpolator.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/interpol/TestConfigurationInterpolator.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/interpol/TestConfigurationInterpolator.java Mon Mar 24 21:20:10 2014
@@ -83,6 +83,7 @@ public class TestConfigurationInterpolat
         EasyMock.expect(lookup.lookup(EasyMock.anyObject(String.class)))
                 .andAnswer(new IAnswer<Object>()
                 {
+                    @Override
                     public Object answer() throws Throwable
                     {
                         if (var.equals(EasyMock.getCurrentArguments()[0]))



Mime
View raw message