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 ms...@apache.org on 2001/06/29 03:37:50 UTC
cvs commit: jakarta-jmeter/src/org/apache/jmeter/resources messages.properties messages_ja.properties messages_ja_JP.eucJP.properties
mstover1 01/06/28 18:37:50
Modified: . build.xml
src MANIFEST
src/org/apache/jmeter/gui JMeterMenuBar.java
src/org/apache/jmeter/gui/tree JMeterTreeListener.java
JMeterTreeModel.java
src/org/apache/jmeter/protocol/http/config/gui
UrlConfigGui.java
src/org/apache/jmeter/protocol/http/control/gui
HttpTestSampleGui.java
Added: src/org/apache/jmeter/resources messages.properties
messages_ja.properties
messages_ja_JP.eucJP.properties
Log:
Internationalization support, first patch
Revision Changes Path
1.29 +4 -0 jakarta-jmeter/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-jmeter/build.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- build.xml 2001/06/17 15:21:07 1.28
+++ build.xml 2001/06/29 01:37:36 1.29
@@ -126,6 +126,10 @@
<copy toDir="${classes.dest.dir}/org/apache/jmeter/images">
<fileset dir="${sources.src.dir}/org/apache/jmeter/images"/>
</copy>
+ <copy toDir="${classes.dest.dir}/org/apache/jmeter/resources">
+ <fileset dir="${sources.src.dir}/org/apache/jmeter/resources"/>
+ </copy>
+
<jar jarfile="ApacheJMeter.jar" manifest="src/MANIFEST" basedir="${classes.dest.dir}">
</jar>
</target>
1.3 +1 -1 jakarta-jmeter/src/MANIFEST
Index: MANIFEST
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/MANIFEST,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MANIFEST 2000/05/18 21:33:56 1.2
+++ MANIFEST 2001/06/29 01:37:38 1.3
@@ -1,2 +1,2 @@
Manifest-Version: 1.0
-Main-Class: org.apache.jmeter.Driver
+Main-Class: org.apache.jmeter.NewDriver
1.5 +20 -18 jakarta-jmeter/src/org/apache/jmeter/gui/JMeterMenuBar.java
Index: JMeterMenuBar.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/gui/JMeterMenuBar.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JMeterMenuBar.java 2001/03/17 22:25:44 1.4
+++ JMeterMenuBar.java 2001/06/29 01:37:41 1.5
@@ -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
+}
1.6 +6 -4 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JMeterTreeListener.java 2001/03/17 22:25:47 1.5
+++ JMeterTreeListener.java 2001/06/29 01:37:43 1.6
@@ -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) {
1.5 +5 -4 jakarta-jmeter/src/org/apache/jmeter/gui/tree/JMeterTreeModel.java
Index: JMeterTreeModel.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/gui/tree/JMeterTreeModel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JMeterTreeModel.java 2001/03/17 22:25:47 1.4
+++ JMeterTreeModel.java 2001/06/29 01:37:43 1.5
@@ -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
+}
1.10 +9 -5 jakarta-jmeter/src/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
Index: UrlConfigGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- UrlConfigGui.java 2001/06/28 01:29:21 1.9
+++ UrlConfigGui.java 2001/06/29 01:37:46 1.10
@@ -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);
1.4 +3 -1 jakarta-jmeter/src/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
Index: HttpTestSampleGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HttpTestSampleGui.java 2001/03/17 22:25:50 1.3
+++ HttpTestSampleGui.java 2001/06/29 01:37:47 1.4
@@ -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());
1.1 jakarta-jmeter/src/org/apache/jmeter/resources/messages.properties
Index: messages.properties
===================================================================
file=File
run=Run
save=Save
save_all=Save All
open=Open
exit=Exit
start=Start
stop=Stop
clear=Clear
report=Report
analyze=Analyze Data File...
option=Option
appearance=Look and Feel
help=Help
about=About
remote_start=Remote Start
remote_start=Remote Stop
root=Root
test_plan=Test Plan
workbench=WorkBench
add=Add
remove=Remove
threadgroup=ThreadGroup
controller=Controller
config_element=Config Element
protocol=Protocol
domain=Domain
port=Port
path=Path
method=Method
default_parameters=Default Parameters
1.1 jakarta-jmeter/src/org/apache/jmeter/resources/messages_ja.properties
Index: messages_ja.properties
===================================================================
file=\u30d5\u30a1\u30a4\u30eb
run=\u5b9f\u884c
save=\u4fdd\u5b58
save_all=\u5168\u3066\u4fdd\u5b58
open=\u958b\u304f
exit=\u7d42\u4e86
start=\u958b\u59cb
stop=\u505c\u6b62
clear=\u6d88\u53bb
report=\u30ec\u30dd\u30fc\u30c8
analyze=\u30c7\u30fc\u30bf\u5206\u6790
option=\u30aa\u30d7\u30b7\u30e7\u30f3
appearance=\u5916\u89b3
help=\u30d8\u30eb\u30d7
about=\u3053\u306e\u30bd\u30d5\u30c8\u306b\u3064\u3044\u3066
remote_start=\u958b\u59cb(\u30ea\u30e2\u30fc\u30c8)
remote_start=\u505c\u6b62(\u30ea\u30e2\u30fc\u30c8)
#root=\u30eb\u30fc\u30c8
#test_plan=\u30c6\u30b9\u30c8\u30d7\u30e9\u30f3
#workbench=\u30ef\u30fc\u30af\u30d9\u30f3\u30c1
add=\u8ffd\u52a0
remove=\u524a\u9664
threadgroup=\u30b9\u30ec\u30c3\u30c9\u30b0\u30eb\u30fc\u30d7
controller=\u30b3\u30f3\u30c8\u30ed\u30fc\u30e9
config_element=\u30b3\u30f3\u30d5\u30a3\u30b0\u30a8\u30ec\u30e1\u30f3\u30c8
protocol=\u30d7\u30ed\u30c8\u30b3\u30eb
domain=\u30c9\u30e1\u30a4\u30f3
port=\u30dd\u30fc\u30c8
path=\u30d1\u30b9
method=\u30e1\u30bd\u30c3\u30c9
default_parameters=\u30c7\u30d5\u30a9\u30eb\u30c8\u30d1\u30e9\u30e1\u30fc\u30bf
1.1 jakarta-jmeter/src/org/apache/jmeter/resources/messages_ja_JP.eucJP.properties
<<Binary file>>
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org