svn commit: r1678619 - /commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java

[oh...@apache.org]

Author: oheger
Date: Sun May 10 20:15:27 2015
New Revision: 1678619

URL: http://svn.apache.org/r1678619
Log:
Checkstyle.

Unused imports and some formatting issues.

Modified:
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java?rev=1678619&r1=1678618&r2=1678619&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java Sun May 10 20:15:27 2015
@@ -41,7 +41,6 @@ import org.apache.commons.configuration2
 import org.apache.commons.configuration2.builder.BuilderParameters;
 import org.apache.commons.configuration2.builder.ConfigurationBuilder;
 import org.apache.commons.configuration2.builder.ConfigurationBuilderEvent;
-import org.apache.commons.configuration2.builder.DefaultParametersManager;
 import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl;
 import org.apache.commons.configuration2.builder.FileBasedBuilderProperties;
 import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
@@ -49,7 +48,6 @@ import org.apache.commons.configuration2
 import org.apache.commons.configuration2.builder.XMLBuilderProperties;
 import org.apache.commons.configuration2.event.EventListener;
 import org.apache.commons.configuration2.ex.ConfigurationException;
-import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
 import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
 import org.apache.commons.configuration2.interpol.Lookup;
 import org.apache.commons.configuration2.io.FileSystem;
@@ -1001,7 +999,7 @@ public class CombinedConfigurationBuilde
         {
             initChildXMLParameters((XMLBuilderProperties<?>) params);
         }
-        if(params instanceof FileBasedBuilderProperties<?>)
+        if (params instanceof FileBasedBuilderProperties<?>)
         {
             initChildFileBasedParameters((FileBasedBuilderProperties<?>) params);
         }
@@ -1131,7 +1129,8 @@ public class CombinedConfigurationBuilde
     }
 
     /**
-     * Executes the {@link DefaultParametersManager} stored in the current
+     * Executes the {@link org.apache.commons.configuration2.builder.DefaultParametersManager
+     * DefaultParametersManager} stored in the current
      * parameters on the passed in parameters object. If default handlers have been
      * registered for this type of parameters, an initialization is now
      * performed. This method is called before the parameters object is
@@ -1139,8 +1138,8 @@ public class CombinedConfigurationBuilde
      * can be overridden later with concrete property definitions.
      *
      * @param params the parameters to be initialized
-     * @throws ConfigurationRuntimeException if an error occurs when copying
-     *         properties
+     * @throws org.apache.commons.configuration2.ex.ConfigurationRuntimeException if an error
+     *         occurs when copying properties
      */
     private void initDefaultChildParameters(BuilderParameters params)
     {
@@ -1288,8 +1287,10 @@ public class CombinedConfigurationBuilde
                 new EventListener<ConfigurationBuilderEvent>()
                 {
             @Override
-            public void onEvent(ConfigurationBuilderEvent event) {
-                synchronized (CombinedConfigurationBuilder.this) {
+            public void onEvent(ConfigurationBuilderEvent event)
+            {
+                synchronized (CombinedConfigurationBuilder.this)
+                {
                     reset();
                     definitionBuilder = defBuilder;
                 }
@@ -1571,7 +1572,8 @@ public class CombinedConfigurationBuilde
             changeListener = new EventListener<ConfigurationBuilderEvent>()
             {
                 @Override
-                public void onEvent(ConfigurationBuilderEvent event) {
+                public void onEvent(ConfigurationBuilderEvent event)
+                {
                     resetResult();
                 }
             };