Author: sebb
Date: Tue Jun 12 10:50:08 2007
New Revision: 546573
URL: http://svn.apache.org/viewvc?view=rev&rev=546573
Log:
Fix up initial state of followRedirects
Rearrange WebServer panel to use only one line
Modified:
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
Modified:
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java?view=diff&rev=546573&r1=546572&r2=546573
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
Tue Jun 12 10:50:08 2007
@@ -118,8 +118,11 @@
VerticalPanel webServerPanel = new VerticalPanel();
webServerPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
JMeterUtils.getResString("web_server"))); //
$NON-NLS-1$
- webServerPanel.add(getDomainPanel());
- webServerPanel.add(getPortPanel());
+ final JPanel domainPanel = getDomainPanel();
+ final JPanel portPanel = getPortPanel();
+ domainPanel.add(portPanel,BorderLayout.EAST);
+ webServerPanel.add(domainPanel);
+ //webServerPanel.add(getPortPanel());
JPanel northPanel = new JPanel();
northPanel.setLayout(new BoxLayout(northPanel,
BoxLayout.Y_AXIS));
Modified:
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java?view=diff&rev=546573&r1=546572&r2=546573
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
Tue Jun 12 10:50:08 2007
@@ -231,15 +231,15 @@
JLabel label = new JLabel(JMeterUtils.getResString("path"));
//$NON-NLS-1$
label.setLabelFor(path);
- autoRedirects = new
JCheckBox(JMeterUtils.getResString("follow_redirects_auto")); //$NON-NLS-1$
- autoRedirects.setName(AUTO_REDIRECTS);
- autoRedirects.setSelected(true);// Default changed in 2.3
- autoRedirects.addChangeListener(this);
-
followRedirects = new
JCheckBox(JMeterUtils.getResString("follow_redirects")); // $NON-NLS-1$
followRedirects.setName(FOLLOW_REDIRECTS);
followRedirects.setSelected(false);
+ autoRedirects = new
JCheckBox(JMeterUtils.getResString("follow_redirects_auto")); //$NON-NLS-1$
+ autoRedirects.setName(AUTO_REDIRECTS);
+ autoRedirects.addChangeListener(this);
+ autoRedirects.setSelected(true);// Default changed in 2.3
+
useKeepAlive = new
JCheckBox(JMeterUtils.getResString("use_keepalive")); // $NON-NLS-1$
useKeepAlive.setName(USE_KEEPALIVE);
useKeepAlive.setSelected(true);
@@ -269,7 +269,7 @@
protected JPanel getProtocolAndMethodPanel() {
// PROTOCOL
- protocol = new JTextField(20);
+ protocol = new JTextField(10);
protocol.setName(PROTOCOL);
// CONTENT_ENCODING
contentEncoding = new JTextField(10);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
