mstover1 02/03/16 19:05:36
Modified: src/org/apache/jmeter/gui MenuFactory.java
src/org/apache/jmeter/gui/tree JMeterTreeListener.java
src/org/apache/jmeter/resources messages_ja.properties
messages_no.properties
Added: src/org/apache/jmeter/gui/action AddParent.java
Log:
Enabling inserting parent nodes into the tree
Revision Changes Path
1.16 +35 -12 jakarta-jmeter/src/org/apache/jmeter/gui/MenuFactory.java
Index: MenuFactory.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/gui/MenuFactory.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- MenuFactory.java 4 Mar 2002 23:08:54 -0000 1.15
+++ MenuFactory.java 17 Mar 2002 03:05:35 -0000 1.16
@@ -67,7 +67,7 @@
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2002/03/04 23:08:54 $
+ *@created $Date: 2002/03/17 03:05:35 $
*@version 1.0
***********************************************************/
@@ -84,6 +84,7 @@
private static JMenu ResponseBasedModifierMenu;
private static JMenu assertionMenu;
private static JMenu configMenu;
+ private static JMenu insertControllerMenu;
private static Set elementsToSkip = new HashSet();
static
{
@@ -125,8 +126,8 @@
{
ModifierMenu = createMenu(
new
Class[]{org.apache.jmeter.config.Modifier.class},
- JMeterUtils.getResString("menu_modifiers"),
- null);
+
JMeterUtils.getResString("menu_modifiers"),
+
null);
setEnabled(ModifierMenu);
}
return ModifierMenu;
@@ -138,8 +139,8 @@
{
ResponseBasedModifierMenu = createMenu(
new
Class[]{org.apache.jmeter.config.ResponseBasedModifier.class},
-
JMeterUtils.getResString("menu_response_based_modifiers"),
- null);
+
JMeterUtils.getResString("menu_response_based_modifiers"),
+
null);
setEnabled(ResponseBasedModifierMenu);
}
return ResponseBasedModifierMenu;
@@ -151,8 +152,8 @@
{
assertionMenu = createMenu(
new
Class[]{org.apache.jmeter.assertions.Assertion.class},
- JMeterUtils.getResString("menu_assertions"),
- null);
+
JMeterUtils.getResString("menu_assertions"),
+
null);
setEnabled(assertionMenu);
}
return assertionMenu;
@@ -177,7 +178,7 @@
skip.add("org.apache.jmeter.threads.ThreadGroup");
listenerMenu = createMenu(
new
Class[]{org.apache.jmeter.samplers.SampleListener.class},
- JMeterUtils.getResString("menu_listener"),
+
JMeterUtils.getResString("menu_listener"),
skip);
setEnabled(listenerMenu);
}
@@ -189,6 +190,20 @@
*
*@return !ToDo (Return description)
***********************************************************/
+ public static synchronized JMenu getLogicControllerMenu(String actionCommand)
+ {
+ if (insertControllerMenu == null)
+ {
+ Set skip = new HashSet();
+ controllerMenu = createMenu(
+ new
Class[]{org.apache.jmeter.control.LogicController.class},
+
JMeterUtils.getResString("menu_logic_controller"),
+ null,actionCommand);
+ setEnabled(controllerMenu);
+ }
+ return controllerMenu;
+ }
+
public static synchronized JMenu getLogicControllerMenu()
{
if (controllerMenu == null)
@@ -196,7 +211,7 @@
Set skip = new HashSet();
controllerMenu = createMenu(
new
Class[]{org.apache.jmeter.control.LogicController.class},
-
JMeterUtils.getResString("menu_logic_controller"),
+
JMeterUtils.getResString("menu_logic_controller"),
null);
setEnabled(controllerMenu);
}
@@ -215,7 +230,7 @@
Set skip = new HashSet();
generativeControllerMenu = createMenu(
new
Class[]{org.apache.jmeter.control.AbstractGenerativeController.class},
-
JMeterUtils.getResString("menu_generative_controller"),
+
JMeterUtils.getResString("menu_generative_controller"),
null);
setEnabled(generativeControllerMenu);
}
@@ -233,8 +248,8 @@
{
Set skip = new HashSet();
configMenu = createMenu(new
Class[]{org.apache.jmeter.config.ConfigElement.class},
-
JMeterUtils.getResString("menu_config_element"),
- null);
+
JMeterUtils.getResString("menu_config_element"),
+
null);
setEnabled(configMenu);
}
return configMenu;
@@ -257,6 +272,12 @@
private static JMenu createMenu(Class[] classes,String menuName,
Set skip)
{
+ return createMenu(classes,menuName,skip,null);
+ }
+
+ private static JMenu createMenu(Class[] classes,String menuName,
+ Set skip,String actionCommand)
+ {
if(skip == null)
{
skip = new HashSet();
@@ -276,6 +297,8 @@
!elementsToSkip.contains(label))
{
JMenuItem mItem = new JMenuItem(label);
+ mItem.setName(item);
+ mItem.setActionCommand(actionCommand);
mItem.addActionListener(ActionRouter.getInstance());
menu.add(mItem);
skip.add(label);
1.1 jakarta-jmeter/src/org/apache/jmeter/gui/action/AddParent.java
Index: AddParent.java
===================================================================
package org.apache.jmeter.gui.action;
import java.awt.event.ActionEvent;
import java.awt.Component;
import java.util.*;
import org.apache.jmeter.control.LogicController;
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.gui.JMeterComponentModel;
import org.apache.jmeter.gui.tree.JMeterTreeNode;
import org.apache.jmeter.gui.FileDialoger;
/**
* Title: JMeter
* Description:
* Copyright: Copyright (c) 2000
* Company: Apache
* @author Michael Stover
* @version 1.0
*/
public class AddParent implements Command
{
private static Set commands = new HashSet();
static
{
commands.add("Add Parent");
}
public AddParent()
{
}
public void doAction(ActionEvent e)
{
String name = ((Component)e.getSource()).getName();
try
{
LogicController controller =
(LogicController)Class.forName(name).newInstance();
addParentToTree(controller);
}
catch(Exception err){err.printStackTrace();}
}
protected void addParentToTree(JMeterComponentModel newParent)
{
GuiPackage guiPackage = GuiPackage.getInstance();
JMeterTreeNode newNode = new JMeterTreeNode(newParent);
JMeterTreeNode currentNode =
guiPackage.getTreeListener().getCurrentNode();
JMeterTreeNode parentNode = (JMeterTreeNode)currentNode.getParent();
int index = parentNode.getIndex(currentNode);
guiPackage.getTreeModel().removeNodeFromParent(currentNode);
guiPackage.getTreeModel().insertNodeInto(newNode,
(JMeterTreeNode)parentNode,index);
guiPackage.getTreeModel().insertNodeInto(currentNode,newNode,
newNode.getChildCount());
}
public Set getActionNames()
{
return commands;
}
}
1.15 +8 -0
jakarta-jmeter/src/org/apache/jmeter/gui/tree/JMeterTreeListener.java
Index: JMeterTreeListener.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/gui/tree/JMeterTreeListener.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- JMeterTreeListener.java 7 Mar 2002 23:03:13 -0000 1.14
+++ JMeterTreeListener.java 17 Mar 2002 03:05:36 -0000 1.15
@@ -70,6 +70,7 @@
import org.apache.jmeter.save.Saveable;
import org.apache.jmeter.timers.*;
import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jmeter.control.SamplerController;
/**
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
@@ -449,6 +450,7 @@
*/
private void generatePopupMenu(JMeterComponentModel comp, JMenu addMenu, int
x, int y)
{
+ boolean sepNeeded = false;
pop = new JPopupMenu();
pop.setInvoker(tree);
@@ -506,6 +508,12 @@
if (addMenu != null)
{
pop.add(addMenu);
+ }
+ if(comp instanceof SamplerController)
+ {
+ JMenu addParentMenu = new
JMenu(JMeterUtils.getResString("insert_parent"));
+ addParentMenu.add(MenuFactory.getLogicControllerMenu("Add
Parent"));
+ pop.add(addParentMenu);
}
if (loadMenuItem != null)
1.6 +3 -5
jakarta-jmeter/src/org/apache/jmeter/resources/messages_ja.properties
Index: messages_ja.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/resources/messages_ja.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- messages_ja.properties 4 Mar 2002 23:08:54 -0000 1.5
+++ messages_ja.properties 17 Mar 2002 03:05:36 -0000 1.6
@@ -72,7 +72,7 @@
patterns_to_include=\u633f\u5165\u3059\u308b\u30d1\u30bf\u30fc\u30f3
patterns_to_exclude=\u9664\u5916\u3059\u308b\u30d1\u30bf\u30fc\u30f3
add_pattern=\u30d1\u30bf\u30fc\u30f3\u8ffd\u52a0
-ramp_up=Ramp-Up \u671f\u9593 (\u79d2):
+ramp_up=Ramp-Up \u671f\u9593 (\u79d2):
constant_timer_title=\u5B9A\u6570\u30BF\u30A4\u30DE
constant_timer_delay=\u30b9\u30ec\u30c3\u30c9\u9045\u5ef6\u6642\u9593
(\u30df\u30ea\u79d2):
gaussian_timer_title=\u30AC\u30A6\u30B7\u30A2\u30F3\u4E71\u6570\u30BF\u30A4\u30DE
@@ -153,7 +153,7 @@
web_server_port=\u30dd\u30fc\u30c8\u756a\u53f7:
web_request=HTTP \u30ea\u30af\u30a8\u30b9\u30c8
web_testing_title=HTTP \u30ea\u30af\u30a8\u30b9\u30c8
-web_testing_retrieve_images=\u5168\u3066\u306e\u30a4\u30e1\u30fc\u30b8\u3068\u30a2\u30d7\u30ec\u30c3\u30c8\u3092\u7e70\u308a\u8fd4\u3057\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3059\u308b(HTML
\u30d5\u30a1\u30a4\u30eb\u306e\u307f)
+web_testing_retrieve_images=\u5168\u3066\u306e\u30a4\u30e1\u30fc\u30b8\u3068\u30a2\u30d7\u30ec\u30c3\u30c8\u3092\u7e70\u308a\u8fd4\u3057\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3059\u308b(HTML
\u30d5\u30a1\u30a4\u30eb\u306e\u307f)
send_file=\u30ea\u30af\u30a8\u30b9\u30c8\u3068\u4e00\u7dd2\u306b\u9001\u4fe1\u3055\u308c\u308b\u30d5\u30a1\u30a4\u30eb:
send_file_filename_label=\u30d5\u30a1\u30a4\u30eb\u540d:
send_file_browse=\u53c2\u7167...
@@ -181,7 +181,5 @@
jndi_method_parms=\u30e1\u30bd\u30c3\u30c9\u306e\u5f15\u6570
jndi_method_button_reflect=\u30ea\u30d5\u30ec\u30af\u30b7\u30e7\u30f3
jndi_method_button_invoke=\u547c\u3073\u51fa\u3057
-
-
-
+insert_parent=Insert Parent
uniform_timer_memo=\u4E00\u69D8\u306B\u30E9\u30F3\u30C0\u30E0\u306A\u9045\u5EF6\u3092\u8FFD\u52A0
1.2 +1 -0
jakarta-jmeter/src/org/apache/jmeter/resources/messages_no.properties
Index: messages_no.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/resources/messages_no.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- messages_no.properties 10 Mar 2002 16:22:32 -0000 1.1
+++ messages_no.properties 17 Mar 2002 03:05:36 -0000 1.2
@@ -173,4 +173,5 @@
jndi_method_remote_interface_list=Remote interfaces
jndi_method_button_reflect=Reflect
jndi_method_button_invoke=Invoke
+insert_parent=Insert Parent
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
