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 se...@apache.org on 2007/05/04 12:54:00 UTC
svn commit: r535162 - in /jakarta/jmeter/branches/rel-2-2/src:
components/org/apache/jmeter/control/gui/
core/org/apache/jmeter/control/gui/ core/org/apache/jmeter/gui/util/
core/org/apache/jmeter/threads/gui/ reports/org/apache/jmeter/gui/util/
Author: sebb
Date: Fri May 4 03:53:59 2007
New Revision: 535162
URL: http://svn.apache.org/viewvc?view=rev&rev=535162
Log:
Use ActionNames.ADD / ADD_PARENT instead of strings
Add NLS markers; lowercase resource names
Modified:
jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/util/MenuFactory.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java
jakarta/jmeter/branches/rel-2-2/src/reports/org/apache/jmeter/gui/util/ReportMenuFactory.java
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java?view=diff&rev=535162&r1=535161&r2=535162
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/control/gui/IncludeControllerGui.java Fri May 4 03:53:59 2007
@@ -26,6 +26,7 @@
import javax.swing.JPopupMenu;
import org.apache.jmeter.control.IncludeController;
+import org.apache.jmeter.gui.action.ActionNames;
import org.apache.jmeter.gui.util.FilePanel;
import org.apache.jmeter.gui.util.MenuFactory;
import org.apache.jmeter.testelement.TestElement;
@@ -116,8 +117,13 @@
public JPopupMenu createPopupMenu() {
JPopupMenu menu = new JPopupMenu();
- JMenu addMenu = MenuFactory.makeMenus(new String[] { MenuFactory.CONFIG_ELEMENTS, MenuFactory.ASSERTIONS,
- MenuFactory.TIMERS, MenuFactory.LISTENERS, }, JMeterUtils.getResString("Add"), "Add");
+ JMenu addMenu = MenuFactory.makeMenus(new String[] {
+ MenuFactory.CONFIG_ELEMENTS,
+ MenuFactory.ASSERTIONS,
+ MenuFactory.TIMERS,
+ MenuFactory.LISTENERS,
+ }, JMeterUtils.getResString("add"), // $NON-NLS-1$
+ ActionNames.ADD);
menu.add(addMenu);
MenuFactory.addEditMenu(menu, true);
MenuFactory.addFileMenu(menu);
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java?view=diff&rev=535162&r1=535161&r2=535162
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java Fri May 4 03:53:59 2007
@@ -25,6 +25,7 @@
import javax.swing.JPopupMenu;
import org.apache.jmeter.gui.AbstractJMeterGuiComponent;
+import org.apache.jmeter.gui.action.ActionNames;
import org.apache.jmeter.gui.util.MenuFactory;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.WorkBench;
@@ -95,8 +96,14 @@
*/
public JPopupMenu createPopupMenu() {
JPopupMenu menu = new JPopupMenu();
- JMenu addMenu = MenuFactory.makeMenus(new String[] { MenuFactory.CONTROLLERS, MenuFactory.SAMPLERS,
- MenuFactory.CONFIG_ELEMENTS, MenuFactory.NON_TEST_ELEMENTS }, JMeterUtils.getResString("Add"), "Add");
+ JMenu addMenu = MenuFactory.makeMenus(new String[] {
+ MenuFactory.CONTROLLERS,
+ MenuFactory.SAMPLERS,
+ MenuFactory.CONFIG_ELEMENTS,
+ MenuFactory.NON_TEST_ELEMENTS
+ },
+ JMeterUtils.getResString("add"), // $NON-NLS-1$
+ ActionNames.ADD);
menu.add(addMenu);
MenuFactory.addEditMenu(menu, false);
MenuFactory.addFileMenu(menu);
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/util/MenuFactory.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/util/MenuFactory.java?view=diff&rev=535162&r1=535161&r2=535162
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/util/MenuFactory.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/util/MenuFactory.java Fri May 4 03:53:59 2007
@@ -201,9 +201,11 @@
public static JPopupMenu getDefaultControllerMenu() {
JPopupMenu pop = new JPopupMenu();
- pop.add(MenuFactory.makeMenus(MENU_ADD_CONTROLLER, JMeterUtils.getResString("add"),// $NON-NLS-1$
+ pop.add(MenuFactory.makeMenus(MENU_ADD_CONTROLLER,
+ JMeterUtils.getResString("add"),// $NON-NLS-1$
ActionNames.ADD));
- pop.add(makeMenus(MENU_PARENT_CONTROLLER, JMeterUtils.getResString("insert_parent"),// $NON-NLS-1$
+ pop.add(makeMenus(MENU_PARENT_CONTROLLER,
+ JMeterUtils.getResString("insert_parent"),// $NON-NLS-1$
ActionNames.ADD_PARENT));
MenuFactory.addEditMenu(pop, true);
MenuFactory.addFileMenu(pop);
@@ -212,9 +214,11 @@
public static JPopupMenu getDefaultSamplerMenu() {
JPopupMenu pop = new JPopupMenu();
- pop.add(MenuFactory.makeMenus(MENU_ADD_SAMPLER, JMeterUtils.getResString("add"),// $NON-NLS-1$
+ pop.add(MenuFactory.makeMenus(MENU_ADD_SAMPLER,
+ JMeterUtils.getResString("add"),// $NON-NLS-1$
ActionNames.ADD));
- pop.add(makeMenus(MENU_PARENT_SAMPLER, JMeterUtils.getResString("insert_parent"),// $NON-NLS-1$
+ pop.add(makeMenus(MENU_PARENT_SAMPLER,
+ JMeterUtils.getResString("insert_parent"),// $NON-NLS-1$
ActionNames.ADD_PARENT));
MenuFactory.addEditMenu(pop, true);
MenuFactory.addFileMenu(pop);
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java?view=diff&rev=535162&r1=535161&r2=535162
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java Fri May 4 03:53:59 2007
@@ -38,6 +38,7 @@
import org.apache.jmeter.control.LoopController;
import org.apache.jmeter.control.gui.LoopControlPanel;
import org.apache.jmeter.gui.AbstractJMeterGuiComponent;
+import org.apache.jmeter.gui.action.ActionNames;
import org.apache.jmeter.gui.tree.JMeterTreeNode;
import org.apache.jmeter.gui.util.FocusRequester;
import org.apache.jmeter.gui.util.JDateField;
@@ -179,9 +180,17 @@
public JPopupMenu createPopupMenu() {
JPopupMenu pop = new JPopupMenu();
- pop.add(MenuFactory.makeMenus(new String[] { MenuFactory.CONTROLLERS, MenuFactory.LISTENERS,
- MenuFactory.SAMPLERS, MenuFactory.ASSERTIONS,MenuFactory.TIMERS, MenuFactory.CONFIG_ELEMENTS, MenuFactory.PRE_PROCESSORS,
- MenuFactory.POST_PROCESSORS }, JMeterUtils.getResString("Add"), "Add"));
+ pop.add(MenuFactory.makeMenus(new String[] {
+ MenuFactory.CONTROLLERS,
+ MenuFactory.LISTENERS,
+ MenuFactory.SAMPLERS,
+ MenuFactory.ASSERTIONS,
+ MenuFactory.TIMERS,
+ MenuFactory.CONFIG_ELEMENTS,
+ MenuFactory.PRE_PROCESSORS,
+ MenuFactory.POST_PROCESSORS },
+ JMeterUtils.getResString("add"), // $NON-NLS-1$
+ ActionNames.ADD));
MenuFactory.addEditMenu(pop, true);
MenuFactory.addFileMenu(pop);
return pop;
Modified: jakarta/jmeter/branches/rel-2-2/src/reports/org/apache/jmeter/gui/util/ReportMenuFactory.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/reports/org/apache/jmeter/gui/util/ReportMenuFactory.java?view=diff&rev=535162&r1=535161&r2=535162
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/reports/org/apache/jmeter/gui/util/ReportMenuFactory.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/reports/org/apache/jmeter/gui/util/ReportMenuFactory.java Fri May 4 03:53:59 2007
@@ -37,6 +37,7 @@
import org.apache.jmeter.gui.JMeterGUIComponent;
import org.apache.jmeter.gui.ReportGuiPackage;
+import org.apache.jmeter.gui.action.ActionNames;
import org.apache.jmeter.report.gui.action.ReportActionRouter;
import org.apache.jmeter.testbeans.TestBean;
import org.apache.jmeter.testbeans.gui.TestBeanGUI;
@@ -179,10 +180,12 @@
public static JPopupMenu getDefaultControllerMenu() {
JPopupMenu pop = new JPopupMenu();
- pop.add(MenuFactory.makeMenus(MENU_ADD_CONTROLLER, JMeterUtils.getResString("Add"),// $NON-NLS-1$
- "Add"));
- pop.add(makeMenus(MENU_PARENT_CONTROLLER, JMeterUtils.getResString("insert_parent"),// $NON-NLS-1$
- "Add Parent"));
+ pop.add(MenuFactory.makeMenus(MENU_ADD_CONTROLLER,
+ JMeterUtils.getResString("add"),// $NON-NLS-1$
+ ActionNames.ADD));
+ pop.add(makeMenus(MENU_PARENT_CONTROLLER,
+ JMeterUtils.getResString("insert_parent"),// $NON-NLS-1$
+ ActionNames.ADD_PARENT));
MenuFactory.addEditMenu(pop, true);
MenuFactory.addFileMenu(pop);
return pop;
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org