svn commit: r15933 - trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/UMLMessageActivatorComboBoxModel.java

Author: tfmorris
Date: 2008-10-16 12:55:43-0700
New Revision: 15933

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/UMLMessageActivatorComboBoxModel.java

Log:
Issue 5438: Return isValid == false when we encounter a deleted element

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/UMLMessageActivatorComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/UMLMessageActivatorComboBoxModel.java?view=diff&rev=15933&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/UMLMessageActivatorComboBoxModel.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/UMLMessageActivatorComboBoxModel.java&r1=15932&r2=15933
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/UMLMessageActivatorComboBoxModel.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/UMLMessageActivatorComboBoxModel.java	2008-10-16 12:55:43-0700
@@ -24,6 +24,7 @@
 
 package org.argouml.uml.ui.behavior.collaborations;
 
+import org.argouml.model.InvalidElementException;
 import org.argouml.model.Model;
 import org.argouml.uml.ui.UMLComboBoxModel2;
 
@@ -60,11 +61,16 @@
      * @see org.argouml.uml.ui.UMLComboBoxModel2#isValidElement(Object)
      */
     protected boolean isValidElement(Object m) {
-        return ((Model.getFacade().isAMessage(m))
-                && m != getTarget()
-                && !Model.getFacade().getPredecessors((getTarget())).contains(m)
-                && Model.getFacade().getInteraction(m)
-                    == Model.getFacade().getInteraction((getTarget())));
+        try {
+            return ((Model.getFacade().isAMessage(m))
+                    && m != getTarget()
+                    && !Model.getFacade().getPredecessors(getTarget())
+                            .contains(m) 
+                            && Model.getFacade().getInteraction(m) == Model
+                    .getFacade().getInteraction(getTarget()));
+        } catch (InvalidElementException e) {
+            return false;
+        }
     }
 
     /*