svn commit: r1174256 - in /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation: DelegatingObservationDispatcher.java EventListenerIteratorImpl.java

[re...@apache.org]

Author: reschke
Date: Thu Sep 22 16:44:41 2011
New Revision: 1174256

URL: http://svn.apache.org/viewvc?rev=1174256&view=rev
Log:
generics

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/DelegatingObservationDispatcher.java
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventListenerIteratorImpl.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/DelegatingObservationDispatcher.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/DelegatingObservationDispatcher.java?rev=1174256&r1=1174255&r2=1174256&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/DelegatingObservationDispatcher.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/DelegatingObservationDispatcher.java Thu Sep 22 16:44:41 2011
@@ -39,7 +39,7 @@ public class DelegatingObservationDispat
     /**
      * the set of dispatchers
      */
-    private final HashSet dispatchers = new HashSet();
+    private final HashSet<ObservationDispatcher> dispatchers = new HashSet<ObservationDispatcher>();
 
     /**
      * Adds a new observation dispatcher to the set of dispatchers
@@ -110,7 +110,7 @@ public class DelegatingObservationDispat
      * @param pathPrefix event path prefix
      * @param userData the user data
      */
-    public void dispatch(List eventList, SessionImpl session,
+    public void dispatch(List<EventState> eventList, SessionImpl session,
                          Path pathPrefix, String userData) {
         ObservationDispatcher[] disp;
         synchronized (dispatchers) {

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventListenerIteratorImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventListenerIteratorImpl.java?rev=1174256&r1=1174255&r2=1174256&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventListenerIteratorImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventListenerIteratorImpl.java Thu Sep 22 16:44:41 2011
@@ -37,7 +37,7 @@ class EventListenerIteratorImpl implemen
     /**
      * Iterator over {@link EventConsumer} instances
      */
-    private final Iterator consumers;
+    private final Iterator<EventConsumer> consumers;
 
     /**
      * The next <code>EventListener</code> that belongs to the session
@@ -59,7 +59,7 @@ class EventListenerIteratorImpl implemen
      * @throws NullPointerException if <code>ticket</code> or <code>consumer</code>
      *                              is <code>null</code>.
      */
-    EventListenerIteratorImpl(Session session, Collection sConsumers, Collection aConsumers)
+    EventListenerIteratorImpl(Session session, Collection<EventConsumer> sConsumers, Collection<EventConsumer> aConsumers)
             throws NullPointerException {
         if (session == null) {
             throw new NullPointerException("session");
@@ -71,7 +71,7 @@ class EventListenerIteratorImpl implemen
             throw new NullPointerException("consumers");
         }
         this.session = session;
-        Collection allConsumers = new ArrayList(sConsumers);
+        Collection<EventConsumer> allConsumers = new ArrayList<EventConsumer>(sConsumers);
         allConsumers.addAll(aConsumers);
         this.consumers = allConsumers.iterator();
         fetchNext();