Modified: jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java Tue Jun 5 16:46:36 2007 @@ -198,7 +198,7 @@ * 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());
Modified: jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorGraph.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorGraph.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorGraph.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorGraph.java Tue Jun 5 16:46:36 2007 @@ -189,7 +189,7 @@ /** * clear will repaint the graph */ - public void clear() { + public void clearData() { paintComponent(getGraphics()); this.repaint(); } Modified: jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java Tue Jun 5 16:46:36 2007 @@ -131,7 +131,7 @@ * 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(); Modified: jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java Tue Jun 5 16:46:36 2007 @@ -162,12 +162,12 @@ } /** - * 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(); } } Modified: jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorModel.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorModel.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorModel.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorModel.java Tue Jun 5 16:46:36 2007 @@ -113,7 +113,7 @@ /** * clear will create a new MonitorStats object. */ - public void clear() { + public void clearData() { current = new MonitorStats(0, 0, 0, 0, 0, "", "", "", System.currentTimeMillis()); } Modified: jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java Tue Jun 5 16:46:36 2007 @@ -286,10 +286,10 @@ * 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(); } } Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java Tue Jun 5 16:46:36 2007 @@ -100,10 +100,10 @@ } /** - * 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$ Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java Tue Jun 5 16:46:36 2007 @@ -64,13 +64,13 @@ } /** - * 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() { Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java Tue Jun 5 16:46:36 2007 @@ -36,9 +36,6 @@ 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 @@ } /** - * 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$ Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java Tue Jun 5 16:46:36 2007 @@ -53,8 +53,6 @@ * * Now uses Commons HttpClient parsing and matching code (since 2.1.2) * - * author <a href="mailto:[EMAIL PROTECTED]">Sean Dowd</a> - * @version $Revision$ $Date$ */ public class CookieManager extends ConfigTestElement implements TestListener, Serializable { private static final Logger log = LoggingManager.getLoggerForClass(); @@ -238,7 +236,7 @@ /** * 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())); } Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java Tue Jun 5 16:46:36 2007 @@ -164,4 +164,8 @@ return panel; } + public void clearGui(){ + super.clearGui(); + portField.setText(HttpMirrorControl.DEFAULT_PORT_S); + } } Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java Tue Jun 5 16:46:36 2007 @@ -135,10 +135,10 @@ /* * (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(); Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java Tue Jun 5 16:46:36 2007 @@ -36,8 +36,6 @@ 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 @@ } /** - * 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$ Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java Tue Jun 5 16:46:36 2007 @@ -51,7 +51,6 @@ * therefore the notes address those situations. <br> * Created on: Jun 26, 2003 * - * author Peter Lin */ public class WebServiceSamplerGui extends AbstractSamplerGui implements java.awt.event.ActionListener { @@ -191,10 +190,10 @@ } /** - * 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$ Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java Tue Jun 5 16:46:36 2007 @@ -112,8 +112,8 @@ /** * Implements JMeterGUIComponent.clear */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); tableModel.clearData(); deleteButton.setEnabled(false); Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java Tue Jun 5 16:46:36 2007 @@ -244,10 +244,10 @@ } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); tableModel.clearData(); clearEachIteration.setSelected(false); Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java Tue Jun 5 16:46:36 2007 @@ -100,10 +100,10 @@ } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); tableModel.clearData(); deleteButton.setEnabled(false); Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java Tue Jun 5 16:46:36 2007 @@ -115,10 +115,10 @@ } /** - * 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$ Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.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(); argumentName.setText(""); //$NON-NLS-1$ pathExt.setSelected(false); Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/UserParameterModifierGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/UserParameterModifierGui.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/UserParameterModifierGui.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/UserParameterModifierGui.java Tue Jun 5 16:46:36 2007 @@ -68,10 +68,10 @@ ((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$ } Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BSFSamplerGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BSFSamplerGui.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BSFSamplerGui.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BSFSamplerGui.java Tue Jun 5 16:46:36 2007 @@ -74,10 +74,10 @@ } /** - * 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$ Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java Tue Jun 5 16:46:36 2007 @@ -71,10 +71,10 @@ } /** - * 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$ Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java Tue Jun 5 16:46:36 2007 @@ -41,7 +41,6 @@ * Configuration screen for Java Messaging Point-to-Point requests. <br> * Created on: October 28, 2004 * - * @author Martijn Blankestijn */ public class JMSConfigGui extends AbstractSamplerGui { @@ -77,7 +76,8 @@ /** * Clears all fields. */ - public void clear() { + public void clearGui() {// renamed from clear + super.clearGui(); queueuConnectionFactory.setText(""); sendQueue.setText(""); receiveQueue.setText(""); Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java Tue Jun 5 16:46:36 2007 @@ -228,6 +228,25 @@ 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. */ Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java Tue Jun 5 16:46:36 2007 @@ -41,8 +41,6 @@ /** * This is the GUI for JMS Subscriber <br> * - * @author Peter Lin - * @version $Id$ */ public class JMSSubscriberGui extends AbstractSamplerGui implements java.awt.event.ActionListener, ChangeListener { @@ -215,6 +213,21 @@ reqAuth.setText(sampler.getUseAuth()); readResponse.setSelected(sampler.getReadResponseAsBoolean()); 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$ } /** Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java Tue Jun 5 16:46:36 2007 @@ -188,10 +188,10 @@ } /** - * 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$ Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java Tue Jun 5 16:46:36 2007 @@ -321,10 +321,10 @@ } /** - * 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$ Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapExtTestSamplerGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapExtTestSamplerGui.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapExtTestSamplerGui.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapExtTestSamplerGui.java Tue Jun 5 16:46:36 2007 @@ -79,12 +79,12 @@ } /** - * Implements JMeterGUIComponent.clear + * Implements JMeterGUIComponent.clearGui */ - public void clear() { - super.clear(); + public void clearGui() { + super.clearGui(); - ldapDefaultPanel.clear(); + ldapDefaultPanel.clearGui(); } public String getLabelResource() { Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java Tue Jun 5 16:46:36 2007 @@ -30,10 +30,6 @@ 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 @@ } /** - * 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() { Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java Tue Jun 5 16:46:36 2007 @@ -38,9 +38,6 @@ 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 MailReaderSamplerGui() { init(); + initGui(); } public String getLabelResource() { @@ -240,7 +238,6 @@ nmbg.add(allMessagesButton); nmbg.add(someMessagesButton); someMessagesField = new JTextField(5); - someMessagesField.setText("0"); allMessagesButton.setSelected(true); numMessagesPanel.add(allMessagesButton); numMessagesPanel.add(someMessagesButton); @@ -249,5 +246,21 @@ 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(""); } } Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/tcp/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/tcp/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/protocol/tcp/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/protocol/tcp/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java Tue Jun 5 16:46:36 2007 @@ -111,10 +111,10 @@ } /** - * 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$ Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/tcp/org/apache/jmeter/protocol/tcp/control/gui/TCPSamplerGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/tcp/org/apache/jmeter/protocol/tcp/control/gui/TCPSamplerGui.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/protocol/tcp/org/apache/jmeter/protocol/tcp/control/gui/TCPSamplerGui.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/protocol/tcp/org/apache/jmeter/protocol/tcp/control/gui/TCPSamplerGui.java Tue Jun 5 16:46:36 2007 @@ -64,13 +64,13 @@ } /** - * 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() { Modified: jakarta/jmeter/branches/rel-2-2/src/reports/org/apache/jmeter/gui/ReportGuiPackage.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/reports/org/apache/jmeter/gui/ReportGuiPackage.java?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/reports/org/apache/jmeter/gui/ReportGuiPackage.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/reports/org/apache/jmeter/gui/ReportGuiPackage.java Tue Jun 5 16:46:36 2007 @@ -51,8 +51,6 @@ * 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 @@ 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 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 @@ } else { comp = getGuiFromCache(c, null); } - comp.clear(); + comp.clearGui(); TestElement node = comp.createTestElement(); nodesToGui.put(node, comp); return node; @@ -347,7 +340,7 @@ * 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); Modified: jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original) +++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Tue Jun 5 16:46:36 2007 @@ -103,6 +103,12 @@ </p> <h4>Incompatible changes (development):</h4> <p> +<b>N.B.</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. +</p> +<p> Calulator and SamplingStatCalculator classes no longer provide any formatting of their data. Formatting should now be done using the jorphan.gui Renderer classes. </p> Modified: jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/component_reference.xml URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/component_reference.xml?view=diff&rev=544682&r1=544681&r2=544682 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/component_reference.xml (original) +++ jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/component_reference.xml Tue Jun 5 16:46:36 2007 @@ -935,7 +935,7 @@ -<component name="JUnit Sampler" index="§-num;.1.16" width="522" height="405" screenshot="junit_sampler.png"> +<component name="JUnit Request" index="§-num;.1.16" width="522" height="405" screenshot="junit_sampler.png"> <description> The current implementation supports standard Junit convention and extensions. It also includes extensions like oneTimeSetUp and oneTimeTearDown. The sampler works like the @@ -2247,20 +2247,6 @@ </table> <note>The above may not be correct - please check the relevant JDBC driver documentation.</note> </component> - -<component name="JNDI Default Configuration" index="§-num;.4.10" width="318" height="127" screenshot="jndi_config.png"> -<description> - <p> - TBA. - </p> -</description> -<properties> - <property name="Name" required="">Descriptive name for this element that is shown in the tree.</property> - <property name="Initial Context Factory" required="No">TBA</property> - <property name="Provider URL" required="No">TBA</property> -</properties> -</component> - <component name="Login Config Element" index="§-num;.4.11" width="352" height="112" screenshot="login-config.png"> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
