jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1814066 - in /jmeter/trunk: src/core/org/apache/jmeter/control/gui/TestFragmentControllerGui.java xdocs/changes.xml
Date Thu, 02 Nov 2017 11:43:08 GMT
Author: pmouawad
Date: Thu Nov  2 11:43:08 2017
New Revision: 1814066

URL: http://svn.apache.org/viewvc?rev=1814066&view=rev
Log:
Bug 61713 - Test Fragment has option to Change Controller and Insert Parent
Bugzilla Id: 61713

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestFragmentControllerGui.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestFragmentControllerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestFragmentControllerGui.java?rev=1814066&r1=1814065&r2=1814066&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestFragmentControllerGui.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestFragmentControllerGui.java Thu
Nov  2 11:43:08 2017
@@ -22,9 +22,14 @@ import java.awt.BorderLayout;
 import java.util.Arrays;
 import java.util.Collection;
 
+import javax.swing.JMenu;
+import javax.swing.JPopupMenu;
+
 import org.apache.jmeter.control.TestFragmentController;
+import org.apache.jmeter.gui.action.ActionNames;
 import org.apache.jmeter.gui.util.MenuFactory;
 import org.apache.jmeter.testelement.TestElement;
+import org.apache.jmeter.util.JMeterUtils;
 
 /**
  * This defines a simple Test Fragment GUI that can be used instead of a Thread Group
@@ -81,5 +86,32 @@ public class TestFragmentControllerGui e
         return Arrays.asList(MenuFactory.FRAGMENTS);
     }
 
-
+    /**
+     * Redefined to remove change parent and inserrt parent menu
+     * @see org.apache.jmeter.control.gui.AbstractControllerGui#createPopupMenu()
+     */
+    @Override
+    public JPopupMenu createPopupMenu() {
+        JPopupMenu pop = new JPopupMenu();        
+        JMenu addMenu = new JMenu(JMeterUtils.getResString("add")); // $NON-NLS-1$
+        addMenu.add(MenuFactory.makeMenu(MenuFactory.CONTROLLERS, ActionNames.ADD));
+        addMenu.add(MenuFactory.makeMenu(MenuFactory.CONFIG_ELEMENTS, ActionNames.ADD));
+        addMenu.add(MenuFactory.makeMenu(MenuFactory.TIMERS, ActionNames.ADD));
+        addMenu.add(MenuFactory.makeMenu(MenuFactory.PRE_PROCESSORS, ActionNames.ADD));
+        addMenu.add(MenuFactory.makeMenu(MenuFactory.SAMPLERS, ActionNames.ADD));
+        addMenu.add(MenuFactory.makeMenu(MenuFactory.POST_PROCESSORS, ActionNames.ADD));
+        addMenu.add(MenuFactory.makeMenu(MenuFactory.ASSERTIONS, ActionNames.ADD));
+        addMenu.add(MenuFactory.makeMenu(MenuFactory.LISTENERS, ActionNames.ADD));
+
+        pop.add(addMenu);
+        pop.add(MenuFactory.makeMenuItemRes("add_think_times",// $NON-NLS-1$
+                ActionNames.ADD_THINK_TIME_BETWEEN_EACH_STEP));
+
+        pop.add(MenuFactory.makeMenuItemRes("apply_naming",// $NON-NLS-1$
+                ActionNames.APPLY_NAMING_CONVENTION));
+        
+        MenuFactory.addEditMenu(pop, true);
+        MenuFactory.addFileMenu(pop);
+        return pop;
+    }
 }

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1814066&r1=1814065&r2=1814066&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Thu Nov  2 11:43:08 2017
@@ -174,6 +174,7 @@ Summary
 <h3>Controllers</h3>
 <ul>
     <li><bug>61556</bug>Clarify in documentation performance impacts of
${} var usage in IfController and groovy. Contributed by Justin McCartney (be_strew at yahoo.co.uk)</li>
+    <li><bug>61713</bug>Test Fragment has option to Change Controller and
Insert Parent</li>
 </ul>
 
 <h3>Listeners</h3>
@@ -221,6 +222,7 @@ Summary
 <p>We also thank bug reporters who helped us improve JMeter. <br/>
 For this release we want to give special thanks to the following reporters for the clear
reports and tests made after our fixes:</p>
 <ul>
+    <li>user7294900 on Stackoverflow (orimarko at gmail.com)</li>
 </ul>
 <p>
 Apologies if we have omitted anyone else.



Mime
View raw message