svn commit: r14738 - trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClass.java

Author: bobtarling
Date: 2008-05-14 14:43:40-0700
New Revision: 14738

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClass.java

Log:
Filter out events due to association removal

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClass.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClass.java?view=diff&rev=14738&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClass.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClass.java&r1=14737&r2=14738
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClass.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClass.java	2008-05-14 14:43:40-0700
@@ -39,6 +39,7 @@
 import org.argouml.model.AddAssociationEvent;
 import org.argouml.model.AssociationChangeEvent;
 import org.argouml.model.AttributeChangeEvent;
+import org.argouml.model.DeleteInstanceEvent;
 import org.argouml.model.Model;
 import org.argouml.model.RemoveAssociationEvent;
 import org.argouml.model.UmlChangeEvent;
@@ -650,6 +651,19 @@
         calcBounds();
         setBounds(getBounds());
     }
+    
+    public void propertyChange(PropertyChangeEvent event) {
+        if (!(event instanceof DeleteInstanceEvent)
+                && event.getSource() == getOwner()
+                && event.getPropertyName().equals("association")
+                && Model.getFacade().isAAssociationEnd(event.getOldValue())) {
+            // TODO: We are getting events we don't want. Can we instruct the
+            // model event pump not to send these in the first place?
+            // See defect 5095.
+            return;
+        }
+        super.propertyChange(event);
+    }
 
     /*
      * @see org.argouml.uml.diagram.ui.FigNodeModelElement#updateListeners(java.lang.Object, java.lang.Object)