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 js...@apache.org on 2004/02/20 03:20:47 UTC
cvs commit: jakarta-jmeter/src/core/org/apache/jmeter/gui/action EditCommand.java CheckDirty.java
jsalvata 2004/02/19 18:20:47
Modified: src/core/org/apache/jmeter/gui/tree JMeterTreeListener.java
src/core/org/apache/jmeter/gui GuiPackage.java
src/core/org/apache/jmeter/gui/action EditCommand.java
CheckDirty.java
Log:
Fix a bunch of bugs I just introduced by making
JMeterTreeNode no longer implement JMeterGUIComponent.
I've searched for more occurences of similar bugs and
I believe there's none left.
Revision Changes Path
1.15 +4 -6 jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java
Index: JMeterTreeListener.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- JMeterTreeListener.java 13 Feb 2004 02:21:36 -0000 1.14
+++ JMeterTreeListener.java 20 Feb 2004 02:20:47 -0000 1.15
@@ -39,7 +39,6 @@
import org.apache.jmeter.control.gui.TestPlanGui;
import org.apache.jmeter.control.gui.WorkBenchGui;
import org.apache.jmeter.gui.GuiPackage;
-import org.apache.jmeter.gui.JMeterGUIComponent;
import org.apache.jmeter.gui.MainFrame;
import org.apache.jmeter.gui.action.DragNDrop;
import org.apache.jmeter.util.JMeterUtils;
@@ -299,7 +298,7 @@
{
tree.setSelectionPath(currentPath);
}
- if (getCurrentNode() instanceof JMeterGUIComponent)
+ if (getCurrentNode() instanceof JMeterTreeNode)
{
log.debug("About to display pop-up");
displayPopUp(e);
@@ -368,8 +367,7 @@
private void displayPopUp(MouseEvent e)
{
- JPopupMenu pop =
- ((JMeterGUIComponent) getCurrentNode()).createPopupMenu();
+ JPopupMenu pop = getCurrentNode().createPopupMenu();
GuiPackage.getInstance().displayPopUp(e, pop);
}
1.31 +5 -6 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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- GuiPackage.java 20 Feb 2004 01:03:07 -0000 1.30
+++ GuiPackage.java 20 Feb 2004 02:20:47 -0000 1.31
@@ -514,10 +514,10 @@
public ValueReplacer getReplacer()
{
return new ValueReplacer(
- (TestPlan) ((JMeterGUIComponent) getTreeModel()
+ (TestPlan) ((JMeterTreeNode) getTreeModel()
.getTestPlan()
.getArray()[0])
- .createTestElement());
+ .getTestElement());
}
/**
@@ -618,8 +618,7 @@
// which is empty.]
getMainFrame().setMainPanel(
(javax.swing.JComponent) getCurrentGui());
- getMainFrame().setEditMenu(
- ((JMeterGUIComponent) getTreeListener().getCurrentNode())
+ getMainFrame().setEditMenu(getTreeListener().getCurrentNode()
.createPopupMenu());
}
}
1.7 +4 -8 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/EditCommand.java
Index: EditCommand.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/EditCommand.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- EditCommand.java 14 Feb 2004 03:34:28 -0000 1.6
+++ EditCommand.java 20 Feb 2004 02:20:47 -0000 1.7
@@ -22,7 +22,6 @@
import java.util.Set;
import org.apache.jmeter.gui.GuiPackage;
-import org.apache.jmeter.gui.JMeterGUIComponent;
import org.apache.jmeter.gui.NamePanel;
/**
@@ -46,11 +45,8 @@
GuiPackage guiPackage = GuiPackage.getInstance();
guiPackage.getMainFrame().setMainPanel(
(javax.swing.JComponent) guiPackage.getCurrentGui());
- guiPackage.getMainFrame().setEditMenu(
- ((JMeterGUIComponent) guiPackage
- .getTreeListener()
- .getCurrentNode())
- .createPopupMenu());
+ guiPackage.getMainFrame().setEditMenu(guiPackage.getTreeListener()
+ .getCurrentNode().createPopupMenu());
// TODO: I believe the following code (to the end of the method) is obsolete,
// since NamePanel no longer seems to be the GUI for any component:
if (!(guiPackage.getCurrentGui() instanceof NamePanel))
1.11 +5 -6 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/CheckDirty.java
Index: CheckDirty.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/CheckDirty.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CheckDirty.java 14 Feb 2004 03:34:28 -0000 1.10
+++ CheckDirty.java 20 Feb 2004 02:20:47 -0000 1.11
@@ -26,7 +26,6 @@
import java.util.Set;
import org.apache.jmeter.gui.GuiPackage;
-import org.apache.jmeter.gui.JMeterGUIComponent;
import org.apache.jmeter.gui.tree.JMeterTreeNode;
import org.apache.jorphan.collections.HashTree;
import org.apache.jorphan.collections.HashTreeTraverser;
@@ -131,14 +130,14 @@
public void addNode(Object node, HashTree subTree)
{
log.debug("Node is class:" + node.getClass());
- JMeterGUIComponent treeNode = (JMeterGUIComponent) node;
+ JMeterTreeNode treeNode = (JMeterTreeNode) node;
if (checkMode)
{
if (previousGuiItems.containsKey(treeNode))
{
if (!previousGuiItems
.get(treeNode)
- .equals(treeNode.createTestElement()))
+ .equals(treeNode.getTestElement()))
{
dirty = true;
}
@@ -156,7 +155,7 @@
{
previousGuiItems.put(
treeNode,
- treeNode.createTestElement().clone());
+ treeNode.getTestElement().clone());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org