? src/org/apache/jmeter/resources Index: build.xml =================================================================== RCS file: /home/cvspublic/jakarta-jmeter/build.xml,v retrieving revision 1.28 diff -u -r1.28 build.xml --- build.xml 2001/06/17 15:21:07 1.28 +++ build.xml 2001/06/28 08:39:16 @@ -1,6 +1,6 @@ - + @@ -126,6 +126,10 @@ + + + + Index: src/MANIFEST =================================================================== RCS file: /home/cvspublic/jakarta-jmeter/src/MANIFEST,v retrieving revision 1.2 diff -u -r1.2 MANIFEST --- src/MANIFEST 2000/05/18 21:33:56 1.2 +++ src/MANIFEST 2001/06/28 08:39:18 @@ -1,2 +1,2 @@ Manifest-Version: 1.0 -Main-Class: org.apache.jmeter.Driver +Main-Class: org.apache.jmeter.NewDriver Index: src/org/apache/jmeter/gui/JMeterMenuBar.java =================================================================== RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/gui/JMeterMenuBar.java,v retrieving revision 1.4 diff -u -r1.4 JMeterMenuBar.java --- src/org/apache/jmeter/gui/JMeterMenuBar.java 2001/03/17 22:25:44 1.4 +++ src/org/apache/jmeter/gui/JMeterMenuBar.java 2001/06/28 08:39:37 @@ -94,6 +94,8 @@ String[] remoteHosts; + private static ResourceBundle rb = ResourceBundle.getBundle("org.apache.jmeter.resources.messages"); + public JMeterMenuBar() { remote_engine_start = new LinkedList(); @@ -123,20 +125,20 @@ public void createMenuBar() { - fileMenu = new JMenu("File"); + fileMenu = new JMenu(rb.getString("file")); fileMenu.setMnemonic('F'); - file_save = new JMenuItem("Save",'S'); + file_save = new JMenuItem(rb.getString("save"),'S'); file_save.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S,KeyEvent.CTRL_MASK)); file_save.addActionListener(ActionRouter.getInstance()); - file_save_all = new JMenuItem("Save All",'A'); + file_save_all = new JMenuItem(rb.getString("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("Open",'O'); + file_load = new JMenuItem(rb.getString("open"),'O'); file_load.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O,KeyEvent.CTRL_MASK)); file_load.addActionListener(ActionRouter.getInstance()); - file_exit = new JMenuItem("Exit", 'X'); + file_exit = new JMenuItem(rb.getString("exit"), 'X'); file_exit.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Q, KeyEvent.CTRL_MASK)); file_exit.setActionCommand("exit"); file_exit.addActionListener(ActionRouter.getInstance()); @@ -145,18 +147,18 @@ fileMenu.add(file_save_all); fileMenu.add(file_exit); - runMenu = new JMenu("Run"); + runMenu = new JMenu(rb.getString("run")); runMenu.setMnemonic('R'); - run_start = new JMenuItem("Start", 'S'); + run_start = new JMenuItem(rb.getString("start"), 'S'); run_start.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, KeyEvent.CTRL_MASK)); run_start.addActionListener(ActionRouter.getInstance()); run_start.setActionCommand("start"); - run_stop = new JMenuItem("Stop", 'T'); + run_stop = new JMenuItem(rb.getString("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("Clear", 'C'); + run_clear = new JMenuItem(rb.getString("clear"), 'C'); run_clear.addActionListener(ActionRouter.getInstance()); run_clear.setActionCommand("clear"); runMenu.add(run_start); @@ -171,15 +173,15 @@ } runMenu.add(run_clear); - reportMenu = new JMenu("Report"); + reportMenu = new JMenu(rb.getString("report")); reportMenu.setMnemonic('P'); - analyze = new JMenuItem("Analyze Data File..."); + analyze = new JMenuItem(rb.getString("analyze")); analyze.setMnemonic('A'); analyze.addActionListener(ActionRouter.getInstance()); reportMenu.add(analyze); - optionsMenu = new JMenu("Options"); - lafMenu = new JMenu("Look and Feel"); + optionsMenu = new JMenu(rb.getString("option")); + lafMenu = new JMenu(rb.getString("appearance")); UIManager.LookAndFeelInfo lafs[] = UIManager.getInstalledLookAndFeels(); for (int i = 0; i < lafs.length; ++i) { @@ -191,9 +193,9 @@ optionsMenu.setMnemonic('O'); optionsMenu.add(lafMenu); - helpMenu = new JMenu("Help"); + helpMenu = new JMenu(rb.getString("help")); helpMenu.setMnemonic('H'); - help_about = new JMenuItem("About", 'A'); + help_about = new JMenuItem(rb.getString("about"), 'A'); help_about.setActionCommand("about"); help_about.addActionListener(ActionRouter.getInstance()); helpMenu.add(help_about); @@ -212,8 +214,8 @@ { if(remoteHosts.length > 0) { - remote_start = new JMenu("Remote Start"); - remote_stop = new JMenu("Remote Stop"); + remote_start = new JMenu(rb.getString("remote_start")); + remote_stop = new JMenu(rb.getString("remote_stop")); for (int i = 0; i < remoteHosts.length; i++) { JMenuItem item = new JMenuItem(remoteHosts[i]); @@ -250,4 +252,4 @@ run_start.setEnabled(!enable); run_stop.setEnabled(enable); } -} \ No newline at end of file +} Index: src/org/apache/jmeter/gui/tree/JMeterTreeListener.java =================================================================== RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/gui/tree/JMeterTreeListener.java,v retrieving revision 1.5 diff -u -r1.5 JMeterTreeListener.java --- src/org/apache/jmeter/gui/tree/JMeterTreeListener.java 2001/03/17 22:25:47 1.5 +++ src/org/apache/jmeter/gui/tree/JMeterTreeListener.java 2001/06/28 08:39:45 @@ -64,6 +64,7 @@ import javax.swing.tree.*; import org.apache.jmeter.gui.*; import org.apache.jmeter.save.Saveable; +import java.util.*; /** * Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache @@ -82,6 +83,7 @@ private JMeterTreeModel model; private JTree tree; + private static ResourceBundle rb = ResourceBundle.getBundle("org.apache.jmeter.resources.messages"); /** * Constructor for the JMeterTreeListener object @@ -245,7 +247,7 @@ *@param pop The feature to be added to the RemoveMenu attribute */ private void addRemoveMenu(JPopupMenu pop) { - JMenuItem item = new JMenuItem("Remove"); + JMenuItem item = new JMenuItem(rb.getString("remove")); item.addActionListener(actionHandler); pop.add(item); } @@ -257,13 +259,13 @@ *@param pop The feature to be added to the SaveMenu attribute */ private void addSaveMenu(JPopupMenu pop) { - JMenuItem item = new JMenuItem("Save"); + JMenuItem item = new JMenuItem(rb.getString("save")); item.addActionListener(actionHandler); pop.add(item); } private void addLoadItem(JPopupMenu pop) { - JMenuItem item = new JMenuItem("Open"); + JMenuItem item = new JMenuItem(rb.getString("open")); item.addActionListener(actionHandler); pop.add(item); } @@ -323,7 +325,7 @@ */ private void getAddMenu(JMeterComponentModel comp) { if (comp.getAddList() != null && comp.getAddList().size() > 0) { - JMenu menu = new JMenu("Add"); + JMenu menu = new JMenu(rb.getString("add")); for (Iterator i = comp.getAddList().iterator(); i.hasNext(); ) { Object compToAdd = i.next(); if (compToAdd instanceof String) { Index: src/org/apache/jmeter/gui/tree/JMeterTreeModel.java =================================================================== RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/gui/tree/JMeterTreeModel.java,v retrieving revision 1.4 diff -u -r1.4 JMeterTreeModel.java --- src/org/apache/jmeter/gui/tree/JMeterTreeModel.java 2001/03/17 22:25:47 1.4 +++ src/org/apache/jmeter/gui/tree/JMeterTreeModel.java 2001/06/28 08:39:46 @@ -78,13 +78,14 @@ public class JMeterTreeModel extends DefaultTreeModel { + private static ResourceBundle rb = ResourceBundle.getBundle("org.apache.jmeter.resources.messages"); public JMeterTreeModel() { - super(new JMeterTreeNode(new WorkBench("Root"))); - this.insertNodeInto(new JMeterTreeNode(TestPlan.createTestPlan("Test Plan")), + super(new JMeterTreeNode(new WorkBench(rb.getString("root")))); + this.insertNodeInto(new JMeterTreeNode(TestPlan.createTestPlan(rb.getString("test_plan"))), (JMeterTreeNode)getRoot(),0); - this.insertNodeInto(new JMeterTreeNode(new WorkBench("WorkBench")), + this.insertNodeInto(new JMeterTreeNode(new WorkBench(rb.getString("workbench"))), (JMeterTreeNode)getRoot(),1); } @@ -172,4 +173,4 @@ } } } -} \ No newline at end of file +} Index: src/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java =================================================================== RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java,v retrieving revision 1.9 diff -u -r1.9 UrlConfigGui.java --- src/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java 2001/06/28 01:29:21 1.9 +++ src/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java 2001/06/28 08:40:27 @@ -56,6 +56,7 @@ import javax.swing.*; import java.awt.event.*; +import java.util.*; import org.apache.jmeter.gui.*; import org.apache.jmeter.protocol.http.config.UrlConfig; @@ -89,6 +90,9 @@ private JRadioButton get = new JRadioButton("GET"); private JRadioButton http = new JRadioButton("HTTP"); private JRadioButton https = new JRadioButton("HTTPS"); + + private static ResourceBundle rb = ResourceBundle.getBundle("org.apache.jmeter.resources.messages"); + protected NamePanel namePanel; protected boolean displayName = true; @@ -155,7 +159,7 @@ protected JPanel getPortPanel() { JPanel portP = new JPanel(); - portP.add(new JLabel("Port")); + portP.add(new JLabel(rb.getString("port"))); Object portI = model.getProperty(UrlConfig.PORT); if (portI!=null) port.setText(portI.toString()); @@ -168,7 +172,7 @@ protected JPanel getDomainPanel() { JPanel domainP = new JPanel(); - domainP.add(new JLabel("Domain")); + domainP.add(new JLabel(rb.getString("domain"))); domain.setText((String)model.getProperty(UrlConfig.DOMAIN)); domain.setName(DOMAIN); domain.addKeyListener(this); @@ -179,7 +183,7 @@ protected JPanel getPathPanel() { JPanel panel = new JPanel(); - panel.add(new JLabel("Path")); + panel.add(new JLabel(rb.getString("path"))); path.setText((String)model.getProperty(UrlConfig.PATH)); path.setName(PATH); path.addKeyListener(this); @@ -190,7 +194,7 @@ protected JPanel getProtocolPanel() { JPanel panel = new JPanel(); - panel.add(new JLabel("Protocol: ")); + panel.add(new JLabel(rb.getString("protocol")+": ")); ButtonGroup group = new ButtonGroup(); group.add(http); group.add(https); @@ -223,7 +227,7 @@ protected JPanel getMethodPanel() { JPanel panel = new JPanel(); - panel.add(new JLabel("Method: ")); + panel.add(new JLabel(rb.getString("method")+": ")); ButtonGroup group = new ButtonGroup(); group.add(get); group.add(post); Index: src/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java =================================================================== RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java,v retrieving revision 1.3 diff -u -r1.3 HttpTestSampleGui.java --- src/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java 2001/03/17 22:25:50 1.3 +++ src/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java 2001/06/28 08:40:30 @@ -55,6 +55,7 @@ package org.apache.jmeter.protocol.http.control.gui; import javax.swing.*; +import java.util.*; import org.apache.jmeter.gui.*; @@ -76,6 +77,7 @@ private HttpTestSample model; private NamePanel namePanel; private UrlConfigGui defaultUrlGui; + private static ResourceBundle rb = ResourceBundle.getBundle("org.apache.jmeter.resources.messages"); public HttpTestSampleGui() { @@ -101,7 +103,7 @@ this.add(namePanel); JPanel urlPanel = new JPanel(); - urlPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),"Default Parameters") ); + urlPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),rb.getString("default_parameters")) ); defaultUrlGui = new UrlConfigGui(false); defaultUrlGui.setModel(model.getDefaultUrl());