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

Author: mvw
Date: 2008-12-07 06:08:18-0800
New Revision: 16271

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

Log:
Adapt Notation Subsystem to the new architecture around DiagramSettings.

Modified: trunk/src/argouml-app/src/org/argouml/notation/NotationProviderFactory2.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/notation/NotationProviderFactory2.java?view=diff&pathrev=16271&r1=16270&r2=16271
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/notation/NotationProviderFactory2.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/notation/NotationProviderFactory2.java	2008-12-07 06:08:18-0800
@@ -295,7 +295,7 @@
      * @param name the name of the notation language to use
      * @return the provider
      */
-    private NotationProvider getNotationProvider(int type,
+    public NotationProvider getNotationProvider(int type,
             Object object, PropertyChangeListener listener, 
             NotationName name) {
 

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&pathrev=16271&r1=16270&r2=16271
==============================================================================
--- 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-12-07 06:08:18-0800
@@ -48,6 +48,8 @@
 import org.argouml.model.AddAssociationEvent;
 import org.argouml.model.AttributeChangeEvent;
 import org.argouml.model.Model;
+import org.argouml.notation.Notation;
+import org.argouml.notation.NotationName;
 import org.argouml.notation.NotationProvider;
 import org.argouml.notation.NotationProviderFactory2;
 import org.argouml.ui.ArgoJMenu;
@@ -657,9 +659,10 @@
             multiplicityNotationProvider.cleanListener(this, own);
         }
         if (Model.getFacade().isAModelElement(own)) {
+            NotationName notation = Notation.findNotation(getSettings().getNotationLanguage());
             multiplicityNotationProvider =
                 NotationProviderFactory2.getInstance().getNotationProvider(
-                        NotationProviderFactory2.TYPE_MULTIPLICITY, own, this);
+                        NotationProviderFactory2.TYPE_MULTIPLICITY, own, this, notation);
             boolean value = getSettings().isShowSingularMultiplicities();
             npArguments.put("singularMultiplicityVisible", value);
         }

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

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