jsalvata 2004/02/19 17:03:08
Modified: src/components/org/apache/jmeter/control
ModuleController.java
src/core/org/apache/jmeter/gui/action Clear.java Save.java
AbstractAction.java Remove.java
src/components/org/apache/jmeter/control/gui
ModuleControllerGui.java
src/core/org/apache/jmeter/gui GuiPackage.java
src/protocol/http/org/apache/jmeter/protocol/http/proxy
ProxyControl.java
src/core/org/apache/jmeter/gui/tree JMeterTreeNode.java
src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui
ProxyControlGui.java
Log:
It's been long since JMeterTreeNode.createTestElement
was creating anything -- so renamed it to getTestElement,
which is a good name for what it does now.
Revision Changes Path
1.7 +3 -3
jakarta-jmeter/src/components/org/apache/jmeter/control/ModuleController.java
Index: ModuleController.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/control/ModuleController.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ModuleController.java 13 Feb 2004 01:31:55 -0000 1.6
+++ ModuleController.java 20 Feb 2004 01:03:07 -0000 1.7
@@ -86,7 +86,7 @@
{
if (selectedNode != null)
{
- return selectedNode.createTestElement();
+ return selectedNode.getTestElement();
}
else
{
1.8 +3 -3 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Clear.java
Index: Clear.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Clear.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Clear.java 13 Feb 2004 02:21:36 -0000 1.7
+++ Clear.java 20 Feb 2004 01:03:07 -0000 1.8
@@ -84,7 +84,7 @@
{
Clearable item =
(Clearable) guiPackage.getGui(
- ((JMeterTreeNode) iter.next()).createTestElement());
+ ((JMeterTreeNode) iter.next()).getTestElement());
item.clear();
}
catch (Exception ex)
1.22 +6 -6 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Save.java
Index: Save.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Save.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Save.java 19 Feb 2004 00:11:06 -0000 1.21
+++ Save.java 20 Feb 2004 01:03:07 -0000 1.22
@@ -166,7 +166,7 @@
{
JMeterTreeNode item = (JMeterTreeNode) iter.next();
convertSubTree(tree.getTree(item));
- TestElement testElement = item.createTestElement();
+ TestElement testElement = item.getTestElement();
tree.replace(item, testElement);
}
}
@@ -193,18 +193,18 @@
save.convertSubTree(tree);
assertEquals(
tree.getArray()[0].getClass().getName(),
- root.createTestElement().getClass().getName());
+ root.getTestElement().getClass().getName());
tree = tree.getTree(tree.getArray()[0]);
assertEquals(
tree.getArray()[0].getClass().getName(),
- root.createTestElement().getClass().getName());
+ root.getTestElement().getClass().getName());
assertEquals(
tree
.getTree(tree.getArray()[0])
.getArray()[0]
.getClass()
.getName(),
- root.createTestElement().getClass().getName());
+ root.getTestElement().getClass().getName());
}
}
1.12 +4 -4
jakarta-jmeter/src/core/org/apache/jmeter/gui/action/AbstractAction.java
Index: AbstractAction.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/AbstractAction.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AbstractAction.java 14 Feb 2004 03:34:28 -0000 1.11
+++ AbstractAction.java 20 Feb 2004 01:03:07 -0000 1.12
@@ -61,7 +61,7 @@
if (item.getUserObject() instanceof ReplaceableController)
{
ReplaceableController rc =
- (ReplaceableController) item.createTestElement();
+ (ReplaceableController) item.getTestElement();
HashTree subTree = tree.getTree(item);
if (subTree != null)
@@ -74,7 +74,7 @@
else
{
convertSubTree(tree.getTree(item));
- TestElement testElement = item.createTestElement();
+ TestElement testElement = item.getTestElement();
tree.replace(item, testElement);
}
}
1.10 +3 -3 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Remove.java
Index: Remove.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Remove.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Remove.java 13 Feb 2004 02:40:54 -0000 1.9
+++ Remove.java 20 Feb 2004 01:03:07 -0000 1.10
@@ -75,6 +75,6 @@
public static void removeNode(JMeterTreeNode node)
{
GuiPackage.getInstance().getTreeModel().removeNodeFromParent(node);
- GuiPackage.getInstance().removeNode(node.createTestElement());
+ GuiPackage.getInstance().removeNode(node.getTestElement());
}
}
1.15 +3 -3
jakarta-jmeter/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java
Index: ModuleControllerGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ModuleControllerGui.java 13 Feb 2004 01:31:55 -0000 1.14
+++ ModuleControllerGui.java 20 Feb 2004 01:03:07 -0000 1.15
@@ -219,7 +219,7 @@
{
StringBuffer name = new StringBuffer();
JMeterTreeNode cur = (JMeterTreeNode) node.getChildAt(i);
- TestElement te = cur.createTestElement();
+ TestElement te = cur.getTestElement();
if (te instanceof ThreadGroup)
{
name.append(parent_name);
1.30 +7 -7 jakarta-jmeter/src/core/org/apache/jmeter/gui/GuiPackage.java
Index: GuiPackage.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/GuiPackage.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- GuiPackage.java 13 Feb 2004 02:21:37 -0000 1.29
+++ GuiPackage.java 20 Feb 2004 01:03:07 -0000 1.30
@@ -243,7 +243,7 @@
try
{
TestElement currentNode =
- treeListener.getCurrentNode().createTestElement();
+ treeListener.getCurrentNode().getTestElement();
JMeterGUIComponent comp = getGui(currentNode);
if(!(comp instanceof AbstractVisualizer)) // TODO: a hack that needs
to be fixed for 2.0
{
@@ -398,7 +398,7 @@
public void updateCurrentGui()
{
currentNode= treeListener.getCurrentNode();
- TestElement element = currentNode.createTestElement();
+ TestElement element = currentNode.getTestElement();
JMeterGUIComponent comp = getGui(element);
comp.configure(element);
}
@@ -417,8 +417,8 @@
log.debug(
"Updating current node " + currentNode.getName());
JMeterGUIComponent comp =
- getGui(currentNode.createTestElement());
- TestElement el = currentNode.createTestElement();
+ getGui(currentNode.getTestElement());
+ TestElement el = currentNode.getTestElement();
comp.modifyTestElement(el);
}
currentNode = treeListener.getCurrentNode();
@@ -431,7 +431,7 @@
public TestElement getCurrentElement()
{
- return treeListener.getCurrentNode().createTestElement();
+ return treeListener.getCurrentNode().getTestElement();
}
/**
1.51 +7 -7
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
Index: ProxyControl.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ProxyControl.java 12 Feb 2004 00:15:00 -0000 1.50
+++ ProxyControl.java 20 Feb 2004 01:03:07 -0000 1.51
@@ -394,7 +394,7 @@
JMeterTreeNode templateNode= (JMeterTreeNode)children.nextElement();
if (templateNode.isEnabled())
{
- TestElement template= templateNode.createTestElement();
+ TestElement template= templateNode.getTestElement();
if (template instanceof Timer)
{
TestElement timer= (TestElement)template.clone();
@@ -594,7 +594,7 @@
for (int i= myTarget.getChildCount()-1; i>=0; i--)
{
JMeterTreeNode c= (JMeterTreeNode)myTarget.getChildAt(i);
- if (c.createTestElement() instanceof GenericController)
+ if (c.getTestElement() instanceof GenericController)
{
myTarget= c;
break;
@@ -783,7 +783,7 @@
(JMeterTreeNode) enum.nextElement();
if (subNode.isEnabled()) {
TestElement testElement =
- (TestElement) subNode.createTestElement();
+ (TestElement) subNode.getTestElement();
if (testElement instanceof SampleListener) {
((SampleListener)testElement).sampleOccurred(event);
}
@@ -806,7 +806,7 @@
(JMeterTreeNode) enum.nextElement();
if (subNode.isEnabled()) {
TestElement testElement =
- (TestElement) subNode.createTestElement();
+ (TestElement) subNode.getTestElement();
if (testElement instanceof TestListener) {
((TestListener)testElement).testStarted();
}
@@ -829,7 +829,7 @@
(JMeterTreeNode) enum.nextElement();
if (subNode.isEnabled()) {
TestElement testElement =
- (TestElement) subNode.createTestElement();
+ (TestElement) subNode.getTestElement();
if (testElement instanceof TestListener) {
((TestListener)testElement).testEnded();
}
1.21 +11 -11
jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
Index: JMeterTreeNode.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- JMeterTreeNode.java 20 Feb 2004 00:56:03 -0000 1.20
+++ JMeterTreeNode.java 20 Feb 2004 01:03:07 -0000 1.21
@@ -62,13 +62,13 @@
public boolean isEnabled()
{
return (
- (AbstractTestElement) createTestElement()).getPropertyAsBoolean(
+ (AbstractTestElement) getTestElement()).getPropertyAsBoolean(
TestElement.ENABLED);
}
public void setEnabled(boolean enabled)
{
- createTestElement().setProperty(
+ getTestElement().setProperty(
new BooleanProperty(TestElement.ENABLED, enabled));
}
@@ -80,12 +80,12 @@
{
try
{
- if (createTestElement() instanceof TestBean)
+ if (getTestElement() instanceof TestBean)
{
try
{
Image img= Introspector.getBeanInfo(
- createTestElement().getClass())
+ getTestElement().getClass())
.getIcon(BeanInfo.ICON_COLOR_16x16);
if (img == null) return null;
return new ImageIcon(img);
@@ -100,13 +100,13 @@
{
return GUIFactory.getIcon(
Class.forName(
- createTestElement().getPropertyAsString(
+ getTestElement().getPropertyAsString(
TestElement.GUI_CLASS)));
}
}
catch (ClassNotFoundException e)
{
- log.warn("Can't get icon for class " + createTestElement(), e);
+ log.warn("Can't get icon for class " + getTestElement(), e);
return null;
}
}
@@ -117,7 +117,7 @@
{
return GuiPackage
.getInstance()
- .getGui(createTestElement())
+ .getGui(getTestElement())
.getMenuCategories();
}
catch (Exception e)
@@ -133,7 +133,7 @@
{
return GuiPackage
.getInstance()
- .getGui(createTestElement())
+ .getGui(getTestElement())
.createPopupMenu();
}
catch (Exception e)
@@ -156,7 +156,7 @@
}
- public TestElement createTestElement()
+ public TestElement getTestElement()
{
return (TestElement) getUserObject();
}
1.40 +3 -3
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
Index: ProxyControlGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ProxyControlGui.java 12 Feb 2004 02:58:26 -0000 1.39
+++ ProxyControlGui.java 20 Feb 2004 01:03:08 -0000 1.40
@@ -690,7 +690,7 @@
{
StringBuffer name = new StringBuffer();
JMeterTreeNode cur = (JMeterTreeNode) node.getChildAt(i);
- TestElement te = cur.createTestElement();
+ TestElement te = cur.getTestElement();
if (te instanceof ThreadGroup)
{
name.append(parent_name);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
