You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2007/06/06 01:46:40 UTC
svn commit: r544682 [1/2] - in /jakarta/jmeter/branches/rel-2-2:
src/components/org/apache/jmeter/assertions/gui/
src/components/org/apache/jmeter/control/gui/
src/components/org/apache/jmeter/extractor/gui/
src/components/org/apache/jmeter/modifiers/g...
Author: sebb
Date: Tue Jun 5 16:46:36 2007
New Revision: 544682
URL: http://svn.apache.org/viewvc?view=rev&rev=544682
Log:
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.
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/DurationAssertionGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XMLSchemaAssertionGUI.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ForeachControlPanel.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/InterleaveControlGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/RandomControlGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/SwitchControllerGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/gui/RegexExtractorGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/reporters/MailerModel.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/DistributionGraph.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/DistributionGraphVisualizer.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/Graph.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphAccum.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphAccumModel.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SimpleDataWriter.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SplineModel.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SummaryReport.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/gui/LoginConfigGui.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/LoopControlPanel.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/RunTimeGui.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/WhileControllerGui.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/CommentPanel.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/GuiPackage.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/JMeterGUIComponent.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/NamePanel.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Clear.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/util/FilePanel.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/ResultCollector.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/ResultSaver.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/Summariser.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/gui/ResultActionGui.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/gui/ResultSaverGui.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/gui/SummariserGui.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/samplers/Clearable.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/TestElement.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java
jakarta/jmeter/branches/rel-2-2/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java
jakarta/jmeter/branches/rel-2-2/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java
jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorGraph.java
jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java
jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java
jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorModel.java
jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java
jakarta/jmeter/branches/rel-2-2/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/UserParameterModifierGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BSFSamplerGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapExtTestSamplerGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/tcp/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/tcp/org/apache/jmeter/protocol/tcp/control/gui/TCPSamplerGui.java
jakarta/jmeter/branches/rel-2-2/src/reports/org/apache/jmeter/gui/ReportGuiPackage.java
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/component_reference.xml
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java Tue Jun 5 16:46:36 2007
@@ -161,10 +161,10 @@
}
/**
- * Implements JMeterGUIComponent.clear
+ * Implements JMeterGUIComponent.clearGui
*/
- public void clear() {
- super.clear();
+ public void clearGui() {
+ super.clearGui();
tableModel.clearData();
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java Tue Jun 5 16:46:36 2007
@@ -137,4 +137,11 @@
return panel;
}
+
+ public void clearGui() {
+ super.clearGui();
+ filename.setText(""); // $NON-NLS-1$
+ parameters.setText(""); // $NON-NLS-1$
+ scriptField.setText(""); // $NON-NLS-1$
+ }
}
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/DurationAssertionGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/DurationAssertionGui.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/DurationAssertionGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/DurationAssertionGui.java Tue Jun 5 16:46:36 2007
@@ -29,14 +29,8 @@
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 @@
}
/**
- * Implements JMeterGUIComponent.clear
+ * Implements JMeterGUIComponent.clearGui
*/
- public void clear() {
- super.clear();
+ public void clearGui() {
+ super.clearGui();
duration.setText(""); //$NON-NLS-1$
}
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java Tue Jun 5 16:46:36 2007
@@ -139,10 +139,10 @@
}
/**
- * Implements JMeterGUIComponent.clear
+ * Implements JMeterGUIComponent.clearGui
*/
- public void clear() {
- super.clear();
+ public void clearGui() {
+ super.clearGui();
docTypeBox.setSelectedIndex(0);
htmlRadioButton.setSelected(true);
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/MD5HexAssertionGUI.java Tue Jun 5 16:46:36 2007
@@ -102,10 +102,10 @@
}
/**
- * Implements JMeterGUIComponent.clear
+ * Implements JMeterGUIComponent.clearGui
*/
- public void clear() {
- super.clear();
+ public void clearGui() {
+ super.clearGui();
md5HexInput.setText(""); //$NON-NLS-1$
}
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java Tue Jun 5 16:46:36 2007
@@ -37,9 +37,6 @@
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 @@
}
/**
- * Implements JMeterGUIComponent.clear
+ * Implements JMeterGUIComponent.clearGui
*/
- public void clear() {
- super.clear();
+ public void clearGui() {
+ super.clearGui();
size.setText(""); //$NON-NLS-1$
equalButton.setSelected(true);
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XMLSchemaAssertionGUI.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XMLSchemaAssertionGUI.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XMLSchemaAssertionGUI.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XMLSchemaAssertionGUI.java Tue Jun 5 16:46:36 2007
@@ -82,10 +82,10 @@
}
/**
- * Implements JMeterGUIComponent.clear
+ * Implements JMeterGUIComponent.clearGui
*/
- public void clear() {
- super.clear();
+ public void clearGui() {
+ super.clearGui();
xmlSchema.setText(""); //$NON-NLS-1$
}
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java Tue Jun 5 16:46:36 2007
@@ -28,12 +28,6 @@
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.layout.VerticalLayout;
-/**
- *
- * author <a href="mailto:jspears@astrology.com">Justin Spears </a>
- *
- */
-
public class XPathAssertionGui extends AbstractAssertionGui {
private XPathPanel xpath;
@@ -118,10 +112,10 @@
}
/**
- * Implements JMeterGUIComponent.clear
+ * Implements JMeterGUIComponent.clearGui
*/
- public void clear() {
- super.clear();
+ public void clearGui() {
+ super.clearGui();
xpath.setXPath("/"); //$NON-NLS-1$
xpath.setNegated(false);
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ForeachControlPanel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ForeachControlPanel.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ForeachControlPanel.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ForeachControlPanel.java Tue Jun 5 16:46:36 2007
@@ -130,10 +130,10 @@
}
/**
- * 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$
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java Tue Jun 5 16:46:36 2007
@@ -30,10 +30,7 @@
import org.apache.jorphan.gui.layout.VerticalLayout;
public class IncludeControllerGui extends AbstractControllerGui
- /*
- * implements
- * UnsharedComponent
- */
+ // implements UnsharedComponent
{
private FilePanel includePanel =
@@ -84,11 +81,11 @@
}
/**
- * 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() {
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/InterleaveControlGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/InterleaveControlGui.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/InterleaveControlGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/InterleaveControlGui.java Tue Jun 5 16:46:36 2007
@@ -62,10 +62,10 @@
}
/**
- * Implements JMeterGUIComponent.clear
+ * Implements JMeterGUIComponent.clearGui
*/
- public void clear() {
- super.clear();
+ public void clearGui() {
+ super.clearGui();
style.setSelected(false);
}
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java Tue Jun 5 16:46:36 2007
@@ -46,10 +46,8 @@
* ModuleController Gui.
*
*/
-public class ModuleControllerGui extends AbstractControllerGui /*
- * implements
- * UnsharedComponent
- */
+public class ModuleControllerGui extends AbstractControllerGui
+// implements UnsharedComponent
{
private JMeterTreeNode selected = null;
@@ -138,10 +136,10 @@
}
/**
- * Implements JMeterGUIComponent.clear
+ * Implements JMeterGUIComponent.clearGui
*/
- public void clear() {
- super.clear();
+ public void clearGui() {
+ super.clearGui();
nodes.setSelectedIndex(-1);
selected = null;
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/RandomControlGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/RandomControlGui.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/RandomControlGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/RandomControlGui.java Tue Jun 5 16:46:36 2007
@@ -54,10 +54,10 @@
}
/**
- * Implements JMeterGUIComponent.clear
+ * Implements JMeterGUIComponent.clearGui
*/
- public void clear() {
- super.clear();
+ public void clearGui() {
+ super.clearGui();
style.setSelected(false);
}
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/SwitchControllerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/SwitchControllerGui.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/SwitchControllerGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/SwitchControllerGui.java Tue Jun 5 16:46:36 2007
@@ -54,10 +54,10 @@
}
/**
- * Implements JMeterGUIComponent.clear
+ * Implements JMeterGUIComponent.clearGui
*/
- public void clear() {
- super.clear();
+ public void clearGui() {
+ super.clearGui();
switchValue.setText(""); // $NON-NLS-1$
}
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java Tue Jun 5 16:46:36 2007
@@ -91,10 +91,10 @@
}
/**
- * 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);
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/gui/RegexExtractorGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/gui/RegexExtractorGui.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/gui/RegexExtractorGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/gui/RegexExtractorGui.java Tue Jun 5 16:46:36 2007
@@ -110,10 +110,10 @@
}
/**
- * Implements JMeterGUIComponent.clear
+ * Implements JMeterGUIComponent.clearGui
*/
- public void clear() {
- super.clear();
+ public void clearGui() {
+ super.clearGui();
useBody.setSelected(true);
useHeaders.setSelected(false);
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java Tue Jun 5 16:46:36 2007
@@ -89,10 +89,10 @@
}
/**
- * 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$
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java Tue Jun 5 16:46:36 2007
@@ -72,10 +72,10 @@
}
/**
- * 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$
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java Tue Jun 5 16:46:36 2007
@@ -127,10 +127,10 @@
}
/**
- * Implements JMeterGUIComponent.clear
+ * Implements JMeterGUIComponent.clearGui
*/
- public void clear() {
- super.clear();
+ public void clearGui() {
+ super.clearGui();
initTableModel();
paramTable.setModel(tableModel);
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/reporters/MailerModel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/reporters/MailerModel.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/reporters/MailerModel.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/reporters/MailerModel.java Tue Jun 5 16:46:36 2007
@@ -42,8 +42,6 @@
/**
* The model for a MailerVisualizer.
*
- * @author <a href="mailto:wolfram.rittmeyer@web.de">Wolfram Rittmeyer</a>
- * @version $Revision$ $Date$
*/
public class MailerModel extends AbstractTestElement implements Serializable {
@@ -216,7 +214,7 @@
* 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;
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java Tue Jun 5 16:46:36 2007
@@ -126,10 +126,10 @@
}
/**
- * Implements JMeterGUIComponent.clear
+ * Implements JMeterGUIComponent.clearGui
*/
- public void clear() {
- super.clear();
+ public void clearGui() {
+ super.clearGui();
targetBox.setSelectedIndex(0);
durationField.setText(""); //$NON-NLS-1$
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java Tue Jun 5 16:46:36 2007
@@ -120,10 +120,10 @@
/*
* (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();
}
}
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java Tue Jun 5 16:46:36 2007
@@ -157,11 +157,11 @@
/*
* (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();
}
}
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java Tue Jun 5 16:46:36 2007
@@ -156,11 +156,11 @@
/*
* (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();
}
}
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java Tue Jun 5 16:46:36 2007
@@ -57,7 +57,7 @@
}
}
- public void clear() {
+ public void clearData() {
textArea.setText(""); // $NON-NLS-1$
}
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/DistributionGraph.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/DistributionGraph.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/DistributionGraph.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/DistributionGraph.java Tue Jun 5 16:46:36 2007
@@ -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.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 @@
*
*/
public class DistributionGraph extends JComponent implements Scrollable, Clearable {
- // private static Logger log = LoggingManager.getLoggerForClass();
private SamplingStatCalculator model;
@@ -144,7 +140,8 @@
/**
* Clears this graph.
*/
- public void clear() {
+ public void clearData() {
+ model.clear();
}
/**
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/DistributionGraphVisualizer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/DistributionGraphVisualizer.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/DistributionGraphVisualizer.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/DistributionGraphVisualizer.java Tue Jun 5 16:46:36 2007
@@ -110,8 +110,8 @@
return "distribution_graph_title"; // $NON-NLS-1$
}
- public synchronized void clear() {
- this.graph.clear();
+ public synchronized void clearData() {
+ this.graph.clearData();
model.clear();
repaint();
}
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/Graph.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/Graph.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/Graph.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/Graph.java Tue Jun 5 16:46:36 2007
@@ -37,8 +37,6 @@
/**
* 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 @@
/**
* Clears this graph.
*/
- public void clear() {
+ public void clearData() {
graphMax = 1;
throughputMax = 1;
}
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphAccum.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphAccum.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphAccum.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphAccum.java Tue Jun 5 16:46:36 2007
@@ -241,7 +241,7 @@
/**
* Clears this graph.
*/
- public void clear() {
+ public void clearData() {
setNoLegendYet(true);
((JPanel) visualizer.getWhiteCanvas()).removeAll();
previousPts = null;
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphAccumModel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphAccumModel.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphAccumModel.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphAccumModel.java Tue Jun 5 16:46:36 2007
@@ -32,8 +32,6 @@
/**
* 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 @@
/**
* Clear the results.
*/
- public void clear() {
+ public void clearData() {
log.debug("Start : clear1");
samples.clear();
max = 1;
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java Tue Jun 5 16:46:36 2007
@@ -121,9 +121,9 @@
/**
* 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");
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java Tue Jun 5 16:46:36 2007
@@ -142,15 +142,15 @@
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 @@
return row;
}
+
}
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java Tue Jun 5 16:46:36 2007
@@ -58,7 +58,6 @@
/**
* 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 @@
/**
* Clears any stored sampling-informations.
*/
- public synchronized void clear() {
+ public synchronized void clearData() {
if (getModel() != null) {
((MailerResultCollector) getModel()).getMailerModel().clear();
}
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SimpleDataWriter.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SimpleDataWriter.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SimpleDataWriter.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SimpleDataWriter.java Tue Jun 5 16:46:36 2007
@@ -20,7 +20,6 @@
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 @@
*
******************************************************************************/
-public class SimpleDataWriter extends AbstractVisualizer implements Clearable {
+public class SimpleDataWriter extends AbstractVisualizer {
/***************************************************************************
* Create the SimpleDataWriter.
**************************************************************************/
@@ -59,7 +58,7 @@
* Does nothing, but required by interface.
*/
- public void clear() {
+ public void clearData() {
}
/**
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SplineModel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SplineModel.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SplineModel.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SplineModel.java Tue Jun 5 16:46:36 2007
@@ -105,10 +105,10 @@
}
public void uncompile() {
- clear();
+ clearData();
}
- public synchronized void clear() {
+ public synchronized void clearData() {
// this.graph.clear();
samples.clear();
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java Tue Jun 5 16:46:36 2007
@@ -102,8 +102,8 @@
updateGui();
}
- public void clear() {
- model.clear();
+ public void clearData() {
+ model.clearData();
}
public void setGUI() {
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java Tue Jun 5 16:46:36 2007
@@ -168,7 +168,7 @@
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 @@
/**
* 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));
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatVisualizer.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatVisualizer.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/StatVisualizer.java Tue Jun 5 16:46:36 2007
@@ -99,7 +99,7 @@
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 @@
/**
* 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));
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SummaryReport.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SummaryReport.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SummaryReport.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/SummaryReport.java Tue Jun 5 16:46:36 2007
@@ -107,7 +107,7 @@
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 @@
/**
* 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));
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/TableVisualizer.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/TableVisualizer.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/TableVisualizer.java Tue Jun 5 16:46:36 2007
@@ -162,9 +162,8 @@
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();
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java Tue Jun 5 16:46:36 2007
@@ -259,7 +259,7 @@
/**
* Clears the visualizer.
*/
- public void clear() {
+ public void clearData() {
log.debug("Start : clear1");
if (log.isDebugEnabled()) {
@@ -664,7 +664,7 @@
/**
* Initialize this visualizer
*/
- protected void init() {
+ private void init() {
setLayout(new BorderLayout(0, 5));
setBorder(makeBorder());
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/gui/LoginConfigGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/gui/LoginConfigGui.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/gui/LoginConfigGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/config/gui/LoginConfigGui.java Tue Jun 5 16:46:36 2007
@@ -107,10 +107,10 @@
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$
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/IfControllerPanel.java Tue Jun 5 16:46:36 2007
@@ -37,7 +37,6 @@
* 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 @@
}
/**
- * Implements JMeterGUIComponent.clear
+ * Implements JMeterGUIComponent.clearGui
*/
- public void clear() {
- super.clear();
+ public void clearGui() {
+ super.clearGui();
theCondition.setText(""); // $NON-NLS-1$
}
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/LoopControlPanel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/LoopControlPanel.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/LoopControlPanel.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/LoopControlPanel.java Tue Jun 5 16:46:36 2007
@@ -127,10 +127,10 @@
}
/**
- * 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);
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/RunTimeGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/RunTimeGui.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/RunTimeGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/RunTimeGui.java Tue Jun 5 16:46:36 2007
@@ -36,7 +36,6 @@
* 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 @@
}
/**
- * Implements JMeterGUIComponent.clear
+ * Implements JMeterGUIComponent.clearGui
*/
- public void clear() {
- super.clear();
+ public void clearGui() {
+ super.clearGui();
seconds.setText("1"); // $NON-NLS-1$
}
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/WhileControllerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/WhileControllerGui.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/WhileControllerGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/WhileControllerGui.java Tue Jun 5 16:46:36 2007
@@ -92,10 +92,10 @@
}
/**
- * Implements JMeterGUIComponent.clear
+ * Implements JMeterGUIComponent.clearGui
*/
- public void clear() {
- super.clear();
+ public void clearGui() {
+ super.clearGui();
theCondition.setText(""); // $NON-NLS-1$
}
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java Tue Jun 5 16:46:36 2007
@@ -31,7 +31,6 @@
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 @@
* @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 @@
/** A GUI panel containing the name of this component. */
protected NamePanel namePanel;
-
+ // used by AbstractReportGui
+
private CommentPanel commentPanel;
/**
@@ -82,12 +81,11 @@
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 @@
}
/**
- * 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,15 +198,20 @@
}
/**
- * 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();
}
/**
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/CommentPanel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/CommentPanel.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/CommentPanel.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/CommentPanel.java Tue Jun 5 16:46:36 2007
@@ -66,4 +66,8 @@
public String getText() {
return this.commentField.getText();
}
+
+ public void clearGui() {
+ commentField.setText(""); // $NON-NLS-1$
+ }
}
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/GuiPackage.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/GuiPackage.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/GuiPackage.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/GuiPackage.java Tue Jun 5 16:46:36 2007
@@ -42,7 +42,6 @@
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 @@
* affect the GUI, they typically use GuiPackage to get access to different
* parts of the GUI.
*
- * @author Michael Stover
- * @author <a href="mailto:jsalvata@apache.org">Jordi Salvat i Alabart</a>
- * @version $Revision$ updated on $Date$
*/
public final class GuiPackage implements LocaleChangeListener {
/** Logging. */
@@ -230,12 +226,7 @@
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 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 @@
} else {
comp = getGuiFromCache(c, null);
}
- comp.clear();
+ comp.clearGui();
TestElement node = comp.createTestElement();
nodesToGui.put(node, comp);
return node;
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/JMeterGUIComponent.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/JMeterGUIComponent.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/JMeterGUIComponent.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/JMeterGUIComponent.java Tue Jun 5 16:46:36 2007
@@ -41,8 +41,6 @@
* @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 @@
* 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
}
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/NamePanel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/NamePanel.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/NamePanel.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/NamePanel.java Tue Jun 5 16:46:36 2007
@@ -82,7 +82,7 @@
add(nameField, BorderLayout.CENTER);
}
- public void clear() {
+ public void clearGui() {
setName(getStaticLabel());
}
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Clear.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Clear.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Clear.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/Clear.java Tue Jun 5 16:46:36 2007
@@ -31,8 +31,10 @@
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 @@
static {
commands.add(ActionNames.CLEAR);
commands.add(ActionNames.CLEAR_ALL);
+ commands.add(ActionNames.RESET_GUI);
}
public Clear() {
@@ -52,13 +55,15 @@
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 @@
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);
}
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/util/FilePanel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/util/FilePanel.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/util/FilePanel.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/util/FilePanel.java Tue Jun 5 16:46:36 2007
@@ -97,6 +97,10 @@
}
+ public void clearGui(){
+ filename.setText(""); // $NON-NLS-1$
+ }
+
/**
* If the gui needs to enable/disable the FilePanel, call the method.
*
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/ResultCollector.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/ResultCollector.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/ResultCollector.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/ResultCollector.java Tue Jun 5 16:46:36 2007
@@ -65,13 +65,12 @@
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 = "<testResults>"; // $NON-NLS-1$
@@ -375,7 +374,7 @@
public void clearVisualizer() {
// current = -1;
if (getVisualizer() != null && getVisualizer() instanceof Clearable) {
- ((Clearable) getVisualizer()).clear();
+ ((Clearable) getVisualizer()).clearData();
}
finalizeFileOutput();
}
@@ -537,4 +536,5 @@
public void setSaveConfig(SampleSaveConfiguration saveConfig) {
getProperty(SAVE_CONFIG).setObjectValue(saveConfig);
}
+
}
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/ResultSaver.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/ResultSaver.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/ResultSaver.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/ResultSaver.java Tue Jun 5 16:46:36 2007
@@ -81,6 +81,7 @@
* 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 @@
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 @@
private boolean getErrorsOnly() {
return getPropertyAsBoolean(ERRORS_ONLY);
}
+
}
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/Summariser.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/Summariser.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/Summariser.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/Summariser.java Tue Jun 5 16:46:36 2007
@@ -101,7 +101,7 @@
* 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());
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/gui/ResultActionGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/gui/ResultActionGui.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/gui/ResultActionGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/gui/ResultActionGui.java Tue Jun 5 16:46:36 2007
@@ -76,10 +76,10 @@
}
/**
- * Implements JMeterGUIComponent.clear
+ * Implements JMeterGUIComponent.clearGui
*/
- public void clear() {
- super.clear();
+ public void clearGui() {
+ super.clearGui();
errorPanel.configure(OnErrorTestElement.ON_ERROR_CONTINUE);
}
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/gui/ResultSaverGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/gui/ResultSaverGui.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/gui/ResultSaverGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/gui/ResultSaverGui.java Tue Jun 5 16:46:36 2007
@@ -27,7 +27,6 @@
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 @@
* 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 @@
}
/**
- * Implements JMeterGUIComponent.clear
+ * Implements JMeterGUIComponent.clearGui
*/
- public void clear() {
- super.clear();
+ public void clearGui() {
+ super.clearGui();
filename.setText(""); //$NON-NLS-1$
errorsOnly.setSelected(false);
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/gui/SummariserGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/gui/SummariserGui.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/gui/SummariserGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/reporters/gui/SummariserGui.java Tue Jun 5 16:46:36 2007
@@ -21,7 +21,6 @@
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 @@
* the existing types.
*
*/
-public class SummariserGui extends AbstractPostProcessorGui implements Clearable {
+public class SummariserGui extends AbstractPostProcessorGui {
public SummariserGui() {
super();
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/samplers/Clearable.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/samplers/Clearable.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/samplers/Clearable.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/samplers/Clearable.java Tue Jun 5 16:46:36 2007
@@ -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
}
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java Tue Jun 5 16:46:36 2007
@@ -85,7 +85,6 @@
* 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 void configure(TestElement element) {
if (!initialized)
init();
- clear();
+ clearGui();
super.configure(element);
@@ -419,17 +418,17 @@
* @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();
}
}
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/TestElement.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/TestElement.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/TestElement.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/testelement/TestElement.java Tue Jun 5 16:46:36 2007
@@ -22,11 +22,6 @@
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 @@
* 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);
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java Tue Jun 5 16:46:36 2007
@@ -52,7 +52,7 @@
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 ThreadGroupGui() {
super();
init();
+ initGui();
}
public Collection getMenuCategories() {
@@ -206,8 +207,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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);
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java Tue Jun 5 16:46:36 2007
@@ -40,10 +40,10 @@
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 @@
* {@link org.apache.jmeter.visualizers.MailerVisualizer MailerVisualizer}.
* <p>
*
- * @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();
@@ -356,5 +357,10 @@
*/
public JComponent getPrintableComponent() {
return this;
+ }
+
+ public void clearGui(){
+ super.clearGui();
+ filePanel.clearGui();
}
}
Modified: jakarta/jmeter/branches/rel-2-2/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java Tue Jun 5 16:46:36 2007
@@ -124,4 +124,10 @@
return dataPanel;
}
+
+ public void clearGui() {
+ super.clearGui();
+ data.setText(""); // $NON-NLS-1$
+
+ }
}
Modified: jakarta/jmeter/branches/rel-2-2/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java?view=diff&rev=544682&r1=544681&r2=544682
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/junit/org/apache/jmeter/protocol/java/control/gui/JUnitTestSamplerGui.java Tue Jun 5 16:46:36 2007
@@ -61,6 +61,7 @@
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 @@
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 @@
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 @@
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()
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org