/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 *   http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
 */

package org.apache.jmeter.gui.tree;

import java.awt.Color;
import java.awt.Component;

import javax.swing.BorderFactory;
import javax.swing.ImageIcon;
import javax.swing.JTree;
import javax.swing.tree.DefaultTreeCellRenderer;

/**
 * Class to render the test tree - sets the enabled/disabled versions of the icons
 */
public class JMeterCellRenderer extends DefaultTreeCellRenderer {
    private static final long serialVersionUID = 240L;

    public JMeterCellRenderer() {
    }

    @Override
    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);
        boolean enabled = node.isEnabled();
        ImageIcon ic = node.getIcon(enabled);
        if (ic != null) {
            if (enabled) {
                setIcon(ic);
            } else {
                setDisabledIcon(ic);
            }
        } else {
            if (!enabled)// i.e. no disabled icon found
            {
                // Must therefore set the enabled icon so there is at least some
                // icon
                ic = node.getIcon();
                if (ic != null) {
                    setIcon(ic);
                }
            }
        }
        this.setEnabled(enabled);
        if(node.isMarkedBySearch()) {
            setBorder(BorderFactory.createLineBorder(Color.red));
        }
        else {
            setBorder(null);
        }
        return this;
    }
}

@@ -975,16 +975,50 @@
 .JTree;%0A
+import javax.swing.border.Border;%0A
 import j
@@ -1271,10 +1271,99 @@
 = 24
-0L
+1L;%0A%0A    private static final Border RED_BORDER = BorderFactory.createLineBorder(Color.red)
 ;%0A%0A 
@@ -2434,49 +2434,18 @@
 der(
-BorderFactory.createLineBorder(Color.red)
+RED_BORDER
 );%0A 

Create Border only once