svn commit: r14288 - trunk/src/app/src/org/argouml/application/events/ArgoEventPump.java

Author: mvw
Date: 2008-04-06 01:10:34-0700
New Revision: 14288

Modified:
   trunk/src/app/src/org/argouml/application/events/ArgoEventPump.java

Log:
Fix for issue 4995, patch as committed by Scott Roberts.

Modified: trunk/src/app/src/org/argouml/application/events/ArgoEventPump.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/application/events/ArgoEventPump.java?view=diff&rev=14288&p1=trunk/src/app/src/org/argouml/application/events/ArgoEventPump.java&p2=trunk/src/app/src/org/argouml/application/events/ArgoEventPump.java&r1=14287&r2=14288
==============================================================================
--- trunk/src/app/src/org/argouml/application/events/ArgoEventPump.java	(original)
+++ trunk/src/app/src/org/argouml/application/events/ArgoEventPump.java	2008-04-06 01:10:34-0700
@@ -1,5 +1,5 @@
 // $Id$
-// Copyright (c) 1996-2007 The Regents of the University of California. All
+// Copyright (c) 1996-2008 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
 // software and its documentation without fee, and without a written
 // agreement is hereby granted, provided that the above copyright notice
@@ -329,8 +329,10 @@
 					(ArgoNotationEventListener) listener);
                 }
             }
-            if (event.getEventType() >= ArgoEventTypes.ANY_DIAGRAM_APPEARANCE_EVENT
-                    && event.getEventType() < ArgoEventTypes.LAST_DIAGRAM_APPEARANCE_EVENT) {
+            if (event.getEventType() >= ArgoEventTypes
+                            .ANY_DIAGRAM_APPEARANCE_EVENT
+                    && event.getEventType() < ArgoEventTypes
+                            .LAST_DIAGRAM_APPEARANCE_EVENT) {
                 if (listener instanceof ArgoDiagramAppearanceEventListener) {
                     handleFireDiagramAppearanceEvent(
                             (ArgoDiagramAppearanceEvent) event,
@@ -352,14 +354,16 @@
                 }
             }
             if (event.getEventType() >= ArgoEventTypes.ANY_STATUS_EVENT
-                    && event.getEventType() < ArgoEventTypes.LAST_STATUS_EVENT) {
+                    && event.getEventType() < ArgoEventTypes
+                            .LAST_STATUS_EVENT) {
                 if (listener instanceof ArgoStatusEventListener) {
                     handleFireStatusEvent((ArgoStatusEvent) event,
                             (ArgoStatusEventListener) listener);
                 }
             }
             if (event.getEventType() >= ArgoEventTypes.ANY_PROFILE_EVENT
-                    && event.getEventType() < ArgoEventTypes.LAST_PROFILE_EVENT) {
+                    && event.getEventType() < ArgoEventTypes
+                            .LAST_PROFILE_EVENT) {
                 if (listener instanceof ArgoProfileEventListener) {
                     handleFireProfileEvent((ArgoProfileEvent) event,
                             (ArgoProfileEventListener) listener);
@@ -390,8 +394,8 @@
             if (pair.getEventType() == ArgoEventTypes.ANY_EVENT) {
                 handleFireEvent(event, pair.getListener());
             } else if (
-                (pair.getEventType() >= event.getEventStartRange())
-                    && (pair.getEventType() <= event.getEventEndRange())) {
+                    pair.getEventType() == event.getEventStartRange()
+                    || pair.getEventType() == event.getEventType()) {
                 handleFireEvent(event, pair.getListener());
             }
         }