khammond 01/09/26 22:21:59
Modified: src/org/apache/jmeter/timers/gui ConstantTimerGui.java
Log:
Cleaned up GUI.
Revision Changes Path
1.5 +68 -27
jakarta-jmeter/src/org/apache/jmeter/timers/gui/ConstantTimerGui.java
Index: ConstantTimerGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/timers/gui/ConstantTimerGui.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ConstantTimerGui.java 2001/07/26 00:34:51 1.4
+++ ConstantTimerGui.java 2001/09/27 05:21:59 1.5
@@ -55,10 +55,14 @@
package org.apache.jmeter.timers.gui;
import javax.swing.*;
+import javax.swing.border.*;
+
import java.awt.event.*;
+import java.awt.*;
import org.apache.jmeter.timers.*;
import org.apache.jmeter.gui.*;
+import org.apache.jmeter.util.*;
/**
* Title: JMeter
@@ -71,68 +75,105 @@
public class ConstantTimerGui extends JPanel implements ModelSupported,KeyListener
{
-
ConstantTimer model;
- private JTextField delayField = new JTextField(6);
- private JTextField nameField = new JTextField(30);
+
+ private JTextField delayField;
+
+ private final String DELAY_FIELD = "Delay Field";
public ConstantTimerGui()
{
- init();
}
public void setModel(Object model)
{
this.model = (ConstantTimer)model;
- updateGui();
+ init();
}
public void updateGui()
{
- nameField.setText(model.getName());
- delayField.setText(""+model.delay());
+ delayField.setText("" + model.delay());
}
- public static void error(Exception e, JComponent thrower) {
+ public static void error(Exception e, JComponent thrower)
+ {
JOptionPane.showMessageDialog(thrower, e, "Error",
JOptionPane.ERROR_MESSAGE);
}
private void init()
{
- this.setLayout(new VerticalLayout(VerticalLayout.LEFT));
- JPanel namePanel = new JPanel();
- namePanel.add(new JLabel("Name"));
- namePanel.add(nameField);
- nameField.addKeyListener(this);
- nameField.setName(NAME_FIELD);
+ this.setLayout(new VerticalLayout(5, VerticalLayout.LEFT,
VerticalLayout.TOP));
+
+ // 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("constant_timer_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 namePanel = new NamePanel(model);
+ mainPanel.add(namePanel);
+
+ // DELAY
JPanel delayPanel = new JPanel();
- JLabel delayLabel = new JLabel("Constant Delay");
- delayField.addKeyListener(this);
- delayField.setName("Delay Field");
+ JLabel delayLabel = new
JLabel(JMeterUtils.getResString("constant_timer_delay"));
delayPanel.add(delayLabel);
+ delayField = new JTextField(6);
delayPanel.add(delayField);
- this.add(namePanel);
- this.add(delayPanel);
+ mainPanel.add(delayPanel);
+
+ delayField.addKeyListener(this);
+ delayField.setName(DELAY_FIELD);
+
+ this.add(mainPanel);
}
public void keyReleased(KeyEvent e)
{
String n = e.getComponent().getName();
- if(n.equals(NAME_FIELD))
- {
- model.setName(nameField.getText());
- }
- else
+ if (n.equals(DELAY_FIELD))
{
- model.setDelay(Long.parseLong(delayField.getText()));
+ try
+ {
+
model.setDelay(Long.parseLong(delayField.getText()));
+ }
+ catch (NumberFormatException nfe)
+ {
+ if (delayField.getText().length() > 0)
+ {
+ JOptionPane.showMessageDialog(this,
"You must enter a valid number",
+ "Invalid data",
JOptionPane.WARNING_MESSAGE);
+
model.setDelay(model.getDefaultDelay());
+
+ // We reset the text to be an empty
string instead
+ // of the default value. If we reset
it to the
+ // default value, then the user has to
delete
+ // that value and reenter his/her own.
That's
+ // too much trouble for the user.
+ delayField.setText("");
+ }
+ else
+ {
+
model.setDelay(model.getDefaultDelay());
+ }
+ }
}
}
- public void keyPressed(KeyEvent e)
+ public void keyPressed(KeyEvent e)
{
}
public void keyTyped(KeyEvent e)
{
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
