You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jakarta.apache.org by se...@apache.org on 2010/07/02 11:39:23 UTC

svn commit: r959929 - in /jakarta/jmeter/trunk: src/core/org/apache/jmeter/gui/util/MenuFactory.java xdocs/changes.xml

Author: sebb
Date: Fri Jul  2 09:39:22 2010
New Revision: 959929

URL: http://svn.apache.org/viewvc?rev=959929&view=rev
Log:
Bug 49540 - Sort "Add" menus alphabetically

Modified:
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
    jakarta/jmeter/trunk/xdocs/changes.xml

Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java?rev=959929&r1=959928&r2=959929&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java Fri Jul  2 09:39:22 2010
@@ -22,6 +22,7 @@ import java.awt.Component;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -151,6 +152,7 @@ public final class MenuFactory {
             }
 
             initializeMenus();
+            sortPluginMenus();
         } catch (Throwable e) {
             log.error("", e);
             if (e instanceof Error){
@@ -639,4 +641,24 @@ public final class MenuFactory {
     static int elementsToSkip_size() {
         return elementsToSkip.size();
     }
+
+    /**
+     * Menu sort helper class
+     */
+    private static class MenuInfoComparator implements Comparator<MenuInfo> {
+       public int compare(MenuInfo o1, MenuInfo o2) {
+          return o1.getLabel().compareTo(o2.getLabel());
+}
+    }
+
+    /**
+     * Sort loaded menus
+     */
+    private static void sortPluginMenus() {
+       Iterator<List<MenuInfo>> it = menuMap.values().iterator();
+       while (it.hasNext()) {
+          List<MenuInfo> menuToSort = it.next();
+          Collections.sort(menuToSort, new MenuInfoComparator());
+       }
+    }
 }

Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=959929&r1=959928&r2=959929&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Fri Jul  2 09:39:22 2010
@@ -240,6 +240,7 @@ In particular, Aggregate Report can now 
 <li>Bug 47943 - DisabledComponentRemover is not used in Start class</li>
 <li>HeapDumper class for runtime generation of dumps</li>
 <li>Basic read-only JavaMail provider implementation for reading raw mail files</li>
+<li>Bug 49540 - Sort "Add" menus alphabetically</li>
 </ul>
 
 <h2>Non-functional changes</h2>



---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@jakarta.apache.org
For additional commands, e-mail: notifications-help@jakarta.apache.org