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

Author: mvw
Date: 2011-04-14 10:46:58-0700
New Revision: 19238

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

Log:
Fix for issue 6105: Link edge name does not show immediately.

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigLink.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigLink.java?view=diff&pathrev=19238&r1=19237&r2=19238
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigLink.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigLink.java	2011-04-14 10:46:58-0700
@@ -1,13 +1,13 @@
 /* $Id$
  *****************************************************************************
- * Copyright (c) 2009 Contributors - see below
+ * Copyright (c) 2009-2011 Contributors - see below
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    mvw
+ *    Michiel van der Wulp
  *****************************************************************************
  *
  * Some portions of this file was previously release using the BSD License:
@@ -39,6 +39,8 @@
 package org.argouml.uml.diagram.static_structure.ui;
 
 import org.argouml.model.Model;
+import org.argouml.model.UmlChangeEvent;
+import org.argouml.notation.NotationProvider;
 import org.argouml.uml.diagram.DiagramSettings;
 import org.argouml.uml.diagram.ui.FigEdgeModelElement;
 import org.argouml.uml.diagram.ui.FigTextGroup;
@@ -86,6 +88,7 @@
         super(element, settings);
         middleGroup = new FigTextGroup(element, settings);
         initialize();
+        updateListeners(null, getOwner());
     }
 
     /*
@@ -115,7 +118,7 @@
         }
         if (newOwner != null) {
             addElementListener(newOwner, 
-                    new String[] {"remove", "name", "association"});
+                    new String[] {"remove", "association"});
             Object newAssociation = Model.getFacade().getAssociation(newOwner);
             if (newAssociation != null) {
                 addElementListener(newAssociation, "name");
@@ -123,6 +126,17 @@
         }
     }
 
+    @Override
+    public void notationRenderingChanged(NotationProvider np, String rendering) {
+        /* Do nothing. */
+    }
+
+    @Override
+    protected void updateLayout(UmlChangeEvent event) {
+        super.updateLayout(event);
+        updateNameText();
+    }
+
     /**
      * Generate the notation for the modelelement and stuff it into the text Fig
      */

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2719846

To unsubscribe from this discussion, e-mail: [[email protected]].