svn commit: r1774101 - in /jmeter/trunk: src/core/org/apache/jmeter/gui/tree/JMeterCellRenderer.java xdocs/changes.xml

[pm...@apache.org]

Author: pmouawad
Date: Tue Dec 13 20:46:14 2016
New Revision: 1774101

URL: http://svn.apache.org/viewvc?rev=1774101&view=rev
Log:
Bug 60449 - JMeter Tree : Annoying behaviour when node name is empty
Bugzilla Id: 60449

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterCellRenderer.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterCellRenderer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterCellRenderer.java?rev=1774101&r1=1774100&r2=1774101&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterCellRenderer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterCellRenderer.java Tue Dec 13 20:46:14 2016
@@ -27,11 +27,18 @@ import javax.swing.JTree;
 import javax.swing.border.Border;
 import javax.swing.tree.DefaultTreeCellRenderer;
 
+import org.apache.commons.lang3.StringUtils;
+import org.apache.jorphan.util.JOrphanUtils;
+
 /**
  * Class to render the test tree - sets the enabled/disabled versions of the icons
  */
 public class JMeterCellRenderer extends DefaultTreeCellRenderer {
     private static final long serialVersionUID = 241L;
+    
+    private static final int DEFAULT_LENGTH = 15;
+
+    private static final String BLANK = StringUtils.repeat(' ', DEFAULT_LENGTH);
 
     private static final Border RED_BORDER = BorderFactory.createLineBorder(Color.red);
 
@@ -42,8 +49,9 @@ public class JMeterCellRenderer extends
     public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded,
             boolean leaf, int row, boolean p_hasFocus) {
         JMeterTreeNode node = (JMeterTreeNode) value;
-        super.getTreeCellRendererComponent(tree, node.getName(), sel, expanded, leaf, row,
-                p_hasFocus);
+        super.getTreeCellRendererComponent(tree,
+                JOrphanUtils.isBlank(node.getName()) ? BLANK : node.getName(), 
+                        sel, expanded, leaf, row, p_hasFocus);
         boolean enabled = node.isEnabled();
         ImageIcon ic = node.getIcon(enabled);
         if (ic != null) {

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1774101&r1=1774100&r2=1774101&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Tue Dec 13 20:46:14 2016
@@ -186,6 +186,7 @@ Fill in some detail.
     and <code>useRegexpForSamplersList</code> is set to <code>true</code>.
     Based on patch by Liu XP (liu_xp2003 at sina.com)</li>
     <li><bug>60442</bug>Fix a typo in <code>build.xml</code> (gavin at 16degrees.com.au)</li>
+    <li><bug>60449</bug>JMeter Tree : Annoying behaviour when node name is empty</li>
 </ul>
 
  <!--  =================== Thanks =================== -->