You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by vl...@apache.org on 2020/03/28 17:24:32 UTC
[jmeter] branch undo created (now 38375a3)
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a change to branch undo
in repository https://gitbox.apache.org/repos/asf/jmeter.git.
at 38375a3 Bug 64142 - Avoid use of gray and disabled color for elements under TestFragment (#558)
This branch includes the following new commits:
new 38375a3 Bug 64142 - Avoid use of gray and disabled color for elements under TestFragment (#558)
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[jmeter] 01/01: Bug 64142 - Avoid use of gray and disabled color
for elements under TestFragment (#558)
Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch undo
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 38375a31d75960c71113c1e56cfc50806f558784
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Sat Mar 28 20:24:19 2020 +0300
Bug 64142 - Avoid use of gray and disabled color for elements under TestFragment (#558)
---
.../main/java/org/apache/jmeter/gui/tree/JMeterCellRenderer.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterCellRenderer.java b/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterCellRenderer.java
index bce4ad4..55b3cbe 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterCellRenderer.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterCellRenderer.java
@@ -28,6 +28,7 @@ import javax.swing.tree.DefaultTreeCellRenderer;
import javax.swing.tree.TreeNode;
import org.apache.commons.lang3.StringUtils;
+import org.apache.jmeter.control.TestFragmentController;
import org.apache.jorphan.util.JOrphanUtils;
/**
@@ -57,7 +58,13 @@ public class JMeterCellRenderer extends DefaultTreeCellRenderer {
// one of its parents is in fact disabled.
for (TreeNode parent = node.getParent(); parent != null && enabled; parent = parent.getParent()) {
if (parent instanceof JMeterTreeNode) {
- enabled = ((JMeterTreeNode) parent).isEnabled();
+ JMeterTreeNode jMeterTreeNode = (JMeterTreeNode) parent;
+ if (jMeterTreeNode.getTestElement() instanceof TestFragmentController) {
+ // TestFragment is always disabled, so we don't want to mark everything below
+ // with pale
+ break;
+ }
+ enabled = jMeterTreeNode.isEnabled();
}
}
ImageIcon ic = node.getIcon(enabled);