You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2015/12/09 21:47:36 UTC

svn commit: r1718964 - in /jmeter/trunk: src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java xdocs/changes.xml

Author: pmouawad
Date: Wed Dec  9 20:47:36 2015
New Revision: 1718964

URL: http://svn.apache.org/viewvc?rev=1718964&view=rev
Log:
Bug 58714 - Module controller : it should not be possible to add a timer as child
#resolve #53
Bugzilla Id: 58714

Modified:
    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/ModuleControllerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java?rev=1718964&r1=1718963&r2=1718964&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 Dec  9 20:47:36 2015
@@ -287,7 +287,6 @@ public class ModuleControllerGui extends
                 new String[] {
                         MenuFactory.CONFIG_ELEMENTS,
                         MenuFactory.ASSERTIONS,
-                        MenuFactory.TIMERS,
                         MenuFactory.LISTENERS,
                 },
                 JMeterUtils.getResString("add"),  // $NON-NLS-1$

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1718964&r1=1718963&r2=1718964&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Wed Dec  9 20:47:36 2015
@@ -190,6 +190,7 @@ Summary
 <ul>
     <li><bug>58600</bug>Display correct filenames, when they are searched by IncludeController</li>
     <li><bug>58678</bug>Module Controller : limit target element selection. Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
+    <li><bug>58714</bug>Module controller : it should not be possible to add a timer as child. Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
 </ul>
 
 <h3>Listeners</h3>