Index: org/apache/jmeter/config/gui/ArgumentsPanel.java =================================================================== RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/config/gui/ArgumentsPanel.java,v retrieving revision 1.5 diff -u -r1.5 ArgumentsPanel.java --- org/apache/jmeter/config/gui/ArgumentsPanel.java 2001/06/29 21:56:57 1.5 +++ org/apache/jmeter/config/gui/ArgumentsPanel.java 2001/07/05 09:07:10 @@ -58,6 +58,7 @@ import javax.swing.*; import javax.swing.table.*; +import java.util.ResourceBundle; import org.apache.jmeter.config.*; import org.apache.jmeter.gui.*; @@ -78,6 +79,7 @@ JButton add; JButton delete; InnerTableModel tableModel; + private static ResourceBundle rb = ResourceBundle.getBundle("org.apache.jmeter.resources.messages"); /************************************************************ * Constructor for the ArgumentsPanel object @@ -160,7 +162,7 @@ private void init() { this.setLayout(new VerticalLayout()); - this.add(new JLabel("Parameter Table")); + this.add(new JLabel(rb.getString("paramtable"))); table = new JTable(tableModel); table.addKeyListener(this); table.setCellSelectionEnabled(true); @@ -176,8 +178,8 @@ scroller.setColumnHeaderView(table.getTableHeader()); this.add(scroller); - add = new JButton("Add"); - delete = new JButton("Delete"); + add = new JButton(rb.getString("add")); + delete = new JButton(rb.getString("delete")); JPanel buttonPanel = new JPanel(); add.addActionListener(this); delete.addActionListener(this); Index: org/apache/jmeter/gui/ListDialog.java =================================================================== RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/gui/ListDialog.java,v retrieving revision 1.4 diff -u -r1.4 ListDialog.java --- org/apache/jmeter/gui/ListDialog.java 2001/03/17 22:25:44 1.4 +++ org/apache/jmeter/gui/ListDialog.java 2001/07/05 09:07:15 @@ -57,6 +57,7 @@ import java.awt.*; import java.awt.event.*; +import java.util.ResourceBundle; import javax.swing.*; import java.util.*; @@ -84,6 +85,7 @@ Vector listData; + private static ResourceBundle rb = ResourceBundle.getBundle("org.apache.jmeter.resources.messages"); /************************* * Constructor takes a label for instructions to the user, and a list of items @@ -94,8 +96,8 @@ public ListDialog(ActionListener listener) { listData = new Vector(); - name = new JLabel("Name"); - value = new JLabel("Add Value"); + name = new JLabel(rb.getString("name")); + value = new JLabel(rb.getString("add_value")); nameField = new JTextField(10); valueField = new JTextField(10); valueField.addKeyListener(this); Index: org/apache/jmeter/gui/LoopControlPanel.java =================================================================== RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/gui/LoopControlPanel.java,v retrieving revision 1.1 diff -u -r1.1 LoopControlPanel.java --- org/apache/jmeter/gui/LoopControlPanel.java 2001/06/29 21:57:02 1.1 +++ org/apache/jmeter/gui/LoopControlPanel.java 2001/07/05 09:07:15 @@ -11,6 +11,7 @@ import javax.swing.*; import java.awt.event.*; +import java.util.ResourceBundle; import javax.swing.border.TitledBorder; import org.apache.jmeter.control.LoopController; @@ -25,9 +26,10 @@ public class LoopControlPanel extends JPanel implements ModelSupported, KeyListener, ActionListener { + private static ResourceBundle rb = ResourceBundle.getBundle("org.apache.jmeter.resources.messages"); NamePanel namePanel; LoopController model; - JCheckBox infinite = new JCheckBox("Infinite"); + JCheckBox infinite = new JCheckBox(rb.getString("infinite")); JTextField loops = new JTextField(5); private boolean displayName = true; @@ -161,7 +163,7 @@ loopPanel.add(infinite); JPanel entryPanel = new JPanel(); entryPanel.add(Box.createHorizontalStrut(10)); - entryPanel.add(new JLabel("Number of Iterations")); + entryPanel.add(new JLabel(rb.getString("iterator_num"))); loops.setName(LOOPS); loops.addKeyListener(this); setState(); Index: org/apache/jmeter/gui/NamePanel.java =================================================================== RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/gui/NamePanel.java,v retrieving revision 1.3 diff -u -r1.3 NamePanel.java --- org/apache/jmeter/gui/NamePanel.java 2001/03/17 22:25:45 1.3 +++ org/apache/jmeter/gui/NamePanel.java 2001/07/05 09:07:15 @@ -56,6 +56,7 @@ import javax.swing.*; import java.awt.event.*; +import java.util.ResourceBundle; /** * Title: JMeter @@ -71,6 +72,7 @@ private JMeterComponentModel model; private JTextField nameField = new JTextField(30); + private static ResourceBundle rb = ResourceBundle.getBundle("org.apache.jmeter.resources.messages"); public NamePanel() { @@ -94,7 +96,7 @@ private void init() { - this.add(new JLabel("Name")); + this.add(new JLabel(rb.getString("name"))); nameField.setName(NAME_FIELD); nameField.setText(model.getName()); nameField.addKeyListener(this); Index: org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java =================================================================== RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java,v retrieving revision 1.3 diff -u -r1.3 MultipartUrlConfigGui.java --- org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java 2001/06/29 21:57:10 1.3 +++ org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java 2001/07/05 09:07:37 @@ -3,6 +3,7 @@ import java.awt.*; import java.awt.event.*; import javax.swing.*; +import java.util.ResourceBundle; import org.apache.jmeter.gui.VerticalLayout; import org.apache.jmeter.gui.NamePanel; @@ -30,6 +31,8 @@ JTextField fieldNameField = new JTextField(15); JTextField mimetypeField = new JTextField(15); + private static ResourceBundle rb = ResourceBundle.getBundle("org.apache.jmeter.resources.messages"); + public MultipartUrlConfigGui() { } @@ -60,9 +63,9 @@ private JPanel getFilePanel() { JPanel panel = new JPanel(new VerticalLayout(1,VerticalLayout.LEFT)); - panel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),"File Upload")); + panel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),rb.getString("upload"))); JPanel tempPanel = new JPanel(); - tempPanel.add(new JLabel("File")); + tempPanel.add(new JLabel(rb.getString("file"))); filenameField.setText(((MultipartUrlConfig)model).getFilename()); filenameField.setName(FILENAME); filenameField.addKeyListener(this); @@ -73,7 +76,7 @@ panel.add(tempPanel); tempPanel = new JPanel(); - tempPanel.add(new JLabel("Field name")); + tempPanel.add(new JLabel(rb.getString("field_name"))); fieldNameField.setText(((MultipartUrlConfig)model).getFileFieldName()); fieldNameField.setName(FIELDNAME); fieldNameField.addKeyListener(this); Index: 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.11 diff -u -r1.11 UrlConfigGui.java --- org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java 2001/06/29 21:57:11 1.11 +++ org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java 2001/07/05 09:07:37 @@ -91,7 +91,7 @@ private JRadioButton http = new JRadioButton("HTTP"); private JRadioButton https = new JRadioButton("HTTPS"); - private static ResourceBundle rb = ResourceBundle.getBundle("org.apache.jmeter.resources.messages"); + private static ResourceBundle rb = ResourceBundle.getBundle("org.apache.jmeter.resources.messages"); protected NamePanel namePanel; protected boolean displayName = true; Index: org/apache/jmeter/protocol/http/gui/AuthPanel.java =================================================================== RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/protocol/http/gui/AuthPanel.java,v retrieving revision 1.7 diff -u -r1.7 AuthPanel.java --- org/apache/jmeter/protocol/http/gui/AuthPanel.java 2001/06/28 01:29:31 1.7 +++ org/apache/jmeter/protocol/http/gui/AuthPanel.java 2001/07/05 09:07:40 @@ -59,6 +59,7 @@ import java.io.*; import java.awt.*; import java.awt.event.*; +import java.util.ResourceBundle; import org.apache.jmeter.util.JMeterUtils; import org.apache.jmeter.protocol.http.control.*; import org.apache.jmeter.gui.*; @@ -76,6 +77,8 @@ { InnerTableModel tableModel; + private static ResourceBundle rb = ResourceBundle.getBundle("org.apache.jmeter.resources.messages"); + /************************************************************ * The authentication manager for this object ***********************************************************/ @@ -141,11 +144,11 @@ scroller.setColumnHeaderView(tableHeader); main.add(scroller); - JButton add = new JButton("Add"); - JButton edit = new JButton("Edit"); - JButton delete = new JButton("Delete"); - JButton load = new JButton("Load"); - JButton save = new JButton("Save"); + JButton add = new JButton(rb.getString("add")); + JButton edit = new JButton(rb.getString("edit")); + JButton delete = new JButton(rb.getString("delete")); + JButton load = new JButton(rb.getString("load")); + JButton save = new JButton(rb.getString("save")); Dimension d = delete.getPreferredSize(); add.setPreferredSize(d); edit.setPreferredSize(d); @@ -183,7 +186,7 @@ c.gridy = 1; g.setConstraints(nameField, c); _main.add(nameField); - JLabel usernameLabel = new JLabel("Username:"); + JLabel usernameLabel = new JLabel(rb.getString("username")+":"); c.gridx = 1; c.gridy = 2; g.setConstraints(usernameLabel, c); @@ -193,7 +196,7 @@ c.gridy = 2; g.setConstraints(usernameField, c); _main.add(usernameField); - JLabel passwordLabel = new JLabel("Password:"); + JLabel passwordLabel = new JLabel(rb.getString("password")+":"); c.gridx = 1; c.gridy = 3; g.setConstraints(passwordLabel, c); @@ -285,7 +288,7 @@ c.gridy = 1; g.setConstraints(nameField, c); _main.add(nameField); - JLabel usernameLabel = new JLabel("Username:"); + JLabel usernameLabel = new JLabel(rb.getString("username")+":"); c.gridx = 1; c.gridy = 2; g.setConstraints(usernameLabel, c); @@ -295,7 +298,7 @@ c.gridy = 2; g.setConstraints(usernameField, c); _main.add(usernameField); - JLabel passwordLabel = new JLabel("Password:"); + JLabel passwordLabel = new JLabel(rb.getString("password")+":"); c.gridx = 1; c.gridy = 3; g.setConstraints(passwordLabel, c); Index: org/apache/jmeter/protocol/http/gui/CookiePanel.java =================================================================== RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/protocol/http/gui/CookiePanel.java,v retrieving revision 1.7 diff -u -r1.7 CookiePanel.java --- org/apache/jmeter/protocol/http/gui/CookiePanel.java 2001/06/28 01:29:32 1.7 +++ org/apache/jmeter/protocol/http/gui/CookiePanel.java 2001/07/05 09:07:40 @@ -60,6 +60,7 @@ import java.awt.*; import java.awt.event.*; import java.io.*; +import java.util.ResourceBundle; import org.apache.jmeter.protocol.http.control.*; import org.apache.jmeter.util.JMeterUtils; @@ -78,6 +79,7 @@ CookieManager manager; InnerTableModel tableModel; + private static ResourceBundle rb = ResourceBundle.getBundle("org.apache.jmeter.resources.messages"); /************************************************************ * A table to show the authentication information @@ -145,12 +147,11 @@ scroller.setColumnHeaderView(tableHeader); main.add(scroller); - JButton add = new JButton("Add"); - JButton edit = new JButton("Edit"); - JButton delete = new JButton("Delete"); - //JButton close = new JButton("Close"); - JButton load = new JButton("Load"); - JButton save = new JButton("Save"); + JButton add = new JButton(rb.getString("add")); + JButton edit = new JButton(rb.getString("edit")); + JButton delete = new JButton(rb.getString("delete")); + JButton load = new JButton(rb.getString("load")); + JButton save = new JButton(rb.getString("save")); Dimension d = delete.getPreferredSize(); add.setPreferredSize(d); edit.setPreferredSize(d); @@ -288,6 +289,7 @@ JDialog updateDialog; + /************************************************************ * !ToDo (Constructor description) ***********************************************************/ @@ -310,27 +312,27 @@ c.fill = c.BOTH; c.gridwidth = 1; c.gridheight = 1; - JLabel nameLabel = new JLabel("Name:"); + JLabel nameLabel = new JLabel(rb.getString("name")+":"); c.gridx = 1; c.gridy = 1; g.setConstraints(nameLabel, c); main.add(nameLabel); - JLabel valueLabel = new JLabel("Value:"); + JLabel valueLabel = new JLabel(rb.getString("value")+":"); c.gridx = 1; c.gridy = 2; g.setConstraints(valueLabel, c); main.add(valueLabel); - JLabel domainLabel = new JLabel("Domain:"); + JLabel domainLabel = new JLabel(rb.getString("domain")+":"); c.gridx = 1; c.gridy = 3; g.setConstraints(domainLabel, c); main.add(domainLabel); - JLabel pathLabel = new JLabel("Path:"); + JLabel pathLabel = new JLabel(rb.getString("path")+":"); c.gridx = 1; c.gridy = 4; g.setConstraints(pathLabel, c); main.add(pathLabel); - JLabel expiresLabel = new JLabel("Expiration:"); + JLabel expiresLabel = new JLabel(rb.getString("expiration")+":"); c.gridx = 1; c.gridy = 6; g.setConstraints(expiresLabel, c); Index: org/apache/jmeter/protocol/http/gui/HeaderPanel.java =================================================================== RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/protocol/http/gui/HeaderPanel.java,v retrieving revision 1.2 diff -u -r1.2 HeaderPanel.java --- org/apache/jmeter/protocol/http/gui/HeaderPanel.java 2001/06/28 01:29:33 1.2 +++ org/apache/jmeter/protocol/http/gui/HeaderPanel.java 2001/07/05 09:07:41 @@ -61,6 +61,7 @@ import java.awt.*; import java.awt.event.*; import java.io.*; +import java.util.ResourceBundle; import org.apache.jmeter.protocol.http.control.*; import org.apache.jmeter.util.JMeterUtils; @@ -79,6 +80,7 @@ HeaderManager manager; InnerTableModel tableModel; + private static ResourceBundle rb = ResourceBundle.getBundle("org.apache.jmeter.resources.messages"); /************************************************************ * A table to show the authentication information @@ -146,12 +148,11 @@ scroller.setColumnHeaderView(tableHeader); main.add(scroller); - JButton add = new JButton("Add"); - JButton edit = new JButton("Edit"); - JButton delete = new JButton("Delete"); - //JButton close = new JButton("Close"); - JButton load = new JButton("Load"); - JButton save = new JButton("Save"); + JButton add = new JButton(rb.getString("add")); + JButton edit = new JButton(rb.getString("edit")); + JButton delete = new JButton(rb.getString("delete")); + JButton load = new JButton(rb.getString("load")); + JButton save = new JButton(rb.getString("save")); Dimension d = delete.getPreferredSize(); add.setPreferredSize(d); edit.setPreferredSize(d); @@ -307,12 +308,12 @@ c.fill = c.BOTH; c.gridwidth = 1; c.gridheight = 1; - JLabel nameLabel = new JLabel("Name:"); + JLabel nameLabel = new JLabel(rb.getString("name")+":"); c.gridx = 1; c.gridy = 1; g.setConstraints(nameLabel, c); main.add(nameLabel); - JLabel valueLabel = new JLabel("Value:"); + JLabel valueLabel = new JLabel(rb.getString("value")+":"); c.gridx = 1; c.gridy = 2; g.setConstraints(valueLabel, c); Index: org/apache/jmeter/resources/messages.properties =================================================================== RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/resources/messages.properties,v retrieving revision 1.1 diff -u -r1.1 messages.properties --- org/apache/jmeter/resources/messages.properties 2001/06/29 01:37:49 1.1 +++ org/apache/jmeter/resources/messages.properties 2001/07/05 09:07:54 @@ -2,7 +2,9 @@ run=Run save=Save save_all=Save All +load=Load open=Open +edit=Edit exit=Exit start=Start stop=Stop @@ -20,6 +22,7 @@ workbench=WorkBench add=Add remove=Remove +delete=Delete threadgroup=ThreadGroup controller=Controller config_element=Config Element @@ -29,3 +32,17 @@ path=Path method=Method default_parameters=Default Parameters +name=Name +value=Value +domain=Domain +path=Path +expiration=Expiration +username=Username +password=Password +number_of_threads=Number of Threads +infinite=Infinite +iterator_num=Number of Iterations +add_value=Add Value +paramtable=Parameter Table +upload=File Upload +field_name=Field name Index: org/apache/jmeter/resources/messages_ja.properties =================================================================== RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/resources/messages_ja.properties,v retrieving revision 1.1 diff -u -r1.1 messages_ja.properties --- org/apache/jmeter/resources/messages_ja.properties 2001/06/29 01:37:49 1.1 +++ org/apache/jmeter/resources/messages_ja.properties 2001/07/05 09:07:54 @@ -2,7 +2,9 @@ run=\u5b9f\u884c save=\u4fdd\u5b58 save_all=\u5168\u3066\u4fdd\u5b58 +load=\u8aad\u8fbc open=\u958b\u304f +edit=\u7de8\u96c6 exit=\u7d42\u4e86 start=\u958b\u59cb stop=\u505c\u6b62 @@ -20,6 +22,7 @@ #workbench=\u30ef\u30fc\u30af\u30d9\u30f3\u30c1 add=\u8ffd\u52a0 remove=\u524a\u9664 +delete=\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 @@ -29,3 +32,17 @@ path=\u30d1\u30b9 method=\u30e1\u30bd\u30c3\u30c9 default_parameters=\u30c7\u30d5\u30a9\u30eb\u30c8\u30d1\u30e9\u30e1\u30fc\u30bf +name=\u540d\u524d +value=\u5024 +domain=\u30c9\u30e1\u30a4\u30f3 +path=\u30d1\u30b9 +expiration=\u671f\u9650 +username=\u30e6\u30fc\u30b6\u540d +password=\u30d1\u30b9\u30ef\u30fc\u30c9 +number_of_threads=\u30b9\u30ec\u30c3\u30c9\u6570 +infinite=\u7121\u9650\u30eb\u30fc\u30d7 +iterator_num=\u30a4\u30c6\u30ec\u30fc\u30bf\u6570 +add_value=\u5024\u306e\u8ffd\u52a0 +paramtable=\u30d1\u30e9\u30e1\u30fc\u30bf\u540d +upload=\u30d5\u30a1\u30a4\u30eb\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9 +field_name=\u30d5\u30a3\u30fc\u30eb\u30c9\u540d Index: org/apache/jmeter/resources/messages_ja_JP.eucJP.properties =================================================================== RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/resources/messages_ja_JP.eucJP.properties,v retrieving revision 1.1 diff -u -r1.1 messages_ja_JP.eucJP.properties --- org/apache/jmeter/resources/messages_ja_JP.eucJP.properties 2001/06/29 01:37:49 1.1 +++ org/apache/jmeter/resources/messages_ja_JP.eucJP.properties 2001/07/05 09:07:54 @@ -2,7 +2,9 @@ run=実行 save=保存 save_all=全て保存 +load=読込 open=開く +edit=編集 exit=終了 start=開始 stop=停止 @@ -20,6 +22,7 @@ #workbench=ワークベンチ add=追加 remove=削除 +delete=削除 threadgroup=スレッドグループ controller=コントローラ config_element=コンフィグエレメント @@ -28,4 +31,18 @@ port=ポート path=パス method=メソッド -default_parameters=デフォルトパラメータ \ No newline at end of file +default_parameters=デフォルトパラメータ +name=名前 +value=値 +domain=ドメイン +path=パス +expiration=期限 +username=ユーザ名 +password=パスワード +number_of_threads=スレッド数 +infinite=無限ループ +iterator_num=イテレータ数 +add_value=値の追加 +paramtable=パラメータ名 +upload=ファイルアップロード +field_name=フィールド名 Index: org/apache/jmeter/threads/gui/ThreadGroupGui.java =================================================================== RCS file: /home/cvspublic/jakarta-jmeter/src/org/apache/jmeter/threads/gui/ThreadGroupGui.java,v retrieving revision 1.4 diff -u -r1.4 ThreadGroupGui.java --- org/apache/jmeter/threads/gui/ThreadGroupGui.java 2001/06/29 21:57:27 1.4 +++ org/apache/jmeter/threads/gui/ThreadGroupGui.java 2001/07/05 09:08:02 @@ -56,6 +56,7 @@ import javax.swing.*; import java.awt.event.*; +import java.util.ResourceBundle; import org.apache.jmeter.gui.*; import org.apache.jmeter.threads.ThreadGroup; @@ -74,10 +75,11 @@ ThreadGroup model; LoopControlPanel loopPanel; + private static ResourceBundle rb = ResourceBundle.getBundle("org.apache.jmeter.resources.messages"); - private JLabel nameLabel = new JLabel("Name"); + private JLabel nameLabel = new JLabel(rb.getString("name")); private JTextField nameInput = new JTextField(30); - private JLabel threadLabel = new JLabel("Number of Threads"); + private JLabel threadLabel = new JLabel(rb.getString("number_of_threads")); private JTextField threadInput = new JTextField(5); public ThreadGroupGui()