Author: pmouawad
Date: Wed Oct 12 17:27:00 2011
New Revision: 1182486
URL: http://svn.apache.org/viewvc?rev=1182486&view=rev
Log:
Bug 51817 - Moving variables up and down in User Defined Variables control.
Fix to milamber mail on dev list
Factored constructors
Added a boolean to enable up/down buttons
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java?rev=1182486&r1=1182485&r2=1182486&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
Wed Oct 12 17:27:00 2011
@@ -87,6 +87,8 @@ public class ArgumentsPanel extends Abst
/** Button to move a argument down*/
private JButton down;
+ private Boolean enableUpDown= Boolean.TRUE;
+
/** Command for adding a row to the table. */
private static final String ADD = "add"; // $NON-NLS-1$
@@ -107,9 +109,7 @@ public class ArgumentsPanel extends Abst
* Create a new ArgumentsPanel as a standalone component.
*/
public ArgumentsPanel() {
- tableLabel = new
JLabel(JMeterUtils.getResString("user_defined_variables")); // $NON-NLS-1$
- standalone = true;
- init();
+ this(JMeterUtils.getResString("user_defined_variables"),null,
Boolean.TRUE, true);// $NON-NLS-1$
}
/**
@@ -120,9 +120,19 @@ public class ArgumentsPanel extends Abst
* the title for the component.
*/
public ArgumentsPanel(String label) {
- tableLabel = new JLabel(label);
- standalone = false;
- init();
+ this(label, null, true, false);
+ }
+
+ /**
+ * Create a new ArgumentsPanel as an embedded component, using the
specified
+ * title.
+ *
+ * @param label
+ * the title for the component.
+ * @param enableUpDown Add up/down buttons
+ */
+ public ArgumentsPanel(String label, Boolean enableUpDown) {
+ this(label, null, enableUpDown, false);
}
/**
@@ -131,9 +141,21 @@ public class ArgumentsPanel extends Abst
* @param bkg background colour
*/
public ArgumentsPanel(String label, Color bkg) {
+ this(label, bkg, true, false);
+ }
+
+ /**
+ * Create a new ArgumentsPanel with a border and color background
+ * @param label text for label
+ * @param bkg background colour
+ * @param enableUpDown Add up/down buttons
+ * @param standalone is standalone
+ */
+ public ArgumentsPanel(String label, Color bkg, Boolean enableUpDown,
boolean standalone) {
tableLabel = new JLabel(label);
+ this.enableUpDown = enableUpDown;
this.background = bkg;
- standalone = false;
+ this.standalone = standalone;
init();
}
@@ -252,7 +274,7 @@ public class ArgumentsPanel extends Abst
delete.setEnabled(true);
}
- if(tableModel.getRowCount()>1) {
+ if(enableUpDown && tableModel.getRowCount()>1) {
up.setEnabled(true);
down.setEnabled(true);
}
@@ -346,7 +368,7 @@ public class ArgumentsPanel extends Abst
delete.setEnabled(false);
}
- if(tableModel.getRowCount()>1) {
+ if(enableUpDown && tableModel.getRowCount()>1) {
up.setEnabled(true);
down.setEnabled(true);
}
@@ -377,7 +399,7 @@ public class ArgumentsPanel extends Abst
// Enable DELETE (which may already be enabled, but it won't hurt)
delete.setEnabled(true);
- if(tableModel.getRowCount()>1) {
+ if(enableUpDown && tableModel.getRowCount()>1) {
up.setEnabled(true);
down.setEnabled(true);
}
@@ -479,12 +501,13 @@ public class ArgumentsPanel extends Abst
delete = new JButton(JMeterUtils.getResString("delete")); //
$NON-NLS-1$
delete.setActionCommand(DELETE);
- up = new JButton(JMeterUtils.getResString("up")); // $NON-NLS-1$
- up.setActionCommand(UP);
-
- down = new JButton(JMeterUtils.getResString("down")); // $NON-NLS-1$
- down.setActionCommand(DOWN);
-
+ if(enableUpDown) {
+ up = new JButton(JMeterUtils.getResString("up")); // $NON-NLS-1$
+ up.setActionCommand(UP);
+
+ down = new JButton(JMeterUtils.getResString("down")); //
$NON-NLS-1$
+ down.setActionCommand(DOWN);
+ }
checkDeleteStatus();
JPanel buttonPanel = new JPanel();
@@ -494,12 +517,14 @@ public class ArgumentsPanel extends Abst
}
add.addActionListener(this);
delete.addActionListener(this);
- up.addActionListener(this);
- down.addActionListener(this);
buttonPanel.add(add);
buttonPanel.add(delete);
- buttonPanel.add(up);
- buttonPanel.add(down);
+ if(enableUpDown) {
+ up.addActionListener(this);
+ down.addActionListener(this);
+ buttonPanel.add(up);
+ buttonPanel.add(down);
+ }
return buttonPanel;
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java?rev=1182486&r1=1182485&r2=1182486&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
Wed Oct 12 17:27:00 2011
@@ -68,7 +68,7 @@ public class FunctionHelper extends JDia
}
private void init() {
- parameterPanel = new
ArgumentsPanel(JMeterUtils.getResString("function_params")); //$NON-NLS-1$
+ parameterPanel = new
ArgumentsPanel(JMeterUtils.getResString("function_params"), false);
//$NON-NLS-1$
initializeFunctionList();
this.getContentPane().setLayout(new BorderLayout(10, 10));
JPanel comboPanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
