svn commit: r18623 - trunk/src/argouml-app/src/org/argouml: kernel notation

Author: mvw
Date: 2010-08-03 12:53:11-0700
New Revision: 18623

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

Log:
Remove old deprecated methods.

Modified: trunk/src/argouml-app/src/org/argouml/kernel/ProjectSettings.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/kernel/ProjectSettings.java?view=diff&pathrev=18623&r1=18622&r2=18623
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/kernel/ProjectSettings.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/kernel/ProjectSettings.java	2010-08-03 12:53:11-0700
@@ -50,7 +50,6 @@
 import org.argouml.configuration.ConfigurationKey;
 import org.argouml.notation.Notation;
 import org.argouml.notation.NotationName;
-import org.argouml.notation.NotationProviderFactory2;
 import org.argouml.notation.NotationSettings;
 import org.argouml.uml.diagram.DiagramSettings;
 import org.tigris.gef.undo.Memento;
@@ -102,9 +101,6 @@
         
         String notationLanguage =
             Notation.getConfiguredNotation().getConfigurationValue();
-        // TODO: The concept of a single global notation language doesn't
-        // work with multiple projects
-        NotationProviderFactory2.setCurrentLanguage(notationLanguage);
         npSettings.setNotationLanguage(notationLanguage);
         
         npSettings.setUseGuillemets(Configuration.getBoolean(
@@ -215,13 +211,11 @@
 
             public void redo() {
                 npSettings.setNotationLanguage(newLanguage);
-                NotationProviderFactory2.setCurrentLanguage(newLanguage);
                 fireNotationEvent(key, oldLanguage, newLanguage);
             }
 
             public void undo() {
                 npSettings.setNotationLanguage(oldLanguage);
-                NotationProviderFactory2.setCurrentLanguage(oldLanguage);
                 fireNotationEvent(key, newLanguage, oldLanguage);
             }
         };

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=18623&r1=18622&r2=18623
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/notation/NotationProviderFactory2.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/notation/NotationProviderFactory2.java	2010-08-03 12:53:11-0700
@@ -1,6 +1,6 @@
 /* $Id$
  *****************************************************************************
- * Copyright (c) 2009 Contributors - see below
+ * Copyright (c) 2009-2010 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
@@ -59,12 +59,7 @@
 
     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;
-    
+
     /**
      * TYPE_NAME the name of the modelelement, e.g. class, package, state
      */
@@ -213,22 +208,6 @@
     }
 
     /**
-     * Get a NotationProvider for the current language.
-     * 
-     * @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);
-        return getNotationProvider(type, object, name);
-    }
-
-    /**
      * Get a NotationProvider for the current project.
      * <p>
      * If there is any reason for failure, null is returned - no
@@ -377,16 +356,4 @@
         return false;
     }
 
-    /**
-     * 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;
-    }
-
 }

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

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