svn commit: r1597289 - /commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/ReloadingFileBasedConfigurationBuilder.java

[oh...@apache.org]

Author: oheger
Date: Sat May 24 13:53:07 2014
New Revision: 1597289

URL: http://svn.apache.org/r1597289
Log:
ReloadingFileBasedConfigurationBuilder now uses ReloadingBuilderSupportListener.

The implementation could be simplified because functionality is already
provided by the generic reloading listener class.

Modified:
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/ReloadingFileBasedConfigurationBuilder.java

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/ReloadingFileBasedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/ReloadingFileBasedConfigurationBuilder.java?rev=1597289&r1=1597288&r2=1597289&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/ReloadingFileBasedConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/ReloadingFileBasedConfigurationBuilder.java Sat May 24 13:53:07 2014
@@ -25,8 +25,6 @@ import org.apache.commons.configuration.
 import org.apache.commons.configuration.reloading.ReloadingController;
 import org.apache.commons.configuration.reloading.ReloadingControllerSupport;
 import org.apache.commons.configuration.reloading.ReloadingDetector;
-import org.apache.commons.configuration.reloading.ReloadingEvent;
-import org.apache.commons.configuration.reloading.ReloadingListener;
 
 /**
  * <p>
@@ -191,7 +189,6 @@ public class ReloadingFileBasedConfigura
                 createReloadingDetector(handler,
                         FileBasedBuilderParametersImpl.fromParameters(
                                 getParameters(), true));
-        getReloadingController().resetReloadingState();
     }
 
     /**
@@ -209,32 +206,11 @@ public class ReloadingFileBasedConfigura
     {
         ReloadingDetector ctrlDetector = createReloadingDetectorForController();
         ReloadingController ctrl = new ReloadingController(ctrlDetector);
-        ctrl.addReloadingListener(createReloadingListener());
+        ReloadingBuilderSupportListener.connect(this, ctrl);
         return ctrl;
     }
 
     /**
-     * Creates a listener object to be registered at the associated reloading
-     * controller. This listener resets the builder's result object whenever a
-     * change in the monitored file is detected. This will trigger a builder
-     * reset event, and the next time {@code getConfiguration()} is called, a
-     * new result object is created.
-     *
-     * @return the listener for the associated {@code ReloadingController}
-     */
-    private ReloadingListener createReloadingListener()
-    {
-        return new ReloadingListener()
-        {
-            @Override
-            public void reloadingRequired(ReloadingEvent event)
-            {
-                resetResult();
-            }
-        };
-    }
-
-    /**
      * Creates a {@code ReloadingDetector} wrapper to be passed to the
      * associated {@code ReloadingController}. This detector wrapper simply
      * delegates to the current {@code ReloadingDetector} if it is available.
@@ -259,8 +235,7 @@ public class ReloadingFileBasedConfigura
             public boolean isReloadingRequired()
             {
                 ReloadingDetector detector = resultReloadingDetector;
-                return (detector != null) ? detector.isReloadingRequired()
-                        : false;
+                return (detector != null) && detector.isReloadingRequired();
             }
         };
     }