Author: knopp
Date: Sun Jan 24 20:08:35 2010
New Revision: 902636

URL: http://svn.apache.org/viewvc?rev=902636&view=rev
Log: (empty)

Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/listener/ChangeListenerSet.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/listener/ListenerSet.java

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/listener/ChangeListenerSet.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/listener/ChangeListenerSet.java?rev=902636&r1=902635&r2=902636&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/listener/ChangeListenerSet.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/listener/ChangeListenerSet.java
 Sun Jan 24 20:08:35 2010
@@ -24,14 +24,14 @@
  * 
  * @author Jonathan Locke
  */
-public final class ChangeListenerSet extends ListenerSet
+public final class ChangeListenerSet extends ListenerSet<IChangeListener>
 {
        /**
         * @see 
org.apache.wicket.util.listener.ListenerSet#notifyListener(org.apache.wicket.util.listener.IListener)
         */
        @Override
-       protected void notifyListener(IListener listener)
+       protected void notifyListener(IChangeListener listener)
        {
-               ((IChangeListener)listener).onChange();
+               listener.onChange();
        }
 }

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/listener/ListenerSet.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/listener/ListenerSet.java?rev=902636&r1=902635&r2=902636&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/listener/ListenerSet.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/listener/ListenerSet.java
 Sun Jan 24 20:08:35 2010
@@ -28,11 +28,13 @@
  * WICKET-2697)
  * 
  * @author Jonathan Locke
+ * 
+ * @param <T>
  */
-public abstract class ListenerSet
+public abstract class ListenerSet<T extends IListener>
 {
        /** Set of change listeners */
-       private final Set<IListener> listeners = new HashSet<IListener>();
+       private final Set<T> listeners = new HashSet<T>();
 
        /**
         * Adds a listener to this set of listeners.
@@ -41,7 +43,7 @@
         *            The listener to add
         * @return <tt>true</tt> if the set did not already contain the 
specified listener.
         */
-       public boolean add(final IListener listener)
+       public boolean add(final T listener)
        {
                return listeners.add(listener);
        }
@@ -52,10 +54,10 @@
        public void notifyListeners()
        {
                // Create a stable copy for iterating over
-               final Set<IListener> copy = new HashSet<IListener>(listeners);
+               final Set<T> copy = new HashSet<T>(listeners);
 
                // Notify all listeners that the file changed
-               for (IListener listener : copy)
+               for (T listener : copy)
                {
                        notifyListener(listener);
                }
@@ -67,7 +69,7 @@
         * @param listener
         *            The listener to remove
         */
-       public void remove(final IListener listener)
+       public void remove(final T listener)
        {
                listeners.remove(listener);
        }
@@ -78,5 +80,5 @@
         * @param listener
         *            The listener to notify
         */
-       protected abstract void notifyListener(IListener listener);
+       protected abstract void notifyListener(T listener);
 }


Reply via email to