Author: sebb
Date: Fri May 4 02:29:15 2007
New Revision: 535138
URL: http://svn.apache.org/viewvc?view=rev&rev=535138
Log:
Bug 40077 - Creating new Elements copies values from Existing elements
Applied patch 20129
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/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/XMLConfPanel.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/assertions/gui/XPathPanel.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/sampler/gui/TestActionGui.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/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/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/HeaderManager.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/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/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/xdocs/changes.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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -160,6 +160,26 @@
}
}
}
+
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ tableModel.clearData();
+
+ responseStringButton.setSelected(true);
+ urlButton.setSelected(false);
+ responseCodeButton.setSelected(false);
+ responseMessageButton.setSelected(false);
+ assumeSuccess.setSelected(false);
+
+ containsBox.setSelected(true);
+ matchesBox.setSelected(false);
+ equalsBox.setSelected(false);
+ notBox.setSelected(false);
+ }
/**
* A newly created component can be initialized with the contents of a
Test
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -68,6 +68,15 @@
el.setProperty(DurationAssertion.DURATION_KEY,duration.getText());
}
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ duration.setText(""); //$NON-NLS-1$
+ }
+
public void configure(TestElement el) {
super.configure(el);
duration.setText(el.getPropertyAsString(DurationAssertion.DURATION_KEY));
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -138,6 +138,22 @@
((HTMLAssertion)
inElement).setFilename(filePanel.getFilename());
}
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ docTypeBox.setSelectedIndex(0);
+ htmlRadioButton.setSelected(true);
+ xhtmlRadioButton.setSelected(false);
+ xmlRadioButton.setSelected(false);
+ errorThresholdField.setText("0"); //$NON-NLS-1$
+ warningThresholdField.setText("0"); //$NON-NLS-1$
+ filePanel.setFilename(""); //$NON-NLS-1$
+ errorsOnly.setSelected(false);
+ }
+
/**
* Configures the associated test element.
*
@@ -160,6 +176,10 @@
if (lAssertion.isErrorsOnly()) {
warningThresholdField.setEnabled(false);
warningThresholdField.setEditable(false);
+ }
+ else {
+ warningThresholdField.setEnabled(true);
+ warningThresholdField.setEditable(true);
}
filePanel.setFilename(lAssertion.getFilename());
}
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -102,4 +102,13 @@
}
((MD5HexAssertion) element).setAllowedMD5Hex(md5HexString);
}
+
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ 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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -84,6 +84,22 @@
((SizeAssertion) el).setAllowedSize(assertionSize);
((SizeAssertion) el).setCompOper(getState());
}
+
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ size.setText(""); //$NON-NLS-1$
+ equalButton.setSelected(true);
+ notequalButton.setSelected(false);
+ greaterthanButton.setSelected(false);
+ lessthanButton.setSelected(false);
+ greaterthanequalButton.setSelected(false);
+ lessthanequalButton.setSelected(false);
+ execState = SizeAssertion.EQUAL;
+ }
public void configure(TestElement el) {
super.configure(el);
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java?view=diff&rev=535138&r1=535137&r2=535138
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java
Fri May 4 02:29:15 2007
@@ -51,7 +51,15 @@
add(getNamespace());
add(getValidate());
add(getWhitespace());
+ setDefaultValues();
}
+
+ public void setDefaultValues() {
+ setWhitespace(false);
+ setValidate(false);
+ setTolerant(false);
+ setNamespace(false);
+ }
/**
* @return Returns the namespace.
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -81,6 +81,15 @@
((XMLSchemaAssertion)
inElement).setXsdFileName(xmlSchema.getText());
}
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ xmlSchema.setText(""); //$NON-NLS-1$
+ }
+
/**
* Configures the GUI from the associated test element.
*
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -116,4 +116,16 @@
assertion.setXPathString(xpath.getXPath());
}
}
+
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ xpath.setXPath("/"); //$NON-NLS-1$
+ xpath.setNegated(false);
+
+ xml.setDefaultValues();
+ }
}
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java?view=diff&rev=535138&r1=535137&r2=535138
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java
Fri May 4 02:29:15 2007
@@ -68,6 +68,7 @@
*/
public XPathPanel(boolean isDoubleBuffered) {
super(isDoubleBuffered);
+ init();
}
/**
@@ -75,6 +76,7 @@
*/
public XPathPanel(LayoutManager layout) {
super(layout);
+ init();
}
/**
@@ -83,7 +85,7 @@
*/
public XPathPanel(LayoutManager layout, boolean isDoubleBuffered) {
super(layout, isDoubleBuffered);
-
+ init();
}
private void init() {
@@ -99,8 +101,15 @@
vbox.add(getNegatedCheckBox());
add(vbox);
+
+ setDefaultValues();
}
+ public void setDefaultValues() {
+ setXPath("/"); //$NON-NLS-1$
+ setNegated(false);
+ }
+
/**
* Get the XPath String
*
@@ -170,7 +179,6 @@
public JTextField getXPathTextField() {
if (xpath == null) {
xpath = new JTextField(50);
- xpath.setText("/"); //$NON-NLS-1$
}
return xpath;
}
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -108,6 +108,23 @@
regex.setMatchNumber(matchNumberField.getText());
}
}
+
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ useBody.setSelected(true);
+ useHeaders.setSelected(false);
+ useURL.setSelected(false);
+
+ regexField.setText(""); //$NON-NLS-1$
+ templateField.setText(""); //$NON-NLS-1$
+ defaultField.setText(""); //$NON-NLS-1$
+ refNameField.setText(""); //$NON-NLS-1$
+ matchNumberField.setText(""); //$NON-NLS-1$
+ }
private void init() {
setLayout(new BorderLayout());
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -88,6 +88,18 @@
}
}
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ xpathQueryField.setText(""); // $NON-NLS-1$
+ defaultField.setText(""); // $NON-NLS-1$
+ refNameField.setText(""); // $NON-NLS-1$
+ tolerant.setSelected(false);
+ }
+
private void init() {
setLayout(new BorderLayout());
setBorder(makeBorder());
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -73,6 +73,20 @@
}
super.configureTestElement(c);
}
+
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ startField.setText(""); //$NON-NLS-1$
+ incrField.setText(""); //$NON-NLS-1$
+ endField.setText(""); //$NON-NLS-1$
+ varNameField.setText(""); //$NON-NLS-1$
+ formatField.setText(""); //$NON-NLS-1$
+ perUserField.setSelected(false);
+ }
public void configure(TestElement element) {
super.configure(element);
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -129,6 +129,17 @@
super.configureTestElement(params);
}
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ initTableModel();
+ paramTable.setModel(tableModel);
+ perIterationCheck.setSelected(false);
+ }
+
private void init() {
setBorder(makeBorder());
setLayout(new BorderLayout());
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -128,6 +128,22 @@
ta.setDuration(duration);
}
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ targetBox.setSelectedIndex(0);
+ durationField.setText(""); //$NON-NLS-1$
+ pauseButton.setSelected(true);
+ stopButton.setSelected(false);
+ action = TestAction.PAUSE;
+ target = TestAction.THREAD;
+ duration = 0;
+
+ }
+
private void init() {
setLayout(new VerticalLayout(5, VerticalLayout.LEFT,
VerticalLayout.TOP));
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -107,6 +107,15 @@
String passwordString = new String(password.getPassword());
element.setProperty(new
StringProperty(ConfigTestElement.PASSWORD, passwordString));
}
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ username.setText(""); //$NON-NLS-1$
+ password.setText(""); //$NON-NLS-1$
+ }
/**
* Initialize the components and layout of this component.
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -76,6 +76,15 @@
((OnErrorTestElement)
te).setErrorAction(errorPanel.getOnErrorSetting());
}
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ errorPanel.configure(OnErrorTestElement.ON_ERROR_CONTINUE);
+ }
+
private void init() {
setLayout(new BorderLayout());
setBorder(makeBorder());
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -85,6 +85,16 @@
te.setProperty(ResultSaver.ERRORS_ONLY,
errorsOnly.isSelected());
}
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ filename.setText(""); //$NON-NLS-1$
+ errorsOnly.setSelected(false);
+ }
+
private void init() {
setLayout(new BorderLayout());
setBorder(makeBorder());
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -99,6 +99,21 @@
element.setProperty(FTPSampler.UPLOAD_FILE,putBox.isSelected());
}
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ server.setText(""); //$NON-NLS-1$
+ remoteFile.setText(""); //$NON-NLS-1$
+ localFile.setText(""); //$NON-NLS-1$
+ binaryMode.setSelected(false);
+ saveResponseData.setSelected(false);
+ getBox.setSelected(true);
+ putBox.setSelected(false);
+ }
+
private JPanel createServerPanel() {
JLabel label = new JLabel(JMeterUtils.getResString("server"));
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -67,6 +67,16 @@
this.configureTestElement(sampler);
}
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ ftpDefaultPanel.clear();
+ loginPanel.clear();
+ }
+
public String getLabelResource() {
return "ftp_testing_title";
}
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -89,6 +89,20 @@
}
}
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ protocol.setText(""); //$NON-NLS-1$
+ domain.setText(""); //$NON-NLS-1$
+ path.setText(""); //$NON-NLS-1$
+ port.setText(""); //$NON-NLS-1$
+ argPanel.clear();
+ imageParser.setSelected(false);
+ }
+
public void configure(TestElement el) {
super.configure(el);
protocol.setText(el.getPropertyAsString(HTTPSamplerBase.PROTOCOL));
Modified:
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java?view=diff&rev=535138&r1=535137&r2=535138
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
Fri May 4 02:29:15 2007
@@ -61,6 +61,11 @@
public HeaderManager() {
setProperty(new CollectionProperty(HEADERS, new ArrayList()));
}
+
+ public void clear() {
+ super.clear();
+ setProperty(new CollectionProperty(HEADERS, new ArrayList()));
+ }
public CollectionProperty getHeaders() {
return (CollectionProperty) getProperty(HEADERS);
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -140,6 +140,8 @@
public void clear() {
super.clear();
getImages.setSelected(false);
+ isMon.setSelected(false);
urlConfigGui.clear();
+ embeddedRE.setText(""); // $NON-NLS-1$
}
}
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -82,6 +82,19 @@
}
}
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ urlField.setText(""); //$NON-NLS-1$
+ soapAction.setText(""); //$NON-NLS-1$
+ soapXml.setText(""); //$NON-NLS-1$
+ sendSoapAction.setSelected(true);
+ soapXmlFile.setFilename(""); //$NON-NLS-1$
+ }
+
private void init() {
setLayout(new BorderLayout());
setBorder(makeBorder());
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -190,6 +190,29 @@
sampler.setProxyPort(proxyPort.getText());
}
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ domain.setText(""); //$NON-NLS-1$
+ protocol.setText(""); //$NON-NLS-1$
+ port.setText(""); //$NON-NLS-1$
+ path.setText(""); //$NON-NLS-1$
+ soapAction.setText(""); //$NON-NLS-1$
+ soapXml.setText(""); //$NON-NLS-1$
+ wsdlField.setText(""); //$NON-NLS-1$
+ randomXmlFile.setText(""); //$NON-NLS-1$
+ connectTimeout.setText(""); //$NON-NLS-1$
+ proxyHost.setText(""); //$NON-NLS-1$
+ proxyPort.setText(""); //$NON-NLS-1$
+ memCache.setSelected(true);
+ readResponse.setSelected(false);
+ useProxy.setSelected(false);
+ soapXmlFile.setFilename(""); //$NON-NLS-1$
+ }
+
/**
* init() adds soapAction to the mainPanel. The class reuses logic from
* SOAPSampler, since it is common.
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -109,6 +109,17 @@
configureTestElement(el);
}
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ tableModel.clearData();
+ deleteButton.setEnabled(false);
+ saveButton.setEnabled(false);
+ }
+
public void configure(TestElement el) {
super.configure(el);
tableModel.manager.clear();
@@ -279,6 +290,11 @@
public InnerTableModel() {
manager = new AuthManager();
}
+
+ public void clearData() {
+ manager.clear();
+ fireTableDataChanged();
+ }
public void removeRow(int row) {
manager.remove(row);
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -243,6 +243,19 @@
}
}
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ tableModel.clearData();
+ clearEachIteration.setSelected(false);
+ policy.setSelectedIndex(policies.length - 1);
+ deleteButton.setEnabled(false);
+ saveButton.setEnabled(false);
+ }
+
private Cookie createCookie(Object[] rowData) {
Cookie cookie = new Cookie(
(String) rowData[0],
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -99,6 +99,17 @@
configureTestElement(el);
}
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ tableModel.clearData();
+ deleteButton.setEnabled(false);
+ saveButton.setEnabled(false);
+ }
+
public void configure(TestElement el) {
headerManager.clear();
super.configure(el);
@@ -258,6 +269,11 @@
public InnerTableModel(HeaderManager man) {
manager = man;
}
+
+ public void clearData() {
+ manager.clear();
+ fireTableDataChanged();
+ }
public void removeRow(int row) {
manager.remove(row);
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -106,6 +106,20 @@
mask.setSuffix(_suffix.getText());
}
}
+
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ _fieldName.setText(""); //$NON-NLS-1$
+ _prefix.setText(""); //$NON-NLS-1$
+ _lowerBound.setText("0"); //$NON-NLS-1$
+ _upperBound.setText("10"); //$NON-NLS-1$
+ _increment.setText("1"); //$NON-NLS-1$
+ _suffix.setText(""); //$NON-NLS-1$
+ }
public void focusGained(FocusEvent evt) {
}
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -104,6 +104,19 @@
rewritingModifier.setShouldCache((shouldCache.isSelected()));
}
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ argumentName.setText(""); //$NON-NLS-1$
+ pathExt.setSelected(false);
+ pathExtNoEquals.setSelected(false);
+ pathExtNoQuestionmark.setSelected(false);
+ shouldCache.setSelected(false);
+ }
+
public void configure(TestElement el) {
URLRewritingModifier rewritingModifier =
((URLRewritingModifier) el);
argumentName.setText(rewritingModifier.getArgumentName());
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -68,6 +68,14 @@
this.configureTestElement(mod);
((UserParameterModifier)
mod).setXmlUri(fileNameField.getText());
}
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ fileNameField.setText("users.xml"); //$NON-NLS-1$
+ }
public void updateGui() {
}
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -78,6 +78,18 @@
te.setProperty(BSFSampler.PARAMETERS, parameters.getText());
te.setProperty(BSFSampler.SCRIPT, scriptField.getText());
}
+
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ scriptField.setText(""); //$NON-NLS-1$
+ langField.setText(""); //$NON-NLS-1$
+ filename.setText(""); //$NON-NLS-1$
+ parameters.setText(""); //$NON-NLS-1$
+ }
public String getLabelResource() {
return "bsf_sampler_title";
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -73,6 +73,17 @@
te.setProperty(BeanShellSampler.FILENAME, filename.getText());
te.setProperty(BeanShellSampler.PARAMETERS,
parameters.getText());
}
+
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ filename.setText(""); //$NON-NLS-1$
+ parameters.setText(""); //$NON-NLS-1$
+ scriptField.setText(""); //$NON-NLS-1$
+ }
public String getLabelResource() {
return "bsh_sampler_title";
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -187,6 +187,27 @@
}
}
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ rootdn.setText(""); //$NON-NLS-1$
+ searchbase.setText(""); //$NON-NLS-1$
+ searchfilter.setText(""); //$NON-NLS-1$
+ delete.setText(""); //$NON-NLS-1$
+ add.setText(""); //$NON-NLS-1$
+ modify.setText(""); //$NON-NLS-1$
+ servername.setText(""); //$NON-NLS-1$
+ port.setText(""); //$NON-NLS-1$
+ user_Defined.setSelected(false);
+ addTest.setSelected(false);
+ modifyTest.setSelected(false);
+ deleteTest.setSelected(false);
+ searchTest.setSelected(false);
+ }
+
/**
* This itemStateChanged listener for changing the card layout for
based on\
* the test selected in the User defined test case.
@@ -197,30 +218,38 @@
if (addTest.isSelected()) {
cl.show(cards, "Add");
tableModifyPanel.clear();
+ modify.setText("");
searchbase.setText("");
searchfilter.setText("");
delete.setText("");
} else if (deleteTest.isSelected()) {
cl.show(cards, "Delete");
tableModifyPanel.clear();
+ modify.setText("");
tableAddPanel.clear();
+ add.setText("");
searchbase.setText("");
searchfilter.setText("");
} else if (searchTest.isSelected()) {
cl.show(cards, "Search");
delete.setText("");
tableModifyPanel.clear();
+ modify.setText("");
tableAddPanel.clear();
+ add.setText("");
} else if (modifyTest.isSelected()) {
cl.show(cards, "Modify");
tableAddPanel.clear();
+ add.setText("");
searchbase.setText("");
searchfilter.setText("");
delete.setText("");
} else {
cl.show(cards, "");
tableAddPanel.clear();
+ add.setText("");
tableModifyPanel.clear();
+ modify.setText("");
searchbase.setText("");
searchfilter.setText("");
delete.setText("");
@@ -228,7 +257,9 @@
} else {
cl.show(cards, "");
tableAddPanel.clear();
+ add.setText("");
tableModifyPanel.clear();
+ modify.setText("");
searchbase.setText("");
searchfilter.setText("");
delete.setText("");
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -308,6 +308,50 @@
element.setProperty(new
StringProperty(LDAPExtSampler.TEST, LDAPExtSampler.UNBIND));
}
}
+
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ rootdn.setText(""); //$NON-NLS-1$
+ searchbase.setText(""); //$NON-NLS-1$
+ searchfilter.setText(""); //$NON-NLS-1$
+ delete.setText(""); //$NON-NLS-1$
+ add.setText(""); //$NON-NLS-1$
+ modify.setText(""); //$NON-NLS-1$
+ servername.setText(""); //$NON-NLS-1$
+ port.setText(""); //$NON-NLS-1$
+ add.setText(""); //$NON-NLS-1$
+ scope.setSelectedIndex(SCOPE_STRINGS.length - 1);
+ countlim.setText(""); //$NON-NLS-1$
+ timelim.setText(""); //$NON-NLS-1$
+ attribs.setText(""); //$NON-NLS-1$
+ userdn.setText(""); //$NON-NLS-1$
+ userpw.setText(""); //$NON-NLS-1$
+ comparedn.setText(""); //$NON-NLS-1$
+ comparefilt.setText(""); //$NON-NLS-1$
+ modddn.setText(""); //$NON-NLS-1$
+ newdn.setText(""); //$NON-NLS-1$
+ connto.setText(""); //$NON-NLS-1$
+ retobj.setSelected(false);
+ deref.setSelected(false);
+ parseflag.setSelected(false);
+ secure.setSelected(false);
+ addTest.setSelected(false);
+ modifyTest.setSelected(false);
+ deleteTest.setSelected(false);
+ searchTest.setSelected(false);
+ bind.setSelected(false);
+ rename.setSelected(false);
+ unbind.setSelected(false);
+ sbind.setSelected(false);
+ compare.setSelected(false);
+
+ tableAddPanel.clear();
+ tableModifyPanel.clear();
+ }
/***************************************************************************
* This itemStateChanged listener for changing the card layout for
based on
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -78,6 +78,15 @@
this.configureTestElement(sampler);
}
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ ldapDefaultPanel.clear();
+ }
+
public String getLabelResource() {
return "ldapext_testing_title"; // $NON-NLS-1$
}
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -75,6 +75,16 @@
((LDAPSampler)
sampler).addTestElement(loginPanel.createTestElement());
this.configureTestElement(sampler);
}
+
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ ldapDefaultPanel.clear();
+ loginPanel.clear();
+ }
public String getLabelResource() {
return "ldap_testing_title";
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -112,6 +112,20 @@
element.setProperty(TCPSampler.REQUEST, requestData.getText());
}
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ server.setText(""); //$NON-NLS-1$
+ port.setText(""); //$NON-NLS-1$
+ timeout.setText(""); //$NON-NLS-1$
+ requestData.setText(""); //$NON-NLS-1$
+ reUseConnection.setSelected(true);
+ setNoDelay.setSelected(false);
+ }
+
private JPanel createTimeoutPanel() {
JLabel label = new
JLabel(JMeterUtils.getResString("tcp_timeout"));
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=535138&r1=535137&r2=535138
==============================================================================
---
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
Fri May 4 02:29:15 2007
@@ -66,6 +66,16 @@
this.configureTestElement(sampler);
}
+ /**
+ * Implements JMeterGUIComponent.clear
+ */
+ public void clear() {
+ super.clear();
+
+ TcpDefaultPanel.clear();
+ loginPanel.clear();
+ }
+
public String getLabelResource() {
return "tcp_sample_title";
}
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=535138&r1=535137&r2=535138
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Fri May 4 02:29:15 2007
@@ -222,6 +222,7 @@
<li>Bug 42267 - Concurrent GUI update failure in Proxy Recording</li>
<li>Bug 30120 - Name of simple controller is resetted if a new simple
controller is added as child</li>
<li>Bug 41078 - merge results in name change of test plan</li>
+<li>Bug 40077 - Creating new Elements copies values from Existing elements</li>
</ul>
<h3>Version 2.2</h3>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
