khammond 01/11/18 08:18:03
Modified: src/org/apache/jmeter/protocol/http/config/gui
MultipartUrlConfigGui.java
Log:
Replaced "Send a file" checkbox with a label.
Revision Changes Path
1.8 +10 -45
jakarta-jmeter/src/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
Index: MultipartUrlConfigGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MultipartUrlConfigGui.java 2001/10/07 15:37:27 1.7
+++ MultipartUrlConfigGui.java 2001/11/18 16:18:03 1.8
@@ -82,7 +82,6 @@
private static String BROWSE = "browse";
private static String PARAMNAME = "paramname";
private static String MIMETYPE = "mimetype";
- private static String SENDFILE = "sendfile";
JTextField filenameField;
JTextField paramNameField;
@@ -91,7 +90,6 @@
JLabel paramNameLabel;
JLabel mimetypeLabel;
JButton browseFileButton;
- JCheckBox sendFileCheckBox;
public MultipartUrlConfigGui()
{
@@ -167,11 +165,9 @@
filePanel.setLayout(new VerticalLayout(1, VerticalLayout.LEFT));
filePanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
- // SEND FILE CHECKBOX
- sendFileCheckBox = new
JCheckBox(JMeterUtils.getResString("send_file"));
- sendFileCheckBox.setActionCommand(SENDFILE);
- sendFileCheckBox.addActionListener(this);
- filePanel.add(sendFileCheckBox);
+ // SEND FILE LABEL
+ JLabel sendFileLabel = new
JLabel(JMeterUtils.getResString("send_file"));
+ filePanel.add(sendFileLabel);
// FILENAME PANEL (contains filename label and text field and Browse
button)
JPanel filenamePanel = new JPanel();
@@ -179,18 +175,18 @@
// --- FILENAME LABEL
filenameLabel = new
JLabel(JMeterUtils.getResString("send_file_filename_label"));
- filenameLabel.setEnabled(false);
+ filenameLabel.setEnabled(true);
// --- FILENAME TEXT FIELD
filenameField = new JTextField(15);
- filenameField.setEnabled(false);
+ filenameField.setEnabled(true);
filenameField.setText(((MultipartUrlConfig)model).getFilename());
filenameField.setName(FILENAME);
filenameField.addKeyListener(this);
// --- BROWSE BUTTON
browseFileButton = new
JButton(JMeterUtils.getResString("send_file_browse"));
- browseFileButton.setEnabled(false);
+ browseFileButton.setEnabled(true);
browseFileButton.setActionCommand(BROWSE);
browseFileButton.addActionListener(this);
@@ -204,14 +200,14 @@
// --- PARAM NAME LABEL
paramNameLabel = new
JLabel(JMeterUtils.getResString("send_file_param_name_label"));
- paramNameLabel.setEnabled(false);
+ paramNameLabel.setEnabled(true);
// --- PARAM NAME TEXT FIELD
paramNameField = new JTextField(15);
paramNameField.setText(((MultipartUrlConfig)model).getFileFieldName());
paramNameField.setName(PARAMNAME);
paramNameField.addKeyListener(this);
- paramNameField.setEnabled(false);
+ paramNameField.setEnabled(true);
paramNamePanel.add(paramNameLabel);
paramNamePanel.add(paramNameField);
@@ -222,11 +218,11 @@
// --- MIME TYPE LABEL
mimetypeLabel = new
JLabel(JMeterUtils.getResString("send_file_mime_label"));
- mimetypeLabel.setEnabled(false);
+ mimetypeLabel.setEnabled(true);
// --- MIME TYPE TEXT FIELD
mimetypeField = new JTextField(15);
- mimetypeField.setEnabled(false);
+ mimetypeField.setEnabled(true);
mimetypeField.setText(((MultipartUrlConfig)model).getMimeType());
mimetypeField.setName(MIMETYPE);
mimetypeField.addKeyListener(this);
@@ -270,37 +266,6 @@
{
((MultipartUrlConfig)model).setFilename(file.getPath());
filenameField.setText(file.getPath());
- }
- }
- else if (name.equals(SENDFILE))
- {
- if (sendFileCheckBox.isSelected())
- {
- filenameLabel.setEnabled(true);
- filenameField.setEnabled(true);
- mimetypeLabel.setEnabled(true);
- mimetypeField.setEnabled(true);
- paramNameLabel.setEnabled(true);
- paramNameField.setEnabled(true);
- browseFileButton.setEnabled(true);
- }
- else
- {
- filenameLabel.setEnabled(false);
- filenameField.setEnabled(false);
- mimetypeLabel.setEnabled(false);
- mimetypeField.setEnabled(false);
- paramNameLabel.setEnabled(false);
- paramNameField.setEnabled(false);
- browseFileButton.setEnabled(false);
-
- filenameField.setText("");
- paramNameField.setText("");
- mimetypeField.setText("");
-
- ((MultipartUrlConfig)model).setFilename("");
- ((MultipartUrlConfig)model).setFileFieldName("");
- ((MultipartUrlConfig)model).setMimeType("");
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
