[vassalengine-svn-trunk] [vassalengine-svn] SF.net SVN: vassalengine: [2342] VASSAL-src/trunk/VASSA
Brought to you by:
rodneykinney,
uckelman
From: <rod...@us...> - 2007-08-13 03:29:24
|
Revision: 2342 http://vassalengine.svn.sourceforge.net/vassalengine/?rev=2342&view=rev Author: rodneykinney Date: 2007-08-12 20:29:25 -0700 (Sun, 12 Aug 2007) Log Message: ----------- Bug fix: MultiActionButton should not appear as sub-menu with ToolbarMenu Modified Paths: -------------- VASSAL-src/trunk/VASSAL/build/module/MultiActionButton.java VASSAL-src/trunk/VASSAL/build/module/ToolbarMenu.java Modified: VASSAL-src/trunk/VASSAL/build/module/MultiActionButton.java =================================================================== --- VASSAL-src/trunk/VASSAL/build/module/MultiActionButton.java 2007-08-12 18:00:00 UTC (rev 2341) +++ VASSAL-src/trunk/VASSAL/build/module/MultiActionButton.java 2007-08-13 03:29:25 UTC (rev 2342) @@ -18,6 +18,7 @@ super(); setAttribute(BUTTON_TEXT, "Multi-Action"); setAttribute(TOOLTIP, ""); //$NON-NLS-1$ + launch.putClientProperty(MENU_PROPERTY, null); } public String[] getAttributeDescriptions() { Modified: VASSAL-src/trunk/VASSAL/build/module/ToolbarMenu.java =================================================================== --- VASSAL-src/trunk/VASSAL/build/module/ToolbarMenu.java 2007-08-12 18:00:00 UTC (rev 2341) +++ VASSAL-src/trunk/VASSAL/build/module/ToolbarMenu.java 2007-08-13 03:29:25 UTC (rev 2342) @@ -166,7 +166,7 @@ } buttonsToMenuMap.clear(); menu.removeAll(); - HashMap<String,JButton> m = new HashMap<String,JButton>(); + HashMap<String,JButton> nameToButton = new HashMap<String,JButton>(); if (toolbar != null) { for (int i = 0, n = toolbar.getComponentCount(); i < n; ++i) { if (toolbar.getComponentAtIndex(i) instanceof JButton) { @@ -176,13 +176,13 @@ if (text == null) { text = b.getText(); } - m.put(text, b); + nameToButton.put(text, b); } } } for (String item : menuItems) { - final JButton b = m.get(item); + final JButton b = nameToButton.get(item); if (b != null) { Object property = b.getClientProperty(MENU_PROPERTY); b.addPropertyChangeListener(this); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |