diff --git a/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java b/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java index c20fb2d11e..ced6849ceb 100644 --- a/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java +++ b/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java @@ -161,10 +161,10 @@ public class AssertionGui extends AbstractAssertionGui { } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); tableModel.clearData(); diff --git a/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java b/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java index d2347f956d..2089cfba35 100644 --- a/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java +++ b/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java @@ -137,4 +137,11 @@ public class BeanShellAssertionGui extends AbstractAssertionGui { return panel; } + + public void clearGui() { + super.clearGui(); + filename.setText(""); // $NON-NLS-1$ + parameters.setText(""); // $NON-NLS-1$ + scriptField.setText(""); // $NON-NLS-1$ + } } diff --git a/src/components/org/apache/jmeter/assertions/gui/DurationAssertionGui.java b/src/components/org/apache/jmeter/assertions/gui/DurationAssertionGui.java index 4a32710767..71adee9509 100644 --- a/src/components/org/apache/jmeter/assertions/gui/DurationAssertionGui.java +++ b/src/components/org/apache/jmeter/assertions/gui/DurationAssertionGui.java @@ -29,14 +29,8 @@ import org.apache.jmeter.assertions.DurationAssertion; import org.apache.jmeter.gui.util.VerticalPanel; import org.apache.jmeter.testelement.TestElement; import org.apache.jmeter.util.JMeterUtils; -//import org.apache.jorphan.logging.LoggingManager; -//import org.apache.log.Logger; -/** - * @version $Revision$ Last updated: $Date$ - */ public class DurationAssertionGui extends AbstractAssertionGui { - //private static final Logger log = LoggingManager.getLoggerForClass(); private JTextField duration; @@ -69,10 +63,10 @@ public class DurationAssertionGui extends AbstractAssertionGui { } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); duration.setText(""); //$NON-NLS-1$ } diff --git a/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java b/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java index 98c1c9913c..243c86f1c4 100644 --- a/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java +++ b/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java @@ -139,10 +139,10 @@ public class HTMLAssertionGui extends AbstractAssertionGui implements FocusListe } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); docTypeBox.setSelectedIndex(0); htmlRadioButton.setSelected(true); diff --git a/src/components/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java b/src/components/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java index cd0fc8b401..653c4f02c5 100644 --- a/src/components/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java +++ b/src/components/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java @@ -102,10 +102,10 @@ public class MD5HexAssertionGUI extends AbstractAssertionGui { } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); md5HexInput.setText(""); //$NON-NLS-1$ } diff --git a/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java b/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java index 3f771dac3a..688ebcc92f 100644 --- a/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java +++ b/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java @@ -37,9 +37,6 @@ import org.apache.jmeter.testelement.TestElement; import org.apache.jmeter.util.JMeterUtils; import org.apache.jorphan.gui.layout.VerticalLayout; -/** - * @version $Revision$ Last updated: $Date$ - */ public class SizeAssertionGui extends AbstractAssertionGui implements FocusListener, ActionListener { private JTextField size; @@ -86,10 +83,10 @@ public class SizeAssertionGui extends AbstractAssertionGui implements FocusListe } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); size.setText(""); //$NON-NLS-1$ equalButton.setSelected(true); diff --git a/src/components/org/apache/jmeter/assertions/gui/XMLSchemaAssertionGUI.java b/src/components/org/apache/jmeter/assertions/gui/XMLSchemaAssertionGUI.java index ca2d509518..11ef99d5e2 100644 --- a/src/components/org/apache/jmeter/assertions/gui/XMLSchemaAssertionGUI.java +++ b/src/components/org/apache/jmeter/assertions/gui/XMLSchemaAssertionGUI.java @@ -82,10 +82,10 @@ public class XMLSchemaAssertionGUI extends AbstractAssertionGui { } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); xmlSchema.setText(""); //$NON-NLS-1$ } diff --git a/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java b/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java index 497bc6d50f..6443e01b02 100644 --- a/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java +++ b/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java @@ -28,12 +28,6 @@ import org.apache.jmeter.testelement.TestElement; import org.apache.jmeter.util.JMeterUtils; import org.apache.jorphan.gui.layout.VerticalLayout; -/** - * - * author Justin Spears - * - */ - public class XPathAssertionGui extends AbstractAssertionGui { private XPathPanel xpath; @@ -118,10 +112,10 @@ public class XPathAssertionGui extends AbstractAssertionGui { } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); xpath.setXPath("/"); //$NON-NLS-1$ xpath.setNegated(false); diff --git a/src/components/org/apache/jmeter/control/gui/ForeachControlPanel.java b/src/components/org/apache/jmeter/control/gui/ForeachControlPanel.java index 743e5325df..d08664f8fc 100644 --- a/src/components/org/apache/jmeter/control/gui/ForeachControlPanel.java +++ b/src/components/org/apache/jmeter/control/gui/ForeachControlPanel.java @@ -130,10 +130,10 @@ public class ForeachControlPanel extends AbstractControllerGui { } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); inputVal.setText(""); // $NON-NLS-1$ returnVal.setText(""); // $NON-NLS-1$ diff --git a/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java b/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java index 2704bc47de..e34e58e30a 100644 --- a/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java +++ b/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java @@ -30,10 +30,7 @@ import org.apache.jmeter.util.JMeterUtils; import org.apache.jorphan.gui.layout.VerticalLayout; public class IncludeControllerGui extends AbstractControllerGui - /* - * implements - * UnsharedComponent - */ + // implements UnsharedComponent { private FilePanel includePanel = @@ -84,11 +81,11 @@ public class IncludeControllerGui extends AbstractControllerGui } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); - includePanel.setFilename(""); // $NON-NLS-1$ + public void clearGui() { + super.clearGui(); + includePanel.clearGui(); } public JPopupMenu createPopupMenu() { diff --git a/src/components/org/apache/jmeter/control/gui/InterleaveControlGui.java b/src/components/org/apache/jmeter/control/gui/InterleaveControlGui.java index 2383b9e187..fb27691011 100644 --- a/src/components/org/apache/jmeter/control/gui/InterleaveControlGui.java +++ b/src/components/org/apache/jmeter/control/gui/InterleaveControlGui.java @@ -62,10 +62,10 @@ public class InterleaveControlGui extends AbstractControllerGui { } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); style.setSelected(false); } diff --git a/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java b/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java index d96bda6db6..d7d820edce 100644 --- a/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java +++ b/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java @@ -46,10 +46,8 @@ import org.apache.jorphan.gui.layout.VerticalLayout; * ModuleController Gui. * */ -public class ModuleControllerGui extends AbstractControllerGui /* - * implements - * UnsharedComponent - */ +public class ModuleControllerGui extends AbstractControllerGui +// implements UnsharedComponent { private JMeterTreeNode selected = null; @@ -138,10 +136,10 @@ public class ModuleControllerGui extends AbstractControllerGui /* } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); nodes.setSelectedIndex(-1); selected = null; diff --git a/src/components/org/apache/jmeter/control/gui/RandomControlGui.java b/src/components/org/apache/jmeter/control/gui/RandomControlGui.java index 94fe7bcc3b..cd595adb80 100644 --- a/src/components/org/apache/jmeter/control/gui/RandomControlGui.java +++ b/src/components/org/apache/jmeter/control/gui/RandomControlGui.java @@ -54,10 +54,10 @@ public class RandomControlGui extends AbstractControllerGui { } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); style.setSelected(false); } diff --git a/src/components/org/apache/jmeter/control/gui/SwitchControllerGui.java b/src/components/org/apache/jmeter/control/gui/SwitchControllerGui.java index e02b19b5e4..a3c4ad89c7 100644 --- a/src/components/org/apache/jmeter/control/gui/SwitchControllerGui.java +++ b/src/components/org/apache/jmeter/control/gui/SwitchControllerGui.java @@ -54,10 +54,10 @@ public class SwitchControllerGui extends AbstractControllerGui { } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); switchValue.setText(""); // $NON-NLS-1$ } diff --git a/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java b/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java index 45f67137bf..8ac11c9c69 100644 --- a/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java +++ b/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java @@ -91,10 +91,10 @@ public class ThroughputControllerGui extends AbstractControllerGui { } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); styleBox.setSelectedIndex(0); throughput.setText("1"); // $NON-NLS-1$ perthread.setSelected(true); diff --git a/src/components/org/apache/jmeter/extractor/gui/RegexExtractorGui.java b/src/components/org/apache/jmeter/extractor/gui/RegexExtractorGui.java index 3bcf14384c..c101442b2f 100644 --- a/src/components/org/apache/jmeter/extractor/gui/RegexExtractorGui.java +++ b/src/components/org/apache/jmeter/extractor/gui/RegexExtractorGui.java @@ -110,10 +110,10 @@ public class RegexExtractorGui extends AbstractPostProcessorGui { } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); useBody.setSelected(true); useHeaders.setSelected(false); diff --git a/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java b/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java index c6bfdad201..57264c91e7 100644 --- a/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java +++ b/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java @@ -89,10 +89,10 @@ public class XPathExtractorGui extends AbstractPostProcessorGui { } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); xpathQueryField.setText(""); // $NON-NLS-1$ defaultField.setText(""); // $NON-NLS-1$ diff --git a/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java b/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java index 2a6e333327..8fe82d5443 100644 --- a/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java +++ b/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java @@ -72,10 +72,10 @@ public class CounterConfigGui extends AbstractPreProcessorGui { } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); startField.setText(""); //$NON-NLS-1$ incrField.setText(""); //$NON-NLS-1$ diff --git a/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java b/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java index 74a985fb45..c07e5d3807 100644 --- a/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java +++ b/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java @@ -127,10 +127,10 @@ public class UserParametersGui extends AbstractPreProcessorGui { } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); initTableModel(); paramTable.setModel(tableModel); diff --git a/src/components/org/apache/jmeter/reporters/MailerModel.java b/src/components/org/apache/jmeter/reporters/MailerModel.java index 25f24698ad..0a5201f17a 100644 --- a/src/components/org/apache/jmeter/reporters/MailerModel.java +++ b/src/components/org/apache/jmeter/reporters/MailerModel.java @@ -42,8 +42,6 @@ import org.apache.log.Logger; /** * The model for a MailerVisualizer. * - * @author Wolfram Rittmeyer - * @version $Revision$ $Date$ */ public class MailerModel extends AbstractTestElement implements Serializable { @@ -216,7 +214,7 @@ public class MailerModel extends AbstractTestElement implements Serializable { * reset any mail-specific attributes (like sender, mail-subject...) since * they are independent of the sampling. */ - public synchronized void clear() { + public synchronized void clear() {// TODO: should this be clearData()? failureCount = 0; successCount = 0; siteDown = false; diff --git a/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java b/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java index faecfefdbe..1a9168b5a6 100644 --- a/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java +++ b/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java @@ -126,10 +126,10 @@ public class TestActionGui extends AbstractSamplerGui { } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); targetBox.setSelectedIndex(0); durationField.setText(""); //$NON-NLS-1$ diff --git a/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java b/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java index ff449e2b88..a2a22b754f 100644 --- a/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java +++ b/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java @@ -120,10 +120,10 @@ public class ConstantTimerGui extends AbstractTimerGui { /* * (non-Javadoc) * - * @see org.apache.jmeter.gui.JMeterGUIComponent#clear() + * @see org.apache.jmeter.gui.JMeterGUIComponent#clearGui() */ - public void clear() { + public void clearGui() { delayField.setText(DEFAULT_DELAY); - super.clear(); + super.clearGui(); } } diff --git a/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java b/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java index 0e1f248982..ef91a908c9 100644 --- a/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java +++ b/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java @@ -157,11 +157,11 @@ public class GaussianRandomTimerGui extends AbstractTimerGui { /* * (non-Javadoc) * - * @see org.apache.jmeter.gui.JMeterGUIComponent#clear() + * @see org.apache.jmeter.gui.JMeterGUIComponent#clearGui() */ - public void clear() { + public void clearGui() { rangeField.setText(DEFAULT_RANGE); delayField.setText(DEFAULT_DELAY); - super.clear(); + super.clearGui(); } } diff --git a/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java b/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java index e437879826..2903933027 100644 --- a/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java +++ b/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java @@ -156,11 +156,11 @@ public class UniformRandomTimerGui extends AbstractTimerGui { /* * (non-Javadoc) * - * @see org.apache.jmeter.gui.JMeterGUIComponent#clear() + * @see org.apache.jmeter.gui.JMeterGUIComponent#clearGui() */ - public void clear() { + public void clearGui() { rangeField.setText(DEFAULT_RANGE); delayField.setText(DEFAULT_DELAY); - super.clear(); + super.clearGui(); } } diff --git a/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java b/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java index 9a92b2b7d2..f0d53908e2 100644 --- a/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java +++ b/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java @@ -57,7 +57,7 @@ public class AssertionVisualizer extends AbstractVisualizer implements Clearable } } - public void clear() { + public void clearData() { textArea.setText(""); // $NON-NLS-1$ } diff --git a/src/components/org/apache/jmeter/visualizers/DistributionGraph.java b/src/components/org/apache/jmeter/visualizers/DistributionGraph.java index c2b9c4b457..73ee548fcf 100644 --- a/src/components/org/apache/jmeter/visualizers/DistributionGraph.java +++ b/src/components/org/apache/jmeter/visualizers/DistributionGraph.java @@ -1,4 +1,3 @@ -// $Header: /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -33,8 +32,6 @@ import org.apache.jmeter.samplers.Clearable; // import org.apache.jorphan.logging.LoggingManager; import org.apache.jorphan.math.NumberComparator; -// import org.apache.log.Logger; - /** * New graph for drawing distribution graph of the results. It is intended as a * way to view the data after the stress has been performed. Although it can be @@ -47,7 +44,6 @@ import org.apache.jorphan.math.NumberComparator; * */ public class DistributionGraph extends JComponent implements Scrollable, Clearable { - // private static Logger log = LoggingManager.getLoggerForClass(); private SamplingStatCalculator model; @@ -144,7 +140,8 @@ public class DistributionGraph extends JComponent implements Scrollable, Clearab /** * Clears this graph. */ - public void clear() { + public void clearData() { + model.clear(); } /** diff --git a/src/components/org/apache/jmeter/visualizers/DistributionGraphVisualizer.java b/src/components/org/apache/jmeter/visualizers/DistributionGraphVisualizer.java index 43dd0bc50b..07ce132a71 100644 --- a/src/components/org/apache/jmeter/visualizers/DistributionGraphVisualizer.java +++ b/src/components/org/apache/jmeter/visualizers/DistributionGraphVisualizer.java @@ -110,8 +110,8 @@ public class DistributionGraphVisualizer extends AbstractVisualizer implements I return "distribution_graph_title"; // $NON-NLS-1$ } - public synchronized void clear() { - this.graph.clear(); + public synchronized void clearData() { + this.graph.clearData(); model.clear(); repaint(); } diff --git a/src/components/org/apache/jmeter/visualizers/Graph.java b/src/components/org/apache/jmeter/visualizers/Graph.java index f05e5cb451..fcafdcfb4f 100644 --- a/src/components/org/apache/jmeter/visualizers/Graph.java +++ b/src/components/org/apache/jmeter/visualizers/Graph.java @@ -37,8 +37,6 @@ import org.apache.log.Logger; /** * Implements a simple graph for displaying performance results. * - * @author Michael Stover Created March 21, 2002 - * @version $Revision$ Last updated: $Date$ */ public class Graph extends JComponent implements Scrollable, Clearable { private static Logger log = LoggingManager.getLoggerForClass(); @@ -133,7 +131,7 @@ public class Graph extends JComponent implements Scrollable, Clearable { /** * Clears this graph. */ - public void clear() { + public void clearData() { graphMax = 1; throughputMax = 1; } diff --git a/src/components/org/apache/jmeter/visualizers/GraphAccum.java b/src/components/org/apache/jmeter/visualizers/GraphAccum.java index da3b31f212..6e47d4aadd 100644 --- a/src/components/org/apache/jmeter/visualizers/GraphAccum.java +++ b/src/components/org/apache/jmeter/visualizers/GraphAccum.java @@ -241,7 +241,7 @@ public class GraphAccum extends JComponent implements Scrollable, GraphAccumList /** * Clears this graph. */ - public void clear() { + public void clearData() { setNoLegendYet(true); ((JPanel) visualizer.getWhiteCanvas()).removeAll(); previousPts = null; diff --git a/src/components/org/apache/jmeter/visualizers/GraphAccumModel.java b/src/components/org/apache/jmeter/visualizers/GraphAccumModel.java index 8bb1b22ec9..4434fb355c 100644 --- a/src/components/org/apache/jmeter/visualizers/GraphAccumModel.java +++ b/src/components/org/apache/jmeter/visualizers/GraphAccumModel.java @@ -32,8 +32,6 @@ import org.apache.log.Logger; /** * The model that collects the average of the set of pages to be sampled. * - * @author Khor Soon Hin Created 2001/08/11 - * @version $Revision$ Last updated: $Date$ */ public class GraphAccumModel implements Clearable, Serializable { @@ -130,7 +128,7 @@ public class GraphAccumModel implements Clearable, Serializable { /** * Clear the results. */ - public void clear() { + public void clearData() { log.debug("Start : clear1"); samples.clear(); max = 1; diff --git a/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java b/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java index 3c523563fb..8b3a41b2c6 100644 --- a/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java +++ b/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java @@ -121,9 +121,9 @@ public class GraphAccumVisualizer extends AbstractVisualizer implements ImageVis /** * Clear this visualizer data. */ - public synchronized void clear() { - model.clear(); - graph.clear(); + public synchronized void clearData() { + model.clearData(); + graph.clearData(); log.debug("Start : clear1"); repaint(); log.debug("End : clear1"); diff --git a/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java b/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java index 807e6befd8..62d59684fd 100644 --- a/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java +++ b/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java @@ -142,15 +142,15 @@ public class GraphVisualizer extends AbstractVisualizer implements ImageVisualiz this.graph.repaint(); } - public synchronized void clear() { - // this.graph.clear(); + public void clearData() { + graph.clearData(); model.clear(); - graph.clear(); dataField.setText("0000"); //$NON-NLS-1$ averageField.setText("0000"); //$NON-NLS-1$ deviationField.setText("0000"); //$NON-NLS-1$ throughputField.setText("0/" + minute); //$NON-NLS-1$ medianField.setText("0000"); //$NON-NLS-1$ + noSamplesField.setText("0000"); //$NON-NLS-1$ updateYAxis(); repaint(); } @@ -440,4 +440,5 @@ public class GraphVisualizer extends AbstractVisualizer implements ImageVisualiz return row; } + } diff --git a/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java b/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java index b3fe62bb1d..1eba680348 100644 --- a/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java +++ b/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java @@ -58,7 +58,6 @@ import org.apache.log.Logger; /** * This class implements a visualizer that mails a message when an error occurs. * - * @version $Revision$ $Date$ */ public class MailerVisualizer extends AbstractVisualizer implements ActionListener, Clearable, ChangeListener { private static final Logger log = LoggingManager.getLoggerForClass(); @@ -101,7 +100,7 @@ public class MailerVisualizer extends AbstractVisualizer implements ActionListen /** * Clears any stored sampling-informations. */ - public synchronized void clear() { + public synchronized void clearData() { if (getModel() != null) { ((MailerResultCollector) getModel()).getMailerModel().clear(); } diff --git a/src/components/org/apache/jmeter/visualizers/SimpleDataWriter.java b/src/components/org/apache/jmeter/visualizers/SimpleDataWriter.java index a6e9ac5eaa..6762d35970 100644 --- a/src/components/org/apache/jmeter/visualizers/SimpleDataWriter.java +++ b/src/components/org/apache/jmeter/visualizers/SimpleDataWriter.java @@ -20,7 +20,6 @@ package org.apache.jmeter.visualizers; import java.awt.BorderLayout; -import org.apache.jmeter.samplers.Clearable; import org.apache.jmeter.samplers.SampleResult; import org.apache.jmeter.visualizers.gui.AbstractVisualizer; @@ -30,7 +29,7 @@ import org.apache.jmeter.visualizers.gui.AbstractVisualizer; * ******************************************************************************/ -public class SimpleDataWriter extends AbstractVisualizer implements Clearable { +public class SimpleDataWriter extends AbstractVisualizer { /*************************************************************************** * Create the SimpleDataWriter. **************************************************************************/ @@ -59,7 +58,7 @@ public class SimpleDataWriter extends AbstractVisualizer implements Clearable { * Does nothing, but required by interface. */ - public void clear() { + public void clearData() { } /** diff --git a/src/components/org/apache/jmeter/visualizers/SplineModel.java b/src/components/org/apache/jmeter/visualizers/SplineModel.java index 2dc3ad12b0..2898db13d7 100644 --- a/src/components/org/apache/jmeter/visualizers/SplineModel.java +++ b/src/components/org/apache/jmeter/visualizers/SplineModel.java @@ -105,10 +105,10 @@ public class SplineModel implements Clearable { } public void uncompile() { - clear(); + clearData(); } - public synchronized void clear() { + public synchronized void clearData() { // this.graph.clear(); samples.clear(); diff --git a/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java b/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java index 814d37e54c..f2bfed6558 100644 --- a/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java +++ b/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java @@ -102,8 +102,8 @@ public class SplineVisualizer extends AbstractVisualizer implements ImageVisuali updateGui(); } - public void clear() { - model.clear(); + public void clearData() { + model.clearData(); } public void setGUI() { diff --git a/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java b/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java index 9da0cc4b8d..6636f6a576 100644 --- a/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java +++ b/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java @@ -168,7 +168,7 @@ ActionListener { new Functor[] { null, null, null, null, null, null, null, null, null, null }, new Class[] { String.class, Long.class, Long.class, Long.class, Long.class, Long.class, Long.class, String.class, String.class, String.class }); - clear(); + clearData(); init(); } @@ -214,7 +214,7 @@ ActionListener { /** * Clears this visualizer and its model, and forces a repaint of the table. */ - public void clear() { + public void clearData() { model.clearData(); tableRows.clear(); tableRows.put(TOTAL_ROW_LABEL, new SamplingStatCalculator(TOTAL_ROW_LABEL)); diff --git a/src/components/org/apache/jmeter/visualizers/StatVisualizer.java b/src/components/org/apache/jmeter/visualizers/StatVisualizer.java index df144fb6b5..7ba968d36e 100644 --- a/src/components/org/apache/jmeter/visualizers/StatVisualizer.java +++ b/src/components/org/apache/jmeter/visualizers/StatVisualizer.java @@ -99,7 +99,7 @@ public class StatVisualizer extends AbstractVisualizer implements Clearable { new Functor[] { null, null, null, null, null, null, null, null, null, null }, new Class[] { String.class, Long.class, Long.class, Long.class, Long.class, Long.class, Long.class, String.class, String.class, String.class }); - clear(); + clearData(); init(); } @@ -145,7 +145,7 @@ public class StatVisualizer extends AbstractVisualizer implements Clearable { /** * Clears this visualizer and its model, and forces a repaint of the table. */ - public void clear() { + public void clearData() { model.clearData(); tableRows.clear(); tableRows.put(TOTAL_ROW_LABEL, new SamplingStatCalculator(TOTAL_ROW_LABEL)); diff --git a/src/components/org/apache/jmeter/visualizers/SummaryReport.java b/src/components/org/apache/jmeter/visualizers/SummaryReport.java index 26c71305a9..18a90ab1ee 100644 --- a/src/components/org/apache/jmeter/visualizers/SummaryReport.java +++ b/src/components/org/apache/jmeter/visualizers/SummaryReport.java @@ -107,7 +107,7 @@ public class SummaryReport extends AbstractVisualizer implements Clearable { new Functor[] { null, null, null, null, null, null, null, null , null, null }, new Class[] { String.class, Long.class, Long.class, Long.class, Long.class, String.class, String.class, String.class, String.class, String.class }); - clear(); + clearData(); init(); } @@ -139,7 +139,7 @@ public class SummaryReport extends AbstractVisualizer implements Clearable { /** * Clears this visualizer and its model, and forces a repaint of the table. */ - public void clear() { + public void clearData() { model.clearData(); tableRows.clear(); tableRows.put(TOTAL_ROW_LABEL, new Calculator(TOTAL_ROW_LABEL)); diff --git a/src/components/org/apache/jmeter/visualizers/TableVisualizer.java b/src/components/org/apache/jmeter/visualizers/TableVisualizer.java index 4f3e8d2348..4910e4435f 100644 --- a/src/components/org/apache/jmeter/visualizers/TableVisualizer.java +++ b/src/components/org/apache/jmeter/visualizers/TableVisualizer.java @@ -162,9 +162,8 @@ public class TableVisualizer extends AbstractVisualizer implements Clearable { updateTextFields(); } - public synchronized void clear() { + public synchronized void clearData() { log.debug("Clear called", new Exception("Debug")); - // this.graph.clear(); model.clearData(); currentData = 0; calc.clear(); diff --git a/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java b/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java index 31ce53d976..79f0d11c4b 100644 --- a/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java +++ b/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java @@ -259,7 +259,7 @@ public class ViewResultsFullVisualizer extends AbstractVisualizer /** * Clears the visualizer. */ - public void clear() { + public void clearData() { log.debug("Start : clear1"); if (log.isDebugEnabled()) { @@ -664,7 +664,7 @@ public class ViewResultsFullVisualizer extends AbstractVisualizer /** * Initialize this visualizer */ - protected void init() { + private void init() { setLayout(new BorderLayout(0, 5)); setBorder(makeBorder()); diff --git a/src/core/org/apache/jmeter/config/gui/LoginConfigGui.java b/src/core/org/apache/jmeter/config/gui/LoginConfigGui.java index 21b443ba64..f693ba4532 100644 --- a/src/core/org/apache/jmeter/config/gui/LoginConfigGui.java +++ b/src/core/org/apache/jmeter/config/gui/LoginConfigGui.java @@ -107,10 +107,10 @@ public class LoginConfigGui extends AbstractConfigGui { element.setProperty(new StringProperty(ConfigTestElement.PASSWORD, passwordString)); } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); username.setText(""); //$NON-NLS-1$ password.setText(""); //$NON-NLS-1$ diff --git a/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java b/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java index 927bb95a36..7cac5120d9 100644 --- a/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java +++ b/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java @@ -37,7 +37,6 @@ import org.apache.jmeter.util.JMeterUtils; * should be executed while a condition holds. This component can be used * standalone or embedded into some other component. * - * @author Cyrus Montakab */ public class IfControllerPanel extends AbstractControllerGui implements ActionListener { @@ -123,10 +122,10 @@ public class IfControllerPanel extends AbstractControllerGui implements ActionLi } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); theCondition.setText(""); // $NON-NLS-1$ } diff --git a/src/core/org/apache/jmeter/control/gui/LoopControlPanel.java b/src/core/org/apache/jmeter/control/gui/LoopControlPanel.java index aa7325ac9c..61a9910e4a 100644 --- a/src/core/org/apache/jmeter/control/gui/LoopControlPanel.java +++ b/src/core/org/apache/jmeter/control/gui/LoopControlPanel.java @@ -127,10 +127,10 @@ public class LoopControlPanel extends AbstractControllerGui implements ActionLis } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); loops.setText("1"); // $NON-NLS-1$ infinite.setSelected(false); diff --git a/src/core/org/apache/jmeter/control/gui/RunTimeGui.java b/src/core/org/apache/jmeter/control/gui/RunTimeGui.java index b17e80acdc..6055338218 100644 --- a/src/core/org/apache/jmeter/control/gui/RunTimeGui.java +++ b/src/core/org/apache/jmeter/control/gui/RunTimeGui.java @@ -36,7 +36,6 @@ import org.apache.jmeter.util.JMeterUtils; * should be executed some number of seconds in a loop. This component can be * used standalone or embedded into some other component. * - * @version $Revision$ on $Date$ */ public class RunTimeGui extends AbstractControllerGui implements ActionListener { @@ -114,10 +113,10 @@ public class RunTimeGui extends AbstractControllerGui implements ActionListener } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); seconds.setText("1"); // $NON-NLS-1$ } diff --git a/src/core/org/apache/jmeter/control/gui/WhileControllerGui.java b/src/core/org/apache/jmeter/control/gui/WhileControllerGui.java index 094692719b..8bba78dccf 100644 --- a/src/core/org/apache/jmeter/control/gui/WhileControllerGui.java +++ b/src/core/org/apache/jmeter/control/gui/WhileControllerGui.java @@ -92,10 +92,10 @@ public class WhileControllerGui extends AbstractControllerGui implements ActionL } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); theCondition.setText(""); // $NON-NLS-1$ } diff --git a/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java b/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java index b51560f1b3..3233804370 100644 --- a/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java +++ b/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java @@ -31,7 +31,6 @@ import javax.swing.border.Border; import javax.swing.tree.TreeNode; import org.apache.jmeter.gui.util.VerticalPanel; -import org.apache.jmeter.samplers.Clearable; import org.apache.jmeter.testelement.TestElement; import org.apache.jmeter.testelement.TestPlan; import org.apache.jmeter.testelement.property.BooleanProperty; @@ -57,9 +56,8 @@ import org.apache.log.Logger; * @see org.apache.jmeter.visualizers.gui.AbstractVisualizer * @see org.apache.jmeter.samplers.gui.AbstractSamplerGui * - * @version $Revision$ on $Date$ */ -public abstract class AbstractJMeterGuiComponent extends JPanel implements JMeterGUIComponent, Printable, Clearable { +public abstract class AbstractJMeterGuiComponent extends JPanel implements JMeterGUIComponent, Printable { /** Logging */ private static Logger log = LoggingManager.getLoggerForClass(); @@ -71,7 +69,8 @@ public abstract class AbstractJMeterGuiComponent extends JPanel implements JMete /** A GUI panel containing the name of this component. */ protected NamePanel namePanel; - + // used by AbstractReportGui + private CommentPanel commentPanel; /** @@ -82,12 +81,11 @@ public abstract class AbstractJMeterGuiComponent extends JPanel implements JMete public AbstractJMeterGuiComponent() { namePanel = new NamePanel(); commentPanel=new CommentPanel(); - setName(getStaticLabel()); - setComment(""); // $NON-NLS-1$ + initGui(); } /** - * Provides a default implementation for the name property. It's unlikely + * Provides a default implementation for setting the name property. It's unlikely * developers will need to override. */ public void setName(String name) { @@ -95,7 +93,7 @@ public abstract class AbstractJMeterGuiComponent extends JPanel implements JMete } /** - * Provides a default implementation for the name property. It's unlikely + * Provides a default implementation for setting the comment property. It's unlikely * developers will need to override. */ public void setComment(String comment) { @@ -200,17 +198,22 @@ public abstract class AbstractJMeterGuiComponent extends JPanel implements JMete } /** - * Provides a default implementat that resets the name field to the value of + * Provides a default implementation that resets the name field to the value of * getStaticLabel(), reset comment and sets enabled to true. Your GUI may need more things * cleared, in which case you should override, clear the extra fields, and - * still call super.clear(). + * still call super.clearGui(). */ - public void clear() { - setName(getStaticLabel()); - setComment(""); // $NON-NLS-1$ + public void clearGui() { + initGui(); enabled = true; } + // helper method - also used by constructor + private void initGui() { + setName(getStaticLabel()); + commentPanel.clearGui(); + } + /** * This provides a convenience for extenders when they implement the * {@link JMeterGUIComponent#modifyTestElement(TestElement)} method. This diff --git a/src/core/org/apache/jmeter/gui/CommentPanel.java b/src/core/org/apache/jmeter/gui/CommentPanel.java index a9ca712100..18e2a686cf 100644 --- a/src/core/org/apache/jmeter/gui/CommentPanel.java +++ b/src/core/org/apache/jmeter/gui/CommentPanel.java @@ -66,4 +66,8 @@ public class CommentPanel extends JPanel { public String getText() { return this.commentField.getText(); } + + public void clearGui() { + commentField.setText(""); // $NON-NLS-1$ + } } diff --git a/src/core/org/apache/jmeter/gui/GuiPackage.java b/src/core/org/apache/jmeter/gui/GuiPackage.java index d9b9f256e3..caf05ad9dc 100644 --- a/src/core/org/apache/jmeter/gui/GuiPackage.java +++ b/src/core/org/apache/jmeter/gui/GuiPackage.java @@ -42,7 +42,6 @@ import org.apache.jmeter.testelement.TestPlan; import org.apache.jmeter.util.JMeterUtils; import org.apache.jmeter.util.LocaleChangeEvent; import org.apache.jmeter.util.LocaleChangeListener; -import org.apache.jmeter.visualizers.gui.AbstractVisualizer; import org.apache.jorphan.collections.HashTree; import org.apache.jorphan.logging.LoggingManager; import org.apache.log.Logger; @@ -55,9 +54,6 @@ import org.apache.log.Logger; * affect the GUI, they typically use GuiPackage to get access to different * parts of the GUI. * - * @author Michael Stover - * @author Jordi Salvat i Alabart - * @version $Revision$ updated on $Date$ */ public final class GuiPackage implements LocaleChangeListener { /** Logging. */ @@ -230,12 +226,7 @@ public final class GuiPackage implements LocaleChangeListener { updateCurrentNode(); TestElement curNode = treeListener.getCurrentNode().getTestElement(); JMeterGUIComponent comp = getGui(curNode); - if (!(comp instanceof AbstractVisualizer)) // TODO: a hack that - // needs to be fixed for - // 2.0 - { - comp.clear(); - } + comp.clearGui(); log.debug("Updating gui to new node"); comp.configure(curNode); currentNodeUpdated = false; @@ -271,7 +262,7 @@ public final class GuiPackage implements LocaleChangeListener { public TestElement createTestElement(Class guiClass, Class testClass) { try { JMeterGUIComponent comp = getGuiFromCache(guiClass, testClass); - comp.clear(); + comp.clearGui(); TestElement node = comp.createTestElement(); nodesToGui.put(node, comp); return node; @@ -302,7 +293,7 @@ public final class GuiPackage implements LocaleChangeListener { } else { comp = getGuiFromCache(c, null); } - comp.clear(); + comp.clearGui(); TestElement node = comp.createTestElement(); nodesToGui.put(node, comp); return node; diff --git a/src/core/org/apache/jmeter/gui/JMeterGUIComponent.java b/src/core/org/apache/jmeter/gui/JMeterGUIComponent.java index 1287ca143c..54bfe2a267 100644 --- a/src/core/org/apache/jmeter/gui/JMeterGUIComponent.java +++ b/src/core/org/apache/jmeter/gui/JMeterGUIComponent.java @@ -41,8 +41,6 @@ import org.apache.jmeter.testelement.TestElement; * @see org.apache.jmeter.visualizers.gui.AbstractVisualizer * @see org.apache.jmeter.samplers.gui.AbstractSamplerGui * - * @version $Revision$ on $Date$ - * */ public interface JMeterGUIComponent { @@ -192,7 +190,9 @@ public interface JMeterGUIComponent { * Clear the gui and return it to initial default values. This is necessary * because most gui classes are instantiated just once and re-used for * multiple test element objects and thus they need to be cleared between - * use. TODO: implement this in all gui classes. + * use. */ - public void clear(); + public void clearGui(); + // N.B. originally called clear() + // @see also Clearable } diff --git a/src/core/org/apache/jmeter/gui/NamePanel.java b/src/core/org/apache/jmeter/gui/NamePanel.java index 15da672934..ab67904f32 100644 --- a/src/core/org/apache/jmeter/gui/NamePanel.java +++ b/src/core/org/apache/jmeter/gui/NamePanel.java @@ -82,7 +82,7 @@ public class NamePanel extends JPanel implements JMeterGUIComponent { add(nameField, BorderLayout.CENTER); } - public void clear() { + public void clearGui() { setName(getStaticLabel()); } diff --git a/src/core/org/apache/jmeter/gui/action/Clear.java b/src/core/org/apache/jmeter/gui/action/Clear.java index e8d611156f..4c8dd51b6a 100644 --- a/src/core/org/apache/jmeter/gui/action/Clear.java +++ b/src/core/org/apache/jmeter/gui/action/Clear.java @@ -31,8 +31,10 @@ import org.apache.jorphan.logging.LoggingManager; import org.apache.log.Logger; /** - * @author Michael Stover - * @version $Revision$ + * Handles the following actions: + * - Clear (Data) + * - Clear All (Data) + * - Reset (Clear GUI) */ public class Clear implements Command { private static final Logger log = LoggingManager.getLoggerForClass(); @@ -41,6 +43,7 @@ public class Clear implements Command { static { commands.add(ActionNames.CLEAR); commands.add(ActionNames.CLEAR_ALL); + commands.add(ActionNames.RESET_GUI); } public Clear() { @@ -52,13 +55,15 @@ public class Clear implements Command { public void doAction(ActionEvent e) { GuiPackage guiPackage = GuiPackage.getInstance(); - if (e.getActionCommand().equals(ActionNames.CLEAR)) { - JMeterGUIComponent model = guiPackage.getCurrentGui(); - try { - ((Clearable) model).clear(); - } catch (Throwable ex) { - log.error("", ex); + final String actionCommand = e.getActionCommand(); + if (actionCommand.equals(ActionNames.CLEAR)) { + JMeterGUIComponent guiComp = guiPackage.getCurrentGui(); + if (guiComp instanceof Clearable){ + ((Clearable) guiComp).clearData(); } + } else if (actionCommand.equals(ActionNames.RESET_GUI)) { + JMeterGUIComponent guiComp = guiPackage.getCurrentGui(); + guiComp.clearGui(); } else { Iterator iter = guiPackage.getTreeModel().getNodesOfType(Clearable.class).iterator(); while (iter.hasNext()) { @@ -69,7 +74,7 @@ public class Clear implements Command { node = (JMeterTreeNode) next; guiComp = guiPackage.getGui(node.getTestElement()); Clearable item = (Clearable) guiComp; - item.clear(); + item.clearData(); } catch (Exception ex) { log.error("Can't clear: "+node+" "+guiComp, ex); } diff --git a/src/core/org/apache/jmeter/gui/util/FilePanel.java b/src/core/org/apache/jmeter/gui/util/FilePanel.java index d381b1933b..ead68bac32 100644 --- a/src/core/org/apache/jmeter/gui/util/FilePanel.java +++ b/src/core/org/apache/jmeter/gui/util/FilePanel.java @@ -97,6 +97,10 @@ public class FilePanel extends HorizontalPanel implements ActionListener { } + public void clearGui(){ + filename.setText(""); // $NON-NLS-1$ + } + /** * If the gui needs to enable/disable the FilePanel, call the method. * diff --git a/src/core/org/apache/jmeter/reporters/ResultCollector.java b/src/core/org/apache/jmeter/reporters/ResultCollector.java index 1ae0b20782..44c80ea7b9 100644 --- a/src/core/org/apache/jmeter/reporters/ResultCollector.java +++ b/src/core/org/apache/jmeter/reporters/ResultCollector.java @@ -65,13 +65,12 @@ import org.apache.jorphan.util.JOrphanUtils; import org.apache.log.Logger; import org.xml.sax.SAXException; -/** - */ -public class ResultCollector extends AbstractListenerElement implements SampleListener, Clearable, Serializable, +public class ResultCollector extends AbstractListenerElement implements SampleListener, Serializable, TestListener, Remoteable, NoThreadClone { + private static final Logger log = LoggingManager.getLoggerForClass(); - private static final long serialVersionUID = 2; + private static final long serialVersionUID = 23; private static final String TESTRESULTS_START = ""; // $NON-NLS-1$ @@ -375,7 +374,7 @@ public class ResultCollector extends AbstractListenerElement implements SampleLi public void clearVisualizer() { // current = -1; if (getVisualizer() != null && getVisualizer() instanceof Clearable) { - ((Clearable) getVisualizer()).clear(); + ((Clearable) getVisualizer()).clearData(); } finalizeFileOutput(); } @@ -537,4 +536,5 @@ public class ResultCollector extends AbstractListenerElement implements SampleLi public void setSaveConfig(SampleSaveConfiguration saveConfig) { getProperty(SAVE_CONFIG).setObjectValue(saveConfig); } + } \ No newline at end of file diff --git a/src/core/org/apache/jmeter/reporters/ResultSaver.java b/src/core/org/apache/jmeter/reporters/ResultSaver.java index 41fabb1c76..7c75b90f86 100644 --- a/src/core/org/apache/jmeter/reporters/ResultSaver.java +++ b/src/core/org/apache/jmeter/reporters/ResultSaver.java @@ -81,6 +81,7 @@ public class ResultSaver extends AbstractTestElement implements Serializable, Sa * start of the test. The super.clear() method clears the name (and all * other properties), so it is called last. */ + // TODO: is this clearData, clearGui or TestElement.clear() ? public void clear() { // System.out.println("-- "+me+this.getName()+" // "+Thread.currentThread().getName()); @@ -88,6 +89,10 @@ public class ResultSaver extends AbstractTestElement implements Serializable, Sa sequenceNumber = 0; // TODO is this the right thing to do? } + // TODO - is this the same as the above? + public void clearData() { + } + /** * Saves the sample result (and any sub results) in files * @@ -183,4 +188,5 @@ public class ResultSaver extends AbstractTestElement implements Serializable, Sa private boolean getErrorsOnly() { return getPropertyAsBoolean(ERRORS_ONLY); } + } diff --git a/src/core/org/apache/jmeter/reporters/Summariser.java b/src/core/org/apache/jmeter/reporters/Summariser.java index ea1ed8d860..4591ad3dfd 100644 --- a/src/core/org/apache/jmeter/reporters/Summariser.java +++ b/src/core/org/apache/jmeter/reporters/Summariser.java @@ -101,7 +101,7 @@ public class Summariser extends AbstractTestElement implements Serializable, Sam * start of the test. The super.clear() method clears the name (and all * other properties), so it is called last. */ - public void clear() { + public void clearData() { // System.out.println("-- "+me+this.getName()+" // "+Thread.currentThread().getName()); diff --git a/src/core/org/apache/jmeter/reporters/gui/ResultActionGui.java b/src/core/org/apache/jmeter/reporters/gui/ResultActionGui.java index 7e87c9ac6a..85720fad37 100644 --- a/src/core/org/apache/jmeter/reporters/gui/ResultActionGui.java +++ b/src/core/org/apache/jmeter/reporters/gui/ResultActionGui.java @@ -76,10 +76,10 @@ public class ResultActionGui extends AbstractPostProcessorGui { } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); errorPanel.configure(OnErrorTestElement.ON_ERROR_CONTINUE); } diff --git a/src/core/org/apache/jmeter/reporters/gui/ResultSaverGui.java b/src/core/org/apache/jmeter/reporters/gui/ResultSaverGui.java index 5ef123e1c4..e55cd26401 100644 --- a/src/core/org/apache/jmeter/reporters/gui/ResultSaverGui.java +++ b/src/core/org/apache/jmeter/reporters/gui/ResultSaverGui.java @@ -27,7 +27,6 @@ import javax.swing.JPanel; import javax.swing.JTextField; import org.apache.jmeter.reporters.ResultSaver; -import org.apache.jmeter.samplers.Clearable; import org.apache.jmeter.processor.gui.AbstractPostProcessorGui; import org.apache.jmeter.testelement.TestElement; import org.apache.jmeter.util.JMeterUtils; @@ -36,9 +35,9 @@ import org.apache.jmeter.util.JMeterUtils; * Create a ResultSaver test element, which saves the sample information in set * of files * - * @version $Revision$ Last updated: $Date$ */ -public class ResultSaverGui extends AbstractPostProcessorGui implements Clearable { +public class ResultSaverGui extends AbstractPostProcessorGui { + // TODO should this implements Clearable ? private JTextField filename; @@ -86,10 +85,10 @@ public class ResultSaverGui extends AbstractPostProcessorGui implements Clearabl } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); filename.setText(""); //$NON-NLS-1$ errorsOnly.setSelected(false); diff --git a/src/core/org/apache/jmeter/reporters/gui/SummariserGui.java b/src/core/org/apache/jmeter/reporters/gui/SummariserGui.java index b5860723bc..8225f0e602 100644 --- a/src/core/org/apache/jmeter/reporters/gui/SummariserGui.java +++ b/src/core/org/apache/jmeter/reporters/gui/SummariserGui.java @@ -21,7 +21,6 @@ package org.apache.jmeter.reporters.gui; import java.awt.BorderLayout; import org.apache.jmeter.reporters.Summariser; -import org.apache.jmeter.samplers.Clearable; import org.apache.jmeter.processor.gui.AbstractPostProcessorGui; import org.apache.jmeter.testelement.TestElement; @@ -32,7 +31,7 @@ import org.apache.jmeter.testelement.TestElement; * the existing types. * */ -public class SummariserGui extends AbstractPostProcessorGui implements Clearable { +public class SummariserGui extends AbstractPostProcessorGui { public SummariserGui() { super(); diff --git a/src/core/org/apache/jmeter/samplers/Clearable.java b/src/core/org/apache/jmeter/samplers/Clearable.java index 40bf47a9cc..0ee5eefb77 100644 --- a/src/core/org/apache/jmeter/samplers/Clearable.java +++ b/src/core/org/apache/jmeter/samplers/Clearable.java @@ -19,12 +19,16 @@ package org.apache.jmeter.samplers; /** - * @author Michael Stover - * @version $Revision$ + * Identifies an object which supports the clearing of run-time data + * using the clearData() method. + * + * Intended for implementation by Listeners. */ public interface Clearable { /** * Clears the current data of the object. */ - public void clear(); + public void clearData(); + // N.B. originally called clear() + // @see also JMeterGUIComponent } \ No newline at end of file diff --git a/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java b/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java index 57e5040da2..5c393a69b6 100644 --- a/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java +++ b/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java @@ -85,7 +85,6 @@ import org.apache.log.Logger; * instance will be used for each element. For efficiency reasons, most * customizers should implement SharedCustomizer. * - * @version $Revision$ updated on $Date$ */ public class TestBeanGUI extends AbstractJMeterGuiComponent implements JMeterGUIComponent { private static final Logger log = LoggingManager.getLoggerForClass(); @@ -302,7 +301,7 @@ public class TestBeanGUI extends AbstractJMeterGuiComponent implements JMeterGUI public void configure(TestElement element) { if (!initialized) init(); - clear(); + clearGui(); super.configure(element); @@ -419,17 +418,17 @@ public class TestBeanGUI extends AbstractJMeterGuiComponent implements JMeterGUI * @see org.apache.jmeter.gui.JMeterGUIComponent#getLabelResource() */ public String getLabelResource() { - // TODO Auto-generated method stub + // @see getStaticLabel return null; } /* * (non-Javadoc) * - * @see org.apache.jmeter.gui.JMeterGUIComponent#clear() + * @see org.apache.jmeter.gui.JMeterGUIComponent#clearGui() */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); propertyMap.clear(); } } diff --git a/src/core/org/apache/jmeter/testelement/TestElement.java b/src/core/org/apache/jmeter/testelement/TestElement.java index 68f7d9e29c..9667ea973c 100644 --- a/src/core/org/apache/jmeter/testelement/TestElement.java +++ b/src/core/org/apache/jmeter/testelement/TestElement.java @@ -22,11 +22,6 @@ import org.apache.jmeter.testelement.property.JMeterProperty; import org.apache.jmeter.testelement.property.PropertyIterator; import org.apache.jmeter.threads.JMeterContext; -/** - * @author Michael Stover - * @version $Revision$ - */ - public interface TestElement extends Cloneable { public final static String NAME = "TestElement.name"; @@ -107,6 +102,8 @@ public interface TestElement extends Cloneable { * Clear the TestElement of all data. */ public void clear(); + // TODO - yet another ambiguous name - does it need changing? + // See also: Clearable, JMeterGUIComponent public String getPropertyAsString(String key); diff --git a/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java b/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java index 701beba761..91ab551379 100644 --- a/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java +++ b/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java @@ -52,7 +52,7 @@ import org.apache.jmeter.threads.ThreadGroup; import org.apache.jmeter.util.JMeterUtils; public class ThreadGroupGui extends AbstractJMeterGuiComponent implements ItemListener { - LoopControlPanel loopPanel; + private LoopControlPanel loopPanel; private VerticalPanel mainPanel; @@ -84,6 +84,7 @@ public class ThreadGroupGui extends AbstractJMeterGuiComponent implements ItemLi public ThreadGroupGui() { super(); init(); + initGui(); } public Collection getMenuCategories() { @@ -206,8 +207,7 @@ public class ThreadGroupGui extends AbstractJMeterGuiComponent implements ItemLi JPanel panel = new JPanel(new BorderLayout(5, 0)); JLabel label = new JLabel(JMeterUtils.getResString("starttime")); //$NON-NLS-1$ panel.add(label, BorderLayout.WEST); - Date today = new Date(); - start = new JDateField(today); + start = new JDateField(); panel.add(start, BorderLayout.CENTER); return panel; } @@ -221,8 +221,8 @@ public class ThreadGroupGui extends AbstractJMeterGuiComponent implements ItemLi JPanel panel = new JPanel(new BorderLayout(5, 0)); JLabel label = new JLabel(JMeterUtils.getResString("endtime")); // $NON-NLS-1$ panel.add(label, BorderLayout.WEST); - Date today = new Date(); - end = new JDateField(today); + + end = new JDateField(); panel.add(end, BorderLayout.CENTER); return panel; } @@ -267,7 +267,6 @@ public class ThreadGroupGui extends AbstractJMeterGuiComponent implements ItemLi continueBox = new JRadioButton(JMeterUtils.getResString("sampler_on_error_continue")); // $NON-NLS-1$ group.add(continueBox); - continueBox.setSelected(true); panel.add(continueBox); stopThrdBox = new JRadioButton(JMeterUtils.getResString("sampler_on_error_stop_thread")); // $NON-NLS-1$ @@ -281,6 +280,25 @@ public class ThreadGroupGui extends AbstractJMeterGuiComponent implements ItemLi return panel; } + public void clearGui(){ + super.clearGui(); + initGui(); + } + + // Initialise the gui field values + private void initGui(){ + threadInput.setText("1"); // $NON-NLS-1$ + rampInput.setText("1"); // $NON-NLS-1$ + continueBox.setSelected(true); + loopPanel.clearGui(); + scheduler.setSelected(false); + Date today = new Date(); + end.setDate(today); + start.setDate(today); + delay.setText(""); // $NON-NLS-1$ + duration.setText(""); // $NON-NLS-1$ + } + private void init() { setLayout(new BorderLayout(0, 5)); setBorder(makeBorder()); @@ -303,7 +321,7 @@ public class ThreadGroupGui extends AbstractJMeterGuiComponent implements ItemLi JLabel threadLabel = new JLabel(JMeterUtils.getResString("number_of_threads")); // $NON-NLS-1$ threadPanel.add(threadLabel, BorderLayout.WEST); - threadInput = new JTextField("1", 5); // $NON-NLS-1$ + threadInput = new JTextField(5); threadInput.setName(THREAD_NAME); threadLabel.setLabelFor(threadInput); threadPanel.add(threadInput, BorderLayout.CENTER); @@ -316,7 +334,7 @@ public class ThreadGroupGui extends AbstractJMeterGuiComponent implements ItemLi JLabel rampLabel = new JLabel(JMeterUtils.getResString("ramp_up")); // $NON-NLS-1$ rampPanel.add(rampLabel, BorderLayout.WEST); - rampInput = new JTextField("1", 5); // $NON-NLS-1$ + rampInput = new JTextField(5); rampInput.setName(RAMP_NAME); rampLabel.setLabelFor(rampInput); rampPanel.add(rampInput, BorderLayout.CENTER); diff --git a/src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java b/src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java index 771b5569ac..0600d78ff3 100644 --- a/src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java +++ b/src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java @@ -40,10 +40,10 @@ import org.apache.jmeter.gui.util.FilePanel; import org.apache.jmeter.gui.util.MenuFactory; import org.apache.jmeter.reporters.AbstractListenerElement; import org.apache.jmeter.reporters.ResultCollector; +import org.apache.jmeter.samplers.Clearable; import org.apache.jmeter.samplers.SampleSaveConfiguration; import org.apache.jmeter.testelement.TestElement; import org.apache.jmeter.util.JMeterUtils; -import org.apache.jmeter.visualizers.Printable; import org.apache.jmeter.visualizers.Visualizer; import org.apache.jorphan.gui.ComponentUtil; import org.apache.jorphan.logging.LoggingManager; @@ -104,10 +104,11 @@ import org.apache.log.Logger; * {@link org.apache.jmeter.visualizers.MailerVisualizer MailerVisualizer}. *

* - * @version $Revision$ */ -public abstract class AbstractVisualizer extends AbstractJMeterGuiComponent implements Visualizer, ChangeListener, - UnsharedComponent, Printable { +public abstract class AbstractVisualizer + extends AbstractJMeterGuiComponent + implements Visualizer, ChangeListener, UnsharedComponent, Clearable + { /** Logging. */ private static final Logger log = LoggingManager.getLoggerForClass(); @@ -357,4 +358,9 @@ public abstract class AbstractVisualizer extends AbstractJMeterGuiComponent impl public JComponent getPrintableComponent() { return this; } + + public void clearGui(){ + super.clearGui(); + filePanel.clearGui(); + } } \ No newline at end of file diff --git a/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java b/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java index aad8290bda..fdd80c9e50 100644 --- a/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java +++ b/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java @@ -124,4 +124,10 @@ public class ExampleSamplerGui extends AbstractSamplerGui { return dataPanel; } + + public void clearGui() { + super.clearGui(); + data.setText(""); // $NON-NLS-1$ + + } } \ No newline at end of file diff --git a/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java b/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java index 5b0c2b6078..b7a5150951 100644 --- a/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java +++ b/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java @@ -61,6 +61,7 @@ implements ChangeListener, ActionListener private static final String METHODCOMBO = "methodcombo"; //$NON-NLS-1$ private static final String PREFIX = "test"; //$NON-NLS-1$ + // Names of JUnit methods private static final String ONETIMESETUP = "oneTimeSetUp"; //$NON-NLS-1$ private static final String ONETIMETEARDOWN = "oneTimeTearDown"; //$NON-NLS-1$ private static final String SUITE = "suite"; //$NON-NLS-1$ @@ -115,9 +116,8 @@ implements ChangeListener, ActionListener private transient TestCase TESTCLASS = null; private List METHODLIST = null; - // TODO: make private? - protected transient ClassFilter FILTER = new ClassFilter(); - protected List CLASSLIST = null; + private transient ClassFilter FILTER = new ClassFilter(); + private List CLASSLIST = null; /** * Constructor for JUnitTestSamplerGui @@ -133,10 +133,6 @@ implements ChangeListener, ActionListener return "junit_request"; //$NON-NLS-1$ } - public String getDocAnchor() { - return "JUnit_Sampler"; // TODO - use default ? - } - /** * Initialize the GUI components and layout. */ @@ -212,6 +208,24 @@ implements ChangeListener, ActionListener return panel; } + private void initGui(){ // TODO - unfinished? + appendError.setSelected(false); + appendExc.setSelected(false); + doSetup.setSelected(false); + filterpkg.setText(""); //$NON-NLS-1$ + constructorLabel.setText(""); //$NON-NLS-1$ + successCode.setText(JMeterUtils.getResString("junit_success_default_code")); //$NON-NLS-1$ + successMsg.setText(JMeterUtils.getResString("junit_success_default_msg")); //$NON-NLS-1$ + failureCode.setText(JMeterUtils.getResString("junit_failure_default_code")); //$NON-NLS-1$ + failureMsg.setText(JMeterUtils.getResString("junit_failure_default_msg")); //$NON-NLS-1$ + errorMsg.setText(JMeterUtils.getResString("junit_error_default_msg")); //$NON-NLS-1$ + errorCode.setText(JMeterUtils.getResString("junit_error_default_code")); //$NON-NLS-1$ + } + + public void clearGui() { + super.clearGui(); + initGui(); + } /* Implements JMeterGuiComponent.createTestElement() */ public TestElement createTestElement() diff --git a/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java b/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java index 5a485e6043..0f53b3ca06 100644 --- a/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java +++ b/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java @@ -198,7 +198,7 @@ public class MonitorAccumModel implements Clearable, Serializable { * clear listeners, subsequent "run" will not notify the gui of data * changes. */ - public void clear() { + public void clearData() { Iterator itr = this.MAP.keySet().iterator(); while (itr.hasNext()) { List lt = (List) this.MAP.get(itr.next()); diff --git a/src/monitor/components/org/apache/jmeter/visualizers/MonitorGraph.java b/src/monitor/components/org/apache/jmeter/visualizers/MonitorGraph.java index aa44aa2db3..a195b2843a 100644 --- a/src/monitor/components/org/apache/jmeter/visualizers/MonitorGraph.java +++ b/src/monitor/components/org/apache/jmeter/visualizers/MonitorGraph.java @@ -189,7 +189,7 @@ public class MonitorGraph extends JComponent implements MouseListener, MonitorGu /** * clear will repaint the graph */ - public void clear() { + public void clearData() { paintComponent(getGraphics()); this.repaint(); } diff --git a/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java b/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java index afc3d410b6..165208daa7 100644 --- a/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java +++ b/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java @@ -131,7 +131,7 @@ public class MonitorHealthPanel extends JPanel implements MonitorListener, Clear * clear will clear the hashmap, remove all ServerPanels from the servers * pane, and update the ui. */ - public void clear() { + public void clearData() { this.SERVERMAP.clear(); this.SERVERS.removeAll(); this.SERVERS.updateUI(); diff --git a/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java b/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java index 1cc718187d..b255bc179b 100644 --- a/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java +++ b/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java @@ -162,12 +162,12 @@ public class MonitorHealthVisualizer extends AbstractVisualizer implements Image } /** - * Clear will clear the MonitorAccumModel and create a new instance. + * Clears the MonitorAccumModel. */ - public void clear() { - this.MODEL.clear(); - this.HEALTHPANE.clear(); - this.PERFPANE.clear(); + public void clearData() { + this.MODEL.clearData(); + this.HEALTHPANE.clearData(); + this.PERFPANE.clearData(); } } diff --git a/src/monitor/components/org/apache/jmeter/visualizers/MonitorModel.java b/src/monitor/components/org/apache/jmeter/visualizers/MonitorModel.java index d5210b0b7c..6b5e217b3c 100644 --- a/src/monitor/components/org/apache/jmeter/visualizers/MonitorModel.java +++ b/src/monitor/components/org/apache/jmeter/visualizers/MonitorModel.java @@ -113,7 +113,7 @@ public class MonitorModel implements Clearable, Serializable, Cloneable { /** * clear will create a new MonitorStats object. */ - public void clear() { + public void clearData() { current = new MonitorStats(0, 0, 0, 0, 0, "", "", "", System.currentTimeMillis()); } diff --git a/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java b/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java index 049af24db1..47722af7d8 100644 --- a/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java +++ b/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java @@ -286,10 +286,10 @@ public class MonitorPerformancePanel extends JSplitPane implements TreeSelection * clear will remove all child nodes from the ROOTNODE, clear the HashMap, * update the graph and jpanel for the server tree. */ - public void clear() { + public void clearData() { this.SERVERMAP.clear(); ROOTNODE.removeAllChildren(); SERVERTREE.updateUI(); - GRAPH.clear(); + GRAPH.clearData(); } } diff --git a/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java b/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java index 15634e6b04..35a788387a 100644 --- a/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java +++ b/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java @@ -100,10 +100,10 @@ public class FtpConfigGui extends AbstractConfigGui { } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); server.setText(""); //$NON-NLS-1$ remoteFile.setText(""); //$NON-NLS-1$ diff --git a/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java b/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java index 9972ef2a19..966bfa89e9 100644 --- a/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java +++ b/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java @@ -64,13 +64,13 @@ public class FtpTestSamplerGui extends AbstractSamplerGui { } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); - ftpDefaultPanel.clear(); - loginPanel.clear(); + ftpDefaultPanel.clearGui(); + loginPanel.clearGui(); } public String getLabelResource() { diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java index d3f351d067..75b7123e60 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java @@ -36,9 +36,6 @@ import org.apache.jmeter.testelement.property.TestElementProperty; import org.apache.jmeter.util.JMeterUtils; import org.apache.jorphan.gui.JLabeledTextField; -/** - * @version $Revision$ - */ public class HttpDefaultsGui extends AbstractConfigGui { JLabeledTextField protocol; @@ -90,10 +87,10 @@ public class HttpDefaultsGui extends AbstractConfigGui { } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); protocol.setText(""); //$NON-NLS-1$ domain.setText(""); //$NON-NLS-1$ diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java b/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java index 11377a270f..f5dac5917d 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java @@ -53,8 +53,6 @@ import org.apache.log.Logger; * * Now uses Commons HttpClient parsing and matching code (since 2.1.2) * - * author Sean Dowd - * @version $Revision$ $Date$ */ public class CookieManager extends ConfigTestElement implements TestListener, Serializable { private static final Logger log = LoggingManager.getLoggerForClass(); @@ -238,7 +236,7 @@ public class CookieManager extends ConfigTestElement implements TestListener, Se /** * Remove all the cookies. */ - public void clear() { + public void clear() {// TODO: should this call super.clear()? log.debug("Clear all cookies from store"); setProperty(new CollectionProperty(COOKIES, new ArrayList())); } diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java index c9b5c00e70..b4f366e61e 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java @@ -164,4 +164,8 @@ public class HttpMirrorControlGui extends LogicControllerGui return panel; } + public void clearGui(){ + super.clearGui(); + portField.setText(HttpMirrorControl.DEFAULT_PORT_S); + } } \ No newline at end of file diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java index 77b10a3575..8adf3f1f53 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java @@ -135,10 +135,10 @@ public class HttpTestSampleGui extends AbstractSamplerGui { /* * (non-Javadoc) * - * @see org.apache.jmeter.gui.JMeterGUIComponent#clear() + * @see org.apache.jmeter.gui.JMeterGUIComponent#clearGui() */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); getImages.setSelected(false); isMon.setSelected(false); urlConfigGui.clear(); diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java index 33c4da68e9..8fa8b02805 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java @@ -36,8 +36,6 @@ import org.apache.jmeter.gui.util.FilePanel; import org.apache.jorphan.gui.JLabeledTextArea; import org.apache.jorphan.gui.JLabeledTextField; -/** - */ public class SoapSamplerGui extends AbstractSamplerGui { private JLabeledTextField urlField; private JLabeledTextField soapAction; @@ -83,10 +81,10 @@ public class SoapSamplerGui extends AbstractSamplerGui { } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); urlField.setText(""); //$NON-NLS-1$ soapAction.setText(""); //$NON-NLS-1$ diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java index 8fdbfde279..8b51303cdf 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java @@ -51,7 +51,6 @@ import org.apache.jmeter.protocol.http.control.AuthManager; * therefore the notes address those situations.
* Created on: Jun 26, 2003 * - * author Peter Lin */ public class WebServiceSamplerGui extends AbstractSamplerGui implements java.awt.event.ActionListener { @@ -191,10 +190,10 @@ public class WebServiceSamplerGui extends AbstractSamplerGui implements java.awt } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); domain.setText(""); //$NON-NLS-1$ protocol.setText(""); //$NON-NLS-1$ diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java b/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java index 547f1b9f90..dab4d8859a 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java @@ -112,8 +112,8 @@ public class AuthPanel extends AbstractConfigGui implements ActionListener { /** * Implements JMeterGUIComponent.clear */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); tableModel.clearData(); deleteButton.setEnabled(false); diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java b/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java index 729f110e62..5a2d31578f 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java @@ -244,10 +244,10 @@ public class CookiePanel extends AbstractConfigGui implements ActionListener { } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); tableModel.clearData(); clearEachIteration.setSelected(false); diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java b/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java index d005db0406..830227d986 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java @@ -100,10 +100,10 @@ public class HeaderPanel extends AbstractConfigGui implements ActionListener } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); tableModel.clearData(); deleteButton.setEnabled(false); diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java index bb12517a7b..d97640465f 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java @@ -115,10 +115,10 @@ public class ParamModifierGui extends AbstractPreProcessorGui implements FocusLi } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); _fieldName.setText(""); //$NON-NLS-1$ _prefix.setText(""); //$NON-NLS-1$ diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java index 0de5bc5118..a5b1d993e5 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java @@ -102,10 +102,10 @@ public class URLRewritingModifierGui extends AbstractPreProcessorGui { } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); argumentName.setText(""); //$NON-NLS-1$ pathExt.setSelected(false); diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/UserParameterModifierGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/UserParameterModifierGui.java index aa3b4cc32a..1f992fc7c4 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/UserParameterModifierGui.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/UserParameterModifierGui.java @@ -68,10 +68,10 @@ public class UserParameterModifierGui extends AbstractPreProcessorGui { ((UserParameterModifier) mod).setXmlUri(fileNameField.getText()); } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); fileNameField.setText("users.xml"); //$NON-NLS-1$ } diff --git a/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BSFSamplerGui.java b/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BSFSamplerGui.java index 82fc71a28e..759b1f2410 100644 --- a/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BSFSamplerGui.java +++ b/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BSFSamplerGui.java @@ -74,10 +74,10 @@ public class BSFSamplerGui extends AbstractSamplerGui { } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); scriptField.setText(""); //$NON-NLS-1$ langField.setText(""); //$NON-NLS-1$ diff --git a/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java b/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java index 769c105fac..343db992ce 100644 --- a/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java +++ b/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java @@ -71,10 +71,10 @@ public class BeanShellSamplerGui extends AbstractSamplerGui { } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); filename.setText(""); //$NON-NLS-1$ parameters.setText(""); //$NON-NLS-1$ diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java b/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java index 052ba4723a..d9dcee48b2 100644 --- a/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java +++ b/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java @@ -41,7 +41,6 @@ import org.apache.jorphan.gui.JLabeledTextField; * Configuration screen for Java Messaging Point-to-Point requests.
* Created on: October 28, 2004 * - * @author Martijn Blankestijn */ public class JMSConfigGui extends AbstractSamplerGui { @@ -77,7 +76,8 @@ public class JMSConfigGui extends AbstractSamplerGui { /** * Clears all fields. */ - public void clear() { + public void clearGui() {// renamed from clear + super.clearGui(); queueuConnectionFactory.setText(""); sendQueue.setText(""); receiveQueue.setText(""); diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java b/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java index 704c2bbae6..83226cdc19 100644 --- a/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java +++ b/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java @@ -228,6 +228,25 @@ public class JMSPublisherGui extends AbstractSamplerGui implements java.awt.even this.add(mainPanel); } + public void clearGui(){ + super.clearGui(); + useProperties.setSelected(false); + jndiICF.setText(""); // $NON-NLS-1$ + urlField.setText(""); // $NON-NLS-1$ + jndiConnFac.setText(""); // $NON-NLS-1$ + jmsTopic.setText(""); // $NON-NLS-1$ + jmsUser.setText(""); // $NON-NLS-1$ + jmsPwd.setText(""); // $NON-NLS-1$ + textMessage.setText(""); // $NON-NLS-1$ + messageFile.setFilename(""); // $NON-NLS-1$ + randomFile.setFilename(""); // $NON-NLS-1$ + msgChoice.setText(""); // $NON-NLS-1$ + configChoice.setText(use_text); + updateConfig(use_text); + iterations.setText(""); // $NON-NLS-1$ + reqAuth.setText(""); // $NON-NLS-1$ + } + /** * the implementation loads the URL and the soap action for the request. */ diff --git a/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java b/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java index d17a39af7f..fc8f328d6b 100644 --- a/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java +++ b/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java @@ -41,8 +41,6 @@ import org.apache.jmeter.protocol.jms.sampler.SubscriberSampler; /** * This is the GUI for JMS Subscriber
* - * @author Peter Lin - * @version $Id$ */ public class JMSSubscriberGui extends AbstractSamplerGui implements java.awt.event.ActionListener, ChangeListener { @@ -217,6 +215,21 @@ public class JMSSubscriberGui extends AbstractSamplerGui implements java.awt.eve clientChoice.setText(sampler.getClientChoice()); } + public void clearGui(){ + super.clearGui(); + useProperties.setSelected(false); // $NON-NLS-1$ + jndiICF.setText(""); // $NON-NLS-1$ + urlField.setText(""); // $NON-NLS-1$ + jndiConnFac.setText(""); // $NON-NLS-1$ + jmsTopic.setText(""); // $NON-NLS-1$ + jmsUser.setText(""); // $NON-NLS-1$ + jmsPwd.setText(""); // $NON-NLS-1$ + iterations.setText(""); // $NON-NLS-1$ + reqAuth.setText(""); // $NON-NLS-1$ + readResponse.setSelected(true); + clientChoice.setText(""); // $NON-NLS-1$ + } + /** * method from ActionListener * diff --git a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java b/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java index c347b14137..b8d0f2a9b1 100644 --- a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java +++ b/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java @@ -188,10 +188,10 @@ public class LdapConfigGui extends AbstractConfigGui implements ItemListener { } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); rootdn.setText(""); //$NON-NLS-1$ searchbase.setText(""); //$NON-NLS-1$ diff --git a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java b/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java index 14aafa2c7d..ec8ce774b1 100644 --- a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java +++ b/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java @@ -321,10 +321,10 @@ public class LdapExtConfigGui extends AbstractConfigGui implements ItemListener } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); rootdn.setText(""); //$NON-NLS-1$ searchbase.setText(""); //$NON-NLS-1$ diff --git a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapExtTestSamplerGui.java b/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapExtTestSamplerGui.java index 0ab9bd5d27..4fc00de25b 100644 --- a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapExtTestSamplerGui.java +++ b/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapExtTestSamplerGui.java @@ -79,12 +79,12 @@ public class LdapExtTestSamplerGui extends AbstractSamplerGui { } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); - ldapDefaultPanel.clear(); + ldapDefaultPanel.clearGui(); } public String getLabelResource() { diff --git a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java b/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java index a31f16d45e..b4f93810f4 100644 --- a/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java +++ b/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java @@ -30,10 +30,6 @@ import org.apache.jmeter.samplers.gui.AbstractSamplerGui; import org.apache.jmeter.testelement.TestElement; import org.apache.jmeter.util.JMeterUtils; -/** - * Created Apr 29 2003 11:52 AM - * - */ public class LdapTestSamplerGui extends AbstractSamplerGui { private LoginConfigGui loginPanel; @@ -77,13 +73,13 @@ public class LdapTestSamplerGui extends AbstractSamplerGui { } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); - ldapDefaultPanel.clear(); - loginPanel.clear(); + ldapDefaultPanel.clearGui(); + loginPanel.clearGui(); } public String getLabelResource() { diff --git a/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java b/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java index 553ef924f0..1ff8e069bb 100644 --- a/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java +++ b/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java @@ -38,9 +38,6 @@ import org.apache.jmeter.testelement.TestElement; import org.apache.jmeter.util.JMeterUtils; import org.apache.jorphan.gui.layout.VerticalLayout; -/** - * @author Thad Smith - */ public class MailReaderSamplerGui extends AbstractSamplerGui { // Gui Components @@ -89,6 +86,7 @@ public class MailReaderSamplerGui extends AbstractSamplerGui { public MailReaderSamplerGui() { init(); + initGui(); } public String getLabelResource() { @@ -240,7 +238,6 @@ public class MailReaderSamplerGui extends AbstractSamplerGui { nmbg.add(allMessagesButton); nmbg.add(someMessagesButton); someMessagesField = new JTextField(5); - someMessagesField.setText("0"); allMessagesButton.setSelected(true); numMessagesPanel.add(allMessagesButton); numMessagesPanel.add(someMessagesButton); @@ -250,4 +247,20 @@ public class MailReaderSamplerGui extends AbstractSamplerGui { deleteBox = new JCheckBox(DeleteLabel); add(deleteBox); } + + public void clearGui() { + super.clearGui(); + initGui(); + } + + private void initGui() { + allMessagesButton.setSelected(true); + //someMessagesButton.setSelected(false); + //someMessagesField.setText("0"); + deleteBox.setSelected(false); + folderBox.setText(INBOX); + passwordBox.setText(""); + serverBox.setText(""); + usernameBox.setText(""); + } } diff --git a/src/protocol/tcp/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java b/src/protocol/tcp/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java index cb54a68ee6..887f679c09 100644 --- a/src/protocol/tcp/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java +++ b/src/protocol/tcp/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java @@ -111,10 +111,10 @@ public class TCPConfigGui extends AbstractConfigGui { } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); server.setText(""); //$NON-NLS-1$ port.setText(""); //$NON-NLS-1$ diff --git a/src/protocol/tcp/org/apache/jmeter/protocol/tcp/control/gui/TCPSamplerGui.java b/src/protocol/tcp/org/apache/jmeter/protocol/tcp/control/gui/TCPSamplerGui.java index 335ca899c0..f3d6ae4ab1 100644 --- a/src/protocol/tcp/org/apache/jmeter/protocol/tcp/control/gui/TCPSamplerGui.java +++ b/src/protocol/tcp/org/apache/jmeter/protocol/tcp/control/gui/TCPSamplerGui.java @@ -64,13 +64,13 @@ public class TCPSamplerGui extends AbstractSamplerGui { } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); - TcpDefaultPanel.clear(); - loginPanel.clear(); + TcpDefaultPanel.clearGui(); + loginPanel.clearGui(); } public String getLabelResource() { diff --git a/src/reports/org/apache/jmeter/gui/ReportGuiPackage.java b/src/reports/org/apache/jmeter/gui/ReportGuiPackage.java index 8eac3a61df..69d1474e00 100644 --- a/src/reports/org/apache/jmeter/gui/ReportGuiPackage.java +++ b/src/reports/org/apache/jmeter/gui/ReportGuiPackage.java @@ -51,8 +51,6 @@ import org.apache.log.Logger; * was safer to just make a new class, rather than braking existing * JMeter gui code. * - * @author Peter Lin - * @version $Revision$ updated on $Date$ */ public final class ReportGuiPackage implements LocaleChangeListener { /** Logging. */ @@ -228,12 +226,7 @@ public final class ReportGuiPackage implements LocaleChangeListener { updateCurrentNode(); TestElement curNode = treeListener.getCurrentNode().getTestElement(); JMeterGUIComponent comp = getGui(curNode); - if (!(comp instanceof AbstractVisualizer)) // TODO: a hack that - // needs to be fixed for - // 2.0 - { - comp.clear(); - } + comp.clearGui(); log.debug("Updating gui to new node"); comp.configure(curNode); currentNodeUpdated = false; @@ -269,7 +262,7 @@ public final class ReportGuiPackage implements LocaleChangeListener { public TestElement createTestElement(Class guiClass, Class testClass) { try { JMeterGUIComponent comp = getGuiFromCache(guiClass, testClass); - comp.clear(); + comp.clearGui(); TestElement node = comp.createTestElement(); nodesToGui.put(node, comp); return node; @@ -300,7 +293,7 @@ public final class ReportGuiPackage implements LocaleChangeListener { } else { comp = getGuiFromCache(c, null); } - comp.clear(); + comp.clearGui(); TestElement node = comp.createTestElement(); nodesToGui.put(node, comp); return node; @@ -347,7 +340,7 @@ public final class ReportGuiPackage implements LocaleChangeListener { * if the specified GUI class cannot be found */ private JMeterGUIComponent getGuiFromCache(Class guiClass, Class testClass) throws InstantiationException, - IllegalAccessException, ClassNotFoundException { + IllegalAccessException { JMeterGUIComponent comp; if (guiClass == TestBeanGUI.class) { comp = (TestBeanGUI) testBeanGUIs.get(testClass); diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 4625169818..d0774085aa 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -103,6 +103,12 @@ https.sessioncontext.shared=true

Incompatible changes (development):

+N.B.The clear() method was defined in the following interfaces: Clearable, JMeterGUIComponent and TestElement. +The methods serve different purposes, so two of them were renamed: +the Clearable method is now clearData() and the JMeterGUIComponent method is now clearGui(). +3rd party add-ons may need to be rebuilt. +

+

Calulator and SamplingStatCalculator classes no longer provide any formatting of their data. Formatting should now be done using the jorphan.gui Renderer classes.

diff --git a/xdocs/usermanual/component_reference.xml b/xdocs/usermanual/component_reference.xml index 91d0a7a25c..babe8e4b64 100644 --- a/xdocs/usermanual/component_reference.xml +++ b/xdocs/usermanual/component_reference.xml @@ -935,7 +935,7 @@ TBC - + The current implementation supports standard Junit convention and extensions. It also includes extensions like oneTimeSetUp and oneTimeTearDown. The sampler works like the @@ -2248,20 +2248,6 @@ The Database URL and JDBC Driver class are defined by the provider of the JDBC i The above may not be correct - please check the relevant JDBC driver documentation. - - -

- TBA. -

- - - Descriptive name for this element that is shown in the tree. - TBA - TBA - - - -

The Login Config Element lets you add or override username and password settings in samplers that use username and password as part of their setup.