svn commit: r1609785 - /commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/reloading/ReloadingController.java

[oheger]

Author: oheger
Date: Fri Jul 11 20:12:27 2014
New Revision: 1609785

URL: http://svn.apache.org/r1609785
Log:
Removed deprecated event handling methods from ReloadingController.

All callers of these methods have been adapted; so they are now obsolete and
can be removed.

Modified:
    
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/reloading/ReloadingController.java

Modified: 
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/reloading/ReloadingController.java
URL: 
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/reloading/ReloadingController.java?rev=1609785&r1=1609784&r2=1609785&view=diff
==============================================================================
--- 
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/reloading/ReloadingController.java
 (original)
+++ 
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/reloading/ReloadingController.java
 Fri Jul 11 20:12:27 2014
@@ -19,7 +19,6 @@ package org.apache.commons.configuration
 import org.apache.commons.configuration.event.EventListener;
 import org.apache.commons.configuration.event.EventListenerList;
 import org.apache.commons.configuration.event.EventType;
-import org.apache.commons.lang3.event.EventListenerSupport;
 
 /**
  * <p>
@@ -70,9 +69,6 @@ public class ReloadingController
     private final ReloadingDetector detector;
 
     /** The helper object which manages the registered event listeners. */
-    private final EventListenerSupport<ReloadingListener> deprecatedListeners;
-
-    /** The helper object which manages the registered event listeners. */
     private final EventListenerList listeners;
 
     /** A flag whether this controller is in reloading state. */
@@ -95,7 +91,6 @@ public class ReloadingController
 
         detector = detect;
         listeners = new EventListenerList();
-        deprecatedListeners = 
EventListenerSupport.create(ReloadingListener.class);
     }
 
     /**
@@ -109,18 +104,6 @@ public class ReloadingController
     }
 
     /**
-     * Adds the specified {@code ReloadingListener} to this controller. It will
-     * receive notifications whenever a reload operation is necessary.
-     *
-     * @param l the listener to be added (must not be <b>null</b>)
-     *          @deprecated Use {@code addEventListener()}
-     */
-    public void addReloadingListener(ReloadingListener l)
-    {
-        deprecatedListeners.addListener(l);
-    }
-
-    /**
      * Adds an event listener of the specified type to this controller. It will
      * receive notifications whenever a reload operation is necessary.
      *
@@ -135,17 +118,6 @@ public class ReloadingController
     }
 
     /**
-     * Removes the specified {@code ReloadingListener} from this controller.
-     *
-     * @param l the listener to be removed
-     *          @deprecated use {@code removeEventListener()}
-     */
-    public void removeReloadingListener(ReloadingListener l)
-    {
-        deprecatedListeners.removeListener(l);
-    }
-
-    /**
      * Removes the specified event listener from this controller.
      *
      * @param eventType the event type
@@ -206,7 +178,6 @@ public class ReloadingController
 
         if (sendEvent)
         {
-            deprecatedListeners.fire().reloadingRequired(new 
ReloadingEvent(this, data));
             listeners.fire(new ReloadingEvent(this, data));
             return true;
         }