? action/command Index: JMeterMenuBar.java =================================================================== RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/gui/JMeterMenuBar.java,v retrieving revision 1.10 diff -u -r1.10 JMeterMenuBar.java --- JMeterMenuBar.java 2001/08/31 00:46:43 1.10 +++ JMeterMenuBar.java 2001/09/07 11:17:09 @@ -96,7 +96,6 @@ String[] remoteHosts; - private static ResourceBundle rb = ResourceBundle.getBundle("org.apache.jmeter.resources.messages"); public JMeterMenuBar() { @@ -127,20 +126,20 @@ public void createMenuBar() { - fileMenu = new JMenu(rb.getString("file")); + fileMenu = new JMenu(JMeterUtils.getResString("file")); fileMenu.setMnemonic('F'); - file_save = new JMenuItem(rb.getString("save"),'S'); + file_save = new JMenuItem(JMeterUtils.getResString("save"),'S'); file_save.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S,KeyEvent.CTRL_MASK)); file_save.addActionListener(ActionRouter.getInstance()); - file_save_all = new JMenuItem(rb.getString("save_all"),'A'); + 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.addActionListener(ActionRouter.getInstance()); - file_load = new JMenuItem(rb.getString("open"),'O'); + file_load = new JMenuItem(JMeterUtils.getResString("open"),'O'); file_load.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O,KeyEvent.CTRL_MASK)); file_load.addActionListener(ActionRouter.getInstance()); - file_exit = new JMenuItem(rb.getString("exit"), 'X'); + 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()); @@ -149,21 +148,21 @@ fileMenu.add(file_save_all); fileMenu.add(file_exit); - runMenu = new JMenu(rb.getString("run")); + runMenu = new JMenu(JMeterUtils.getResString("run")); runMenu.setMnemonic('R'); - run_start = new JMenuItem(rb.getString("start"), 'S'); + run_start = new JMenuItem(JMeterUtils.getResString("start"), 'S'); run_start.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_R, KeyEvent.CTRL_MASK)); run_start.addActionListener(ActionRouter.getInstance()); run_start.setActionCommand("start"); - run_stop = new JMenuItem(rb.getString("stop"), 'T'); + run_stop = new JMenuItem(JMeterUtils.getResString("stop"), 'T'); run_stop.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_PERIOD, KeyEvent.CTRL_MASK)); run_stop.setEnabled(false); run_stop.addActionListener(ActionRouter.getInstance()); run_stop.setActionCommand("stop"); - run_clear = new JMenuItem(rb.getString("clear"), 'C'); + run_clear = new JMenuItem(JMeterUtils.getResString("clear"), 'C'); run_clear.addActionListener(ActionRouter.getInstance()); run_clear.setActionCommand(org.apache.jmeter.gui.action.Clear.CLEAR); - run_clearAll = new JMenuItem(rb.getString("clear_all"), 'a'); + run_clearAll = new JMenuItem(JMeterUtils.getResString("clear_all"), 'a'); run_clearAll.addActionListener(ActionRouter.getInstance()); run_clearAll.setActionCommand(org.apache.jmeter.gui.action.Clear.CLEAR_ALL); runMenu.add(run_start); @@ -179,15 +178,15 @@ runMenu.add(run_clear); runMenu.add(run_clearAll); - reportMenu = new JMenu(rb.getString("report")); + reportMenu = new JMenu(JMeterUtils.getResString("report")); reportMenu.setMnemonic('P'); - analyze = new JMenuItem(rb.getString("analyze")); + analyze = new JMenuItem(JMeterUtils.getResString("analyze")); analyze.setMnemonic('A'); analyze.addActionListener(ActionRouter.getInstance()); reportMenu.add(analyze); - optionsMenu = new JMenu(rb.getString("option")); - lafMenu = new JMenu(rb.getString("appearance")); + optionsMenu = new JMenu(JMeterUtils.getResString("option")); + lafMenu = new JMenu(JMeterUtils.getResString("appearance")); UIManager.LookAndFeelInfo lafs[] = UIManager.getInstalledLookAndFeels(); for (int i = 0; i < lafs.length; ++i) { @@ -202,7 +201,7 @@ try { Class.forName("com.sun.net.ssl.KeyManager"); - sslManager = new JMenuItem(rb.getString("sslManager")); + sslManager = new JMenuItem(JMeterUtils.getResString("sslManager")); sslManager.addActionListener(ActionRouter.getInstance()); sslManager.setActionCommand("sslManager"); sslManager.setMnemonic('S'); @@ -214,9 +213,9 @@ //ignore } - helpMenu = new JMenu(rb.getString("help")); + helpMenu = new JMenu(JMeterUtils.getResString("help")); helpMenu.setMnemonic('H'); - help_about = new JMenuItem(rb.getString("about"), 'A'); + help_about = new JMenuItem(JMeterUtils.getResString("about"), 'A'); help_about.setActionCommand("about"); help_about.addActionListener(ActionRouter.getInstance()); helpMenu.add(help_about); @@ -235,8 +234,8 @@ { if(remoteHosts.length > 0) { - remote_start = new JMenu(rb.getString("remote_start")); - remote_stop = new JMenu(rb.getString("remote_stop")); + remote_start = new JMenu(JMeterUtils.getResString("remote_start")); + remote_stop = new JMenu(JMeterUtils.getResString("remote_stop")); for (int i = 0; i < remoteHosts.length; i++) { JMenuItem item = new JMenuItem(remoteHosts[i]); Index: tree/JMeterTreeListener.java =================================================================== RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/gui/tree/JMeterTreeListener.java,v retrieving revision 1.7 diff -u -r1.7 JMeterTreeListener.java --- tree/JMeterTreeListener.java 2001/07/26 00:34:45 1.7 +++ tree/JMeterTreeListener.java 2001/09/07 11:17:10 @@ -64,6 +64,7 @@ import javax.swing.tree.*; import org.apache.jmeter.gui.*; import org.apache.jmeter.save.Saveable; +import org.apache.jmeter.util.JMeterUtils; import java.util.*; /** @@ -83,7 +84,6 @@ private JMeterTreeModel model; private JTree tree; - private static ResourceBundle rb = ResourceBundle.getBundle("org.apache.jmeter.resources.messages"); /** * Constructor for the JMeterTreeListener object @@ -247,7 +247,7 @@ *@param pop The feature to be added to the RemoveMenu attribute */ private void addRemoveMenu(JPopupMenu pop) { - JMenuItem item = new JMenuItem(rb.getString("remove")); + JMenuItem item = new JMenuItem(JMeterUtils.getResString("remove")); item.addActionListener(actionHandler); pop.add(item); } @@ -259,13 +259,13 @@ *@param pop The feature to be added to the SaveMenu attribute */ private void addSaveMenu(JPopupMenu pop) { - JMenuItem item = new JMenuItem(rb.getString("save")); + JMenuItem item = new JMenuItem(JMeterUtils.getResString("save")); item.addActionListener(actionHandler); pop.add(item); } private void addLoadItem(JPopupMenu pop) { - JMenuItem item = new JMenuItem(rb.getString("open")); + JMenuItem item = new JMenuItem(JMeterUtils.getResString("open")); item.addActionListener(actionHandler); pop.add(item); } @@ -325,7 +325,7 @@ */ private void getAddMenu(JMeterComponentModel comp) { if (comp.getAddList() != null && comp.getAddList().size() > 0) { - JMenu menu = new JMenu(rb.getString("add")); + JMenu menu = new JMenu(JMeterUtils.getResString("add")); for (Iterator i = comp.getAddList().iterator(); i.hasNext(); ) { Object compToAdd = i.next(); if (compToAdd instanceof String) { Index: tree/JMeterTreeModel.java =================================================================== RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/gui/tree/JMeterTreeModel.java,v retrieving revision 1.8 diff -u -r1.8 JMeterTreeModel.java --- tree/JMeterTreeModel.java 2001/08/31 00:46:43 1.8 +++ tree/JMeterTreeModel.java 2001/09/07 11:17:10 @@ -64,6 +64,7 @@ import org.apache.jmeter.samplers.SampleListener; import org.apache.jmeter.gui.JMeterComponentModel; import org.apache.jmeter.util.ListedHashTree; +import org.apache.jmeter.util.JMeterUtils; import org.apache.jmeter.control.SamplerController; import org.apache.jmeter.control.TestPlan; import org.apache.jmeter.control.WorkBench; @@ -79,17 +80,16 @@ public class JMeterTreeModel extends DefaultTreeModel { - private static ResourceBundle rb = ResourceBundle.getBundle("org.apache.jmeter.resources.messages"); /************************************************************ * !ToDo (Constructor description) ***********************************************************/ public JMeterTreeModel() { - super(new JMeterTreeNode(new WorkBench(rb.getString("root")))); - this.insertNodeInto(new JMeterTreeNode(TestPlan.createTestPlan(rb.getString("test_plan"))), + super(new JMeterTreeNode(new WorkBench(JMeterUtils.getResString("root")))); + this.insertNodeInto(new JMeterTreeNode(TestPlan.createTestPlan(JMeterUtils.getResString("test_plan"))), (JMeterTreeNode)getRoot(), 0); - this.insertNodeInto(new JMeterTreeNode(new WorkBench(rb.getString("workbench"))), + this.insertNodeInto(new JMeterTreeNode(new WorkBench(JMeterUtils.getResString("workbench"))), (JMeterTreeNode)getRoot(), 1); }