svn commit: r13976 - trunk/src_new/org/argouml: application application/api cognitive/checklist/ui cognitive/ui ui uml/diagram/ui uml/ui
[email protected] 21 Dec 2007 21:15:35 -0000
Newsgroups
gmane.comp.lang.uml.argouml.cvs
Message-ID
<[email protected] >
Author: mvw
Date: 2007-12-21 13:15:35-0800
New Revision: 13976
Modified:
trunk/src_new/org/argouml/application/SubsystemUtility.java
trunk/src_new/org/argouml/application/api/AbstractArgoJPanel.java
trunk/src_new/org/argouml/cognitive/checklist/ui/TabChecklist.java
trunk/src_new/org/argouml/cognitive/ui/TabToDo.java
trunk/src_new/org/argouml/ui/DetailsPane.java
trunk/src_new/org/argouml/ui/StylePanel.java
trunk/src_new/org/argouml/ui/TabText.java
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/TabConstraints.java
trunk/src_new/org/argouml/uml/ui/TabProps.java
trunk/src_new/org/argouml/uml/ui/TabStyle.java
trunk/src_new/org/argouml/uml/ui/TabTaggedValues.java
Log:
Make the tabs determine themselves what icon they show.
Modified: trunk/src_new/org/argouml/application/SubsystemUtility.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/application/SubsystemUtility.java?view=diff&rev=13976&p1=trunk/src_new/org/argouml/application/SubsystemUtility.java&p2=trunk/src_new/org/argouml/application/SubsystemUtility.java&r1=13975&r2=13976
==============================================================================
--- trunk/src_new/org/argouml/application/SubsystemUtility.java (original)
+++ trunk/src_new/org/argouml/application/SubsystemUtility.java 2007-12-21 13:15:35-0800
@@ -30,6 +30,7 @@
import org.argouml.ui.DetailsPane;
import org.argouml.ui.GUI;
import org.argouml.ui.ProjectBrowser;
+import org.argouml.ui.TabToDoTarget;
/**
* Utility class for subsystem management.
@@ -53,8 +54,9 @@
GUI.getInstance().addProjectSettingsTab(tab);
}
for (AbstractArgoJPanel tab : subsystem.getDetailsTabs()) {
+ /* All tabs are added at the end, except a TabToDoTarget: */
((DetailsPane) ProjectBrowser.getInstance().getDetailsPane())
- .addTab(tab, true);
+ .addTab(tab, !(tab instanceof TabToDoTarget));
}
}
Modified: trunk/src_new/org/argouml/application/api/AbstractArgoJPanel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/application/api/AbstractArgoJPanel.java?view=diff&rev=13976&p1=trunk/src_new/org/argouml/application/api/AbstractArgoJPanel.java&p2=trunk/src_new/org/argouml/application/api/AbstractArgoJPanel.java&r1=13975&r2=13976
==============================================================================
--- trunk/src_new/org/argouml/application/api/AbstractArgoJPanel.java (original)
+++ trunk/src_new/org/argouml/application/api/AbstractArgoJPanel.java 2007-12-21 13:15:35-0800
@@ -28,6 +28,7 @@
import java.awt.Point;
import java.awt.Rectangle;
+import javax.swing.Icon;
import javax.swing.JDialog;
import javax.swing.JPanel;
import javax.swing.JTabbedPane;
@@ -50,6 +51,9 @@
* TODO: Spawning of windows disabled in spawn()<p>
*
* Title: This JPanel keeps track of its own title.<p>
+ *
+ * Icon: This JPanel keeps track of its own icon; i.e. an arrow pointing to
+ * the panel that it gives details of.<p>
*
* Orientation: This JPanel is Orientable.<p>
*
@@ -70,6 +74,8 @@
private static final int OVERLAPP = 30;
private String title = "untitled";
+
+ private Icon icon = null;
/**
* if true, remove tab from parent JTabbedPane.
@@ -158,6 +164,20 @@
title = t;
}
+ /**
+ * @return the icon to be shown for this panel
+ */
+ public Icon getIcon() {
+ return icon;
+ }
+
+ /**
+ * @param icon this icon will be shown in front of the title
+ */
+ public void setIcon(Icon icon) {
+ this.icon = icon;
+ }
+
////////////////////////////////////////////////////////////////
// actions
Modified: trunk/src_new/org/argouml/cognitive/checklist/ui/TabChecklist.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/cognitive/checklist/ui/TabChecklist.java?view=diff&rev=13976&p1=trunk/src_new/org/argouml/cognitive/checklist/ui/TabChecklist.java&p2=trunk/src_new/org/argouml/cognitive/checklist/ui/TabChecklist.java&r1=13975&r2=13976
==============================================================================
--- trunk/src_new/org/argouml/cognitive/checklist/ui/TabChecklist.java (original)
+++ trunk/src_new/org/argouml/cognitive/checklist/ui/TabChecklist.java 2007-12-21 13:15:35-0800
@@ -52,6 +52,7 @@
import org.argouml.cognitive.checklist.Checklist;
import org.argouml.cognitive.checklist.ChecklistStatus;
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;
@@ -77,6 +78,7 @@
public TabChecklist() {
super("tab.checklist");
+ setIcon(new UpArrowIcon());
tableModel = new TableModelChecklist(this);
table.setModel(tableModel);
Modified: trunk/src_new/org/argouml/cognitive/ui/TabToDo.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/cognitive/ui/TabToDo.java?view=diff&rev=13976&p1=trunk/src_new/org/argouml/cognitive/ui/TabToDo.java&p2=trunk/src_new/org/argouml/cognitive/ui/TabToDo.java&r1=13975&r2=13976
==============================================================================
--- trunk/src_new/org/argouml/cognitive/ui/TabToDo.java (original)
+++ trunk/src_new/org/argouml/cognitive/ui/TabToDo.java 2007-12-21 13:15:35-0800
@@ -37,6 +37,7 @@
import org.argouml.cognitive.ToDoItem;
import org.argouml.cognitive.critics.Wizard;
import org.argouml.configuration.Configuration;
+import org.argouml.swingext.LeftArrowIcon;
import org.argouml.ui.TabToDoTarget;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.ui.targetmanager.TargetManager;
@@ -75,6 +76,8 @@
*/
public TabToDo() {
super("tab.todo-item");
+ setIcon(new LeftArrowIcon());
+
String position =
Configuration.getString(Configuration.makeKey("layout",
"tabtodo"));
Modified: trunk/src_new/org/argouml/ui/DetailsPane.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/DetailsPane.java?view=diff&rev=13976&p1=trunk/src_new/org/argouml/ui/DetailsPane.java&p2=trunk/src_new/org/argouml/ui/DetailsPane.java&r1=13975&r2=13976
==============================================================================
--- trunk/src_new/org/argouml/ui/DetailsPane.java (original)
+++ trunk/src_new/org/argouml/ui/DetailsPane.java 2007-12-21 13:15:35-0800
@@ -190,16 +190,8 @@
* false = at the beginning
*/
public void addTab(AbstractArgoJPanel p, boolean atEnd) {
- Icon icon = null;
+ Icon icon = p.getIcon();
String title = Translator.localize(p.getTitle());
- if (p instanceof TabToDoTarget) {
- icon = leftArrowIcon;
- atEnd = false; //overrule the parameter!
- } else if (p instanceof TabModelTarget) {
- icon = upArrowIcon;
- } else if (p instanceof TabFigTarget) {
- icon = upArrowIcon;
- }
if (atEnd) {
topLevelTabbedPane.addTab(title, icon, p);
tabPanelList.add(p);
Modified: trunk/src_new/org/argouml/ui/StylePanel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/StylePanel.java?view=diff&rev=13976&p1=trunk/src_new/org/argouml/ui/StylePanel.java&p2=trunk/src_new/org/argouml/ui/StylePanel.java&r1=13975&r2=13976
==============================================================================
--- trunk/src_new/org/argouml/ui/StylePanel.java (original)
+++ trunk/src_new/org/argouml/ui/StylePanel.java 2007-12-21 13:15:35-0800
@@ -41,6 +41,7 @@
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
+import org.argouml.swingext.UpArrowIcon;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.uml.diagram.ArgoDiagram;
import org.tigris.gef.presentation.Fig;
Modified: trunk/src_new/org/argouml/ui/TabText.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/TabText.java?view=diff&rev=13976&p1=trunk/src_new/org/argouml/ui/TabText.java&p2=trunk/src_new/org/argouml/ui/TabText.java&r1=13975&r2=13976
==============================================================================
--- trunk/src_new/org/argouml/ui/TabText.java (original)
+++ trunk/src_new/org/argouml/ui/TabText.java 2007-12-21 13:15:35-0800
@@ -37,6 +37,7 @@
import org.apache.log4j.Logger;
import org.argouml.application.api.AbstractArgoJPanel;
+import org.argouml.swingext.UpArrowIcon;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.ui.targetmanager.TargetManager;
import org.tigris.toolbar.ToolBarFactory;
@@ -82,6 +83,7 @@
*/
public TabText(String title, boolean withToolbar) {
super(title);
+ setIcon(new UpArrowIcon());
setLayout(new BorderLayout());
textArea.setFont(new Font("Monospaced", Font.PLAIN, 12));
textArea.setTabSize(4);
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=13976&p1=trunk/src_new/org/argouml/uml/diagram/ui/PropPanelString.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/PropPanelString.java&r1=13975&r2=13976
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/PropPanelString.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/PropPanelString.java 2007-12-21 13:15:35-0800
@@ -35,6 +35,7 @@
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;
@@ -58,6 +59,7 @@
*/
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=13976&p1=trunk/src_new/org/argouml/uml/ui/PropPanel.java&p2=trunk/src_new/org/argouml/uml/ui/PropPanel.java&r1=13975&r2=13976
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/PropPanel.java (original)
+++ trunk/src_new/org/argouml/uml/ui/PropPanel.java 2007-12-21 13:15:35-0800
@@ -55,14 +55,15 @@
import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.application.helpers.ResourceLoaderWrapper;
import org.argouml.i18n.Translator;
+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;
import org.argouml.ui.targetmanager.TargetListener;
import org.argouml.ui.targetmanager.TargettableModelView;
-import org.argouml.kernel.ProfileConfiguration;
import org.tigris.gef.presentation.Fig;
import org.tigris.swidgets.GridLayout2;
import org.tigris.swidgets.Horizontal;
@@ -135,7 +136,8 @@
public PropPanel(String label, ImageIcon icon, Orientation orientation) {
super(Translator.localize(label));
setOrientation(orientation);
-
+ setIcon(new UpArrowIcon());
+
LabelledLayout layout =
new LabelledLayout(orientation == Vertical.getInstance());
layout.setHgap(5);
@@ -178,6 +180,7 @@
*/
public PropPanel(String label, ImageIcon icon) {
this(label, icon, Horizontal.getInstance());
+ setIcon(new UpArrowIcon());
}
/*
Modified: trunk/src_new/org/argouml/uml/ui/TabConstraints.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/TabConstraints.java?view=diff&rev=13976&p1=trunk/src_new/org/argouml/uml/ui/TabConstraints.java&p2=trunk/src_new/org/argouml/uml/ui/TabConstraints.java&r1=13975&r2=13976
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/TabConstraints.java (original)
+++ trunk/src_new/org/argouml/uml/ui/TabConstraints.java 2007-12-21 13:15:35-0800
@@ -41,6 +41,7 @@
import org.argouml.model.Model;
import org.argouml.ocl.ArgoFacade;
import org.argouml.ocl.OCLUtil;
+import org.argouml.swingext.UpArrowIcon;
import org.argouml.ui.TabModelTarget;
import org.argouml.ui.targetmanager.TargetEvent;
import org.tigris.gef.presentation.Fig;
@@ -87,6 +88,7 @@
public TabConstraints() {
super("tab.constraints");
+ setIcon(new UpArrowIcon());
setLayout(new BorderLayout(0, 0));
mOcleEditor = new OCLEditor();
Modified: trunk/src_new/org/argouml/uml/ui/TabProps.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/TabProps.java?view=diff&rev=13976&p1=trunk/src_new/org/argouml/uml/ui/TabProps.java&p2=trunk/src_new/org/argouml/uml/ui/TabProps.java&r1=13975&r2=13976
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/TabProps.java (original)
+++ trunk/src_new/org/argouml/uml/ui/TabProps.java 2007-12-21 13:15:35-0800
@@ -34,6 +34,7 @@
import org.apache.log4j.Logger;
import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.model.Model;
+import org.argouml.swingext.UpArrowIcon;
import org.argouml.ui.TabModelTarget;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.ui.targetmanager.TargetListener;
@@ -192,6 +193,7 @@
*/
public TabProps(String tabName, String panelClassBase) {
super(tabName);
+ setIcon(new UpArrowIcon());
TargetManager.getInstance().addTargetListener(this);
setOrientation(Horizontal.getInstance());
panelClassBaseName = panelClassBase;
Modified: trunk/src_new/org/argouml/uml/ui/TabStyle.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/TabStyle.java?view=diff&rev=13976&p1=trunk/src_new/org/argouml/uml/ui/TabStyle.java&p2=trunk/src_new/org/argouml/uml/ui/TabStyle.java&r1=13975&r2=13976
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/TabStyle.java (original)
+++ trunk/src_new/org/argouml/uml/ui/TabStyle.java 2007-12-21 13:15:35-0800
@@ -41,6 +41,7 @@
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
+import org.argouml.swingext.UpArrowIcon;
import org.argouml.ui.StylePanel;
import org.argouml.ui.TabFigTarget;
import org.argouml.ui.targetmanager.TargetEvent;
@@ -130,6 +131,7 @@
public TabStyle(String tabName, String[] spn) {
super(tabName);
this.stylePanelNames = spn;
+ setIcon(new UpArrowIcon());
setLayout(new BorderLayout());
}
Modified: trunk/src_new/org/argouml/uml/ui/TabTaggedValues.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/TabTaggedValues.java?view=diff&rev=13976&p1=trunk/src_new/org/argouml/uml/ui/TabTaggedValues.java&p2=trunk/src_new/org/argouml/uml/ui/TabTaggedValues.java&r1=13975&r2=13976
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/TabTaggedValues.java (original)
+++ trunk/src_new/org/argouml/uml/ui/TabTaggedValues.java 2007-12-21 13:15:35-0800
@@ -51,6 +51,7 @@
import org.argouml.i18n.Translator;
import org.argouml.model.InvalidElementException;
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;
@@ -89,6 +90,7 @@
*/
public TabTaggedValues() {
super("tab.tagged-values");
+ setIcon(new UpArrowIcon());
buttonPanel = new ToolBar();
buttonPanel.setName(getTitle());
buttonPanel.setFloatable(false);