svn commit: r15312 - trunk/src/argouml-app/src/org/argouml/persistence

Author: mvw
Date: 2008-07-20 00:24:13-0700
New Revision: 15312

Modified:
   trunk/src/argouml-app/src/org/argouml/persistence/ArgoParser.java
   trunk/src/argouml-app/src/org/argouml/persistence/ArgoTokenTable.java

Log:
Issue 5252: Show '1' multiplicities setting lost: This makes the setting load correctly.

Still to do: Refresh the Figs with this loaded setting.

Modified: trunk/src/argouml-app/src/org/argouml/persistence/ArgoParser.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/persistence/ArgoParser.java?view=diff&rev=15312&p1=trunk/src/argouml-app/src/org/argouml/persistence/ArgoParser.java&p2=trunk/src/argouml-app/src/org/argouml/persistence/ArgoParser.java&r1=15311&r2=15312
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/persistence/ArgoParser.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/persistence/ArgoParser.java	2008-07-20 00:24:13-0700
@@ -219,6 +219,9 @@
         case ArgoTokenTable.TOKEN_SHOWSTEREOTYPES:
             handleShowStereotypes(e);
             break;
+        case ArgoTokenTable.TOKEN_SHOWSINGULARMULTIPLICITIES:
+            handleShowSingularMultiplicities(e);
+            break;
         case ArgoTokenTable.TOKEN_DEFAULTSHADOWWIDTH:
             handleDefaultShadowWidth(e);
             break;
@@ -417,6 +420,14 @@
     /**
      * @param e the element
      */
+    protected void handleShowSingularMultiplicities(XMLElement e) {
+        String showSingularMultiplicities = e.getText().trim();
+        ps.setShowSingularMultiplicities(showSingularMultiplicities);
+    }
+
+    /**
+     * @param e the element
+     */
     protected void handleDefaultShadowWidth(XMLElement e) {
         String dsw = e.getText().trim();
         ps.setDefaultShadowWidth(dsw);

Modified: trunk/src/argouml-app/src/org/argouml/persistence/ArgoTokenTable.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/persistence/ArgoTokenTable.java?view=diff&rev=15312&p1=trunk/src/argouml-app/src/org/argouml/persistence/ArgoTokenTable.java&p2=trunk/src/argouml-app/src/org/argouml/persistence/ArgoTokenTable.java&r1=15311&r2=15312
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/persistence/ArgoTokenTable.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/persistence/ArgoTokenTable.java	2008-07-20 00:24:13-0700
@@ -65,6 +65,8 @@
     private static final String STRING_SHOWPROPERTIES = "showproperties";
     private static final String STRING_SHOWTYPES = "showtypes";
     private static final String STRING_SHOWSTEREOTYPES = "showstereotypes";
+    private static final String STRING_SHOWSINGULARMULTIPLICITIES 
+        = "showsingularmultiplicities";
     private static final String STRING_DEFAULTSHADOWWIDTH
         = "defaultshadowwidth";
     private static final String STRING_FONTNAME = "fontname";
@@ -124,6 +126,8 @@
     public static final int    TOKEN_SHOWASSOCIATIONNAMES     = 24;
     /** A token for the active diagram name **/
     public static final int    TOKEN_ACTIVE_DIAGRAM     = 25;
+    /** A token for Notation Settings **/
+    public static final int    TOKEN_SHOWSINGULARMULTIPLICITIES = 26;
 
     /** The token for undefined. */
     public static final int    TOKEN_UNDEFINED               = 99;
@@ -154,6 +158,8 @@
         addToken(STRING_SHOWPROPERTIES, Integer.valueOf(TOKEN_SHOWPROPERTIES));
         addToken(STRING_SHOWTYPES, Integer.valueOf(TOKEN_SHOWTYPES));
         addToken(STRING_SHOWSTEREOTYPES, Integer.valueOf(TOKEN_SHOWSTEREOTYPES));
+        addToken(STRING_SHOWSINGULARMULTIPLICITIES, 
+                Integer.valueOf(TOKEN_SHOWSINGULARMULTIPLICITIES));
         addToken(STRING_DEFAULTSHADOWWIDTH,
                 Integer.valueOf(TOKEN_DEFAULTSHADOWWIDTH));
         addToken(STRING_FONTNAME, Integer.valueOf(TOKEN_FONTNAME));