Author: mvw
Date: 2007-07-13 00:53:45-0700
New Revision: 13065
Modified:
trunk/src_new/org/argouml/cognitive/ui/TabToDo.java
trunk/src_new/org/argouml/i18n/misc.properties
trunk/src_new/org/argouml/swingext/ArgoToolbarManager.java
trunk/src_new/org/argouml/ui/TabText.java
trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.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:
Next patch for issue 1308 from Aleksandar.
Solves translated keys issue in argo.user.properties file.
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=13065&p1=trunk/src_new/org/argouml/cognitive/ui/TabToDo.java&p2=trunk/src_new/org/argouml/cognitive/ui/TabToDo.java&r1=13064&r2=13065
==============================================================================
--- trunk/src_new/org/argouml/cognitive/ui/TabToDo.java (original)
+++ trunk/src_new/org/argouml/cognitive/ui/TabToDo.java 2007-07-13 00:53:45-0700
@@ -98,7 +98,7 @@
factory.setFloatable(false);
factory.setOrientation(SwingConstants.VERTICAL);
JToolBar toolBar = factory.createToolBar();
- toolBar.setName(Translator.localize(getTitle()));
+ toolBar.setName(getTitle());
ArgoToolbarManager.getInstance().registerToolbar(this.getClass(),
toolBar, 9);
add(toolBar, BorderLayout.WEST);
Modified: trunk/src_new/org/argouml/i18n/misc.properties
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/i18n/misc.properties?view=diff&rev=13065&p1=trunk/src_new/org/argouml/i18n/misc.properties&p2=trunk/src_new/org/argouml/i18n/misc.properties&r1=13064&r2=13065
==============================================================================
--- trunk/src_new/org/argouml/i18n/misc.properties (original)
+++ trunk/src_new/org/argouml/i18n/misc.properties 2007-07-13 00:53:45-0700
@@ -186,8 +186,13 @@
misc.tagged-values = Tagged Values
misc.todo-item = ToDo Item
misc.todo-unresolvable = Unable to resolve with poster of type: {0}
+misc.toolbar.constraints = Constraints Toolbar
+misc.toolbar.create-diagram = Create Diagram Toolbar
misc.toolbar.diagram = Diagram
+misc.toolbar.edit = Edit Toolbar
+misc.toolbar.file = File Toolbar
misc.toolbar.properties = Properties
+misc.toolbar.view = View Toolbar
misc.tooltip.commentlink = Annotated Element
misc.transition.source-state = Transition->Source State
misc.transition.target-state = Transition->Target State
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=13065&p1=trunk/src_new/org/argouml/swingext/ArgoToolbarManager.java&p2=trunk/src_new/org/argouml/swingext/ArgoToolbarManager.java&r1=13064&r2=13065
==============================================================================
--- trunk/src_new/org/argouml/swingext/ArgoToolbarManager.java (original)
+++ trunk/src_new/org/argouml/swingext/ArgoToolbarManager.java 2007-07-13 00:53:45-0700
@@ -42,11 +42,11 @@
import org.argouml.configuration.Configuration;
import org.argouml.configuration.ConfigurationKey;
+import org.argouml.i18n.Translator;
/**
* Class that handles toolbars show/hide functionality.
*
- *
* @author Aleksandar
*/
public class ArgoToolbarManager {
@@ -154,13 +154,11 @@
/**
* Registers new toolbar.
*
- * @param key
- * Class that is toolbar connected to, or toolbar object itself
- * (it there is just one toolbar of that kind in the application.
- * @param toolbar
- * new toolbar to register
- * @param prefferedMenuPosition
- * preffered menu postition, -1 for the last postition
+ * @param key Class that is toolbar connected to, or toolbar object itself
+ * (if there is just one toolbar of that kind in the application.
+ * @param toolbar new toolbar to register
+ * @param prefferedMenuPosition preffered menu postition, -1 for the last
+ * postition
*/
private void registerNew(Object key, JToolBar newToolbar,
int prefferedMenuPosition) {
@@ -185,13 +183,13 @@
if (wantedMenuItem == null) {
ToolbarManagerMenuItemAction action =
new ToolbarManagerMenuItemAction(
- newToolbar.getName(), key);
- wantedMenuItem = new JCheckBoxMenuItem(newToolbar.getName(),
- newToolbar.isVisible());
+ Translator.localize(newToolbar.getName()), key);
+ wantedMenuItem = new JCheckBoxMenuItem(Translator
+ .localize(newToolbar.getName()), newToolbar.isVisible());
wantedMenuItem.setAction(action);
- JCheckBoxMenuItem menuItem2 = new JCheckBoxMenuItem(newToolbar
- .getName(), newToolbar.isVisible());
+ JCheckBoxMenuItem menuItem2 = new JCheckBoxMenuItem(Translator
+ .localize(newToolbar.getName()), newToolbar.isVisible());
menuItem2.setAction(action);
getMenu().insert(wantedMenuItem, prefferedMenuPosition);
@@ -240,10 +238,8 @@
* placed on JPanel, when all toolbars are hidden, this panel needs to be
* hidden, too.
*
- * @param container
- * container
- * @param toolbars
- * toolbars in the container
+ * @param container container
+ * @param toolbars toolbars in the container
*/
public void registerContainer(final JComponent container,
final JToolBar[] toolbars) {
@@ -287,12 +283,10 @@
/**
* Registers new toolbar for specific group.
*
- * @param key
- * group that toolbar belongs to.
- * @param newToolbar
- * new toolbar to register.
- * @param prefferedMenuPosition
- * preffered menu postition, -1 for the last postition
+ * @param key group that toolbar belongs to.
+ * @param newToolbar new toolbar to register.
+ * @param prefferedMenuPosition preffered menu postition, -1 for the last
+ * postition
*/
public void registerToolbar(Object key, JToolBar newToolbar,
int prefferedMenuPosition) {
@@ -329,11 +323,9 @@
* Gets toolbar visibility status from configuration. If it doesn't exist in
* configuration it creates 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
+ * @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,
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=13065&p1=trunk/src_new/org/argouml/ui/TabText.java&p2=trunk/src_new/org/argouml/ui/TabText.java&r1=13064&r2=13065
==============================================================================
--- trunk/src_new/org/argouml/ui/TabText.java (original)
+++ trunk/src_new/org/argouml/ui/TabText.java 2007-07-13 00:53:45-0700
@@ -97,7 +97,7 @@
if (withToolbar) {
toolbar = new ToolBar();
toolbar.setOrientation(SwingConstants.HORIZONTAL);
- toolbar.setName(Translator.localize(getTitle()));
+ toolbar.setName(getTitle());
add(toolbar, BorderLayout.NORTH);
ArgoToolbarManager.getInstance().registerToolbar(this.getClass(),
Modified: trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java?view=diff&rev=13065&p1=trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java&p2=trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java&r1=13064&r2=13065
==============================================================================
--- trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java (original)
+++ trunk/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java 2007-07-13 00:53:45-0700
@@ -294,7 +294,7 @@
JMenu file = new JMenu(menuLocalize("File"));
add(file);
setMnemonic(file, "File");
- fileToolbar = new ToolBar("File Toolbar");
+ fileToolbar = new ToolBar("misc.toolbar.file");
JMenuItem newItem = file.add(new ActionNew());
setMnemonic(newItem, "New");
ShortcutMgr.assignAccelerator(newItem, ShortcutMgr.ACTION_NEW_PROJECT);
@@ -566,7 +566,7 @@
private void initMenuCreate() {
createDiagramMenu = add(new JMenu(menuLocalize("Create Diagram")));
setMnemonic(createDiagramMenu, "Create Diagram");
- createDiagramToolbar = new ToolBar("Create Diagram Toolbar");
+ createDiagramToolbar = new ToolBar("misc.toolbar.create-diagram");
JMenuItem usecaseDiagram = createDiagramMenu
.add(new ActionUseCaseDiagram());
setMnemonic(usecaseDiagram, "Usecase Diagram");
@@ -890,7 +890,7 @@
*/
public JToolBar getEditToolbar() {
if (editToolbar == null) {
- editToolbar = new ToolBar("Edit Toolbar");
+ editToolbar = new ToolBar("misc.toolbar.edit");
// editToolbar.add(ActionCut.getInstance());
// editToolbar.add(ActionCopy.getInstance());
// editToolbar.add(ActionPaste.getInstance());
@@ -920,7 +920,7 @@
*/
public JToolBar getViewToolbar() {
if (viewToolbar == null) {
- viewToolbar = new ToolBar("View Toolbar");
+ viewToolbar = new ToolBar("misc.toolbar.view");
viewToolbar.add(new ActionFind());
viewToolbar.add(new ZoomSliderButton());
}
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=13065&p1=trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java&r1=13064&r2=13065
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java 2007-07-13 00:53:45-0700
@@ -227,7 +227,7 @@
public JToolBar getJToolBar() {
if (toolBar == null) {
initToolBar();
- toolBar.setName(Translator.localize("misc.toolbar.diagram"));
+ toolBar.setName("misc.toolbar.diagram");
ArgoToolbarManager.getInstance().registerToolbar(UMLDiagram.class,
toolBar, 4);
}
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=13065&p1=trunk/src_new/org/argouml/uml/ui/PropPanel.java&p2=trunk/src_new/org/argouml/uml/ui/PropPanel.java&r1=13064&r2=13065
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/PropPanel.java (original)
+++ trunk/src_new/org/argouml/uml/ui/PropPanel.java 2007-07-13 00:53:45-0700
@@ -205,7 +205,7 @@
factory.setRollover(true);
factory.setFloatable(false);
JToolBar toolBar = factory.createToolBar();
- toolBar.setName(Translator.localize("misc.toolbar.properties"));
+ toolBar.setName("misc.toolbar.properties");
ArgoToolbarManager.getInstance().registerToolbar(PropPanel.class,
toolBar, 5);
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=13065&p1=trunk/src_new/org/argouml/uml/ui/TabConstraints.java&p2=trunk/src_new/org/argouml/uml/ui/TabConstraints.java&r1=13064&r2=13065
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/TabConstraints.java (original)
+++ trunk/src_new/org/argouml/uml/ui/TabConstraints.java 2007-07-13 00:53:45-0700
@@ -96,6 +96,7 @@
mOcleEditor.setDoAutoSplit(false);
setToolbarRollover(true);
setToolbarFloatable(false);
+ getOclToolbar().setName("misc.toolbar.constraints");
ArgoToolbarManager.getInstance().registerToolbar(this.getClass(),
getOclToolbar(), 7);
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=13065&p1=trunk/src_new/org/argouml/uml/ui/TabTaggedValues.java&p2=trunk/src_new/org/argouml/uml/ui/TabTaggedValues.java&r1=13064&r2=13065
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/TabTaggedValues.java (original)
+++ trunk/src_new/org/argouml/uml/ui/TabTaggedValues.java 2007-07-13 00:53:45-0700
@@ -90,7 +90,7 @@
public TabTaggedValues() {
super("tab.tagged-values");
buttonPanel = new ToolBar();
- buttonPanel.setName(Translator.localize(getTitle()));
+ buttonPanel.setName(getTitle());
ArgoToolbarManager.getInstance().registerToolbar(this.getClass(),
buttonPanel, 8);
buttonPanel.setFloatable(false);
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.