sebb 2003/10/19 15:20:17
Modified: src/components/org/apache/jmeter/visualizers
StatVisualizer.java StatVisualizerModel.java
GraphAccumVisualizer.java TableDataModel.java
MailerVisualizer.java SimpleDataWriter.java
GraphAccumListener.java GraphModel.java
GraphAccum.java GraphVisualizer.java
GraphAccumModel.java Graph.java
Log:
Fix @created; remove unused fields; remove redundant null tests
Revision Changes Path
1.15 +5 -5
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
Index: StatVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/StatVisualizer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- StatVisualizer.java 18 Aug 2003 19:38:18 -0000 1.14
+++ StatVisualizer.java 19 Oct 2003 22:20:16 -0000 1.15
@@ -95,7 +95,7 @@
protected JScrollPane myScrollPane;
private final static String VISUALIZER_NAME =
JMeterUtils.getResString("aggregate_report");
- private long sleepTill = 0;
+ //private long sleepTill = 0;
transient private StatVisualizerModel model;
transient private StatTableModel myStatTableModel;
@@ -137,7 +137,7 @@
{
TestElement t = super.createTestElement();
- sleepTill = 0;
+ //sleepTill = 0;
return t;
}
1.12 +2 -2
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/StatVisualizerModel.java
Index: StatVisualizerModel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/StatVisualizerModel.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- StatVisualizerModel.java 5 Oct 2003 01:08:40 -0000 1.11
+++ StatVisualizerModel.java 19 Oct 2003 22:20:16 -0000 1.12
@@ -74,8 +74,8 @@
* you!
*
* @author James Boutcher
- * @created March 21, 2002
- * @version $Revision$
+ * Created March 21, 2002
+ * @version $Revision$ Last updated: $Date$
*/
public class StatVisualizerModel implements Clearable
{
1.12 +2 -2
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java
Index: GraphAccumVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- GraphAccumVisualizer.java 7 Sep 2003 18:52:53 -0000 1.11
+++ GraphAccumVisualizer.java 19 Oct 2003 22:20:16 -0000 1.12
@@ -82,7 +82,7 @@
* number of times the set of pages is configured to load.
*
* @author Khor Soon Hin
- * @created 2001/08/11
+ * Created 2001/08/11
* @version $Revision$ $Date$
*/
public class GraphAccumVisualizer extends AbstractVisualizer
1.11 +3 -3
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/TableDataModel.java
Index: TableDataModel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/TableDataModel.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TableDataModel.java 16 Aug 2003 09:58:28 -0000 1.10
+++ TableDataModel.java 19 Oct 2003 22:20:16 -0000 1.11
@@ -72,8 +72,8 @@
* GraphModel.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Alf Hogemark</a>Hogemark
- * @created March 10, 2002
- * @version $Revision$
+ * Created March 10, 2002
+ * @version $Revision$ Last updated: $Date$
*/
public class TableDataModel extends GraphModel implements TableModel
{
@@ -228,7 +228,7 @@
{
if ((rowIndex >= 0) && (rowIndex < urlList.size()))
{
- return new Boolean(
+ return Boolean.valueOf(
!((Sample) getSamples().get(rowIndex)).error);
}
}
1.16 +4 -4
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java
Index: MailerVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- MailerVisualizer.java 7 Sep 2003 18:52:53 -0000 1.15
+++ MailerVisualizer.java 19 Oct 2003 22:20:16 -0000 1.16
@@ -115,8 +115,8 @@
private JTextField failureLimitField;
private JTextField successLimitField;
- private JPanel mainPanel;
- private JLabel panelTitleLabel;
+ //private JPanel mainPanel;
+ //private JLabel panelTitleLabel;
/**
@@ -198,7 +198,7 @@
c.anchor = GridBagConstraints.NORTHWEST;
c.insets = new Insets(0, 0, 0, 0);
c.gridwidth = 1;
- mailerPanel.add(new JLabel("Addressie(s):"));
+ mailerPanel.add(new JLabel("Addressee(s):"));
addressField = new JTextField(25);
addressField.setEditable(true);
1.5 +1 -2
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/SimpleDataWriter.java
Index: SimpleDataWriter.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/SimpleDataWriter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SimpleDataWriter.java 24 Apr 2003 21:35:44 -0000 1.4
+++ SimpleDataWriter.java 19 Oct 2003 22:20:16 -0000 1.5
@@ -69,7 +69,6 @@
* recording data by eliminating GUI overhead.
*
[EMAIL PROTECTED] <a href="mailto:kcassell@apache.org";>Keith Cassell</a>
- [EMAIL PROTECTED] $Date$
[EMAIL PROTECTED] $Revision$ $Date$
***********************************************************/
1.3 +4 -8
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphAccumListener.java
Index: GraphAccumListener.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphAccumListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GraphAccumListener.java 3 Feb 2003 14:29:01 -0000 1.2
+++ GraphAccumListener.java 19 Oct 2003 22:20:16 -0000 1.3
@@ -2,7 +2,7 @@
* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -59,13 +59,9 @@
/**
- * Title: JMeter
- * Description:
- * Copyright: Copyright (c) 2000
- * Company: Apache
- * @author Khor Soon Hin
- * @created 2001/08/12
- * @version 1.0
+ * @author Khor Soon Hin
+ * Created 2001/08/12
+ * @version $Revision$ Last updated: $Date$
*/
1.12 +5 -5
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphModel.java
Index: GraphModel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphModel.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- GraphModel.java 5 Oct 2003 01:08:40 -0000 1.11
+++ GraphModel.java 19 Oct 2003 22:20:16 -0000 1.12
@@ -66,8 +66,8 @@
/**
* @author Michael Stover
- * @created February 8, 2001
- * @version $Revision$
+ * Created February 8, 2001
+ * @version $Revision$ Last updated: $Date$
*/
public class GraphModel implements Clearable, Serializable
{
@@ -75,7 +75,7 @@
private String name;
private List samples;
private List listeners;
- private long previous = 0;
+ //private long previous = 0;
private boolean bigChange = false;
private Sample current = new Sample(0, 0, 0, 0, 0,false);
private long startTime = Long.MAX_VALUE;
@@ -232,7 +232,7 @@
public void clear()
{
samples.clear();
- previous = 0;
+ //previous = 0;
graphMax = 1;
bigChange = true;
current = new Sample(0, 0, 0, 0, 0,false);
@@ -332,7 +332,7 @@
median,
!success);
- previous = sample;
+ //previous = sample;
current = s;
samples.add(s);
return s;
1.9 +5 -5
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphAccum.java
Index: GraphAccum.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphAccum.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- GraphAccum.java 5 Oct 2003 01:08:40 -0000 1.8
+++ GraphAccum.java 19 Oct 2003 22:20:16 -0000 1.9
@@ -81,8 +81,8 @@
* Draws the graph.
*
* @author Khor Soon Hin
- * @created 2001/08/11
- * @version $Revision$
+ * Created 2001/08/11
+ * @version $Revision$ Last updated: $Date$
*/
public class GraphAccum extends JComponent implements Scrollable,
GraphAccumListener
@@ -372,7 +372,7 @@
// Store current total time point
previousPts[0] = new Point(x % width, d.height - data);
- if (legendPanel != null && noLegendYet)
+ if (noLegendYet)
{
gbc.gridx = 0;
gbc.gridy = compCount++;
@@ -413,7 +413,7 @@
}
// Store load time without components
previousPts[1] = new Point(x % width, d.height - data);
- if (legendPanel != null && noLegendYet)
+ if (noLegendYet)
{
gbc.gridx = 0;
gbc.gridy = compCount++;
@@ -471,7 +471,7 @@
// Store the current plot
previousPts[currPreviousPts++] =
new Point(x % width, d.height - data);
- if (legendPanel != null && noLegendYet)
+ if (noLegendYet)
{
gbc.gridx = 0;
gbc.gridy = compCount++;
1.17 +2 -2
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java
Index: GraphVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- GraphVisualizer.java 5 Oct 2003 01:08:40 -0000 1.16
+++ GraphVisualizer.java 19 Oct 2003 22:20:16 -0000 1.17
@@ -87,7 +87,7 @@
* autoscaling plots.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @created February 8, 2001
+ * Created February 8, 2001
* @version $Revision$ $Date$
*/
public class GraphVisualizer extends AbstractVisualizer
1.8 +2 -2
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphAccumModel.java
Index: GraphAccumModel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphAccumModel.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- GraphAccumModel.java 7 Sep 2003 18:52:53 -0000 1.7
+++ GraphAccumModel.java 19 Oct 2003 22:20:16 -0000 1.8
@@ -69,8 +69,8 @@
* The model that collects the average of the set of pages to be sampled.
*
* @author Khor Soon Hin
- * @created 2001/08/11
- * @version $Revision$
+ * Created 2001/08/11
+ * @version $Revision$ Last updated: $Date$
*/
public class GraphAccumModel implements Clearable, Serializable
1.11 +2 -2
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/Graph.java
Index: Graph.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/Graph.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Graph.java 5 Oct 2003 01:08:40 -0000 1.10
+++ Graph.java 19 Oct 2003 22:20:16 -0000 1.11
@@ -73,8 +73,8 @@
* Implements a simple graph for displaying performance results.
*
* @author Michael Stover
- * @created March 21, 2002
- * @version $Revision$
+ * Created March 21, 2002
+ * @version $Revision$ Last updated: $Date$
*/
public class Graph
extends JComponent
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
