mstover1 2002/06/06 19:00:36
Modified: src_1/org/apache/jmeter/gui/action CheckDirty.java
src_1/org/apache/jmeter/gui/tree JMeterTreeModel.java
src_1/org/apache/jmeter/gui/util JMeterMenuBar.java
src_1/org/apache/jmeter/resources messages.properties
messages_ja.properties messages_no.properties
Added: src_1/org/apache/jmeter/gui AbstractJMeterGuiComponent.java
Log:
New 'new' function
Minor changes to menu text
Revision Changes Path
1.1
jakarta-jmeter/src_1/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
Index: AbstractJMeterGuiComponent.java
===================================================================
package org.apache.jmeter.gui;
import java.util.Collection;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import org.apache.jmeter.testelement.TestElement;
/**
* @author mstover
*
* To change this generated comment edit the template variable "typecomment":
* Window>Preferences>Java>Templates.
*/
public abstract class AbstractJMeterGuiComponent
extends JPanel
implements JMeterGUIComponent {
public AbstractJMeterGuiComponent() {
namePanel = new NamePanel();
setName(getStaticLabel());
}
/**
* @see JMeterGUIComponent#setName(String)
*/
public void setName(String name) {
namePanel.setName(name);
}
/**
* @see JMeterGUIComponent#getName()
*/
public String getName() {
return getNamePanel().getName();
}
protected NamePanel getNamePanel() {
return namePanel;
}
protected NamePanel namePanel;
/****************************************
* !ToDo (Method description)
*
*@param element !ToDo (Parameter description)
***************************************/
public void configure(TestElement element)
{
setName((String)element.getProperty(TestElement.NAME));
}
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 -0
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CheckDirty.java 6 Jun 2002 13:48:26 -0000 1.2
+++ CheckDirty.java 7 Jun 2002 02:00:35 -0000 1.3
@@ -64,6 +64,7 @@
}
else if(action.equals(ADD_ALL))
{
+ previousGuiItems.clear();
GuiPackage.getInstance().getTreeModel().getTestPlan().traverse(this);
}
else if(action.equals(CHECK_DIRTY))
1.6 +11 -1
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JMeterTreeModel.java 6 Jun 2002 13:48:26 -0000 1.5
+++ JMeterTreeModel.java 7 Jun 2002 02:00:35 -0000 1.6
@@ -73,7 +73,7 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2002/06/06 13:48:26 $
+ *@created $Date: 2002/06/07 02:00:35 $
*@version 1.0
***************************************/
@@ -199,5 +199,15 @@
public ListedHashTree getTestPlan()
{
return
getCurrentSubTree((JMeterTreeNode)((JMeterTreeNode)this.getRoot()).getChildAt(0));
+ }
+
+ public void clearTestPlan()
+ {
+ super.removeNodeFromParent((JMeterTreeNode)getChild(getRoot(), 0));
+ this.insertNodeInto(new JMeterTreeNode(new TestPlanGui()),
+ (JMeterTreeNode)getRoot(), 0);
+ super.removeNodeFromParent((JMeterTreeNode)getChild(getRoot(), 1));
+ this.insertNodeInto(new JMeterTreeNode(new WorkBenchGui()),
+ (JMeterTreeNode)getRoot(), 1);
}
}
1.7 +8 -1
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JMeterMenuBar.java 6 Jun 2002 13:48:26 -0000 1.6
+++ JMeterMenuBar.java 7 Jun 2002 02:00:36 -0000 1.7
@@ -74,7 +74,7 @@
* Apache Foundation
*
*@author Michael Stover
- *@created $Date: 2002/06/06 13:48:26 $
+ *@created $Date: 2002/06/07 02:00:36 $
*@version 1.0
***************************************/
@@ -84,6 +84,7 @@
JMenuItem file_save_all;
JMenuItem file_load;
JMenuItem file_exit;
+ JMenuItem file_new;
JMenu editMenu;
JMenu edit_add;
JMenu edit_add_submenu;
@@ -285,11 +286,17 @@
// Set default SAVE menu item to disabled since the default node that
is selected
// is ROOT, which does not allow items to be inserted.
file_load.setEnabled(false);
+
+ file_new = new JMenuItem(JMeterUtils.getResString("new"), 'N');
+ file_new.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N,
KeyEvent.CTRL_MASK));
+ file_new.setActionCommand("new");
+ file_new.addActionListener(ActionRouter.getInstance());
file_exit = new JMenuItem(JMeterUtils.getResString("exit"), 'X');
file_exit.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Q,
KeyEvent.CTRL_MASK));
file_exit.setActionCommand("exit");
file_exit.addActionListener(ActionRouter.getInstance());
+ fileMenu.add(file_new);
fileMenu.add(file_load);
fileMenu.add(file_save_all);
fileMenu.addSeparator();
1.15 +3 -1
jakarta-jmeter/src_1/org/apache/jmeter/resources/messages.properties
Index: messages.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/resources/messages.properties,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- messages.properties 5 Jun 2002 03:29:07 -0000 1.14
+++ messages.properties 7 Jun 2002 02:00:36 -0000 1.15
@@ -1,13 +1,14 @@
file=File
run=Run
save=Save As...
-save_all=Save All
+save_all=Save Test Plan
load=Load
open=Open...
edit=Edit
exit=Exit
start=Start
stop=Stop
+new=New
clear=Clear
clear_all=Clear All
report=Report
@@ -216,6 +217,7 @@
user_param_mod_help_note=(Do not change this. Instead, modify the file of that
name in JMeter's /bin directory)
filename=File Name
cancel_exit_to_save=There are test items that have not been saved. Do you wish to
save before exiting?
+cancel_new_to_save=There are test items that have not been saved. Do you wish to
save before clearing your test plan?
save?=Save?
insert_before=Insert Before
insert_after=Insert After
1.14 +2 -0
jakarta-jmeter/src_1/org/apache/jmeter/resources/messages_ja.properties
Index: messages_ja.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/resources/messages_ja.properties,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- messages_ja.properties 5 Jun 2002 03:29:07 -0000 1.13
+++ messages_ja.properties 7 Jun 2002 02:00:36 -0000 1.14
@@ -7,6 +7,7 @@
edit=\u7de8\u96c6
exit=\u7d42\u4e86
start=\u958b\u59cb
+new=New
stop=\u505c\u6b62
clear=\u6d88\u53bb
clear_all=\u5168\u3066\u6d88\u53bb
@@ -210,6 +211,7 @@
user_param_mod_help_note=(Do not change this. Instead, modify the file of that
name in JMeter's /bin directory)
filename=File Name
cancel_exit_to_save=There are test items that have not been saved. Do you wish to
save before exiting?
+cancel_new_to_save=There are test items that have not been saved. Do you wish to
save before clearing your test plan?
save?=Save?
insert_before=Insert Before
insert_after=Insert After
1.14 +2 -0
jakarta-jmeter/src_1/org/apache/jmeter/resources/messages_no.properties
Index: messages_no.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/resources/messages_no.properties,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- messages_no.properties 5 Jun 2002 03:29:07 -0000 1.13
+++ messages_no.properties 7 Jun 2002 02:00:36 -0000 1.14
@@ -7,6 +7,7 @@
edit=Rediger
exit=Avslutt
start=Start
+new=New
stop=Stopp
clear=Nullstill
clear_all=Nullstill alle
@@ -209,6 +210,7 @@
user_param_mod_help_note=(Do not change this. Instead, modify the file of that
name in JMeter's /bin directory)
filename=File Name
cancel_exit_to_save=There are test items that have not been saved. Do you wish to
save before exiting?
+cancel_new_to_save=There are test items that have not been saved. Do you wish to
save before clearing your test plan?
save?=Save?
insert_before=Insert Before
insert_after=Insert After
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
