[vassalengine-svn] SF.net SVN: vassalengine:[8385] VASSAL-src/branches/Brent-3.2-New/src/ VASSAL/build/module/map/MenuDisplayer.java

[<swa...@us...>]

Revision: 8385
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=8385&view=rev
Author:   swampwallaby
Date:     2012-09-26 21:48:38 +0000 (Wed, 26 Sep 2012)
Log Message:
-----------
Bug 4775 - a context menu containing a single submenu is deviously disallowed

Modified Paths:
--------------
    VASSAL-src/branches/Brent-3.2-New/src/VASSAL/build/module/map/MenuDisplayer.java

Modified: VASSAL-src/branches/Brent-3.2-New/src/VASSAL/build/module/map/MenuDisplayer.java
===================================================================
--- VASSAL-src/branches/Brent-3.2-New/src/VASSAL/build/module/map/MenuDisplayer.java	2012-09-26 19:20:15 UTC (rev 8384)
+++ VASSAL-src/branches/Brent-3.2-New/src/VASSAL/build/module/map/MenuDisplayer.java	2012-09-26 21:48:38 UTC (rev 8385)
@@ -1,7 +1,7 @@
 /*
  * $Id$
  *
- * Copyright (c) 2000-2003 by Rodney Kinney
+ * Copyright (c) 2000-2012 by Rodney Kinney, Brent Easton
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -181,16 +181,16 @@
         }
       }
 
-      // Promote contents of a single submenu
-      if (commands.size() == 1) {
-        if (commands.get(0) instanceof JMenu) {
-          JMenu submenu = (JMenu) commands.get(0);
-          commands.remove(submenu);
-          for (int i = 0; i < submenu.getItemCount(); i++) {
-            commands.add(submenu.getItem(i));
-          }
-        }
-      }
+      // Promote contents of a single submenu [Removed as per Bug 4775]
+      // if (commands.size() == 1) {
+      //   if (commands.get(0) instanceof JMenu) {
+      //     JMenu submenu = (JMenu) commands.get(0);
+      //     commands.remove(submenu);
+      //     for (int i = 0; i < submenu.getItemCount(); i++) {
+      //       commands.add(submenu.getItem(i));
+      //     }
+      //   }
+      // }
 
       for (JMenuItem item : commands) {
         popup.add(item);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.