Return-Path: 
 <openwebbeans-commits-return-793-apmail-incubator-openwebbeans-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: 
 apmail-incubator-openwebbeans-commits-archive@minotaur.apache.org
Received: (qmail 10455 invoked from network); 30 Sep 2009 19:00:32 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 30 Sep 2009 19:00:32 -0000
Received: (qmail 20901 invoked by uid 500); 30 Sep 2009 19:00:32 -0000
Delivered-To: 
 apmail-incubator-openwebbeans-commits-archive@incubator.apache.org
Received: (qmail 20879 invoked by uid 500); 30 Sep 2009 19:00:32 -0000
Mailing-List: contact openwebbeans-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
List-Help: <mailto:openwebbeans-commits-help@incubator.apache.org>
List-Unsubscribe: 
 <mailto:openwebbeans-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:openwebbeans-commits@incubator.apache.org>
List-Id: <openwebbeans-commits.incubator.apache.org>
Reply-To: openwebbeans-dev@incubator.apache.org
Delivered-To: mailing list openwebbeans-commits@incubator.apache.org
Received: (qmail 20869 invoked by uid 99); 30 Sep 2009 19:00:32 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Sep 2009 19:00:32 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Sep 2009 19:00:29 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 2FB2823888E8; Wed, 30 Sep 2009 19:00:08 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r820389 -
 /incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
Date: Wed, 30 Sep 2009 19:00:08 -0000
To: openwebbeans-commits@incubator.apache.org
From: dblevins@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090930190008.2FB2823888E8@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dblevins
Date: Wed Sep 30 19:00:07 2009
New Revision: 820389

URL: http://svn.apache.org/viewvc?rev=820389&view=rev
Log:
Removed duplicate add/remove code

Modified:
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java?rev=820389&r1=820388&r2=820389&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java Wed Sep 30 19:00:07 2009
@@ -88,21 +88,11 @@
         set.add(observerImpl);
     }
 
-    public <T> void addObserver(Observer<T> observer, TypeLiteral<T> eventType, Annotation... annotations)
+    public <T> void addObserver(Observer<T> observer, TypeLiteral<T> typeLiteral, Annotation... annotations)
     {
-        EventUtil.checkEventType(eventType.getRawType());
-        EventUtil.checkEventBindings(annotations);
-
-        ObserverWrapper<T> observerImpl = new ObserverWrapper<T>(observer, eventType.getRawType(), annotations);
-
-        Set<ObserverWrapper<?>> set = observers.get(eventType.getRawType());
-        if (set == null)
-        {
-            set = new HashSet<ObserverWrapper<?>>();
-            observers.put(eventType.getRawType(), set);
-        }
+        EventUtil.checkEventType(typeLiteral.getRawType());
 
-        set.add(observerImpl);
+        addObserver(observer, false, TransactionalObserverType.NONE, typeLiteral.getRawType(), annotations);
     }
 
     public <T> void removeObserver(Observer<T> observer, Class<T> eventType, Annotation... annotations)
@@ -129,28 +119,9 @@
         }
     }
 
-    public <T> void removeObserver(Observer<T> observer, TypeLiteral<T> eventType, Annotation... annotations)
+    public <T> void removeObserver(Observer<T> observer, TypeLiteral<T> typeLiteral, Annotation... annotations)
     {
-        EventUtil.checkEventType(eventType.getRawType());
-        EventUtil.checkEventBindings(annotations);
-
-        if (observers.containsKey(eventType.getRawType()))
-        {
-            Set<ObserverWrapper<?>> set = observers.get(eventType.getRawType());
-            for (ObserverWrapper<?> s : set)
-            {
-                Observer<T> ob = (Observer<T>) ((ObserverWrapper<?>) s).getObserver();
-
-                Set<Annotation> evenBindings = s.getEventQualifiers();
-                Annotation[] anns = new Annotation[evenBindings.size()];
-                anns = evenBindings.toArray(anns);
-
-                if (ob.equals(observer) && Arrays.equals(anns, annotations))
-                {
-                    set.remove(s);
-                }
-            }
-        }
+        removeObserver(observer, typeLiteral.getRawType(), annotations);
     }
 
     public <T> Set<Observer<T>> resolveObservers(T event, Annotation... bindings)