khammond 01/10/07 08:37:47
Modified: src/org/apache/jmeter/protocol/http/config/gui
UrlConfigGui.java
Log:
New GUI style.
Revision Changes Path
1.16 +161 -86
jakarta-jmeter/src/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
Index: UrlConfigGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- UrlConfigGui.java 2001/09/26 14:52:35 1.15
+++ UrlConfigGui.java 2001/10/07 15:37:47 1.16
@@ -55,7 +55,9 @@
package org.apache.jmeter.protocol.http.config.gui;
import javax.swing.*;
+import javax.swing.border.*;
import java.awt.event.*;
+import java.awt.*;
import java.util.*;
import org.apache.jmeter.gui.*;
@@ -76,24 +78,22 @@
public class UrlConfigGui extends JPanel implements
ModelSupported,KeyListener,ActionListener
{
private static String DOMAIN = "domain";
- private static String PORT = "port";
- //private static String METHOD = "method";
+ private static String PORT = "port";
private static String PATH = "path";
private static String POST = "post";
private static String GET = "get";
private static String HTTP = "http";
private static String HTTPS = "https";
+ private static String SEND_PARAM = "sendparam";
- private JTextField domain = new JTextField(30);
- private JTextField port = new JTextField(30);
- private JTextField path = new JTextField(30);
- private JRadioButton post = new JRadioButton("POST");
- private JRadioButton get = new JRadioButton("GET");
- private JRadioButton http = new JRadioButton("HTTP");
- private JRadioButton https = new JRadioButton("HTTPS");
+ private JTextField domain;
+ private JTextField port;
+ private JTextField path;
+ private JRadioButton post;
+ private JRadioButton get;
+ private JRadioButton http;
+ private JRadioButton https;
- private static ResourceBundle rb =
ResourceBundle.getBundle("org.apache.jmeter.resources.messages");
-
protected NamePanel namePanel;
protected boolean displayName = true;
@@ -112,16 +112,24 @@
{
domain.setText((String)model.getProperty(UrlConfig.DOMAIN));
path.setText((String)model.getProperty(UrlConfig.PATH));
+
Object portI = model.getProperty(UrlConfig.PORT);
- if (portI!=null)
- port.setText(portI.toString());
- if(namePanel != null)
- namePanel.updateGui();
- if(UrlConfig.POST.equals(model.getProperty(UrlConfig.METHOD)))
+
+ if (portI != null)
+ {
+ port.setText(portI.toString());
+ }
+
+ if (namePanel != null)
+ {
+ namePanel.updateGui();
+ }
+
+ if (UrlConfig.POST.equals(model.getProperty(UrlConfig.METHOD)))
{
post.setSelected(true);
}
- else if(UrlConfig.GET.equals(model.getProperty(UrlConfig.METHOD)))
+ else if (UrlConfig.GET.equals(model.getProperty(UrlConfig.METHOD)))
{
get.setSelected(true);
}
@@ -131,11 +139,11 @@
model.setMethod(UrlConfig.GET);
}
- if(https.getText().equalsIgnoreCase(model.getProtocol()))
+ if (https.getText().equalsIgnoreCase(model.getProtocol()))
{
https.setSelected(true);
}
- else if(http.getText().equalsIgnoreCase(model.getProtocol()))
+ else if (http.getText().equalsIgnoreCase(model.getProtocol()))
{
http.setSelected(true);
}
@@ -154,118 +162,184 @@
protected void init()
{
- this.setLayout(new VerticalLayout(1,VerticalLayout.LEFT));
- if(displayName)
+ this.setLayout(new VerticalLayout(5, VerticalLayout.LEFT,
VerticalLayout.TOP));
+
+ JPanel webServerPanel = new JPanel();
+ webServerPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT,
VerticalLayout.TOP));
+
webServerPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
JMeterUtils.getResString("web_server")));
+ webServerPanel.add(getDomainPanel());
+ webServerPanel.add(getPortPanel());
+
+ JPanel webRequestPanel = new JPanel();
+ webRequestPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT,
VerticalLayout.TOP));
+
webRequestPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
JMeterUtils.getResString("web_request")));
+ webRequestPanel.add(getProtocolAndMethodPanel());
+ webRequestPanel.add(getPathPanel());
+ webRequestPanel.add(getParameterPanel());
+
+ if (displayName)
{
- namePanel = new NamePanel();
- namePanel.setModel(model);
- this.add(namePanel);
- }
- this.add(getProtocolPanel());
- this.add(getMethodPanel());
- this.add(getDomainPanel());
- this.add(getPortPanel());
- this.add(getPathPanel());
- this.add(getParameterPanel());
- }
-
- protected JPanel getPortPanel() {
- JPanel portP = new JPanel();
- portP.add(new JLabel(rb.getString("port")));
- Object portI = model.getProperty(UrlConfig.PORT);
- if (portI!=null)
- port.setText(portI.toString());
- port.setName(PORT);
- port.addKeyListener(this);
- portP.add(port);
- return portP;
- }
+ // MAIN PANEL
+ JPanel mainPanel = new JPanel();
+ Border margin = new EmptyBorder(10, 10, 5, 10);
+ mainPanel.setBorder(margin);
+ mainPanel.setLayout(new VerticalLayout(5,
VerticalLayout.LEFT));
+
+ // TITLE
+ JLabel panelTitleLabel = new
JLabel(JMeterUtils.getResString("url_config_title"));
+ Font curFont = panelTitleLabel.getFont();
+ int curFontSize = curFont.getSize();
+ curFontSize += 4;
+ panelTitleLabel.setFont(new Font(curFont.getFontName(),
curFont.getStyle(), curFontSize));
+ mainPanel.add(panelTitleLabel);
+
+ // NAME
+ namePanel = new NamePanel(model);
+ mainPanel.add(namePanel);
+ mainPanel.add(webServerPanel);
+ mainPanel.add(webRequestPanel);
+
+ this.add(mainPanel);
+ }
+ else
+ {
+ this.add(webServerPanel);
+ this.add(webRequestPanel);
+ }
+ }
+
+ protected JPanel getPortPanel()
+ {
+ JPanel portP = new JPanel();
+ portP.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 10));
+ portP.add(new JLabel(JMeterUtils.getResString("web_server_port")));
+
+ port = new JTextField(6);
+
+ Object portI = model.getProperty(UrlConfig.PORT);
+ if (portI != null)
+ {
+ port.setText(portI.toString());
+ }
+
+ port.setName(PORT);
+ port.addKeyListener(this);
+ portP.add(port);
+
+ return portP;
+ }
+
protected JPanel getDomainPanel()
{
JPanel domainP = new JPanel();
- domainP.add(new JLabel(rb.getString("domain")));
+ domainP.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 10));
+ domainP.add(new JLabel(JMeterUtils.getResString("web_server_domain")));
+
+ domain = new JTextField(20);
domain.setText((String)model.getProperty(UrlConfig.DOMAIN));
domain.setName(DOMAIN);
domain.addKeyListener(this);
domainP.add(domain);
+
return domainP;
}
protected JPanel getPathPanel()
{
JPanel panel = new JPanel();
- panel.add(new JLabel(rb.getString("path")));
+ panel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 10));
+ panel.add(new JLabel(JMeterUtils.getResString("path")));
+
+ path = new JTextField(20);
path.setText((String)model.getProperty(UrlConfig.PATH));
path.setName(PATH);
path.addKeyListener(this);
panel.add(path);
+
return panel;
}
- protected JPanel getProtocolPanel()
+ protected JPanel getProtocolAndMethodPanel()
{
JPanel panel = new JPanel();
- panel.add(new JLabel(rb.getString("protocol")+": "));
- ButtonGroup group = new ButtonGroup();
- group.add(http);
- group.add(https);
- if(http.getText().equalsIgnoreCase(model.getProtocol()))
+ panel.setLayout(new BoxLayout(panel, BoxLayout.X_AXIS));
+ panel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
+
+ panel.add(new JLabel(JMeterUtils.getResString("protocol")));
+ panel.add(Box.createRigidArea(new Dimension(5, 0)));
+
+ // PROTOCOL
+ http = new JRadioButton(JMeterUtils.getResString("url_config_http"));
+ http.setActionCommand(HTTP);
+ http.addActionListener(this);
+ https = new JRadioButton(JMeterUtils.getResString("url_config_https"));
+ https.setActionCommand(HTTPS);
+ https.addActionListener(this);
+ ButtonGroup protocolButtonGroup = new ButtonGroup();
+ protocolButtonGroup.add(http);
+ protocolButtonGroup.add(https);
+
+ if (http.getText().equalsIgnoreCase(model.getProtocol()))
{
http.setSelected(true);
}
- else if(https.getText().equalsIgnoreCase(model.getProtocol()))
+ else if (https.getText().equalsIgnoreCase(model.getProtocol()))
{
https.setSelected(true);
}
- http.setActionCommand(HTTP);
- https.setActionCommand(HTTPS);
- http.addActionListener(this);
- https.addActionListener(this);
panel.add(http);
panel.add(https);
- return panel;
- }
- protected JPanel getMethodPanel()
- {
- JPanel panel = new JPanel();
- panel.add(new JLabel(rb.getString("method")+": "));
- ButtonGroup group = new ButtonGroup();
- group.add(get);
- group.add(post);
- if(UrlConfig.POST.equals(model.getProperty(UrlConfig.METHOD)))
+ panel.add(Box.createRigidArea(new Dimension(20, 0)));
+
+ // METHOD
+ post = new JRadioButton(JMeterUtils.getResString("url_config_post"));
+ post.setActionCommand(POST);
+ post.addActionListener(this);
+ get = new JRadioButton(JMeterUtils.getResString("url_config_get"));
+ get.setActionCommand(GET);
+ get.addActionListener(this);
+ ButtonGroup methodButtonGroup = new ButtonGroup();
+ methodButtonGroup.add(post);
+ methodButtonGroup.add(get);
+
+ panel.add(new JLabel(JMeterUtils.getResString("method")));
+ panel.add(Box.createRigidArea(new Dimension(5, 0)));
+
+ if (UrlConfig.POST.equals(model.getProperty(UrlConfig.METHOD)))
{
post.setSelected(true);
}
- else if(UrlConfig.GET.equals(model.getProperty(UrlConfig.METHOD)))
+ else if (UrlConfig.GET.equals(model.getProperty(UrlConfig.METHOD)))
{
get.setSelected(true);
}
- post.setActionCommand(POST);
- get.setActionCommand(GET);
- post.addActionListener(this);
- get.addActionListener(this);
panel.add(get);
panel.add(post);
+
return panel;
}
protected JPanel getParameterPanel()
{
- ArgumentsPanel panel = new ArgumentsPanel();
+ ArgumentsPanel argsPanel = new ArgumentsPanel();
Arguments args = (Arguments)model.getProperty(UrlConfig.ARGUMENTS);
- if(args == null)
+
+ if (args == null)
{
args = new Arguments();
model.putProperty(UrlConfig.ARGUMENTS,args);
}
- panel.setModel(args);
- return panel;
+
+ argsPanel.setModel(args);
+
+ return argsPanel;
}
+
public void keyPressed(KeyEvent e)
{
}
@@ -277,19 +351,20 @@
public void keyReleased(KeyEvent e)
{
String name = e.getComponent().getName();
- if(name.equals(DOMAIN))
+
+ if (name.equals(DOMAIN))
{
model.putProperty(UrlConfig.DOMAIN,domain.getText());
}
- else if(name.equals(PATH))
+ else if (name.equals(PATH))
{
model.putProperty(UrlConfig.PATH,path.getText());
}
- else if (name.equals(PORT)) {
+ else if (name.equals(PORT))
+ {
try
{
- model.putProperty
- (UrlConfig.PORT, new Integer(port.getText()));
+ model.putProperty(UrlConfig.PORT, new
Integer(port.getText()));
}
catch (Exception ex)
{
@@ -301,22 +376,22 @@
public void actionPerformed(ActionEvent e)
{
String name = e.getActionCommand();
- if(name.equals(POST))
+
+ if (name.equals(POST))
{
model.putProperty(UrlConfig.METHOD,UrlConfig.POST);
}
- else if(name.equals(GET))
+ else if (name.equals(GET))
{
model.putProperty(UrlConfig.METHOD,UrlConfig.GET);
}
- else if(name.equals(HTTP))
+ else if (name.equals(HTTP))
{
model.putProperty(UrlConfig.PROTOCOL,"http");
}
- else if(name.equals(HTTPS))
+ else if (name.equals(HTTPS))
{
model.putProperty(UrlConfig.PROTOCOL,"https");
}
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
