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

Author: mvw
Date: 2009-03-29 11:45:31-0700
New Revision: 16994

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

Log:
Stop using deprecated method, and removed it.

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=16994&r1=16993&r2=16994
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/notation/NotationProviderFactory2.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/notation/NotationProviderFactory2.java	2009-03-29 11:45:31-0700
@@ -199,7 +199,7 @@
     }
 
     /**
-     * Get a NotationProvider for the given language.
+     * Get a NotationProvider for the current language.
      * 
      * @param type the provider type
      * @return the provider
@@ -274,24 +274,6 @@
     }
 
     /**
-     * Create a new NotationProvider.
-     * 
-     * @param type the provider type
-     * @return the provider
-     * @param object the constructor parameter
-     * @param listener the fig
-     * that refreshes after the NotationProvider has changed
-     * @deprecated for 0.27.2 by tfmorris.  Use 
-     * {@link #getNotationProvider(int, Object, PropertyChangeListener, NotationName)}.
-     */
-    @Deprecated
-    public NotationProvider getNotationProvider(int type,
-            Object object, PropertyChangeListener listener) {
-    	NotationName name = Notation.findNotation(currentLanguage);
-        return getNotationProvider(type, object, listener, name);
-    }
-
-    /**
      * Get a NotationProvider for the current project.
      * 
      * @param type the provider type

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java?view=diff&pathrev=16994&r1=16993&r2=16994
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java	2009-03-29 11:45:31-0700
@@ -243,9 +243,11 @@
                 edgePort.setOwner(getOwner());
             }
             stereotypeFig.setOwner(element); // this fixes issue 5414
+            NotationName nn = Notation.findNotation(
+                    settings.getNotationSettings().getNotationLanguage());
             notationProviderName =
                 NotationProviderFactory2.getInstance().getNotationProvider(
-                        getNotationProviderType(), element, this);
+                        getNotationProviderType(), element, this, nn);
 
             addElementListener(element, "remove");
         }

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java?view=diff&pathrev=16994&r1=16993&r2=16994
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java	2009-03-29 11:45:31-0700
@@ -432,9 +432,10 @@
         nameFig.setText(placeString());
         
         if (element != null) {
+            NotationName nn = Notation.findNotation(notationSettings.getNotationLanguage());
             notationProviderName =
                 NotationProviderFactory2.getInstance().getNotationProvider(
-                        getNotationProviderType(), element, this);
+                        getNotationProviderType(), element, this, nn);
 
             /* This next line presumes that the 1st fig with this owner 
              * is the previous port - and consequently nullifies the owner

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

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