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 2010/02/06 14:55:16 UTC
svn commit: r907216 - in
/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui:
MultipartUrlConfigGui.java UrlConfigGui.java
Author: sebb
Date: Sat Feb 6 13:55:15 2010
New Revision: 907216
URL: http://svn.apache.org/viewvc?rev=907216&view=rev
Log:
Make Follow Redirects the default (better for cookie tracking)
Easier selection of redirect options
Move Proxy panel lower down screen
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java?rev=907216&r1=907215&r2=907216&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java Sat Feb 6 13:55:15 2010
@@ -82,6 +82,7 @@
this.add(getWebServerTimeoutPanel(), BorderLayout.NORTH);
this.add(webRequestPanel, BorderLayout.CENTER);
+ this.add(getProxyServerPanel(), BorderLayout.SOUTH);
}
private JPanel getHTTPFileArgsPanel() {
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java?rev=907216&r1=907215&r2=907216&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java Sat Feb 6 13:55:15 2010
@@ -106,8 +106,8 @@
public void clear() {
domain.setText(""); // $NON-NLS-1$
if (notConfigOnly){
- followRedirects.setSelected(false);
- autoRedirects.setSelected(true);
+ followRedirects.setSelected(true);
+ autoRedirects.setSelected(false);
method.setText(HTTPSamplerBase.DEFAULT_METHOD);
useKeepAlive.setSelected(true);
useMultipartForPost.setSelected(false);
@@ -221,6 +221,7 @@
this.add(getWebServerTimeoutPanel(), BorderLayout.NORTH);
this.add(webRequestPanel, BorderLayout.CENTER);
+ this.add(getProxyServerPanel(), BorderLayout.SOUTH);
}
/**
@@ -250,6 +251,17 @@
webServerTimeoutPanel.add(webServerPanel, BorderLayout.CENTER);
webServerTimeoutPanel.add(timeOut, BorderLayout.EAST);
+ JPanel bigPanel = new VerticalPanel();
+ bigPanel.add(webServerTimeoutPanel);
+ return bigPanel;
+ }
+
+ /**
+ * Create a panel containing the proxy server details
+ *
+ * @return the panel
+ */
+ protected final JPanel getProxyServerPanel(){
JPanel proxyServer = new HorizontalPanel();
proxyServer.add(getProxyHostPanel(), BorderLayout.CENTER);
proxyServer.add(getProxyPortPanel(), BorderLayout.EAST);
@@ -264,10 +276,7 @@
proxyServerPanel.add(proxyServer, BorderLayout.CENTER);
proxyServerPanel.add(proxyLogin, BorderLayout.EAST);
- JPanel bigPanel = new VerticalPanel();
- bigPanel.add(webServerTimeoutPanel);
- bigPanel.add(proxyServerPanel);
- return bigPanel;
+ return proxyServerPanel;
}
private JPanel getPortPanel() {
@@ -385,11 +394,12 @@
if (notConfigOnly){
followRedirects = new JCheckBox(JMeterUtils.getResString("follow_redirects")); // $NON-NLS-1$
- followRedirects.setSelected(false);
+ followRedirects.setSelected(true);
+ followRedirects.addChangeListener(this);
autoRedirects = new JCheckBox(JMeterUtils.getResString("follow_redirects_auto")); //$NON-NLS-1$
autoRedirects.addChangeListener(this);
- autoRedirects.setSelected(true);// Default changed in 2.3
+ autoRedirects.setSelected(false);// Default changed in 2.3 and again in 2.4
useKeepAlive = new JCheckBox(JMeterUtils.getResString("use_keepalive")); // $NON-NLS-1$
useKeepAlive.setSelected(true);
@@ -457,13 +467,16 @@
return argsPanel;
}
- // Disable follow redirects if Autoredirect is selected
+ // autoRedirects and followRedirects cannot both be selected
public void stateChanged(ChangeEvent e) {
if (e.getSource() == autoRedirects){
if (autoRedirects.isSelected()) {
- followRedirects.setEnabled(false);
- } else {
- followRedirects.setEnabled(true);
+ followRedirects.setSelected(false);
+ }
+ }
+ if (e.getSource() == followRedirects){
+ if (followRedirects.isSelected()) {
+ autoRedirects.setSelected(false);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org