svn commit: r1851689 - in /jmeter/trunk: src/components/org/apache/jmeter/gui/action/ src/core/org/apache/jmeter/gui/action/ src/core/org/apache/jmeter/gui/plugin/ src/core/org/apache/jmeter/gui/util/ src/core/org/apache/jmeter/resources/ xdocs/

[pm...@apache.org]

Author: pmouawad
Date: Sat Jan 19 22:00:15 2019
New Revision: 1851689

URL: http://svn.apache.org/viewvc?rev=1851689&view=rev
Log:
Bug 63094 - Introduce a new Tools menu
Bugzilla Id: 63094

Modified:
    jmeter/trunk/src/components/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/CompileJSR223TestElements.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/plugin/MenuCreator.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/components/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java?rev=1851689&r1=1851688&r2=1851689&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java Sat Jan 19 22:00:15 2019
@@ -184,7 +184,7 @@ public class ExportTransactionAndSampler
 
     @Override
     public JMenuItem[] getMenuItemsAtLocation(MENU_LOCATION location) {
-        if(location == MENU_LOCATION.HELP) {
+        if(location == MENU_LOCATION.TOOLS) {
             
             JMenuItem menuItemIC = new JMenuItem(
                     JMeterUtils.getResString("export_transactions_menu"), KeyEvent.VK_UNDEFINED);

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/CompileJSR223TestElements.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/CompileJSR223TestElements.java?rev=1851689&r1=1851688&r2=1851689&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/CompileJSR223TestElements.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/CompileJSR223TestElements.java Sat Jan 19 22:00:15 2019
@@ -130,7 +130,7 @@ public class CompileJSR223TestElements e
 
     @Override
     public JMenuItem[] getMenuItemsAtLocation(MENU_LOCATION location) {
-        if(location == MENU_LOCATION.HELP) {
+        if(location == MENU_LOCATION.TOOLS) {
             
             JMenuItem menuItemIC = new JMenuItem(
                     JMeterUtils.getResString("compile_menu"), KeyEvent.VK_UNDEFINED);

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/plugin/MenuCreator.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/plugin/MenuCreator.java?rev=1851689&r1=1851688&r2=1851689&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/plugin/MenuCreator.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/plugin/MenuCreator.java Sat Jan 19 22:00:15 2019
@@ -32,7 +32,8 @@ public interface MenuCreator {
         RUN,
         OPTIONS,
         HELP,
-        SEARCH
+        SEARCH,
+        TOOLS
     }
     
     /**

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java?rev=1851689&r1=1851688&r2=1851689&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java Sat Jan 19 22:00:15 2019
@@ -85,6 +85,7 @@ public class JMeterMenuBar extends JMenu
     private Collection<JMenuItem> remoteEngineShut;
     private JMenu optionsMenu;
     private JMenu helpMenu;
+    private JMenu toolsMenu;
     private String[] remoteHosts;
     private JMenu remoteExit;
     private Collection<JMenuItem> remoteEngineExit;
@@ -195,12 +196,14 @@ public class JMeterMenuBar extends JMenu
         makeRunMenu();
         makeSearchMenu();
         makeOptionsMenu();
+        makeToolsMenu();
         makeHelpMenu();
         this.add(fileMenu);
         this.add(editMenu);
         this.add(searchMenu);
         this.add(runMenu);
         this.add(optionsMenu);
+        this.add(toolsMenu);
 
         menuCreators.stream()
                 .map(MenuCreator::getTopLevelMenus)
@@ -242,8 +245,6 @@ public class JMeterMenuBar extends JMenu
         JMenuItem whatClass = makeMenuItemRes("help_node", 'W', ActionNames.WHAT_CLASS, KeyStrokes.WHAT_CLASS);//$NON-NLS-1$
         JMenuItem setDebug = makeMenuItemRes("debug_on", ActionNames.DEBUG_ON, KeyStrokes.DEBUG_ON);//$NON-NLS-1$
         JMenuItem resetDebug = makeMenuItemRes("debug_off", ActionNames.DEBUG_OFF, KeyStrokes.DEBUG_OFF);//$NON-NLS-1$
-        JMenuItem heapDump = makeMenuItemRes("heap_dump", ActionNames.HEAP_DUMP);//$NON-NLS-1$
-        JMenuItem threadDump = makeMenuItemRes("thread_dump", ActionNames.THREAD_DUMP);//$NON-NLS-1$
         
         JMenu usefulLinks = makeMenuRes("useful_links");//$NON-NLS-1$
         usefulLinks.add(makeMenuItemRes("link_release_notes", ActionNames.LINK_RELEASE_NOTES));
@@ -259,8 +260,6 @@ public class JMeterMenuBar extends JMenu
         helpMenu.add(whatClass);
         helpMenu.add(setDebug);
         helpMenu.add(resetDebug);
-        helpMenu.add(heapDump);
-        helpMenu.add(threadDump);
 
         addPluginsMenuItems(helpMenu, menuCreators, MENU_LOCATION.HELP);
         
@@ -270,6 +269,17 @@ public class JMeterMenuBar extends JMenu
         helpMenu.add(helpAbout);
     }
 
+    private void makeToolsMenu() {
+        toolsMenu = makeMenuRes("tools",'T'); //$NON-NLS-1$
+
+        JMenuItem heapDump = makeMenuItemRes("heap_dump", ActionNames.HEAP_DUMP);//$NON-NLS-1$
+        JMenuItem threadDump = makeMenuItemRes("thread_dump", ActionNames.THREAD_DUMP);//$NON-NLS-1$
+        toolsMenu.add(heapDump);
+        toolsMenu.add(threadDump);
+        
+        addPluginsMenuItems(toolsMenu, menuCreators, MENU_LOCATION.TOOLS);
+    }
+
     private void makeOptionsMenu() {
         optionsMenu = makeMenuRes("option",'O'); //$NON-NLS-1$
         optionsMenu.add(makeMenuItemRes("function_dialog_menu_item", 'F', ActionNames.FUNCTIONS, KeyStrokes.FUNCTIONS));
@@ -504,7 +514,7 @@ public class JMeterMenuBar extends JMenu
         fileMenu.add(fileSaveSelectionAs);
         fileMenu.add(fileSelectionAsTestFragment);
         fileMenu.add(fileRevert);
-        fileMenu.addSeparator();
+
         // Add the recent files, which will also add a separator that is
         // visible when needed
         fileLoadRecentFiles = LoadRecentProject.getRecentFileMenuItems();
@@ -638,6 +648,7 @@ public class JMeterMenuBar extends JMenu
         updateMenuElement(searchMenu);
         updateMenuElement(runMenu);
         updateMenuElement(optionsMenu);
+        updateMenuElement(toolsMenu);
         updateMenuElement(helpMenu);
         for (MenuCreator creator : menuCreators) {
             creator.localeChanged();

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1851689&r1=1851688&r2=1851689&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Sat Jan 19 22:00:15 2019
@@ -1265,6 +1265,7 @@ timelim=Time limit
 timeout_config_box_title=Timeout configuration
 timeout_title=Timeout (ms)
 toggle=Toggle
+tools=Tools
 toolbar_icon_set_not_found=The file description of toolbar icon set is not found. See logs.
 tr=Turkish
 transaction_controller_include_timers=Include duration of timer and pre-post processors in generated sample

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1851689&r1=1851688&r2=1851689&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties Sat Jan 19 22:00:15 2019
@@ -1254,6 +1254,7 @@ timelim=Limiter le temps de réponses
 timeout_config_box_title=Configuration du délai d'expiration
 timeout_title=Délai expiration (ms)
 toggle=Permuter
+tools=Outils
 toolbar_icon_set_not_found=Le fichier de description des icônes de la barre d'outils n'est pas trouvé. Voir les journaux. 
 tr=Turc
 transaction_controller_include_timers=Inclure la durée des compteurs de temps et pre/post processeurs dans le calcul du temps

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1851689&r1=1851688&r2=1851689&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Jan 19 22:00:15 2019
@@ -68,11 +68,21 @@ Summary
 <!-- =================== Incompatible changes =================== -->
 
 <ch_section>Incompatible changes</ch_section>
-
+<ul>
 <li>In <code>Response Time Percentiles Over Time (successful responses)</code> graph of the HTML report, before this version, percentile computation of each time slot used the percentile data
 of previous time slot as a base. Starting with this version, each time slot is independant. See <bugzilla>62883</bugzilla></li>
 <li><code>ClientJMeterEngine#rsetProperties</code> signature has been changed to use <code>HashMap&lt;String,String&gt;</code> instead of Properties, see <bugzilla>63034</bugzilla></li>
-
+<li>A new Menu item <code>Tools</code> has been introduced, the following menu items that were in <code>Help</code> menu are now under this new menu item:
+<ul>
+    <li><code>Create Heap Dump</code></li>
+    <li><code>Create Thread Dump</code></li>
+    <li><code>Compile JSR223 Elements</code></li>
+    <li><code>Export Transactions for Report</code></li>
+    <li><code>Import from cURL</code></li>
+</ul>
+See <bugzilla>63094</bugzilla>
+</li>
+</ul>
 <!-- =================== Improvements =================== -->
 
 <ch_section>Improvements</ch_section>
@@ -136,6 +146,7 @@ of previous time slot as a base. Startin
     <li><bug>59633</bug>Menus <code>Save Test Plan as</code>, <code>Save as Test Fragment</code> and <code>Save Selection as ...</code> should use a new file name in File Dialog</li>
     <li><bug>61486</bug>Make jmeter-server and non GUI mode run headless</li>
     <li><bug>63093</bug>Add <code>Compile JSR223 Test Elements</code> menu item. Contributed by Ubik Load Pack (support at ubikloadpack.com)</li>
+    <li><bug>63094</bug>Introduce a new Tools menu</li>
 </ul>
 
 <ch_section>Non-functional changes</ch_section>