woolfel 2005/08/16 18:10:08
Modified: src/core/org/apache/jmeter/gui/tree JMeterTreeNode.java
src/core/org/apache/jmeter/gui/action ActionRouter.java
src/core/org/apache/jmeter/gui
AbstractJMeterGuiComponent.java MainFrame.java
NamePanel.java JMeterGUIComponent.java
Added: src/core/org/apache/jmeter/gui/tree NamedTreeNode.java
Log:
made some changes to support the report GUI
peter
Revision Changes Path
1.28 +3 -3
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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- JMeterTreeNode.java 12 Jul 2005 20:51:01 -0000 1.27
+++ JMeterTreeNode.java 17 Aug 2005 01:10:08 -0000 1.28
@@ -42,7 +42,7 @@
* @author Michael Stover
* @version $Revision$
*/
-public class JMeterTreeNode extends DefaultMutableTreeNode {
+public class JMeterTreeNode extends DefaultMutableTreeNode implements
NamedTreeNode {
transient private static Logger log =
LoggingManager.getLoggerForClass();
private JMeterTreeModel treeModel;
1.1
jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/NamedTreeNode.java
Index: NamedTreeNode.java
===================================================================
/*
* Created on Aug 16, 2005
*
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Style - Code Templates
*/
package org.apache.jmeter.gui.tree;
/**
* @author pete
*
* TODO To change the template for this generated type comment go to
* Window - Preferences - Java - Code Style - Code Templates
*/
public interface NamedTreeNode {
void setName(String name);
String getName();
void nameChanged();
}
1.24 +19 -16
jakarta-jmeter/src/core/org/apache/jmeter/gui/action/ActionRouter.java
Index: ActionRouter.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/ActionRouter.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ActionRouter.java 12 Jul 2005 20:50:26 -0000 1.23
+++ ActionRouter.java 17 Aug 2005 01:10:08 -0000 1.24
@@ -266,20 +266,23 @@
iterClasses = listClasses.iterator();
while (iterClasses.hasNext()) {
String strClassName = (String)
iterClasses.next();
- commandClass = Class.forName(strClassName);
- if
(!Modifier.isAbstract(commandClass.getModifiers())) {
- command = (Command)
commandClass.newInstance();
- Iterator iter =
command.getActionNames().iterator();
- while (iter.hasNext()) {
- String commandName = (String)
iter.next();
- Set commandObjects = (Set)
commands.get(commandName);
- if (commandObjects == null) {
- commandObjects = new
HashSet();
-
commands.put(commandName, commandObjects);
- }
- commandObjects.add(command);
- }
- }
+ if (strClassName.startsWith("org.apache.jmeter.gui")) {
+ log.info("classname:: " + strClassName);
+ commandClass = Class.forName(strClassName);
+ if (!Modifier.isAbstract(commandClass.getModifiers())) {
+ command = (Command) commandClass.newInstance();
+ Iterator iter = command.getActionNames().iterator();
+ while (iter.hasNext()) {
+ String commandName = (String) iter.next();
+ Set commandObjects = (Set)
commands.get(commandName);
+ if (commandObjects == null) {
+ commandObjects = new HashSet();
+ commands.put(commandName, commandObjects);
+ }
+ commandObjects.add(command);
+ }
+ }
+ }
}
} catch (Exception e) {
if
("java.awt.HeadlessException".equals(e.getClass().getName())) // JDK1.4:
1.35 +6 -6
jakarta-jmeter/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
Index: AbstractJMeterGuiComponent.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- AbstractJMeterGuiComponent.java 12 Jul 2005 20:50:54 -0000 1.34
+++ AbstractJMeterGuiComponent.java 17 Aug 2005 01:10:08 -0000 1.35
@@ -28,8 +28,8 @@
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.border.Border;
+import javax.swing.tree.TreeNode;
-import org.apache.jmeter.gui.tree.JMeterTreeNode;
import org.apache.jmeter.gui.util.VerticalPanel;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.property.BooleanProperty;
@@ -65,7 +65,7 @@
private boolean enabled = true;
/** The tree node which this component is associated with. */
- private JMeterTreeNode node;
+ private TreeNode node;
/** A GUI panel containing the name of this component. */
private NamePanel namePanel;
@@ -206,7 +206,7 @@
* Provides a default implementation for the node property. It is
unlikely
* developers would need to override this method.
*/
- public void setNode(JMeterTreeNode node) {
+ public void setNode(TreeNode node) {
this.node = node;
getNamePanel().setNode(node);
}
@@ -215,7 +215,7 @@
* Provides a default implementation for the node property. It is
unlikely
* developers would need to override this method.
*/
- protected JMeterTreeNode getNode() {
+ protected TreeNode getNode() {
return node;
}
1.30 +5 -5
jakarta-jmeter/src/core/org/apache/jmeter/gui/MainFrame.java
Index: MainFrame.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/MainFrame.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- MainFrame.java 16 Aug 2005 03:44:20 -0000 1.29
+++ MainFrame.java 17 Aug 2005 01:10:08 -0000 1.30
@@ -73,13 +73,13 @@
public class MainFrame extends JFrame implements TestListener, Remoteable {
/** The menu bar. */
- private JMeterMenuBar menuBar;
+ protected JMeterMenuBar menuBar;
/** The main panel where components display their GUIs. */
- private JScrollPane mainPanel;
+ protected JScrollPane mainPanel;
/** The panel where the test tree is shown. */
- private JScrollPane treePanel;
+ protected JScrollPane treePanel;
/** The test tree. */
protected JTree tree;
1.18 +8 -7
jakarta-jmeter/src/core/org/apache/jmeter/gui/NamePanel.java
Index: NamePanel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/NamePanel.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- NamePanel.java 12 Jul 2005 20:50:54 -0000 1.17
+++ NamePanel.java 17 Aug 2005 01:10:08 -0000 1.18
@@ -27,8 +27,9 @@
import javax.swing.JTextField;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
+import javax.swing.tree.TreeNode;
-import org.apache.jmeter.gui.tree.JMeterTreeNode;
+import org.apache.jmeter.gui.tree.NamedTreeNode;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.WorkBench;
import org.apache.jmeter.testelement.property.StringProperty;
@@ -48,7 +49,7 @@
private JLabel nameLabel;
/** The node which this component is providing the name for. */
- private JMeterTreeNode node;
+ private TreeNode node;
/**
* Create a new NamePanel with the default name.
@@ -118,7 +119,7 @@
*
* @return the tree node corresponding to this component
*/
- protected JMeterTreeNode getNode() {
+ protected TreeNode getNode() {
return node;
}
@@ -128,7 +129,7 @@
* @param node
* the tree node corresponding to this component
*/
- public void setNode(JMeterTreeNode node) {
+ public void setNode(TreeNode node) {
this.node = node;
}
@@ -184,7 +185,7 @@
*/
private void updateName(String newValue) {
if (getNode() != null) {
- getNode().nameChanged();
+ ((NamedTreeNode)getNode()).nameChanged();
}
}
1.16 +5 -5
jakarta-jmeter/src/core/org/apache/jmeter/gui/JMeterGUIComponent.java
Index: JMeterGUIComponent.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/JMeterGUIComponent.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- JMeterGUIComponent.java 12 Jul 2005 20:50:54 -0000 1.15
+++ JMeterGUIComponent.java 17 Aug 2005 01:10:08 -0000 1.16
@@ -22,7 +22,7 @@
import javax.swing.JPopupMenu;
-import org.apache.jmeter.gui.tree.JMeterTreeNode;
+import javax.swing.tree.TreeNode;
import org.apache.jmeter.testelement.TestElement;
/**
@@ -177,8 +177,8 @@
* @param node
* the tree node corresponding to this component
*/
- void setNode(JMeterTreeNode node);
-
+ void setNode(TreeNode node);
+
/**
* Clear the gui and return it to initial default values. This is
necessary
* because most gui classes are instantiated just once and re-used for
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
