Skip to content

Commit 38375a3

Browse files
committed
Bug 64142 - Avoid use of gray and disabled color for elements under TestFragment (#558)
1 parent 7708bba commit 38375a3

1 file changed

Lines changed: 8 additions & 1 deletion

File tree

src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterCellRenderer.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import javax.swing.tree.TreeNode;
2929

3030
import org.apache.commons.lang3.StringUtils;
31+
import org.apache.jmeter.control.TestFragmentController;
3132
import org.apache.jorphan.util.JOrphanUtils;
3233

3334
/**
@@ -57,7 +58,13 @@ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean
5758
// one of its parents is in fact disabled.
5859
for (TreeNode parent = node.getParent(); parent != null && enabled; parent = parent.getParent()) {
5960
if (parent instanceof JMeterTreeNode) {
60-
enabled = ((JMeterTreeNode) parent).isEnabled();
61+
JMeterTreeNode jMeterTreeNode = (JMeterTreeNode) parent;
62+
if (jMeterTreeNode.getTestElement() instanceof TestFragmentController) {
63+
// TestFragment is always disabled, so we don't want to mark everything below
64+
// with pale
65+
break;
66+
}
67+
enabled = jMeterTreeNode.isEnabled();
6168
}
6269
}
6370
ImageIcon ic = node.getIcon(enabled);

0 commit comments

Comments
 (0)