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/12/07 18:24:37 UTC
svn commit: r602161 - in /jakarta/jmeter/trunk/src:
core/org/apache/jmeter/gui/ core/org/apache/jmeter/gui/tree/
core/org/apache/jmeter/testelement/property/
protocol/http/org/apache/jmeter/protocol/http/config/gui/
protocol/http/org/apache/jmeter/prot...
Author: sebb
Date: Fri Dec 7 09:24:36 2007
New Revision: 602161
URL: http://svn.apache.org/viewvc?rev=602161&view=rev
Log:
Tidy up: use getName()/setName() instead of property access
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/NamePanel.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeModel.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeNode.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java?rev=602161&r1=602160&r2=602161&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java Fri Dec 7 09:24:36 2007
@@ -187,7 +187,7 @@
* the TestElement to configure
*/
public void configure(TestElement element) {
- setName(element.getPropertyAsString(TestElement.NAME));
+ setName(element.getName());
if (element.getProperty(TestElement.ENABLED) instanceof NullProperty) {
enabled = true;
} else {
@@ -225,7 +225,7 @@
* the TestElement being created.
*/
protected void configureTestElement(TestElement mc) {
- mc.setProperty(new StringProperty(TestElement.NAME, getName()));
+ mc.setName(getName());
mc.setProperty(new StringProperty(TestElement.GUI_CLASS, this.getClass().getName()));
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/NamePanel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/NamePanel.java?rev=602161&r1=602160&r2=602161&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/NamePanel.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/NamePanel.java Fri Dec 7 09:24:36 2007
@@ -130,7 +130,7 @@
/* Implements JMeterGUIComponent.configure(TestElement) */
public void configure(TestElement testElement) {
- setName(testElement.getPropertyAsString(TestElement.NAME));
+ setName(testElement.getName());
}
/* Implements JMeterGUIComponent.createPopupMenu() */
@@ -166,7 +166,7 @@
/* Implements JMeterGUIComponent.modifyTestElement(TestElement) */
public void modifyTestElement(TestElement wb) {
- wb.setProperty(new StringProperty(TestElement.NAME, getName()));
+ wb.setName(getName());
wb.setProperty(new StringProperty(TestElement.GUI_CLASS, this.getClass().getName()));
wb.setProperty(new StringProperty(TestElement.TEST_CLASS, WorkBench.class.getName()));
}
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java?rev=602161&r1=602160&r2=602161&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java Fri Dec 7 09:24:36 2007
@@ -34,7 +34,6 @@
import org.apache.jmeter.testelement.AbstractTestElement;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.property.BooleanProperty;
-import org.apache.jmeter.testelement.property.StringProperty;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
@@ -129,11 +128,11 @@
}
public void setName(String name) {
- ((TestElement) getUserObject()).setProperty(new StringProperty(TestElement.NAME, name));
+ ((TestElement) getUserObject()).setName(name);
}
public String getName() {
- return ((TestElement) getUserObject()).getPropertyAsString(TestElement.NAME);
+ return ((TestElement) getUserObject()).getName();
}
public void nameChanged() {
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java?rev=602161&r1=602160&r2=602161&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java Fri Dec 7 09:24:36 2007
@@ -26,9 +26,6 @@
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
-/**
- * @version $Revision$
- */
public abstract class AbstractProperty implements JMeterProperty {
//TODO consider using private logs for each derived class
protected static final Logger log = LoggingManager.getLoggerForClass();
@@ -363,7 +360,7 @@
return (JMeterProperty) item;
}
if (item instanceof TestElement) {
- return new TestElementProperty(((TestElement) item).getPropertyAsString(TestElement.NAME),
+ return new TestElementProperty(((TestElement) item).getName(),
(TestElement) item);
}
if (item instanceof Collection) {
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java?rev=602161&r1=602160&r2=602161&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java Fri Dec 7 09:24:36 2007
@@ -106,7 +106,7 @@
}
protected void configureTestElement(TestElement mc) {
- mc.setProperty(TestElement.NAME, getName());
+ mc.setName(getName());
mc.setProperty(TestElement.GUI_CLASS, this.getClass().getName());
mc.setProperty(TestElement.TEST_CLASS, mc.getClass().getName());
}
@@ -157,7 +157,7 @@
* contains the data to be displayed
*/
public void configure(TestElement el) {
- setName(el.getPropertyAsString(TestElement.NAME));
+ setName(el.getName());
argsPanel.configure((TestElement) el.getProperty(HTTPSamplerBase.ARGUMENTS).getObjectValue());
domain.setText(el.getPropertyAsString(HTTPSamplerBase.DOMAIN));
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java?rev=602161&r1=602160&r2=602161&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java Fri Dec 7 09:24:36 2007
@@ -687,7 +687,7 @@
if (subNode.isEnabled()) {
TestElement element = (TestElement) subNode.getUserObject();
if (myClass.isInstance(element)) {
- log.debug("Applicable: " + element.getPropertyAsString(TestElement.NAME));
+ log.debug("Applicable: " + element.getName());
if (ascending)
elements.addFirst(element);
else
Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeModel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeModel.java?rev=602161&r1=602160&r2=602161&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeModel.java (original)
+++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeModel.java Fri Dec 7 09:24:36 2007
@@ -81,8 +81,7 @@
current = (ReportTreeNode) ((ReportTreeNode) getRoot())
.getChildAt(0);
((TestElement) current.getUserObject()).addTestElement(item);
- ((ReportPlan) current.getUserObject()).setName(item
- .getPropertyAsString(TestElement.NAME));
+ ((ReportPlan) current.getUserObject()).setName(item.getName());
addSubTree(subTree.getTree(item), current);
} else {
if (subTree.getTree(item) != null) {
Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeNode.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeNode.java?rev=602161&r1=602160&r2=602161&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeNode.java (original)
+++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeNode.java Fri Dec 7 09:24:36 2007
@@ -36,14 +36,9 @@
import org.apache.jmeter.testelement.AbstractTestElement;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.property.BooleanProperty;
-import org.apache.jmeter.testelement.property.StringProperty;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
-/**
- * @author Peter Lin
- * @version $Revision$
- */
public class ReportTreeNode extends DefaultMutableTreeNode implements
NamedTreeNode {
transient private static Logger log = LoggingManager.getLoggerForClass();
@@ -149,13 +144,11 @@
}
public void setName(String name) {
- ((TestElement) getUserObject()).setProperty(new StringProperty(
- TestElement.NAME, name));
+ ((TestElement) getUserObject()).setName(name);
}
public String getName() {
- return ((TestElement) getUserObject())
- .getPropertyAsString(TestElement.NAME);
+ return ((TestElement) getUserObject()).getName();
}
public void nameChanged() {
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org