svn commit: r1609810 - in /commons/proper/configuration/trunk/src: main/java/org/apache/commons/configuration/builder/ test/java/org/apache/commons/configuration/builder/

[oheger]

Author: oheger
Date: Fri Jul 11 20:28:22 2014
New Revision: 1609810

URL: http://svn.apache.org/r1609810
Log:
Adapted the auto-save mechanism of file-based configurations.

The specialized listener implementing the auto-save mechanism now implements
the new event listener interface.

Modified:
    
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/AutoSaveListener.java
    
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/FileBasedConfigurationBuilder.java
    
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestAutoSaveListener.java

Modified: 
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/AutoSaveListener.java
URL: 
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/AutoSaveListener.java?rev=1609810&r1=1609809&r2=1609810&view=diff
==============================================================================
--- 
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/AutoSaveListener.java
 (original)
+++ 
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/AutoSaveListener.java
 Fri Jul 11 20:28:22 2014
@@ -17,7 +17,7 @@
 package org.apache.commons.configuration.builder;
 
 import org.apache.commons.configuration.event.ConfigurationEvent;
-import org.apache.commons.configuration.event.ConfigurationListener;
+import org.apache.commons.configuration.event.EventListener;
 import org.apache.commons.configuration.ex.ConfigurationException;
 import org.apache.commons.configuration.io.FileHandler;
 import org.apache.commons.configuration.io.FileHandlerListenerAdapter;
@@ -46,7 +46,7 @@ import org.apache.commons.logging.LogFac
  * @since 2.0
  */
 class AutoSaveListener extends FileHandlerListenerAdapter implements
-        ConfigurationListener
+        EventListener<ConfigurationEvent>
 {
     /** The logger. */
     private final Log log = LogFactory.getLog(getClass());
@@ -81,7 +81,7 @@ class AutoSaveListener extends FileHandl
      * operation is in progress.
      */
     @Override
-    public void configurationChanged(ConfigurationEvent event)
+    public void onEvent(ConfigurationEvent event)
     {
         if (autoSaveRequired(event))
         {

Modified: 
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/FileBasedConfigurationBuilder.java
URL: 
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/FileBasedConfigurationBuilder.java?rev=1609810&r1=1609809&r2=1609810&view=diff
==============================================================================
--- 
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/FileBasedConfigurationBuilder.java
 (original)
+++ 
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/FileBasedConfigurationBuilder.java
 Fri Jul 11 20:28:22 2014
@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHa
 import org.apache.commons.configuration.FileBasedConfiguration;
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.commons.configuration.XMLPropertiesConfiguration;
+import org.apache.commons.configuration.event.ConfigurationEvent;
 import org.apache.commons.configuration.ex.ConfigurationException;
 import org.apache.commons.configuration.io.FileHandler;
 import org.apache.commons.lang3.ClassUtils;
@@ -343,7 +344,7 @@ public class FileBasedConfigurationBuild
         if (autoSaveListener == null)
         {
             autoSaveListener = new AutoSaveListener(this);
-            addConfigurationListener(autoSaveListener);
+            addConfigurationListener(ConfigurationEvent.ANY, autoSaveListener);
             autoSaveListener.updateFileHandler(getFileHandler());
         }
     }
@@ -356,7 +357,7 @@ public class FileBasedConfigurationBuild
     {
         if (autoSaveListener != null)
         {
-            removeConfigurationListener(autoSaveListener);
+            removeConfigurationListener(ConfigurationEvent.ANY, 
autoSaveListener);
             autoSaveListener.updateFileHandler(null);
             autoSaveListener = null;
         }

Modified: 
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestAutoSaveListener.java
URL: 
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestAutoSaveListener.java?rev=1609810&r1=1609809&r2=1609810&view=diff
==============================================================================
--- 
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestAutoSaveListener.java
 (original)
+++ 
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestAutoSaveListener.java
 Fri Jul 11 20:28:22 2014
@@ -16,7 +16,6 @@
  */
 package org.apache.commons.configuration.builder;
 
-import org.apache.commons.configuration.AbstractConfiguration;
 import org.apache.commons.configuration.event.ConfigurationEvent;
 import org.apache.commons.configuration.ex.ConfigurationException;
 import org.apache.commons.configuration.io.FileHandler;
@@ -51,8 +50,8 @@ public class TestAutoSaveListener
      */
     private void fireChangeEvent(boolean before)
     {
-        listener.configurationChanged(new ConfigurationEvent(this,
-                AbstractConfiguration.EVENT_ADD_PROPERTY, "someProperty",
+        listener.onEvent(new ConfigurationEvent(this,
+                ConfigurationEvent.ADD_PROPERTY, "someProperty",
                 "someValue", before));
     }