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/01 21:32:39 UTC
svn commit: r1717516 - in /jmeter/trunk:
src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java
xdocs/changes.xml
Author: pmouawad
Date: Tue Dec 1 20:32:39 2015
New Revision: 1717516
URL: http://svn.apache.org/viewvc?rev=1717516&view=rev
Log:
Bug 58673 - Module controller : when the target element is disabled the default jtree icons are displayed
#resolve #30
Bugzilla Id: 58673
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=1717516&r1=1717515&r2=1717516&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 Tue Dec 1 20:32:39 2015
@@ -441,6 +441,13 @@ public class ModuleControllerGui extends
setDisabledIcon(icon);
}
}
+ else if (!enabled) { // i.e. no disabled icon found
+ // Must therefore set the enabled icon so there is at least some icon
+ icon = node.getIcon();
+ if (icon != null) {
+ setIcon(icon);
+ }
+ }
}
return this;
}
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1717516&r1=1717515&r2=1717516&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Tue Dec 1 20:32:39 2015
@@ -102,6 +102,7 @@ Summary
<li><bug>58406</bug>IfController : Allow use of Nashorn Engine if available for JavaScript evaluation</li>
<li><bug>58281</bug>RandomOrderController : Improve randomization algorithm performance. Contributed by Graham Russell (jmeter at ham1.co.uk)</li>
<li><bug>58675</bug>Module controller error message can easily be missed. Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
+ <li><bug>58673</bug>Module controller : when the target element is disabled the default jtree icons are displayed. Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
</ul>
<h3>Listeners</h3>