svn commit: r16171 - trunk/src/argouml-app/src/org/argouml/ui/StylePanelFig.java

Author: tfmorris
Date: 2008-11-24 10:57:11-0800
New Revision: 16171

Modified:
   trunk/src/argouml-app/src/org/argouml/ui/StylePanelFig.java

Log:
Use new stereotype style enum

Modified: trunk/src/argouml-app/src/org/argouml/ui/StylePanelFig.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/StylePanelFig.java?view=diff&rev=16171&p1=trunk/src/argouml-app/src/org/argouml/ui/StylePanelFig.java&p2=trunk/src/argouml-app/src/org/argouml/ui/StylePanelFig.java&r1=16170&r2=16171
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/StylePanelFig.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/ui/StylePanelFig.java	2008-11-24 10:57:11-0800
@@ -40,15 +40,14 @@
 import javax.swing.JTextField;
 import javax.swing.text.Document;
 
-import org.tigris.gef.presentation.Fig;
-import org.tigris.gef.ui.ColorRenderer;
-
 import org.argouml.i18n.Translator;
 import org.argouml.swingext.SpacerPanel;
-import org.argouml.uml.diagram.DiagramAppearance;
+import org.argouml.uml.diagram.DiagramSettings.StereotypeStyle;
 import org.argouml.uml.diagram.ui.FigEdgeModelElement;
 import org.argouml.uml.diagram.ui.FigNodeModelElement;
 import org.argouml.util.ArgoFrame;
+import org.tigris.gef.presentation.Fig;
+import org.tigris.gef.ui.ColorRenderer;
 
 /**
  * The basic stylepanel for a Fig which allows the user to see and adjust 
@@ -187,6 +186,7 @@
         DefaultComboBoxModel model = new DefaultComboBoxModel();
         stereoField.setModel(model);
         
+        // NOTE: These must stay in this order to match rendering styles
         model.addElement(Translator
                 .localize("menu.popup.stereotype-view.textual"));
         model.addElement(Translator
@@ -284,18 +284,7 @@
         
         if (target instanceof FigNodeModelElement) {
             FigNodeModelElement fig = (FigNodeModelElement) target;
-            
-            switch (fig.getStereotypeView()) {
-            case DiagramAppearance.STEREOTYPE_VIEW_TEXTUAL:
-                stereoField.setSelectedIndex(0);                
-                break;
-            case DiagramAppearance.STEREOTYPE_VIEW_BIG_ICON:
-                stereoField.setSelectedIndex(1);                
-                break;
-            case DiagramAppearance.STEREOTYPE_VIEW_SMALL_ICON:
-                stereoField.setSelectedIndex(2);                
-                break;
-            }
+            stereoField.setSelectedIndex(fig.getStereotypeStyle().ordinal());
         }
     }
 
@@ -511,20 +500,8 @@
                     int idx = model.getIndexOf(item);
                     FigNodeModelElement fig = (FigNodeModelElement) target;
 
-                    switch (idx) {
-                    case 0:
-                        fig.setStereotypeView(
-                                DiagramAppearance.STEREOTYPE_VIEW_TEXTUAL);
-                        break;
-                    case 1:
-                        fig.setStereotypeView(
-                                DiagramAppearance.STEREOTYPE_VIEW_BIG_ICON);
-                        break;
-                    case 2:
-                        fig.setStereotypeView(
-                                DiagramAppearance.STEREOTYPE_VIEW_SMALL_ICON);
-                        break;
-                    }
+                    fig.setStereotypeStyle(StereotypeStyle.getEnum(idx));
+
                 }
             }
         }