svn commit: r1609781 - in /commons/proper/configuration/trunk/src: main/java/org/apache/commons/configuration/reloading/ReloadingEvent.java test/java/org/apache/commons/configuration/reloading/TestReloadingController.java

[oheger]

Author: oheger
Date: Fri Jul 11 20:09:47 2014
New Revision: 1609781

URL: http://svn.apache.org/r1609781
Log:
ReloadingEvent now extends Event.

The event mechanism used by ReloadingController is going to be ported to the
new mechanism based on event types.

Modified:
    
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/reloading/ReloadingEvent.java
    
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/reloading/TestReloadingController.java

Modified: 
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/reloading/ReloadingEvent.java
URL: 
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/reloading/ReloadingEvent.java?rev=1609781&r1=1609780&r2=1609781&view=diff
==============================================================================
--- 
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/reloading/ReloadingEvent.java
 (original)
+++ 
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/reloading/ReloadingEvent.java
 Fri Jul 11 20:09:47 2014
@@ -16,7 +16,8 @@
  */
 package org.apache.commons.configuration.reloading;
 
-import java.util.EventObject;
+import org.apache.commons.configuration.event.Event;
+import org.apache.commons.configuration.event.EventType;
 
 /**
  * <p>
@@ -31,12 +32,16 @@ import java.util.EventObject;
  * @version $Id$
  * @since 2.0
  */
-public class ReloadingEvent extends EventObject
+public class ReloadingEvent extends Event
 {
     /**
      * The serial version UID.
      */
-    private static final long serialVersionUID = 20121006L;
+    private static final long serialVersionUID = 20140701L;
+
+    /** The common event super type for all reloading events. */
+    public static final EventType<ReloadingEvent> ANY =
+            new EventType<ReloadingEvent>(Event.ANY, "RELOAD");
 
     /** Stores additional data about this event. */
     private final Object data;
@@ -50,7 +55,7 @@ public class ReloadingEvent extends Even
      */
     public ReloadingEvent(ReloadingController source, Object addData)
     {
-        super(source);
+        super(source, ANY);
         data = addData;
     }
 

Modified: 
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/reloading/TestReloadingController.java
URL: 
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/reloading/TestReloadingController.java?rev=1609781&r1=1609780&r2=1609781&view=diff
==============================================================================
--- 
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/reloading/TestReloadingController.java
 (original)
+++ 
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/reloading/TestReloadingController.java
 Fri Jul 11 20:09:47 2014
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertFal
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
+import org.apache.commons.configuration.event.Event;
 import org.apache.commons.lang3.mutable.MutableObject;
 import org.easymock.EasyMock;
 import org.easymock.IAnswer;
@@ -182,4 +183,14 @@ public class TestReloadingController
         EasyMock.replay(detector);
         createController().resetReloadingState();
     }
+
+    /**
+     * Tests the event type of the reloading event.
+     */
+    @Test
+    public void testReloadingEventType()
+    {
+        assertEquals("Wrong super event type", Event.ANY,
+                ReloadingEvent.ANY.getSuperType());
+    }
 }