svn commit: r18625 - trunk/src/argouml-app: src/org/argouml/kernel tests/org/argouml/kernel

Author: mvw
Date: 2010-08-04 11:20:30-0700
New Revision: 18625

Modified:
   trunk/src/argouml-app/src/org/argouml/kernel/ProjectSettings.java
   trunk/src/argouml-app/tests/org/argouml/kernel/TestProjectSettings.java

Log:
Removed some deprecated code (related to Notation).

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=18625&r1=18624&r2=18625
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/kernel/ProjectSettings.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/kernel/ProjectSettings.java	2010-08-04 11:20:30-0700
@@ -307,28 +307,6 @@
     }
 
     /**
-     * @return the left pointing guillemet, i.e. << or the one-character symbol
-     * @deprecated for 0.27.2 by tfmorris. There's no need for a separate method
-     *             for this. It can be easily handled in a format string using
-     *             the results of {@link DiagramSettings#isUseGuillemets()}.
-     */
-    @Deprecated
-    public String getLeftGuillemot() {
-        return getUseGuillemotsValue() ? "\u00ab" : "<<";
-    }
-
-    /**
-     * @return the right pointing guillemet, i.e. >> or the one-character symbol
-     * @deprecated for 0.27.2 by tfmorris. There's no need for a separate method
-     *             for this. It can be easily handled in a format string using
-     *             the results of {@link DiagramSettings#isUseGuillemets()}.
-     */
-    @Deprecated
-    public String getRightGuillemot() {
-        return getUseGuillemotsValue() ? "\u00bb" : ">>";
-    }
-
-    /**
      * Used by "argo.tee".
      *
      * @return Returns "true" if we show association names.

Modified: trunk/src/argouml-app/tests/org/argouml/kernel/TestProjectSettings.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/kernel/TestProjectSettings.java?view=diff&pathrev=18625&r1=18624&r2=18625
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/kernel/TestProjectSettings.java	(original)
+++ trunk/src/argouml-app/tests/org/argouml/kernel/TestProjectSettings.java	2010-08-04 11:20:30-0700
@@ -118,18 +118,10 @@
         Project p = ProjectManager.getManager().makeEmptyProject();
         assertTrue("Guillemots not correct",
                 !p.getProjectSettings().getUseGuillemotsValue());
-        assertTrue("Guillemots string not set correctly",
-                "<<".equals(p.getProjectSettings().getLeftGuillemot()));
-        assertTrue("Guillemots string not set correctly",
-                ">>".equals(p.getProjectSettings().getRightGuillemot()));
 
         p.getProjectSettings().setUseGuillemots(true);
         assertTrue("Guillemots not correct",
                 p.getProjectSettings().getUseGuillemotsValue());
-        assertTrue("Guillemots string not set correctly",
-                "\u00ab".equals(p.getProjectSettings().getLeftGuillemot()));
-        assertTrue("Guillemots string not set correctly",
-                "\u00bb".equals(p.getProjectSettings().getRightGuillemot()));
 
         p.getProjectSettings().setUseGuillemots(Boolean.toString(false));
         assertTrue("Guillemots not correct",

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

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