You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2005/06/12 14:21:21 UTC
cvs commit: jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui ProxyControlGui.java
sebb 2005/06/12 05:21:21
Modified: src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui
ProxyControlGui.java
Log:
Bug 25413 - don't enable Restart button unnecessarily
Revision Changes Path
1.45 +21 -6 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
Index: ProxyControlGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ProxyControlGui.java 28 May 2005 10:17:31 -0000 1.44
+++ ProxyControlGui.java 12 Jun 2005 12:21:21 -0000 1.45
@@ -24,6 +24,8 @@
import java.awt.event.ActionListener;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
import java.util.Arrays;
@@ -72,6 +74,7 @@
implements
JMeterGUIComponent,
ActionListener,
+ ItemListener,
KeyListener,
FocusListener,
UnsharedComponent
@@ -232,7 +235,7 @@
useKeepAlive.setSelected(model.getUseKeepalive());
regexMatch.setSelected(model.getRegexMatch());
- reinitializeTargetCombo();//TODO is this needed? What does it do?
+ reinitializeTargetCombo();// Set up list of potential targets and enable listener
populateTable(includeModel, model.getIncludePatterns().iterator());
populateTable(excludeModel, model.getExcludePatterns().iterator());
@@ -262,6 +265,16 @@
public void focusGained(FocusEvent e)
{}
+ /*
+ * Handles groupingMode.
+ * actionPerfomed is not suitable, as that seems to be activated
+ * whenever the Proxy is selected in the Test Plan
+ */
+ public void itemStateChanged(ItemEvent e) {
+ //System.err.println(e.paramString());
+ enableRestart();
+ }
+
/****************************************
* !ToDo (Method description)
*
@@ -271,6 +284,8 @@
{
String command = action.getActionCommand();
+ //System.err.println(action.paramString()+" "+command+ " "+action.getModifiers());
+
if (command.equals(STOP))
{
model.stopProxy();
@@ -289,7 +304,6 @@
}
else if ( command.equals(ProxyControl.CAPTURE_HTTP_HEADERS)
|| command.equals(ProxyControl.ADD_ASSERTIONS)
- || command.equals(ProxyControl.GROUPING_MODE)
|| command.equals(ProxyControl.USE_KEEPALIVE)
|| command.equals(ProxyControl.REGEX_MATCH)
)
@@ -326,6 +340,7 @@
log.debug("In model "+model);
TreeNodeWrapper nw= (TreeNodeWrapper)targetNodes.getSelectedItem();
model.setTarget(nw.getTreeNode());
+ enableRestart();
}
}
@@ -355,6 +370,7 @@
{
if (stop.isEnabled())
{
+ //System.err.println("Enable Restart");
restart.setEnabled(true);
}
}
@@ -575,8 +591,7 @@
groupingMode = new JComboBox(m);
groupingMode.setName(ProxyControl.GROUPING_MODE);
groupingMode.setSelectedIndex(0);
- groupingMode.addActionListener(this);
- groupingMode.setActionCommand(ProxyControl.GROUPING_MODE);
+ groupingMode.addItemListener(this);
JLabel label2 = new JLabel(JMeterUtils.getResString("grouping_mode"));
label2.setLabelFor(groupingMode);
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org