mstover1 2002/06/06 06:48:27
Modified: src_1/org/apache/jmeter/assertions/gui
AbstractAssertionGui.java
src_1/org/apache/jmeter/config/gui AbstractConfigGui.java
AbstractModifierGui.java
AbstractResponseBasedModifierGui.java
src_1/org/apache/jmeter/control/gui
AbstractControllerGui.java
InterleaveControlGui.java LogicControllerGui.java
LoopControlPanel.java ModifyControllerGui.java
OnceOnlyControllerGui.java
src_1/org/apache/jmeter/gui MainFrame.java
src_1/org/apache/jmeter/gui/action ActionRouter.java
CheckDirty.java Load.java Save.java
src_1/org/apache/jmeter/gui/tree JMeterTreeModel.java
src_1/org/apache/jmeter/gui/util JMeterMenuBar.java
MenuFactory.java
src_1/org/apache/jmeter/protocol/http/control
AuthManager.java
src_1/org/apache/jmeter/reporters ResultCollector.java
src_1/org/apache/jmeter/samplers SampleResult.java
src_1/org/apache/jmeter/samplers/gui AbstractSamplerGui.java
src_1/org/apache/jmeter/save/old/handlers
FtpTestHandler.java JMeterHandler.java
JdbcTestSampleHandler.java
src_1/org/apache/jmeter/timers/gui AbstractTimerGui.java
src_1/org/apache/jmeter/visualizers StatVisualizer.java
src_1/org/apache/jmeter/visualizers/gui
AbstractVisualizer.java
Log:
Cleaning up abstract class hierarchy
further improvements to loading 1.7 test scripts
Revision Changes Path
1.2 +8 -45
jakarta-jmeter/src_1/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java
Index: AbstractAssertionGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractAssertionGui.java 19 Apr 2002 02:31:47 -0000 1.1
+++ AbstractAssertionGui.java 6 Jun 2002 13:48:25 -0000 1.2
@@ -1,11 +1,13 @@
package org.apache.jmeter.assertions.gui;
-import org.apache.jmeter.gui.JMeterGUIComponent;
-import org.apache.jmeter.testelement.TestElement;
-import javax.swing.*;
-import java.util.*;
-import org.apache.jmeter.gui.util.MenuFactory;
+import java.util.Arrays;
+import java.util.Collection;
+
+import javax.swing.JPopupMenu;
+import org.apache.jmeter.gui.AbstractJMeterGuiComponent;
import org.apache.jmeter.gui.NamePanel;
+import org.apache.jmeter.gui.util.MenuFactory;
+import org.apache.jmeter.testelement.TestElement;
/**
* Title: JMeter
@@ -16,52 +18,13 @@
* @version 1.0
*/
-public abstract class AbstractAssertionGui extends JPanel implements
JMeterGUIComponent
+public abstract class AbstractAssertionGui extends AbstractJMeterGuiComponent
{
- private NamePanel namePanel;
-
- public AbstractAssertionGui()
- {
- namePanel = new NamePanel();
- setName(getStaticLabel());
- }
-
- public void setName(String name)
- {
- namePanel.setName(name);
- }
- public String getName()
- {
- return namePanel.getName();
- }
-
- protected NamePanel getNamePanel()
- {
- return namePanel;
- }
-
- protected void configureTestElement(TestElement mc)
- {
- mc.setProperty(TestElement.NAME, getName());
- mc.setProperty(TestElement.GUI_CLASS, this.getClass().getName());
- mc.setProperty(TestElement.TEST_CLASS, mc.getClass().getName());
- }
-
public JPopupMenu createPopupMenu()
{
return MenuFactory.getDefaultAssertionMenu();
}
-
- /****************************************
- * !ToDo (Method description)
- *
- *@param element !ToDo (Parameter description)
- ***************************************/
- public void configure(TestElement element)
- {
- setName((String)element.getProperty(TestElement.NAME));
- }
public Collection getMenuCategories()
{
1.5 +10 -49
jakarta-jmeter/src_1/org/apache/jmeter/config/gui/AbstractConfigGui.java
Index: AbstractConfigGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/config/gui/AbstractConfigGui.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractConfigGui.java 23 May 2002 15:47:04 -0000 1.4
+++ AbstractConfigGui.java 6 Jun 2002 13:48:25 -0000 1.5
@@ -53,11 +53,12 @@
* <http://www.apache.org/>.
*/
package org.apache.jmeter.config.gui;
-import java.awt.event.*;
-import java.util.*;
-import javax.swing.*;
-import org.apache.jmeter.config.*;
-import org.apache.jmeter.gui.*;
+import java.util.Arrays;
+import java.util.Collection;
+
+import javax.swing.JPopupMenu;
+import org.apache.jmeter.gui.AbstractJMeterGuiComponent;
+import org.apache.jmeter.gui.NamePanel;
import org.apache.jmeter.gui.util.MenuFactory;
import org.apache.jmeter.testelement.TestElement;
@@ -65,44 +66,15 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2002/05/23 15:47:04 $
+ *@created $Date: 2002/06/06 13:48:25 $
*@version 1.0
***************************************/
-public abstract class AbstractConfigGui extends JPanel implements JMeterGUIComponent
+public abstract class AbstractConfigGui extends AbstractJMeterGuiComponent
{
-
- private NamePanel namePanel;
- public AbstractConfigGui()
- {
- namePanel = new NamePanel();
- setName(getStaticLabel());
- }
-
- public void setName(String name)
- {
- namePanel.setName(name);
- }
- public String getName()
- {
- return namePanel.getName();
- }
-
- protected NamePanel getNamePanel()
- {
- return namePanel;
- }
- /****************************************
- * !ToDo (Method description)
- *
- *@param element !ToDo (Parameter description)
- ***************************************/
- public void configure(TestElement element)
- {
- setName((String)element.getProperty(TestElement.NAME));
- }
+
/****************************************
* !ToDo (Method description)
@@ -124,16 +96,5 @@
return Arrays.asList(new String[]{MenuFactory.CONFIG_ELEMENTS});
}
- /****************************************
- * !ToDo (Method description)
- *
- *@param mc !ToDo (Parameter description)
- ***************************************/
- protected void configureTestElement(TestElement mc)
- {
- mc.setProperty(TestElement.NAME, getName());
- mc.setProperty(TestElement.GUI_CLASS, this.getClass().getName());
- mc.setProperty(TestElement.TEST_CLASS, mc.getClass().getName());
- }
-
+
}
1.2 +7 -42
jakarta-jmeter/src_1/org/apache/jmeter/config/gui/AbstractModifierGui.java
Index: AbstractModifierGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/config/gui/AbstractModifierGui.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractModifierGui.java 19 Apr 2002 02:31:47 -0000 1.1
+++ AbstractModifierGui.java 6 Jun 2002 13:48:25 -0000 1.2
@@ -1,11 +1,13 @@
package org.apache.jmeter.config.gui;
-import org.apache.jmeter.gui.JMeterGUIComponent;
-import org.apache.jmeter.testelement.TestElement;
+import java.util.Arrays;
+import java.util.Collection;
+
+import javax.swing.JPopupMenu;
+import org.apache.jmeter.gui.AbstractJMeterGuiComponent;
import org.apache.jmeter.gui.NamePanel;
import org.apache.jmeter.gui.util.MenuFactory;
-import javax.swing.*;
-import java.util.*;
+import org.apache.jmeter.testelement.TestElement;
/**
* Title: JMeter
@@ -16,51 +18,14 @@
* @version 1.0
*/
-public abstract class AbstractModifierGui extends JPanel implements
JMeterGUIComponent
+public abstract class AbstractModifierGui extends AbstractJMeterGuiComponent
{
- private NamePanel namePanel;
- public AbstractModifierGui()
- {
- namePanel = new NamePanel();
- setName(getStaticLabel());
- }
-
- public void setName(String name)
- {
- namePanel.setName(name);
- }
- public String getName()
- {
- return namePanel.getName();
- }
-
- protected NamePanel getNamePanel()
- {
- return namePanel;
- }
-
- protected void configureTestElement(TestElement mc)
- {
- mc.setProperty(TestElement.NAME, getName());
- mc.setProperty(TestElement.GUI_CLASS, this.getClass().getName());
- mc.setProperty(TestElement.TEST_CLASS, mc.getClass().getName());
- }
public JPopupMenu createPopupMenu()
{
return MenuFactory.getDefaultModifierMenu();
}
-
- /****************************************
- * !ToDo (Method description)
- *
- *@param element !ToDo (Parameter description)
- ***************************************/
- public void configure(TestElement element)
- {
- setName((String)element.getProperty(TestElement.NAME));
- }
public Collection getMenuCategories()
{
1.2 +6 -6
jakarta-jmeter/src_1/org/apache/jmeter/config/gui/AbstractResponseBasedModifierGui.java
Index: AbstractResponseBasedModifierGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/config/gui/AbstractResponseBasedModifierGui.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractResponseBasedModifierGui.java 19 Apr 2002 02:31:47 -0000 1.1
+++ AbstractResponseBasedModifierGui.java 6 Jun 2002 13:48:25 -0000 1.2
@@ -1,11 +1,11 @@
package org.apache.jmeter.config.gui;
-import org.apache.jmeter.gui.JMeterGUIComponent;
-import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.gui.NamePanel;
+import java.util.Arrays;
+import java.util.Collection;
+
+import javax.swing.JPopupMenu;
+import org.apache.jmeter.gui.AbstractJMeterGuiComponent;
import org.apache.jmeter.gui.util.MenuFactory;
-import javax.swing.*;
-import java.util.*;
/**
* Title: JMeter
@@ -16,7 +16,7 @@
* @version 1.0
*/
-public abstract class AbstractResponseBasedModifierGui extends AbstractModifierGui
implements JMeterGUIComponent
+public abstract class AbstractResponseBasedModifierGui extends
AbstractJMeterGuiComponent
{
public JPopupMenu createPopupMenu()
1.3 +7 -26
jakarta-jmeter/src_1/org/apache/jmeter/control/gui/AbstractControllerGui.java
Index: AbstractControllerGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/control/gui/AbstractControllerGui.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractControllerGui.java 29 Apr 2002 17:08:07 -0000 1.2
+++ AbstractControllerGui.java 6 Jun 2002 13:48:25 -0000 1.3
@@ -1,7 +1,9 @@
package org.apache.jmeter.control.gui;
-import java.util.*;
-import javax.swing.*;
-import org.apache.jmeter.gui.JMeterGUIComponent;
+import java.util.Arrays;
+import java.util.Collection;
+
+import javax.swing.JPopupMenu;
+import org.apache.jmeter.gui.AbstractJMeterGuiComponent;
import org.apache.jmeter.gui.util.MenuFactory;
import org.apache.jmeter.testelement.TestElement;
@@ -9,11 +11,11 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2002/04/29 17:08:07 $
+ *@created $Date: 2002/06/06 13:48:25 $
*@version 1.0
***************************************/
-public abstract class AbstractControllerGui extends JPanel implements
JMeterGUIComponent
+public abstract class AbstractControllerGui extends AbstractJMeterGuiComponent
{
/****************************************
@@ -36,25 +38,4 @@
return MenuFactory.getDefaultControllerMenu();
}
- /****************************************
- * !ToDo (Method description)
- *
- *@param element !ToDo (Parameter description)
- ***************************************/
- public void configure(TestElement element)
- {
- setName((String)element.getProperty(TestElement.NAME));
- }
-
- /****************************************
- * !ToDo (Method description)
- *
- *@param mc !ToDo (Parameter description)
- ***************************************/
- protected void configureTestElement(TestElement mc)
- {
- mc.setProperty(TestElement.NAME, getName());
- mc.setProperty(TestElement.GUI_CLASS, this.getClass().getName());
- mc.setProperty(TestElement.TEST_CLASS, mc.getClass().getName());
}
-}
1.3 +1 -2
jakarta-jmeter/src_1/org/apache/jmeter/control/gui/InterleaveControlGui.java
Index: InterleaveControlGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/control/gui/InterleaveControlGui.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InterleaveControlGui.java 29 Apr 2002 17:08:07 -0000 1.2
+++ InterleaveControlGui.java 6 Jun 2002 13:48:25 -0000 1.3
@@ -69,14 +69,13 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Kevin Hammond
- *@created $Date: 2002/04/29 17:08:07 $
+ *@created $Date: 2002/06/06 13:48:25 $
*@version 1.0
***************************************/
public class InterleaveControlGui extends AbstractControllerGui
{
InterleaveControl model;
- NamePanel namePanel;
/****************************************
* !ToDo (Constructor description)
1.3 +1 -2
jakarta-jmeter/src_1/org/apache/jmeter/control/gui/LogicControllerGui.java
Index: LogicControllerGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/control/gui/LogicControllerGui.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LogicControllerGui.java 29 Apr 2002 17:08:07 -0000 1.2
+++ LogicControllerGui.java 6 Jun 2002 13:48:25 -0000 1.3
@@ -69,13 +69,12 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Kevin Hammond
- *@created $Date: 2002/04/29 17:08:07 $
+ *@created $Date: 2002/06/06 13:48:25 $
*@version 1.0
***************************************/
public class LogicControllerGui extends AbstractControllerGui
{
- NamePanel namePanel;
/****************************************
* !ToDo (Constructor description)
1.4 +1 -2
jakarta-jmeter/src_1/org/apache/jmeter/control/gui/LoopControlPanel.java
Index: LoopControlPanel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/control/gui/LoopControlPanel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LoopControlPanel.java 29 Apr 2002 17:08:07 -0000 1.3
+++ LoopControlPanel.java 6 Jun 2002 13:48:25 -0000 1.4
@@ -15,7 +15,7 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2002/04/29 17:08:07 $
+ *@created $Date: 2002/06/06 13:48:25 $
*@version 1.0
***************************************/
@@ -25,7 +25,6 @@
JCheckBox infinite;
JTextField loops;
- NamePanel namePanel;
private boolean displayName = true;
private static String INFINITE = "Infinite Field";
1.4 +1 -2
jakarta-jmeter/src_1/org/apache/jmeter/control/gui/ModifyControllerGui.java
Index: ModifyControllerGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/control/gui/ModifyControllerGui.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ModifyControllerGui.java 20 May 2002 13:05:50 -0000 1.3
+++ ModifyControllerGui.java 6 Jun 2002 13:48:25 -0000 1.4
@@ -73,14 +73,13 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Kevin Hammond
- *@created $Date: 2002/05/20 13:05:50 $
+ *@created $Date: 2002/06/06 13:48:25 $
*@version 1.0
***************************************/
public class ModifyControllerGui extends AbstractControllerGui
{
ModifyController model;
- NamePanel namePanel;
/****************************************
* !ToDo (Constructor description)
1.3 +1 -2
jakarta-jmeter/src_1/org/apache/jmeter/control/gui/OnceOnlyControllerGui.java
Index: OnceOnlyControllerGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/control/gui/OnceOnlyControllerGui.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OnceOnlyControllerGui.java 29 Apr 2002 17:08:07 -0000 1.2
+++ OnceOnlyControllerGui.java 6 Jun 2002 13:48:25 -0000 1.3
@@ -69,14 +69,13 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Kevin Hammond
- *@created $Date: 2002/04/29 17:08:07 $
+ *@created $Date: 2002/06/06 13:48:25 $
*@version 1.0
***************************************/
public class OnceOnlyControllerGui extends AbstractControllerGui
{
OnceOnlyController model;
- NamePanel namePanel;
/****************************************
* !ToDo (Constructor description)
1.11 +0 -0 jakarta-jmeter/src_1/org/apache/jmeter/gui/MainFrame.java
Index: MainFrame.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/gui/MainFrame.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MainFrame.java 5 Jun 2002 03:29:06 -0000 1.10
+++ MainFrame.java 6 Jun 2002 13:48:26 -0000 1.11
@@ -70,7 +70,7 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2002/06/05 03:29:06 $
+ *@created $Date: 2002/06/06 13:48:26 $
*@version 1.0
***************************************/
@@ -404,8 +404,8 @@
* !ToDo (Class description)
*
*@author $Author: mstover1 $
- *@created $Date: 2002/06/05 03:29:06 $
- *@version $Revision: 1.10 $
+ *@created $Date: 2002/06/06 13:48:26 $
+ *@version $Revision: 1.11 $
***************************************/
private class WindowHappenings extends WindowAdapter
{
1.3 +20 -2
jakarta-jmeter/src_1/org/apache/jmeter/gui/action/ActionRouter.java
Index: ActionRouter.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/gui/action/ActionRouter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ActionRouter.java 29 Apr 2002 17:08:08 -0000 1.2
+++ ActionRouter.java 6 Jun 2002 13:48:26 -0000 1.3
@@ -91,7 +91,19 @@
{
try
{
- ((Command) commands.get(e.getActionCommand())).doAction(e);
+ Set commandObjects = (Set)commands.get(e.getActionCommand());
+ Iterator iter = commandObjects.iterator();
+ while(iter.hasNext())
+ {
+ try
+ {
+ ((Command)iter.next()).doAction(e);
+ }
+ catch(Exception err)
+ {
+ err.printStackTrace();
+ }
+ }
}
catch (NullPointerException er)
{
@@ -128,7 +140,13 @@
while (iter.hasNext())
{
String commandName =
(String)iter.next();
- commands.put(commandName, command);
+ Set commandObjects =
(Set)commands.get(commandName);
+ if(commandObjects == null)
+ {
+ commandObjects = new HashSet();
+
commands.put(commandName,commandObjects);
+ }
+ commandObjects.add(command);
}
}
}
1.2 +10 -1
jakarta-jmeter/src_1/org/apache/jmeter/gui/action/CheckDirty.java
Index: CheckDirty.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/gui/action/CheckDirty.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CheckDirty.java 17 May 2002 01:29:34 -0000 1.1
+++ CheckDirty.java 6 Jun 2002 13:48:26 -0000 1.2
@@ -19,6 +19,8 @@
public static final String SUB_TREE_SAVED = "sub_tree_saved";
public static final String SUB_TREE_LOADED = "sub_tree_loaded";
public static final String ADD_ALL = "add_all";
+ public static final String SAVE = "save";
+ public static final String SAVE_ALL = "save_all";
boolean checkMode = false;
boolean dirty = false;
@@ -30,6 +32,8 @@
commands.add(SUB_TREE_SAVED);
commands.add(SUB_TREE_LOADED);
commands.add(ADD_ALL);
+ commands.add(SAVE);
+ commands.add(SAVE_ALL);
}
public CheckDirty()
@@ -43,9 +47,14 @@
*/
public void doAction(ActionEvent e) {
String action = e.getActionCommand();
- if(action.equals(SUB_TREE_SAVED))
+ if(action.equals(SUB_TREE_SAVED) || action.equals(SAVE))
{
ListedHashTree subTree =
GuiPackage.getInstance().getCurrentSubTree();
+ subTree.traverse(this);
+ }
+ else if(action.equals(SAVE_ALL))
+ {
+ ListedHashTree subTree =
GuiPackage.getInstance().getTreeModel().getTestPlan();
subTree.traverse(this);
}
else if(action.equals(SUB_TREE_LOADED))
1.8 +0 -0 jakarta-jmeter/src_1/org/apache/jmeter/gui/action/Load.java
Index: Load.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/gui/action/Load.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Load.java 5 Jun 2002 03:29:06 -0000 1.7
+++ Load.java 6 Jun 2002 13:48:26 -0000 1.8
@@ -85,7 +85,7 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2002/06/05 03:29:06 $
+ *@created $Date: 2002/06/06 13:48:26 $
*@version 1.0
***************************************/
public class Load implements Command
1.5 +13 -4 jakarta-jmeter/src_1/org/apache/jmeter/gui/action/Save.java
Index: Save.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/gui/action/Save.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Save.java 17 May 2002 01:29:34 -0000 1.4
+++ Save.java 6 Jun 2002 13:48:26 -0000 1.5
@@ -74,11 +74,14 @@
public class Save implements Command
{
+ private final static String SAVE_ALL = "save_all";
+ private final static String SAVE = "save";
private static Set commands = new HashSet();
static
{
- commands.add(JMeterUtils.getResString("save"));
+ commands.add(SAVE);
+ commands.add(SAVE_ALL);
}
@@ -106,7 +109,15 @@
***************************************/
public void doAction(ActionEvent e)
{
- ListedHashTree subTree = GuiPackage.getInstance().getCurrentSubTree();
+ ListedHashTree subTree = null;
+ if(e.getActionCommand().equals(SAVE))
+ {
+ subTree = GuiPackage.getInstance().getCurrentSubTree();
+ }
+ else if(e.getActionCommand().equals(SAVE_ALL))
+ {
+ subTree =
GuiPackage.getInstance().getTreeModel().getTestPlan();
+ }
try
{
convertSubTree(subTree);
@@ -123,8 +134,6 @@
{
writer = new FileOutputStream(chooser.getSelectedFile());
SaveService.saveSubTree(subTree,writer);
- ActionRouter.getInstance().actionPerformed(new ActionEvent(
-
e.getSource(),e.getID(),CheckDirty.SUB_TREE_SAVED));
}
catch(Throwable ex)
{
1.5 +2 -2
jakarta-jmeter/src_1/org/apache/jmeter/gui/tree/JMeterTreeModel.java
Index: JMeterTreeModel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/gui/tree/JMeterTreeModel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JMeterTreeModel.java 2 May 2002 22:54:58 -0000 1.4
+++ JMeterTreeModel.java 6 Jun 2002 13:48:26 -0000 1.5
@@ -73,7 +73,7 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2002/05/02 22:54:58 $
+ *@created $Date: 2002/06/06 13:48:26 $
*@version 1.0
***************************************/
@@ -198,6 +198,6 @@
public ListedHashTree getTestPlan()
{
- return getCurrentSubTree((JMeterTreeNode)this.getRoot());
+ return
getCurrentSubTree((JMeterTreeNode)((JMeterTreeNode)this.getRoot()).getChildAt(0));
}
}
1.6 +4 -18
jakarta-jmeter/src_1/org/apache/jmeter/gui/util/JMeterMenuBar.java
Index: JMeterMenuBar.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/gui/util/JMeterMenuBar.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JMeterMenuBar.java 29 May 2002 22:52:35 -0000 1.5
+++ JMeterMenuBar.java 6 Jun 2002 13:48:26 -0000 1.6
@@ -74,14 +74,13 @@
* Apache Foundation
*
*@author Michael Stover
- *@created $Date: 2002/05/29 22:52:35 $
+ *@created $Date: 2002/06/06 13:48:26 $
*@version 1.0
***************************************/
public class JMeterMenuBar extends JMenuBar
{
JMenu fileMenu;
- JMenuItem file_save;
JMenuItem file_save_all;
JMenuItem file_load;
JMenuItem file_exit;
@@ -133,13 +132,7 @@
***************************************/
public void setFileSaveEnabled(boolean enabled)
{
- file_save.setEnabled(enabled);
-
- // Currently, SAVE ALL is not implemented. It actually generates
- // a nasty exception when selected. Therefore, for now, always
- // make the SAVE ALL menu item disabled.
- //file_save_all.setEnabled(save);
- file_save_all.setEnabled(false);
+ file_save_all.setEnabled(enabled);
}
/****************************************
@@ -275,21 +268,15 @@
// FILE MENU
fileMenu = new JMenu(JMeterUtils.getResString("file"));
fileMenu.setMnemonic('F');
- file_save = new JMenuItem(JMeterUtils.getResString("save"), 'S');
- file_save.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S,
KeyEvent.CTRL_MASK));
- file_save.addActionListener(ActionRouter.getInstance());
-
- // Set default SAVE menu item to disabled since the default node that
is selected
- // is ROOT, which cannot be saved.
- file_save.setEnabled(false);
file_save_all = new JMenuItem(JMeterUtils.getResString("save_all"),
'A');
file_save_all.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_A,
KeyEvent.CTRL_MASK));
+ file_save_all.setActionCommand("save_all");
file_save_all.addActionListener(ActionRouter.getInstance());
// Currently, SAVE ALL is not implemented. It actually generates
// a nasty exception when selected. Therefore, for now, always
// make the SAVE ALL menu item disabled.
- file_save_all.setEnabled(false);
+ file_save_all.setEnabled(true);
file_load = new JMenuItem(JMeterUtils.getResString("open"), 'O');
file_load.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O,
KeyEvent.CTRL_MASK));
@@ -304,7 +291,6 @@
file_exit.setActionCommand("exit");
file_exit.addActionListener(ActionRouter.getInstance());
fileMenu.add(file_load);
- fileMenu.add(file_save);
fileMenu.add(file_save_all);
fileMenu.addSeparator();
fileMenu.add(file_exit);
1.8 +2 -2 jakarta-jmeter/src_1/org/apache/jmeter/gui/util/MenuFactory.java
Index: MenuFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/gui/util/MenuFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MenuFactory.java 29 May 2002 22:52:35 -0000 1.7
+++ MenuFactory.java 6 Jun 2002 13:48:26 -0000 1.8
@@ -63,7 +63,7 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2002/05/29 22:52:35 $
+ *@created $Date: 2002/06/06 13:48:26 $
*@version 1.0
***************************************/
@@ -189,7 +189,7 @@
{
addSeparator(menu);
menu.add(makeMenuItem(JMeterUtils.getResString("open"), "Open",
JMeterUtils.getResString("open")));
- menu.add(makeMenuItem(JMeterUtils.getResString("save"), "Save",
JMeterUtils.getResString("save")));
+ menu.add(makeMenuItem(JMeterUtils.getResString("save"), "Save",
"save"));
}
/****************************************
1.7 +0 -0
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/control/AuthManager.java
Index: AuthManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/control/AuthManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AuthManager.java 5 Jun 2002 03:29:07 -0000 1.6
+++ AuthManager.java 6 Jun 2002 13:48:26 -0000 1.7
@@ -80,7 +80,7 @@
*
*@author <a href="mailto:[EMAIL PROTECTED]";>Rapha�l Luta
* </a>
- *@created $Date: 2002/06/05 03:29:07 $
+ *@created $Date: 2002/06/06 13:48:26 $
*@version 0.9
***************************************/
public class AuthManager extends AbstractTestElement implements ConfigElement,
1.14 +0 -0
jakarta-jmeter/src_1/org/apache/jmeter/reporters/ResultCollector.java
Index: ResultCollector.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/reporters/ResultCollector.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ResultCollector.java 5 Jun 2002 03:29:07 -0000 1.13
+++ ResultCollector.java 6 Jun 2002 13:48:27 -0000 1.14
@@ -72,7 +72,7 @@
* Title: Description: Copyright: Copyright (c) 2001 Company:
*
*@author Michael Stover
- *@created $Date: 2002/06/05 03:29:07 $
+ *@created $Date: 2002/06/06 13:48:27 $
*@version 1.0
*/
1.11 +0 -0
jakarta-jmeter/src_1/org/apache/jmeter/samplers/SampleResult.java
Index: SampleResult.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/samplers/SampleResult.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SampleResult.java 5 Jun 2002 03:29:07 -0000 1.10
+++ SampleResult.java 6 Jun 2002 13:48:27 -0000 1.11
@@ -67,8 +67,8 @@
* sample of an entry.
*
*@author $Author: mstover1 $
- *@created $Date: 2002/06/05 03:29:07 $
- *@version $Revision: 1.10 $
+ *@created $Date: 2002/06/06 13:48:27 $
+ *@version $Revision: 1.11 $
*/
public class SampleResult implements Serializable
{
1.4 +8 -43
jakarta-jmeter/src_1/org/apache/jmeter/samplers/gui/AbstractSamplerGui.java
Index: AbstractSamplerGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/samplers/gui/AbstractSamplerGui.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractSamplerGui.java 29 Apr 2002 17:08:13 -0000 1.3
+++ AbstractSamplerGui.java 6 Jun 2002 13:48:27 -0000 1.4
@@ -1,48 +1,24 @@
package org.apache.jmeter.samplers.gui;
-import java.util.*;
-import javax.swing.*;
-import org.apache.jmeter.gui.JMeterGUIComponent;
+import java.util.Arrays;
+import java.util.Collection;
+
+import javax.swing.JPopupMenu;
+import org.apache.jmeter.gui.AbstractJMeterGuiComponent;
+import org.apache.jmeter.gui.NamePanel;
import org.apache.jmeter.gui.util.MenuFactory;
import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.gui.NamePanel;
/****************************************
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2002/04/29 17:08:13 $
+ *@created $Date: 2002/06/06 13:48:27 $
*@version 1.0
***************************************/
-public abstract class AbstractSamplerGui extends JPanel implements
JMeterGUIComponent
+public abstract class AbstractSamplerGui extends AbstractJMeterGuiComponent
{
- private NamePanel namePanel;
-
- public AbstractSamplerGui()
- {
- namePanel = new NamePanel();
- setName(getStaticLabel());
- }
-
- public void setName(String name)
- {
- namePanel.setName(name);
- }
-
- public void configure(TestElement element)
- {
- setName((String)element.getProperty(TestElement.NAME));
- }
-
- public String getName()
- {
- return namePanel.getName();
- }
- protected NamePanel getNamePanel()
- {
- return namePanel;
- }
/****************************************
* !ToDo (Method description)
@@ -64,15 +40,4 @@
return Arrays.asList(new String[]{MenuFactory.SAMPLERS});
}
- /****************************************
- * !ToDo (Method description)
- *
- *@param mc !ToDo (Parameter description)
- ***************************************/
- protected void configureTestElement(TestElement mc)
- {
- mc.setProperty(TestElement.NAME, getName());
- mc.setProperty(TestElement.GUI_CLASS, this.getClass().getName());
- mc.setProperty(TestElement.TEST_CLASS, mc.getClass().getName());
}
-}
1.2 +1 -1
jakarta-jmeter/src_1/org/apache/jmeter/save/old/handlers/FtpTestHandler.java
Index: FtpTestHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/save/old/handlers/FtpTestHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FtpTestHandler.java 1 Jun 2002 13:21:27 -0000 1.1
+++ FtpTestHandler.java 6 Jun 2002 13:48:27 -0000 1.2
@@ -111,7 +111,7 @@
{
sampler = new FTPSampler();
sampler.setName(atts.getValue("name"));
-
sampler.setProperty(TestElement.GUI_CLASS,JMeterHandler.getGuiClass(atts.getValue("type")));
+
sampler.setProperty(TestElement.GUI_CLASS,"org.apache.jmeter.protocol.ftp.control.gui.FtpTestSamplerGui");
}
1.3 +9 -1
jakarta-jmeter/src_1/org/apache/jmeter/save/old/handlers/JMeterHandler.java
Index: JMeterHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/save/old/handlers/JMeterHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JMeterHandler.java 5 Jun 2002 03:29:07 -0000 1.2
+++ JMeterHandler.java 6 Jun 2002 13:48:27 -0000 1.3
@@ -107,7 +107,15 @@
guiClassMap.put("org.apache.jmeter.control.InterleaveControl",
"org.apache.jmeter.control.gui.InterleaveControlGui");
guiClassMap.put("org.apache.jmeter.control.OnceOnlyController",
-
"org.apache.jmeter.control.gui.OnceOnlyControllerGui");
+
"org.apache.jmeter.control.gui.OnceOnlyControllerGui");
+ guiClassMap.put("org.apache.jmeter.protocol.jdbc.config.DbConfig",
+
"org.apache.jmeter.protocol.jdbc.config.gui.DbConfigGui");
+ guiClassMap.put("org.apache.jmeter.protocol.jdbc.config.PoolConfig",
+
"org.apache.jmeter.protocol.jdbc.config.gui.PoolConfigGui");
+ guiClassMap.put("org.apache.jmeter.protocol.jdbc.config.SqlConfig",
+
"org.apache.jmeter.protocol.jdbc.config.gui.SqlConfigGui");
+ guiClassMap.put("org.apache.jmeter.protocol.ftp.config.FtpConfig",
+
"org.apache.jmeter.protocol.ftp.config.gui.FtpConfigGui");
propertyConversion.put("arguments",HTTPSampler.ARGUMENTS);
propertyConversion.put("port",HTTPSampler.PORT);
1.2 +2 -2
jakarta-jmeter/src_1/org/apache/jmeter/save/old/handlers/JdbcTestSampleHandler.java
Index: JdbcTestSampleHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/save/old/handlers/JdbcTestSampleHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JdbcTestSampleHandler.java 1 Jun 2002 13:21:27 -0000 1.1
+++ JdbcTestSampleHandler.java 6 Jun 2002 13:48:27 -0000 1.2
@@ -68,7 +68,7 @@
* Title: Description: Copyright: Copyright (c) 2001 Company:
*
*@author Michael Stover
- *@created $Date: 2002/06/01 13:21:27 $
+ *@created $Date: 2002/06/06 13:48:27 $
*@version 1.0
***********************************************************/
@@ -139,7 +139,7 @@
public void setAtts(Attributes atts) throws java.lang.Exception
{
sampler = new JDBCSampler();
-
sampler.setProperty(TestElement.GUI_CLASS,JMeterHandler.getGuiClass(atts.getValue("type")));
+
sampler.setProperty(TestElement.GUI_CLASS,"org.apache.jmeter.protocol.jdbc.control.gui.JdbcTestSampleGui");
sampler.setName(atts.getValue("name"));
}
1.2 +8 -46
jakarta-jmeter/src_1/org/apache/jmeter/timers/gui/AbstractTimerGui.java
Index: AbstractTimerGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/timers/gui/AbstractTimerGui.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractTimerGui.java 29 Mar 2002 14:06:12 -0000 1.1
+++ AbstractTimerGui.java 6 Jun 2002 13:48:27 -0000 1.2
@@ -1,11 +1,13 @@
package org.apache.jmeter.timers.gui;
-import org.apache.jmeter.gui.JMeterGUIComponent;
-import org.apache.jmeter.testelement.TestElement;
-import javax.swing.*;
-import java.util.*;
-import org.apache.jmeter.gui.util.MenuFactory;
+import java.util.Arrays;
+import java.util.Collection;
+
+import javax.swing.JPopupMenu;
+import org.apache.jmeter.gui.AbstractJMeterGuiComponent;
import org.apache.jmeter.gui.NamePanel;
+import org.apache.jmeter.gui.util.MenuFactory;
+import org.apache.jmeter.testelement.TestElement;
/**
* Title: JMeter
@@ -16,53 +18,13 @@
* @version 1.0
*/
-public abstract class AbstractTimerGui extends JPanel implements JMeterGUIComponent
+public abstract class AbstractTimerGui extends AbstractJMeterGuiComponent
{
- private NamePanel namePanel;
-
- public AbstractTimerGui()
- {
- namePanel = new NamePanel();
- setName(getStaticLabel());
- }
-
- public void setName(String name)
- {
- namePanel.setName(name);
- }
- public String getName()
- {
- return namePanel.getName();
- }
-
- protected NamePanel getNamePanel()
- {
- return namePanel;
- }
-
- protected void configureTestElement(TestElement mc)
- {
- mc.setProperty(TestElement.NAME, getName());
- mc.setProperty(TestElement.GUI_CLASS, this.getClass().getName());
- mc.setProperty(TestElement.TEST_CLASS, mc.getClass().getName());
- }
-
-
public JPopupMenu createPopupMenu()
{
return MenuFactory.getDefaultTimerMenu();
}
-
- /****************************************
- * !ToDo (Method description)
- *
- *@param element !ToDo (Parameter description)
- ***************************************/
- public void configure(TestElement element)
- {
- setName((String)element.getProperty(TestElement.NAME));
- }
public Collection getMenuCategories()
{
1.7 +0 -0
jakarta-jmeter/src_1/org/apache/jmeter/visualizers/StatVisualizer.java
Index: StatVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/visualizers/StatVisualizer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StatVisualizer.java 5 Jun 2002 03:29:08 -0000 1.6
+++ StatVisualizer.java 6 Jun 2002 13:48:27 -0000 1.7
@@ -81,7 +81,7 @@
* Company: Apache Foundation
*
*@author James Boutcher
- *@created $Date: 2002/06/05 03:29:08 $
+ *@created $Date: 2002/06/06 13:48:27 $
*@version 1.0
***************************************/
@@ -395,8 +395,8 @@
* support our dynamically-sizing TableModel for this visualizer.
*
*@author $Author: mstover1 $
- *@created $Date: 2002/06/05 03:29:08 $
- *@version $Revision: 1.6 $
+ *@created $Date: 2002/06/06 13:48:27 $
+ *@version $Revision: 1.7 $
***************************************/
class SortFilterModel extends AbstractTableModel
@@ -581,8 +581,8 @@
* !ToDo (Class description)
*
*@author $Author: mstover1 $
- *@created $Date: 2002/06/05 03:29:08 $
- *@version $Revision: 1.6 $
+ *@created $Date: 2002/06/06 13:48:27 $
+ *@version $Revision: 1.7 $
***************************************/
private class Row implements Comparable
{
@@ -631,8 +631,8 @@
* Class which implements the model for our main table in this visualizer.
*
*@author $Author: mstover1 $
- *@created $Date: 2002/06/05 03:29:08 $
- *@version $Revision: 1.6 $
+ *@created $Date: 2002/06/06 13:48:27 $
+ *@version $Revision: 1.7 $
***************************************/
class StatTableModel extends AbstractTableModel
1.9 +16 -55
jakarta-jmeter/src_1/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java
Index: AbstractVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractVisualizer.java 2 May 2002 22:55:00 -0000 1.8
+++ AbstractVisualizer.java 6 Jun 2002 13:48:27 -0000 1.9
@@ -1,53 +1,44 @@
package org.apache.jmeter.visualizers.gui;
-import java.util.*;
-import java.io.*;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.event.*;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+import javax.swing.JPopupMenu;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
import org.apache.jmeter.exceptions.IllegalUserActionException;
-import org.apache.jmeter.gui.JMeterGUIComponent;
+import org.apache.jmeter.gui.AbstractJMeterGuiComponent;
import org.apache.jmeter.gui.NamePanel;
+import org.apache.jmeter.gui.util.FilePanel;
import org.apache.jmeter.gui.util.MenuFactory;
import org.apache.jmeter.reporters.AbstractListenerElement;
-import org.apache.jmeter.samplers.SampleListener;
-import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.visualizers.Visualizer;
import org.apache.jmeter.reporters.ResultCollector;
-import org.apache.jmeter.gui.util.FilePanel;
+import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jmeter.visualizers.Visualizer;
/****************************************
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2002/05/02 22:55:00 $
+ *@created $Date: 2002/06/06 13:48:27 $
*@version 1.0
***************************************/
-public abstract class AbstractVisualizer
- extends JPanel
- implements JMeterGUIComponent, Visualizer, ChangeListener {
+public abstract class AbstractVisualizer extends AbstractJMeterGuiComponent
+ implements Visualizer, ChangeListener {
- /****************************************
- * !ToDo (Field description)
- ***************************************/
- private NamePanel namePanel;
- private FilePanel filePanel;
+ private FilePanel filePanel;
ResultCollector collector;
/****************************************
* !ToDo (Constructor description)
***************************************/
public AbstractVisualizer() {
- namePanel = new NamePanel();
+ super();
filePanel = new FilePanel(this);
- setName(getStaticLabel());
}
- protected NamePanel getNamePanel() {
- return namePanel;
- }
protected ResultCollector getModel() {
return collector;
@@ -57,25 +48,6 @@
return filePanel;
}
- /****************************************
- * !ToDo (Method description)
- *
- *@param name !ToDo (Parameter description)
- ***************************************/
- public void setName(String name) {
- super.setName(name);
- namePanel.setName(name);
- }
-
- /****************************************
- * !ToDoo (Method description)
- *
- *@return !ToDo (Return description)
- ***************************************/
- public String getName() {
- return namePanel.getName();
- }
-
public void setFile(String filename) {
filePanel.setFilename(filename);
}
@@ -99,15 +71,6 @@
}
/****************************************
- * !ToDo (Method description)
- *
- *@param element !ToDo (Parameter description)
- ***************************************/
- public void configure(TestElement element) {
- setName((String) element.getProperty(TestElement.NAME));
- }
-
- /****************************************
* !ToDoo (Method description)
*
*@return !ToDo (Return description)
@@ -144,9 +107,7 @@
*@param mc !ToDo (Parameter description)
***************************************/
protected void configureTestElement(AbstractListenerElement mc) {
- mc.setProperty(TestElement.NAME, getName());
- mc.setProperty(TestElement.GUI_CLASS, this.getClass().getName());
- mc.setProperty(TestElement.TEST_CLASS, mc.getClass().getName());
+ super.configureTestElement(mc);
mc.setListener(this);
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
