You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2015/04/11 22:33:42 UTC

svn commit: r1672926 - /commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java

Author: oheger
Date: Sat Apr 11 20:33:42 2015
New Revision: 1672926

URL: http://svn.apache.org/r1672926
Log:
Checkstyle; e.g. unused imports.

Modified:
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java?rev=1672926&r1=1672925&r2=1672926&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java Sat Apr 11 20:33:42 2015
@@ -31,9 +31,7 @@ import java.util.Stack;
 
 import org.apache.commons.configuration2.event.ConfigurationEvent;
 import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
-import org.apache.commons.configuration2.sync.LockMode;
 import org.apache.commons.configuration2.sync.NoOpSynchronizer;
-import org.apache.commons.configuration2.sync.Synchronizer;
 import org.apache.commons.configuration2.tree.ConfigurationNodeVisitorAdapter;
 import org.apache.commons.configuration2.tree.DefaultExpressionEngine;
 import org.apache.commons.configuration2.tree.ExpressionEngine;
@@ -153,7 +151,8 @@ import org.apache.commons.configuration2
  * </p>
  * <p>
  * Whether an {@code AbstractHierarchicalConfiguration} object is thread-safe or
- * not depends on the underlying {@code NodeModel} and the {@link Synchronizer}
+ * not depends on the underlying {@code NodeModel} and the
+ * {@link org.apache.commons.configuration2.sync.Synchronizer Synchronizer}
  * it is associated with. Some {@code NodeModel} implementations are inherently
  * thread-safe; they do not require a special {@code Synchronizer}. (Per
  * default, a dummy {@code Synchronizer} is used which is not thread-safe!) The
@@ -161,8 +160,10 @@ import org.apache.commons.configuration2
  * {@code Synchronizer} accordingly. When accessing the configuration's root
  * node directly, the client application is responsible for proper
  * synchronization. This is achieved by calling the methods
- * {@link #lock(LockMode)}, and {@link #unlock(LockMode)} with a proper
- * {@link LockMode} argument. In any case, it is recommended to not access the
+ * {@link #lock(org.apache.commons.configuration2.sync.LockMode) lock()},
+ * and {@link #unlock(org.apache.commons.configuration2.sync.LockMode) unlock()} with a proper
+ * {@link org.apache.commons.configuration2.sync.LockMode LockMode} argument.
+ * In any case, it is recommended to not access the
  * root node directly, but to use corresponding methods for querying or updating
  * configuration data instead. Direct manipulations of a configuration's node
  * structure circumvent many internal mechanisms and thus can cause undesired
@@ -538,7 +539,8 @@ public abstract class AbstractHierarchic
      * for nodes encountered on the path.
      */
     @Override
-    public String nodeKey(T node, Map<T, String> cache, NodeHandler<T> handler) {
+    public String nodeKey(T node, Map<T, String> cache, NodeHandler<T> handler)
+    {
         List<T> path = new LinkedList<T>();
         T currentNode = node;
         String key = cache.get(node);