jsalvata 2004/02/19 18:35:45
Modified: src/core/org/apache/jmeter/gui/action EnableComponent.java
src/core/org/apache/jmeter/gui GuiPackage.java
src/core/org/apache/jmeter/gui/tree JMeterTreeNode.java
Log:
Make cue for Activate/Disable be visible immediately.
Revision Changes Path
1.6 +4 -4
jakarta-jmeter/src/core/org/apache/jmeter/gui/action/EnableComponent.java
Index: EnableComponent.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/EnableComponent.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- EnableComponent.java 14 Feb 2004 03:34:28 -0000 1.5
+++ EnableComponent.java 20 Feb 2004 02:35:44 -0000 1.6
@@ -51,12 +51,12 @@
if (e.getActionCommand().equals(ENABLE))
{
log.debug("enabling current gui object");
- GuiPackage.getInstance().getCurrentGui().setEnabled(true);
+ GuiPackage.getInstance().getCurrentNode().setEnabled(true);
}
else if (e.getActionCommand().equals(DISABLE))
{
log.debug("disabling current gui object");
- GuiPackage.getInstance().getCurrentGui().setEnabled(false);
+ GuiPackage.getInstance().getCurrentNode().setEnabled(false);
}
}
1.32 +8 -3 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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- GuiPackage.java 20 Feb 2004 02:20:47 -0000 1.31
+++ GuiPackage.java 20 Feb 2004 02:35:45 -0000 1.32
@@ -429,9 +429,14 @@
}
}
+ public JMeterTreeNode getCurrentNode()
+ {
+ return treeListener.getCurrentNode();
+ }
+
public TestElement getCurrentElement()
{
- return treeListener.getCurrentNode().getTestElement();
+ return getCurrentNode().getTestElement();
}
/**
1.23 +3 -24
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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- JMeterTreeNode.java 20 Feb 2004 01:08:34 -0000 1.22
+++ JMeterTreeNode.java 20 Feb 2004 02:35:45 -0000 1.23
@@ -71,10 +71,7 @@
{
getTestElement().setProperty(
new BooleanProperty(TestElement.ENABLED, enabled));
- }
-
- public void clear()
- {
+ treeModel.nodeChanged(this);
}
public ImageIcon getIcon()
@@ -144,19 +141,6 @@
}
}
- public void configure(TestElement element)
- {
-
- }
-
- /**
- * Modifies a given TestElement to mirror the data in the gui components.
- */
- public void modifyTestElement(TestElement el)
- {
-
- }
-
public TestElement getTestElement()
{
return (TestElement) getUserObject();
@@ -180,11 +164,6 @@
{
return ((TestElement) getUserObject()).getPropertyAsString(
TestElement.NAME);
- }
-
- public void setNode(JMeterTreeNode node)
- {
-
}
public void nameChanged()
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
