Author: pmouawad
Date: Wed Jan 3 21:49:54 2018
New Revision: 1820015
URL: http://svn.apache.org/viewvc?rev=1820015&view=rev
Log:
Bug 61965 - Module and Include Controller should not allow to add meaningless
elements in their context
Bugzilla Id: 61965
Modified:
jmeter/trunk/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java
jmeter/trunk/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java
jmeter/trunk/xdocs/changes.xml
Modified:
jmeter/trunk/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java?rev=1820015&r1=1820014&r2=1820015&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java
Wed Jan 3 21:49:54 2018
@@ -18,11 +18,9 @@
package org.apache.jmeter.control.gui;
-import javax.swing.JMenu;
import javax.swing.JPopupMenu;
import org.apache.jmeter.control.IncludeController;
-import org.apache.jmeter.gui.action.ActionNames;
import org.apache.jmeter.gui.util.FilePanel;
import org.apache.jmeter.gui.util.MenuFactory;
import org.apache.jmeter.testelement.TestElement;
@@ -91,14 +89,6 @@ public class IncludeControllerGui extend
@Override
public JPopupMenu createPopupMenu() {
JPopupMenu menu = new JPopupMenu();
- JMenu addMenu = MenuFactory.makeMenus(new String[] {
- MenuFactory.CONFIG_ELEMENTS,
- MenuFactory.ASSERTIONS,
- MenuFactory.TIMERS,
- MenuFactory.LISTENERS,
- }, JMeterUtils.getResString("add"), // $NON-NLS-1$
- ActionNames.ADD);
- menu.add(addMenu);
MenuFactory.addEditMenu(menu, true);
MenuFactory.addFileMenu(menu);
return menu;
Modified:
jmeter/trunk/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java?rev=1820015&r1=1820014&r2=1820015&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java
Wed Jan 3 21:49:54 2018
@@ -33,7 +33,6 @@ import javax.swing.BoxLayout;
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JLabel;
-import javax.swing.JMenu;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.JTree;
@@ -50,7 +49,6 @@ import org.apache.jmeter.control.Control
import org.apache.jmeter.control.ModuleController;
import org.apache.jmeter.control.TestFragmentController;
import org.apache.jmeter.gui.GuiPackage;
-import org.apache.jmeter.gui.action.ActionNames;
import org.apache.jmeter.gui.tree.JMeterTreeNode;
import org.apache.jmeter.gui.util.MenuFactory;
import org.apache.jmeter.testelement.TestElement;
@@ -271,15 +269,6 @@ public class ModuleControllerGui extends
@Override
public JPopupMenu createPopupMenu() {
JPopupMenu menu = new JPopupMenu();
- JMenu addMenu = MenuFactory.makeMenus(
- new String[] {
- MenuFactory.CONFIG_ELEMENTS,
- MenuFactory.ASSERTIONS,
- MenuFactory.LISTENERS,
- },
- JMeterUtils.getResString("add"), // $NON-NLS-1$
- ActionNames.ADD);
- menu.add(addMenu);
MenuFactory.addEditMenu(menu, true);
MenuFactory.addFileMenu(menu);
return menu;
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1820015&r1=1820014&r2=1820015&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Wed Jan 3 21:49:54 2018
@@ -238,6 +238,7 @@ Summary
<ul>
<li><bug>61556</bug>Clarify in documentation performance impacts of
<code>${}</code> 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. Contributed by Ubik Load Pack (support at ubikloadpack.com)</li>
+ <li><bug>61965</bug>Module and Include Controller should not allow to add
meaningless elements in their context.</li>
</ul>
<h3>Listeners</h3>
