svn commit: r16037 - trunk/src/argouml-app/src/org/argouml/notation/NotationProviderFactory2.java

Author: tfmorris
Date: 2008-11-12 15:32:57-0800
New Revision: 16037

Modified:
   trunk/src/argouml-app/src/org/argouml/notation/NotationProviderFactory2.java

Log:
Deprecate methods which imply that there's a single global notation used for all callers

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&rev=16037&p1=trunk/src/argouml-app/src/org/argouml/notation/NotationProviderFactory2.java&p2=trunk/src/argouml-app/src/org/argouml/notation/NotationProviderFactory2.java&r1=16036&r2=16037
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/notation/NotationProviderFactory2.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/notation/NotationProviderFactory2.java	2008-11-12 15:32:57-0800
@@ -46,6 +46,9 @@
     private static final Logger LOG = 
         Logger.getLogger(NotationProviderFactory2.class);
     
+    // TODO: The concept of a single global notation language isn't going to
+    // work with multiple projects (or diagrams with different languages in
+    // the same project)
     private static String currentLanguage;
     
     /**
@@ -195,7 +198,10 @@
      * @param type the provider type
      * @return the provider
      * @param object the constructor parameter
+     * @deprecated for 0.27.2 by tfmorris.  Use 
+     * {@link #getNotationProvider(int, Object, NotationName)}.
      */
+    @Deprecated
     public NotationProvider getNotationProvider(int type,
             Object object) {
         NotationName name = Notation.findNotation(currentLanguage);
@@ -269,7 +275,10 @@
      * @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);
@@ -366,10 +375,13 @@
     }
 
     /**
-     * Set the notation language currently used in the Project.
+     * Set the default notation language for all users of this factory.
      * 
      * @param theCurrentLanguage the currentLanguage to set
+     * @deprecated for 0.27.2 by tfmorris. Callers should manage the language
+     *             that they want explicitly.
      */
+    @Deprecated
     public static void setCurrentLanguage(String theCurrentLanguage) {
         NotationProviderFactory2.currentLanguage = theCurrentLanguage;
     }