svn commit: r15584 - trunk/src/argouml-app/src/org/argouml/uml/diagram/ui

Author: mvw
Date: 2008-08-19 09:44:05-0700
New Revision: 15584

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigSingleLineText.java

Log:
Some optimisations related to issue 5182: removed double registration for listening to notation change events. This reduces file load times considerably.

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java?view=diff&rev=15584&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java&r1=15583&r2=15584
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java	2008-08-19 09:44:05-0700
@@ -629,8 +629,6 @@
                 new String[] {"name", "visibility", "stereotype"}*/);
         setTextFilled(false);
         setJustification(FigText.JUSTIFY_CENTER);
-        ArgoEventPump.addListener(
-                ArgoEventTypes.ANY_NOTATION_EVENT, this);
     }
 
     @Override
@@ -649,13 +647,7 @@
                         NotationProviderFactory2.TYPE_ASSOCIATION_END_NAME, 
                         getOwner(),
                         this);
-            Project p = getProject();
-            if (p != null) {
-                npArguments.put("rightGuillemot", 
-                        p.getProjectSettings().getRightGuillemot());
-                npArguments.put("leftGuillemot", 
-                        p.getProjectSettings().getLeftGuillemot());
-            }
+            initNotationArguments();
         }
     }
     

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigSingleLineText.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigSingleLineText.java?view=diff&rev=15584&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigSingleLineText.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigSingleLineText.java&r1=15583&r2=15584
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigSingleLineText.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigSingleLineText.java	2008-08-19 09:44:05-0700
@@ -293,7 +293,7 @@
         return npArguments;
     }
 
-    private void initNotationArguments() {
+    protected void initNotationArguments() {
         Project p = getProject();
         if (p != null) {
             npArguments.put("rightGuillemot",