Author: closettop_nightlybuild Date: 2012-06-05 08:17:49-0700 New Revision: 19888
Modified: trunk/src/argouml-app/src/org/argouml/i18n/menu.properties trunk/src/argouml-app/src/org/argouml/ui/MenuBar14.java trunk/src/argouml-app/src/org/argouml/ui/MenuBar2.java trunk/src/argouml-app/src/org/argouml/ui/cmd/GenericArgoMenuBar.java Log: Patch from issue 6322. Refactoring : rename the parameter of prepareKey to key Submitted-by: elbedd (Linus fixed line endings) Change-Id: I168ceb5c7f71707ddf074806fc775b7f15529506 Modified: trunk/src/argouml-app/src/org/argouml/i18n/menu.properties Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/i18n/menu.properties?view=diff&pathrev=19888&r1=19887&r2=19888 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/i18n/menu.properties (original) +++ trunk/src/argouml-app/src/org/argouml/i18n/menu.properties 2012-06-05 08:17:49-0700 @@ -64,7 +64,7 @@ menu.item.open.mnemonic = O menu.item.save.mnemonic = S menu.item.saveas.mnemonic = A -menu.item.revert-to-saved.mnemonic = Revert to Saved +menu.item.revert-to-saved.mnemonic = R menu.item.import.mnemonic = I menu.item.print.mnemonic = P menu.item.pagesetup.mnemonic = u Modified: trunk/src/argouml-app/src/org/argouml/ui/MenuBar14.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/MenuBar14.java?view=diff&pathrev=19888&r1=19887&r2=19888 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/ui/MenuBar14.java (original) +++ trunk/src/argouml-app/src/org/argouml/ui/MenuBar14.java 2012-06-05 08:17:49-0700 @@ -97,7 +97,7 @@ JMenuItem stateDiagram = getCreateDiagramMenu().add(new ActionStateDiagram()); - setMnemonic(stateDiagram, "Statechart Diagram"); + setMnemonic(stateDiagram, "State Diagram"); getCreateDiagramToolbar().add((new ActionStateDiagram())); ShortcutMgr.assignAccelerator(stateDiagram, ShortcutMgr.ACTION_STATE_DIAGRAM); Modified: trunk/src/argouml-app/src/org/argouml/ui/MenuBar2.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/MenuBar2.java?view=diff&pathrev=19888&r1=19887&r2=19888 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/ui/MenuBar2.java (original) +++ trunk/src/argouml-app/src/org/argouml/ui/MenuBar2.java 2012-06-05 08:17:49-0700 @@ -97,7 +97,7 @@ JMenuItem stateDiagram = getCreateDiagramMenu().add(new ActionStateDiagram()); - setMnemonic(stateDiagram, "Statechart Diagram"); + setMnemonic(stateDiagram, "State Diagram"); getCreateDiagramToolbar().add((new ActionStateDiagram())); ShortcutMgr.assignAccelerator(stateDiagram, ShortcutMgr.ACTION_STATE_DIAGRAM); Modified: trunk/src/argouml-app/src/org/argouml/ui/cmd/GenericArgoMenuBar.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/cmd/GenericArgoMenuBar.java?view=diff&pathrev=19888&r1=19887&r2=19888 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/ui/cmd/GenericArgoMenuBar.java (original) +++ trunk/src/argouml-app/src/org/argouml/ui/cmd/GenericArgoMenuBar.java 2012-06-05 08:17:49-0700 @@ -336,7 +336,6 @@ ShortcutMgr.assignAccelerator(newItem, ShortcutMgr.ACTION_NEW_PROJECT); toolbarTools.add((new ActionNew())); JMenuItem newProfileItem = file.add(new ActionNewProfile()); - setMnemonic(newProfileItem, "New Profile"); ShortcutMgr.assignAccelerator(newProfileItem, null); toolbarTools.add((new ActionNewProfile())); openAction = new ActionOpenProject(); @@ -401,7 +400,6 @@ setMnemonic(notation, "Notation"); JMenuItem propertiesItem = file.add(new ActionProjectSettings()); - setMnemonic(propertiesItem, "Properties"); ShortcutMgr.assignAccelerator(propertiesItem, ShortcutMgr.ACTION_PROJECT_SETTINGS); @@ -558,7 +556,7 @@ view.addSeparator(); JMenu grid = (JMenu) view.add(new JMenu(menuLocalize("Adjust Grid"))); - setMnemonic(grid, "Grid"); + setMnemonic(grid, "Adjust Grid"); List<Action> gridActions = ActionAdjustGrid.createAdjustGridActions(false); ButtonGroup groupGrid = new ButtonGroup(); @@ -573,7 +571,7 @@ } JMenu snap = (JMenu) view.add(new JMenu(menuLocalize("Adjust Snap"))); - setMnemonic(snap, "Snap"); + setMnemonic(snap, "Adjust Snap"); List<Action> snapActions = ActionAdjustSnap.createAdjustSnapActions(); ButtonGroup groupSnap = new ButtonGroup(); ActionAdjustSnap.setGroup(groupSnap); @@ -647,7 +645,7 @@ JMenuItem stateDiagram = createDiagramMenu.add(new ActionStateDiagram()); - setMnemonic(stateDiagram, "Statechart Diagram"); + setMnemonic(stateDiagram, "State Diagram"); toolbarTools.add((new ActionStateDiagram())); ShortcutMgr.assignAccelerator(stateDiagram, ShortcutMgr.ACTION_STATE_DIAGRAM); @@ -1060,14 +1058,14 @@ * Prepares one part of the key for menu- or/and menuitem-mnemonics used in * menu.properties. * - * The method changes the parameter str to lower cases. Spaces in the - * parameter str are changed to hyphens. + * The method changes the parameter key to lower cases. Spaces in the + * parameter key are changed to hyphens. * - * @param str - * @return the prepared str + * @param key + * @return the prepared key */ - private static String prepareKey(String str) { - return str.toLowerCase().replace(' ', '-'); + private static String prepareKey(String key) { + return key.toLowerCase().replace(' ', '-'); } /** ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2969090 To unsubscribe from this discussion, e-mail: [[email protected]].
