From 5a1e12f23f0c68bc78d0c7f1a39472150a7220cd Mon Sep 17 00:00:00 2001 From: Philippe Mouawad Date: Tue, 1 Dec 2015 20:36:31 +0000 Subject: [PATCH] Bug 58674 - module controller : it should not be possible to select more than one node in the tree #resolve #31 Bugzilla Id: 58674 git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1717519 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/jmeter/control/gui/ModuleControllerGui.java | 4 +++- xdocs/changes.xml | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java b/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java index e6697317f8..8f6cf069bd 100644 --- a/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java +++ b/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java @@ -45,6 +45,7 @@ import javax.swing.tree.DefaultTreeCellRenderer; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreeNode; import javax.swing.tree.TreePath; +import javax.swing.tree.TreeSelectionModel; import org.apache.jmeter.control.Controller; import org.apache.jmeter.control.ModuleController; @@ -111,7 +112,8 @@ public class ModuleControllerGui extends AbstractControllerGui implements Action moduleToRunTreeModel = new DefaultTreeModel(new DefaultMutableTreeNode()); moduleToRunTreeNodes = new JTree(moduleToRunTreeModel); moduleToRunTreeNodes.setCellRenderer(new ModuleControllerCellRenderer()); - + moduleToRunTreeNodes.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION); + ImageIcon image = JMeterUtils.getImage("warning.png"); warningLabel = new JLabel("", image, SwingConstants.LEFT); // $NON-NLS-1$ warningLabel.setForeground(Color.RED); diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 88e78ed718..3c44af048c 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -103,6 +103,7 @@ Summary
  • 58281RandomOrderController : Improve randomization algorithm performance. Contributed by Graham Russell (jmeter at ham1.co.uk)
  • 58675Module controller error message can easily be missed. Contributed by Benoit Wiart (benoit dot wiart at gmail.com)
  • 58673Module controller : when the target element is disabled the default jtree icons are displayed. Contributed by Benoit Wiart (benoit dot wiart at gmail.com)
    • +
  • 58674Module controller : it should not be possible to select more than one node in the tree. Contributed by Benoit Wiart (benoit dot wiart at gmail.com)

    • Listeners