Author: mvw
Date: 2007-07-16 14:11:26-0700
New Revision: 13092
Modified:
trunk/src_new/org/argouml/cognitive/ui/TabToDo.java
trunk/src_new/org/argouml/swingext/ArgoToolbarManager.java
trunk/src_new/org/argouml/ui/TabText.java
trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.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/TabTaggedValues.java
Log:
Fix for issue 1308: Allow configuring toolbars.
Patch supplied by Aleksander.
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=13092&p1=trunk/src_new/org/argouml/cognitive/ui/TabToDo.java&p2=trunk/src_new/org/argouml/cognitive/ui/TabToDo.java&r1=13091&r2=13092
==============================================================================
--- trunk/src_new/org/argouml/cognitive/ui/TabToDo.java (original)
+++ trunk/src_new/org/argouml/cognitive/ui/TabToDo.java 2007-07-16 14:11:26-0700
@@ -99,8 +99,6 @@
factory.setOrientation(SwingConstants.VERTICAL);
JToolBar toolBar = factory.createToolBar();
toolBar.setName(getTitle());
- ArgoToolbarManager.getInstance().registerToolbar(this.getClass(),
- toolBar, 9);
add(toolBar, BorderLayout.WEST);
splitPane = new BorderSplitPane();
Modified: trunk/src_new/org/argouml/swingext/ArgoToolbarManager.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/swingext/ArgoToolbarManager.java?view=diff&rev=13092&p1=trunk/src_new/org/argouml/swingext/ArgoToolbarManager.java&p2=trunk/src_new/org/argouml/swingext/ArgoToolbarManager.java&r1=13091&r2=13092
==============================================================================
--- trunk/src_new/org/argouml/swingext/ArgoToolbarManager.java (original)
+++ trunk/src_new/org/argouml/swingext/ArgoToolbarManager.java 2007-07-16 14:11:26-0700
@@ -176,7 +176,7 @@
// If there is persistant state for this toolbar, respect it,
// or add it to persistance data
boolean visibility = getConfiguredToolbarAppearance(newToolbar
- .getName(), newToolbar.isVisible());
+ .getName());
newToolbar.setVisible(visibility);
// Create new menu item if it doesn't exist for this class.
@@ -321,23 +321,16 @@
/**
* Gets toolbar visibility status from configuration. If it doesn't exist in
- * configuration it creates new entries in configuration for that toolbar.
+ * configuration it does NOT create new entries in configuration for that
+ * toolbar.
*
* @param toolbarName Name of the toolbar to get visibility status
- * @param currentStatus Toolbar current status to write to config file if it
- * doesn't exist
* @return visibility status
*/
- public boolean getConfiguredToolbarAppearance(String toolbarName,
- Boolean currentStatus) {
+ public boolean getConfiguredToolbarAppearance(String toolbarName) {
ConfigurationKey key = Configuration.makeKey("toolbars", toolbarName);
String visibilityAsString = Configuration.getString(key);
- if (visibilityAsString.equals("")) {
- visibilityAsString = currentStatus.toString();
- Configuration.setString(key, visibilityAsString);
- }
-
- return (visibilityAsString.equals("true")) ? true : false;
+ return (visibilityAsString.equals("false")) ? false : true;
}
}
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=13092&p1=trunk/src_new/org/argouml/ui/TabText.java&p2=trunk/src_new/org/argouml/ui/TabText.java&r1=13091&r2=13092
==============================================================================
--- trunk/src_new/org/argouml/ui/TabText.java (original)
+++ trunk/src_new/org/argouml/ui/TabText.java 2007-07-16 14:11:26-0700
@@ -99,9 +99,6 @@
toolbar.setOrientation(SwingConstants.HORIZONTAL);
toolbar.setName(getTitle());
add(toolbar, BorderLayout.NORTH);
-
- ArgoToolbarManager.getInstance().registerToolbar(this.getClass(),
- toolbar, 6);
}
}
Modified: trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java?view=diff&rev=13092&p1=trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java&r1=13091&r2=13092
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java 2007-07-16 14:11:26-0700
@@ -228,8 +228,6 @@
if (toolBar == null) {
initToolBar();
toolBar.setName("misc.toolbar.diagram");
- ArgoToolbarManager.getInstance().registerToolbar(UMLDiagram.class,
- toolBar, 4);
}
return toolBar;
}
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=13092&p1=trunk/src_new/org/argouml/uml/ui/PropPanel.java&p2=trunk/src_new/org/argouml/uml/ui/PropPanel.java&r1=13091&r2=13092
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/PropPanel.java (original)
+++ trunk/src_new/org/argouml/uml/ui/PropPanel.java 2007-07-16 14:11:26-0700
@@ -206,8 +206,6 @@
factory.setFloatable(false);
JToolBar toolBar = factory.createToolBar();
toolBar.setName("misc.toolbar.properties");
- ArgoToolbarManager.getInstance().registerToolbar(PropPanel.class,
- toolBar, 5);
buttonPanel.removeAll();
buttonPanel.add(BorderLayout.WEST, toolBar);
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=13092&p1=trunk/src_new/org/argouml/uml/ui/TabConstraints.java&p2=trunk/src_new/org/argouml/uml/ui/TabConstraints.java&r1=13091&r2=13092
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/TabConstraints.java (original)
+++ trunk/src_new/org/argouml/uml/ui/TabConstraints.java 2007-07-16 14:11:26-0700
@@ -97,8 +97,6 @@
setToolbarRollover(true);
setToolbarFloatable(false);
getOclToolbar().setName("misc.toolbar.constraints");
- ArgoToolbarManager.getInstance().registerToolbar(this.getClass(),
- getOclToolbar(), 7);
add(mOcleEditor);
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=13092&p1=trunk/src_new/org/argouml/uml/ui/TabTaggedValues.java&p2=trunk/src_new/org/argouml/uml/ui/TabTaggedValues.java&r1=13091&r2=13092
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/TabTaggedValues.java (original)
+++ trunk/src_new/org/argouml/uml/ui/TabTaggedValues.java 2007-07-16 14:11:26-0700
@@ -91,8 +91,6 @@
super("tab.tagged-values");
buttonPanel = new ToolBar();
buttonPanel.setName(getTitle());
- ArgoToolbarManager.getInstance().registerToolbar(this.getClass(),
- buttonPanel, 8);
buttonPanel.setFloatable(false);
JButton b = new JButton();
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.