Author: pmouawad
Date: Sun Mar 6 16:34:20 2016
New Revision: 1733811
URL: http://svn.apache.org/viewvc?rev=1733811&view=rev
Log:
Bug 59129 - HTTP Request : Simplify GUI with simple/advanced Tabs
First part
Bugzilla Id: 59129
Modified:
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1733811&r1=1733810&r2=1733811&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Sun
Mar 6 16:34:20 2016
@@ -1292,6 +1292,8 @@ web_server_timeout_connect=Connect:
web_server_timeout_response=Response:
web_server_timeout_title=Timeouts (milliseconds)
web_testing2_title=HTTP Request HTTPClient
+web_testing_basic=Basic
+web_testing_advanced=Advanced
web_testing_concurrent_download=Parallel downloads. Number:
web_testing_embedded_url_pattern=URLs must match\:
web_testing_retrieve_images=Retrieve All Embedded Resources
Modified:
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1733811&r1=1733810&r2=1733811&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
Sun Mar 6 16:34:20 2016
@@ -1277,6 +1277,8 @@ web_server_timeout_connect=Connexion \:
web_server_timeout_response=R\u00E9ponse \:
web_server_timeout_title=D\u00E9lai expiration (ms)
web_testing2_title=Requ\u00EAte HTTP HTTPClient
+web_testing_basic=Basique
+web_testing_advanced=Advanc\u00E9
web_testing_concurrent_download=T\u00E9l\u00E9chargements en parall\u00E8le.
Nombre \:
web_testing_embedded_url_pattern=Les URL \u00E0 inclure doivent correspondre
\u00E0 \:
web_testing_retrieve_images=R\u00E9cup\u00E9rer les ressources incluses
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java?rev=1733811&r1=1733810&r2=1733811&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
Sun Mar 6 16:34:20 2016
@@ -20,7 +20,6 @@ package org.apache.jmeter.protocol.http.
import java.awt.BorderLayout;
import java.awt.Dimension;
-import java.awt.Font;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
@@ -29,8 +28,8 @@ import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
+import javax.swing.JTabbedPane;
import javax.swing.JTextField;
-import javax.swing.UIManager;
import org.apache.jmeter.gui.util.HorizontalPanel;
import org.apache.jmeter.gui.util.VerticalPanel;
@@ -48,14 +47,8 @@ import org.apache.jmeter.util.JMeterUtil
*
*/
public class HttpTestSampleGui extends AbstractSamplerGui {
- private static final long serialVersionUID = 240L;
+ private static final long serialVersionUID = 241L;
- private static final Font FONT_DEFAULT =
UIManager.getDefaults().getFont("TextField.font");
-
- private static final Font FONT_VERY_SMALL = new Font("SansSerif",
Font.PLAIN, (int) Math.round(FONT_DEFAULT.getSize() * 0.6));
-
- private static final Font FONT_SMALL = new Font("SansSerif", Font.PLAIN,
(int) Math.round(FONT_DEFAULT.getSize() * 0.8));
-
private UrlConfigGui urlConfigGui;
private JCheckBox getImages;
@@ -155,20 +148,27 @@ public class HttpTestSampleGui extends A
setLayout(new BorderLayout(0, 5));
setBorder(makeBorder());
- add(makeTitlePanel(), BorderLayout.NORTH);
-
// URL CONFIG
urlConfigGui = new UrlConfigGui(true, !isAJP, true, true);
- add(urlConfigGui, BorderLayout.CENTER);
+
+ // AdvancedPanel (embedded resources, source address and optional
tasks)
+ JPanel advancedPanel = new VerticalPanel();
+ advancedPanel.add(createEmbeddedRsrcPanel());
+ advancedPanel.add(createSourceAddrPanel());
+ advancedPanel.add(createOptionalTasksPanel());
+
+ JTabbedPane tabbedPane = new JTabbedPane();
+ tabbedPane.add(JMeterUtils
+ .getResString("web_testing_basic"), urlConfigGui);
+ tabbedPane.add(JMeterUtils
+ .getResString("web_testing_advanced"), advancedPanel);
+
+ JPanel emptyPanel = new JPanel();
+ emptyPanel.setMaximumSize(new Dimension());
- // Bottom (embedded resources, source address and optional tasks)
- JPanel bottomPane = new VerticalPanel();
- bottomPane.add(createEmbeddedRsrcPanel());
- JPanel optionAndSourcePane = new HorizontalPanel();
- optionAndSourcePane.add(createSourceAddrPanel());
- optionAndSourcePane.add(createOptionalTasksPanel());
- bottomPane.add(optionAndSourcePane);
- add(bottomPane, BorderLayout.SOUTH);
+ add(makeTitlePanel(), BorderLayout.NORTH);
+ add(tabbedPane, BorderLayout.CENTER);
+ add(emptyPanel, BorderLayout.SOUTH);
}
protected JPanel createEmbeddedRsrcPanel() {
@@ -179,7 +179,6 @@ public class HttpTestSampleGui extends A
final JPanel checkBoxPanel = new HorizontalPanel();
// RETRIEVE IMAGES
getImages = new
JCheckBox(JMeterUtils.getResString("web_testing_retrieve_images")); //
$NON-NLS-1$
- getImages.setFont(FONT_SMALL);
// add a listener to activate or not concurrent dwn.
getImages.addItemListener(new ItemListener() {
@Override
@@ -190,7 +189,6 @@ public class HttpTestSampleGui extends A
});
// Download concurrent resources
concurrentDwn = new
JCheckBox(JMeterUtils.getResString("web_testing_concurrent_download")); //
$NON-NLS-1$
- concurrentDwn.setFont(FONT_SMALL);
concurrentDwn.addItemListener(new ItemListener() {
@Override
public void itemStateChanged(final ItemEvent e) {
@@ -199,7 +197,6 @@ public class HttpTestSampleGui extends A
}
});
concurrentPool = new JTextField(2); // 2 column size
- concurrentPool.setFont(FONT_SMALL);
concurrentPool.setMaximumSize(new Dimension(30,20));
checkBoxPanel.add(getImages);
@@ -208,7 +205,6 @@ public class HttpTestSampleGui extends A
embeddedRsrcPanel.add(checkBoxPanel);
// Embedded URL match regex
- labelEmbeddedRE.setFont(FONT_SMALL);
checkBoxPanel.add(labelEmbeddedRE);
embeddedRE = new JTextField(10);
checkBoxPanel.add(embeddedRE);
@@ -219,19 +215,17 @@ public class HttpTestSampleGui extends A
protected JPanel createOptionalTasksPanel() {
// OPTIONAL TASKS
- final JPanel checkBoxPanel = new HorizontalPanel();
+ final JPanel checkBoxPanel = new VerticalPanel();
checkBoxPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
JMeterUtils
.getResString("optional_tasks"))); // $NON-NLS-1$
- // Is monitor
- isMon = new JCheckBox(JMeterUtils.getResString("monitor_is_title"));
// $NON-NLS-1$
- isMon.setFont(FONT_SMALL);
// Use MD5
useMD5 = new
JCheckBox(JMeterUtils.getResString("response_save_as_md5")); // $NON-NLS-1$
- useMD5.setFont(FONT_SMALL);
- checkBoxPanel.add(isMon);
+ // Is monitor
+ isMon = new JCheckBox(JMeterUtils.getResString("monitor_is_title"));
// $NON-NLS-1$
checkBoxPanel.add(useMD5);
+ checkBoxPanel.add(isMon);
return checkBoxPanel;
}
@@ -244,7 +238,6 @@ public class HttpTestSampleGui extends A
if (!isAJP) {
// Add a new field source ip address (for HC implementations only)
sourceIpType.setSelectedIndex(HTTPSamplerBase.SourceType.HOSTNAME.ordinal());
//default: IP/Hostname
- sourceIpType.setFont(FONT_VERY_SMALL);
sourceAddrPanel.add(sourceIpType);
sourceIpAddr = new JTextField();
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1733811&r1=1733810&r2=1733811&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sun Mar 6 16:34:20 2016
@@ -142,6 +142,7 @@ Summary
<li><bug>59083</bug>HTTP Request : Make Method field editable so that
additional methods (Webdav) can be added easily</li>
<li><bug>59118</bug>Add comment in recorded think time by proxy recorder.
Contributed by Antonio Gomes Rodrigues (ra0077 at gmail.com)</li>
<li><bug>59116</bug>Add the possibility to setup a prefix to sampler name
recorded by proxy. Partly based on a patch by Antonio Gomes Rodrigues (ra0077
at gmail.com)</li>
+ <li><bug>59129</bug>HTTP Request : Simplify GUI with simple/advanced
Tabs</li>
</ul>
<h3>Other samplers</h3>
@@ -245,7 +246,7 @@ Summary
<li><bug>58793</bug>Create developers page explaining how to build and
contribute</li>
<li><bug>59046</bug>JMeter Gui Replace controller should keep the name and the
selection. Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
<li><bug>59038</bug>Deprecate HTTPClient 3.1 related elements</li>
-<li><bug>59094</bug> - Drop support of old JMX file format</li>
+<li><bug>59094</bug>Drop support of old JMX file format</li>
<li><bug>59082</bug>Remove the "TestCompiler.useStaticSet" parameter.
Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
<li><bug>59093</bug>Option parsing error message can be 'lost'</li>
<li><bug>58715</bug>Feature request: Bundle groovy-all with JMeter</li>
