svn commit: r13160 - trunk/src_new/org/argouml: notation/providers uml/diagram/collaboration/ui

Author: mvw
Date: 2007-07-27 01:25:39-0700
New Revision: 13160

Modified:
   trunk/src_new/org/argouml/notation/providers/ClassifierRoleNotation.java
   trunk/src_new/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java

Log:
Made the ClassifierRole notation update when the Class name changes.

Modified: trunk/src_new/org/argouml/notation/providers/ClassifierRoleNotation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/ClassifierRoleNotation.java?view=diff&rev=13160&p1=trunk/src_new/org/argouml/notation/providers/ClassifierRoleNotation.java&p2=trunk/src_new/org/argouml/notation/providers/ClassifierRoleNotation.java&r1=13159&r2=13160
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/ClassifierRoleNotation.java	(original)
+++ trunk/src_new/org/argouml/notation/providers/ClassifierRoleNotation.java	2007-07-27 01:25:39-0700
@@ -24,6 +24,9 @@
 
 package org.argouml.notation.providers;
 
+import java.beans.PropertyChangeListener;
+import java.util.Collection;
+
 import org.argouml.model.Model;
 import org.argouml.notation.NotationProvider;
 
@@ -47,4 +50,13 @@
         }
     }
 
+    @Override
+    public void initialiseListener(PropertyChangeListener listener, Object modelElement) {
+        super.initialiseListener(listener, modelElement);
+        Collection classifiers = Model.getFacade().getBases(modelElement);
+        for (Object c : classifiers) {
+            addElementListener(listener, c, "name");
+        }
+    }
+
 }

Modified: trunk/src_new/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java?view=diff&rev=13160&p1=trunk/src_new/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java&p2=trunk/src_new/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java&r1=13159&r2=13160
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java	2007-07-27 01:25:39-0700
@@ -29,7 +29,6 @@
 import java.awt.Rectangle;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyVetoException;
-import java.util.Collection;
 import java.util.Iterator;
 
 import org.argouml.model.AddAssociationEvent;
@@ -414,34 +413,12 @@
                 || mee instanceof AttributeChangeEvent) {
             renderingChanged();
             updateListeners(getOwner(), getOwner());
+            notationProvider.updateListener(this, getOwner(), mee);
             damage();
         }
     }
 
     /*
-     * @see org.argouml.uml.diagram.ui.FigNodeModelElement#updateListeners(java.lang.Object, java.lang.Object)
-     */
-    protected void updateListeners(Object oldOwner, Object newOwner) {
-        if (oldOwner != null) {
-            removeAllElementListeners();
-        }
-        super.updateListeners(oldOwner, newOwner);
-        /* Now, let's register for all events from all modelelements
-         * that may change the text: 
-         */
-        if (newOwner != null) {
-            addElementListener(newOwner, 
-                    new String[] {"name", "base", "remove"});
-            Collection bases = Model.getFacade().getBases(newOwner);
-            Iterator i = bases.iterator();
-            while (i.hasNext()) {
-                Object base = i.next();
-                addElementListener(base, "name");
-            }
-        }
-    }
-
-    /*
      * @see org.tigris.gef.presentation.Fig#makeSelection()
      */
     public Selection makeSelection() {