Author: sebb
Date: Sat May 5 08:08:46 2007
New Revision: 535538
URL: http://svn.apache.org/viewvc?view=rev&rev=535538
Log:
Fix GUI layout problems
Add NLS markers where appropriate
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XMLAssertionGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/InterleaveControlGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/OnceOnlyControllerGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/RandomControlGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java
jakarta/jmeter/branches/rel-2-2/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java?view=diff&rev=535538&r1=535537&r2=535538
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java
Sat May 5 08:08:46 2007
@@ -141,7 +141,7 @@
}
private void init() {
- setLayout(new VerticalLayout(5, VerticalLayout.LEFT,
VerticalLayout.TOP));
+ setLayout(new VerticalLayout(5, VerticalLayout.BOTH,
VerticalLayout.TOP));
setBorder(makeBorder());
add(makeTitlePanel());
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XMLAssertionGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XMLAssertionGui.java?view=diff&rev=535538&r1=535537&r2=535538
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XMLAssertionGui.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XMLAssertionGui.java
Sat May 5 08:08:46 2007
@@ -68,7 +68,7 @@
* Inits the GUI.
*/
private void init() {
- setLayout(new VerticalLayout(5, VerticalLayout.LEFT,
VerticalLayout.TOP));
+ setLayout(new VerticalLayout(5, VerticalLayout.BOTH,
VerticalLayout.TOP));
setBorder(makeBorder());
add(makeTitlePanel());
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java?view=diff&rev=535538&r1=535537&r2=535538
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java
Sat May 5 08:08:46 2007
@@ -18,10 +18,6 @@
package org.apache.jmeter.control.gui;
-//import java.util.Collection;
-//import java.util.Iterator;
-
-//import javax.swing.JLabel;
import javax.swing.JMenu;
import javax.swing.JPopupMenu;
@@ -33,11 +29,6 @@
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.layout.VerticalLayout;
-/**
- *
- *
- * @version $Revision$ on $Date$
- */
public class IncludeControllerGui extends AbstractControllerGui
/*
* implements
@@ -45,13 +36,8 @@
*/
{
- //NOTUSED private JLabel warningLabel;
-
private FilePanel includePanel =
- new FilePanel(JMeterUtils.getResString("include_path"), ".jmx");
-
- public static final String CONTROLLER = "Module To Run";
-
+ new FilePanel(JMeterUtils.getResString("include_path"), ".jmx");
//$NON-NLS-1$ //$NON-NLS-2$
/**
* Initializes the gui panel for the ModuleController instance.
@@ -61,7 +47,7 @@
}
public String getLabelResource() {
- return "include_controller";
+ return "include_controller";//$NON-NLS-1$
}
/*
@@ -75,24 +61,6 @@
this.includePanel.setFilename(controller.getIncludePath());
}
-//NOTUSED
-// private String renderPath(Collection path) {
-// Iterator iter = path.iterator();
-// StringBuffer buf = new StringBuffer();
-// boolean first = true;
-// while (iter.hasNext()) {
-// if (first) {
-// first = false;
-// iter.next();
-// continue;
-// }
-// buf.append(iter.next());
-// if (iter.hasNext())
-// buf.append(" > ");
-// }
-// return buf.toString();
-// }
-
/*
* (non-Javadoc)
*
@@ -139,21 +107,10 @@
}
private void init() {
- setLayout(new VerticalLayout(5, VerticalLayout.LEFT,
VerticalLayout.TOP));
+ setLayout(new VerticalLayout(5, VerticalLayout.BOTH,
VerticalLayout.TOP));
setBorder(makeBorder());
add(makeTitlePanel());
add(includePanel);
- }
-
-//NOTUSED
-// private String spaces(int level) {
-// int multi = 4;
-// StringBuffer spaces = new StringBuffer(level * multi);
-// for (int i = 0; i < level * multi; i++) {
-// spaces.append(" ");
-// }
-// return spaces.toString();
-// }
-
+ }
}
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/InterleaveControlGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/InterleaveControlGui.java?view=diff&rev=535538&r1=535537&r2=535538
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/InterleaveControlGui.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/InterleaveControlGui.java
Sat May 5 08:08:46 2007
@@ -74,7 +74,7 @@
}
private void init() {
- setLayout(new VerticalLayout(5, VerticalLayout.LEFT,
VerticalLayout.TOP));
+ setLayout(new VerticalLayout(5, VerticalLayout.BOTH,
VerticalLayout.TOP));
setBorder(makeBorder());
add(makeTitlePanel());
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java?view=diff&rev=535538&r1=535537&r2=535538
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java
Sat May 5 08:08:46 2007
@@ -166,7 +166,7 @@
}
private void init() {
- setLayout(new VerticalLayout(5, VerticalLayout.LEFT,
VerticalLayout.TOP));
+ setLayout(new VerticalLayout(5, VerticalLayout.BOTH,
VerticalLayout.TOP));
setBorder(makeBorder());
add(makeTitlePanel());
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/OnceOnlyControllerGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/OnceOnlyControllerGui.java?view=diff&rev=535538&r1=535537&r2=535538
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/OnceOnlyControllerGui.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/OnceOnlyControllerGui.java
Sat May 5 08:08:46 2007
@@ -47,7 +47,7 @@
}
private void init() {
- setLayout(new VerticalLayout(5, VerticalLayout.LEFT,
VerticalLayout.TOP));
+ setLayout(new VerticalLayout(5, VerticalLayout.BOTH,
VerticalLayout.TOP));
setBorder(makeBorder());
add(makeTitlePanel());
}
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/RandomControlGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/RandomControlGui.java?view=diff&rev=535538&r1=535537&r2=535538
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/RandomControlGui.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/RandomControlGui.java
Sat May 5 08:08:46 2007
@@ -75,7 +75,7 @@
}
private void init() {
- setLayout(new VerticalLayout(5, VerticalLayout.LEFT,
VerticalLayout.TOP));
+ setLayout(new VerticalLayout(5, VerticalLayout.BOTH,
VerticalLayout.TOP));
setBorder(makeBorder());
add(makeTitlePanel());
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java?view=diff&rev=535538&r1=535537&r2=535538
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java
Sat May 5 08:08:46 2007
@@ -117,7 +117,7 @@
}
private void init() {
- setLayout(new VerticalLayout(5, VerticalLayout.LEFT,
VerticalLayout.TOP));
+ setLayout(new VerticalLayout(5, VerticalLayout.BOTH,
VerticalLayout.TOP));
setBorder(makeBorder());
add(makeTitlePanel());
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java?view=diff&rev=535538&r1=535537&r2=535538
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java
Sat May 5 08:08:46 2007
@@ -145,7 +145,7 @@
}
private void init() {
- setLayout(new VerticalLayout(5, VerticalLayout.LEFT,
VerticalLayout.TOP));
+ setLayout(new VerticalLayout(5, VerticalLayout.BOTH,
VerticalLayout.TOP));
setBorder(makeBorder());
add(makeTitlePanel());
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java?view=diff&rev=535538&r1=535537&r2=535538
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java
Sat May 5 08:08:46 2007
@@ -32,7 +32,6 @@
/**
* The GUI for ConstantTimer.
*
- * @version $Revision$ on $Date$
*/
public class ConstantTimerGui extends AbstractTimerGui {
/**
@@ -102,13 +101,13 @@
* Initialize this component.
*/
private void init() {
- setLayout(new VerticalLayout(5, VerticalLayout.LEFT,
VerticalLayout.TOP));
+ setLayout(new VerticalLayout(5, VerticalLayout.BOTH,
VerticalLayout.TOP));
setBorder(makeBorder());
add(makeTitlePanel());
Box delayPanel = Box.createHorizontalBox();
- JLabel delayLabel = new
JLabel(JMeterUtils.getResString("constant_timer_delay"));
+ JLabel delayLabel = new
JLabel(JMeterUtils.getResString("constant_timer_delay"));//$NON-NLS-1$
delayPanel.add(delayLabel);
delayField = new JTextField(6);
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java?view=diff&rev=535538&r1=535537&r2=535538
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java
Sat May 5 08:08:46 2007
@@ -107,14 +107,14 @@
}
public String getLabelResource() {
- return "gaussian_timer_title";
+ return "gaussian_timer_title";//$NON-NLS-1$
}
/**
* Initialize this component.
*/
private void init() {
- setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
+ setLayout(new VerticalLayout(5, VerticalLayout.BOTH));
setBorder(makeBorder());
add(makeTitlePanel());
@@ -122,11 +122,11 @@
JPanel threadDelayPropsPanel = new JPanel();
threadDelayPropsPanel.setLayout(new VerticalLayout(5,
VerticalLayout.LEFT));
threadDelayPropsPanel.setBorder(BorderFactory.createTitledBorder(JMeterUtils
- .getResString("thread_delay_properties")));
+
.getResString("thread_delay_properties")));//$NON-NLS-1$
// DELAY DEVIATION
Box delayDevPanel = Box.createHorizontalBox();
- delayDevPanel.add(new
JLabel(JMeterUtils.getResString("gaussian_timer_range")));
+ delayDevPanel.add(new
JLabel(JMeterUtils.getResString("gaussian_timer_range")));//$NON-NLS-1$
delayDevPanel.add(Box.createHorizontalStrut(5));
rangeField = new JTextField(6);
@@ -138,7 +138,7 @@
// AVG DELAY
Box avgDelayPanel = Box.createHorizontalBox();
- avgDelayPanel.add(new
JLabel(JMeterUtils.getResString("gaussian_timer_delay")));
+ avgDelayPanel.add(new
JLabel(JMeterUtils.getResString("gaussian_timer_delay")));//$NON-NLS-1$
avgDelayPanel.add(Box.createHorizontalStrut(5));
delayField = new JTextField(6);
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java?view=diff&rev=535538&r1=535537&r2=535538
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java
Sat May 5 08:08:46 2007
@@ -72,7 +72,7 @@
}
public String getLabelResource() {
- return "uniform_timer_title";
+ return "uniform_timer_title"; //$NON-NLS-1$
}
/**
@@ -112,7 +112,7 @@
* Initialize this component.
*/
private void init() {
- setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
+ setLayout(new VerticalLayout(5, VerticalLayout.BOTH));
setBorder(makeBorder());
add(makeTitlePanel());
@@ -121,11 +121,11 @@
JPanel threadDelayPropsPanel = new JPanel();
threadDelayPropsPanel.setLayout(new VerticalLayout(5,
VerticalLayout.LEFT));
threadDelayPropsPanel.setBorder(BorderFactory.createTitledBorder(JMeterUtils
- .getResString("thread_delay_properties")));
+ .getResString("thread_delay_properties")));
//$NON-NLS-1$
// DELAY DEVIATION
Box delayDevPanel = Box.createHorizontalBox();
- delayDevPanel.add(new
JLabel(JMeterUtils.getResString("uniform_timer_range")));
+ delayDevPanel.add(new
JLabel(JMeterUtils.getResString("uniform_timer_range"))); //$NON-NLS-1$
delayDevPanel.add(Box.createHorizontalStrut(5));
rangeField = new JTextField(6);
@@ -137,7 +137,7 @@
// AVG DELAY
Box avgDelayPanel = Box.createHorizontalBox();
- avgDelayPanel.add(new
JLabel(JMeterUtils.getResString("uniform_timer_delay")));
+ avgDelayPanel.add(new
JLabel(JMeterUtils.getResString("uniform_timer_delay"))); //$NON-NLS-1$
avgDelayPanel.add(Box.createHorizontalStrut(5));
delayField = new JTextField(6);
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java?view=diff&rev=535538&r1=535537&r2=535538
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java
Sat May 5 08:08:46 2007
@@ -43,10 +43,11 @@
* Spline interpolated curve. Currently, it tries to look mostly like the
* GraphVisualizer.
*
- * @version $Revision$ on $Date$
*/
public class SplineVisualizer extends AbstractVisualizer implements
ImageVisualizer, GraphListener, Clearable {
+ private static final String SUFFIX_MS = " ms"; //$NON-NLS-1$
+
protected final Color BACKGROUND_COLOR = getBackground();
protected final Color MINIMUM_COLOR = new Color(0F, 0.5F, 0F);
@@ -94,7 +95,7 @@
}
public String getLabelResource() {
- return "spline_visualizer_title";
+ return "spline_visualizer_title"; //$NON-NLS-1$
}
public void updateGui(Sample s) {
@@ -117,43 +118,43 @@
Border margin = new EmptyBorder(10, 10, 5, 10);
mainPanel.setBorder(margin);
- mainPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
+ mainPanel.setLayout(new VerticalLayout(5, VerticalLayout.BOTH));
// NAME
mainPanel.add(makeTitlePanel());
- maximumLabel = new
JLabel(JMeterUtils.getResString("spline_visualizer_maximum"));
+ maximumLabel = new
JLabel(JMeterUtils.getResString("spline_visualizer_maximum")); //$NON-NLS-1$
maximumLabel.setForeground(MAXIMUM_COLOR);
maximumLabel.setBackground(backColor);
- averageLabel = new
JLabel(JMeterUtils.getResString("spline_visualizer_average"));
+ averageLabel = new
JLabel(JMeterUtils.getResString("spline_visualizer_average")); //$NON-NLS-1$
averageLabel.setForeground(AVERAGE_COLOR);
averageLabel.setBackground(backColor);
- incomingLabel = new
JLabel(JMeterUtils.getResString("spline_visualizer_incoming"));
+ incomingLabel = new
JLabel(JMeterUtils.getResString("spline_visualizer_incoming")); //$NON-NLS-1$
incomingLabel.setForeground(INCOMING_COLOR);
incomingLabel.setBackground(backColor);
- minimumLabel = new
JLabel(JMeterUtils.getResString("spline_visualizer_minimum"));
+ minimumLabel = new
JLabel(JMeterUtils.getResString("spline_visualizer_minimum")); //$NON-NLS-1$
minimumLabel.setForeground(MINIMUM_COLOR);
minimumLabel.setBackground(backColor);
- maximumNumberLabel = new JLabel("0 ms");
+ maximumNumberLabel = new JLabel("0 ms"); //$NON-NLS-1$
maximumNumberLabel.setHorizontalAlignment(JLabel.RIGHT);
maximumNumberLabel.setForeground(MAXIMUM_COLOR);
maximumNumberLabel.setBackground(backColor);
- averageNumberLabel = new JLabel("0 ms");
+ averageNumberLabel = new JLabel("0 ms"); //$NON-NLS-1$
averageNumberLabel.setHorizontalAlignment(JLabel.RIGHT);
averageNumberLabel.setForeground(AVERAGE_COLOR);
averageNumberLabel.setBackground(backColor);
- incomingNumberLabel = new JLabel("0 ms");
+ incomingNumberLabel = new JLabel("0 ms"); //$NON-NLS-1$
incomingNumberLabel.setHorizontalAlignment(JLabel.RIGHT);
incomingNumberLabel.setForeground(INCOMING_COLOR);
incomingNumberLabel.setBackground(backColor);
- minimumNumberLabel = new JLabel("0 ms");
+ minimumNumberLabel = new JLabel("0 ms"); //$NON-NLS-1$
minimumNumberLabel.setHorizontalAlignment(JLabel.RIGHT);
minimumNumberLabel.setForeground(MINIMUM_COLOR);
minimumNumberLabel.setBackground(backColor);
@@ -215,32 +216,32 @@
if (FILL_UP_WITH_ZEROS) {
for (int i = numberString.length(); i <
NUMBERS_TO_DISPLAY; i++) {
- numberString = "0" + numberString;
+ numberString = "0" + numberString; //$NON-NLS-1$
}
}
return numberString;
}
public void setMinimum(long n) {
- String text = this.formatMeasureToDisplay(n) + " ms";
+ String text = this.formatMeasureToDisplay(n) + SUFFIX_MS;
this.minimumNumberLabel.setText(text);
}
public void setMaximum(long n) {
- String text = this.formatMeasureToDisplay(n) + " ms";
+ String text = this.formatMeasureToDisplay(n) + SUFFIX_MS;
this.maximumNumberLabel.setText(text);
}
public void setAverage(long n) {
- String text = this.formatMeasureToDisplay(n) + " ms";
+ String text = this.formatMeasureToDisplay(n) + SUFFIX_MS;
this.averageNumberLabel.setText(text);
}
public void setIncoming(long n) {
- String text = this.formatMeasureToDisplay(n) + " ms";
+ String text = this.formatMeasureToDisplay(n) + SUFFIX_MS;
this.incomingNumberLabel.setText(text);
}
@@ -260,7 +261,6 @@
/**
* Component showing a Spline curve.
*
- * @version $Revision$
*/
public class SplineGraph extends JComponent {
public boolean reinterpolated = false;
@@ -297,8 +297,8 @@
g.setColor(this.getBackground());
g.fillRect(0, 0, width, height);
g.setColor(WAITING_COLOR);
-
g.drawString(JMeterUtils.getResString("spline_visualizer_waitingmessage"),
(width - 120) / 2, height
- - (height - 12) / 2);
+
g.drawString(JMeterUtils.getResString("spline_visualizer_waitingmessage"),
//$NON-NLS-1$
+ (width - 120) / 2, height -
(height - 12) / 2);
return;
}
Modified:
jakarta/jmeter/branches/rel-2-2/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java?view=diff&rev=535538&r1=535537&r2=535538
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java
Sat May 5 08:08:46 2007
@@ -170,11 +170,13 @@
mrs.setDeleteMessages(delete);
}
+ // TODO - fix GUI layout problems
+
/*
* Helper method to set up the GUI screen
*/
private void init() {
- setLayout(new VerticalLayout(5, VerticalLayout.LEFT,
VerticalLayout.TOP));
+ setLayout(new VerticalLayout(5, VerticalLayout.BOTH,
VerticalLayout.TOP));
setBorder(makeBorder());
add(makeTitlePanel());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
