svn commit: r13993 - trunk/src_new/org/argouml/uml: diagram/ui ui

Author: mvw
Date: 2007-12-24 04:58:15-0800
New Revision: 13993

Modified:
   trunk/src_new/org/argouml/uml/diagram/ui/PropPanelString.java
   trunk/src_new/org/argouml/uml/ui/PropPanel.java
   trunk/src_new/org/argouml/uml/ui/TabDocumentation.java
   trunk/src_new/org/argouml/uml/ui/TabStereotype.java

Log:
Since now the tabs determine themselves what icon they show, it would be good to have junit tests for the presence of the icons.

Modified: trunk/src_new/org/argouml/uml/diagram/ui/PropPanelString.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/PropPanelString.java?view=diff&rev=13993&p1=trunk/src_new/org/argouml/uml/diagram/ui/PropPanelString.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/PropPanelString.java&r1=13992&r2=13993
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/PropPanelString.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/PropPanelString.java	2007-12-24 04:58:15-0800
@@ -28,6 +28,7 @@
 import java.awt.GridBagLayout;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+
 import javax.swing.JLabel;
 import javax.swing.JTextField;
 import javax.swing.event.DocumentEvent;
@@ -35,10 +36,8 @@
 
 import org.argouml.application.api.AbstractArgoJPanel;
 import org.argouml.i18n.Translator;
-import org.argouml.swingext.UpArrowIcon;
 import org.argouml.ui.TabModelTarget;
 import org.argouml.ui.targetmanager.TargetEvent;
-
 import org.tigris.gef.presentation.FigText;
 
 /**
@@ -59,7 +58,6 @@
      */
     public PropPanelString() {
 	super(Translator.localize("tab.string"));
-        setIcon(new UpArrowIcon());
 	GridBagLayout gb = new GridBagLayout();
 	setLayout(gb);
 	GridBagConstraints c = new GridBagConstraints();

Modified: trunk/src_new/org/argouml/uml/ui/PropPanel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/PropPanel.java?view=diff&rev=13993&p1=trunk/src_new/org/argouml/uml/ui/PropPanel.java&p2=trunk/src_new/org/argouml/uml/ui/PropPanel.java&r1=13992&r2=13993
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/PropPanel.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/PropPanel.java	2007-12-24 04:58:15-0800
@@ -58,7 +58,6 @@
 import org.argouml.kernel.ProfileConfiguration;
 import org.argouml.kernel.ProjectManager;
 import org.argouml.model.Model;
-import org.argouml.swingext.UpArrowIcon;
 import org.argouml.ui.LookAndFeelMgr;
 import org.argouml.ui.TabModelTarget;
 import org.argouml.ui.targetmanager.TargetEvent;
@@ -136,7 +135,6 @@
     public PropPanel(String label, ImageIcon icon, Orientation orientation) {
         super(Translator.localize(label));
         setOrientation(orientation);
-        setIcon(new UpArrowIcon());
         
         LabelledLayout layout =
             new LabelledLayout(orientation == Vertical.getInstance());
@@ -180,7 +178,6 @@
      */
     public PropPanel(String label, ImageIcon icon) {
         this(label, icon, Horizontal.getInstance());
-        setIcon(new UpArrowIcon());
     }
 
     /*

Modified: trunk/src_new/org/argouml/uml/ui/TabDocumentation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/TabDocumentation.java?view=diff&rev=13993&p1=trunk/src_new/org/argouml/uml/ui/TabDocumentation.java&p2=trunk/src_new/org/argouml/uml/ui/TabDocumentation.java&r1=13992&r2=13993
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/TabDocumentation.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/TabDocumentation.java	2007-12-24 04:58:15-0800
@@ -26,6 +26,7 @@
 
 import java.awt.Color;
 
+import javax.swing.ImageIcon;
 import javax.swing.JScrollPane;
 import javax.swing.UIManager;
 
@@ -33,6 +34,7 @@
 import org.argouml.configuration.Configuration;
 import org.argouml.i18n.Translator;
 import org.argouml.model.Model;
+import org.argouml.swingext.UpArrowIcon;
 import org.tigris.gef.presentation.Fig;
 import org.tigris.swidgets.Horizontal;
 import org.tigris.swidgets.LabelledLayout;
@@ -78,9 +80,11 @@
      * Construct new documentation tab
      */
     public TabDocumentation() {
-        super(Translator.localize("tab.documentation"), (orientation
-                .equals("West") || orientation.equals("East")) ? Vertical
-                .getInstance() : Horizontal.getInstance());
+        super(Translator.localize("tab.documentation"), (ImageIcon) null);
+        setOrientation((
+                orientation.equals("West") || orientation.equals("East"))
+                ? Vertical.getInstance() : Horizontal.getInstance());
+        setIcon(new UpArrowIcon());
 
         addField(Translator.localize("label.author"), new UMLTextField2(
                 new UMLModelElementTaggedValueDocument(Argo.AUTHOR_TAG)));

Modified: trunk/src_new/org/argouml/uml/ui/TabStereotype.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/TabStereotype.java?view=diff&rev=13993&p1=trunk/src_new/org/argouml/uml/ui/TabStereotype.java&p2=trunk/src_new/org/argouml/uml/ui/TabStereotype.java&r1=13992&r2=13993
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/TabStereotype.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/TabStereotype.java	2007-12-24 04:58:15-0800
@@ -47,6 +47,7 @@
 import org.argouml.i18n.Translator;
 import org.argouml.model.Model;
 import org.argouml.swingext.SpacerPanel;
+import org.argouml.swingext.UpArrowIcon;
 import org.argouml.ui.targetmanager.TargetManager;
 import org.argouml.uml.StereotypeUtility;
 import org.argouml.uml.ui.foundation.core.UMLModelElementStereotypeListModel;
@@ -92,6 +93,7 @@
         setOrientation((orientation
                 .equals("West") || orientation.equals("East")) ? Vertical
                 .getInstance() : Horizontal.getInstance());
+        setIcon(new UpArrowIcon());
         setLayout(new BorderLayout());
         remove(getTitleLabel()); // no title looks better