bloritsch 01/09/05 06:52:55
Modified: src/org/apache/jmeter/gui/action SSLManagerCommand.java
src/org/apache/jmeter/resources messages.properties
src/org/apache/jmeter/util SSLManager.java
Log:
Added internationalization to SSLManager classes
Revision Changes Path
1.2 +3 -2
jakarta-jmeter/src/org/apache/jmeter/gui/action/SSLManagerCommand.java
Index: SSLManagerCommand.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/gui/action/SSLManagerCommand.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SSLManagerCommand.java 2001/09/05 12:21:46 1.1
+++ SSLManagerCommand.java 2001/09/05 13:52:55 1.2
@@ -62,6 +62,7 @@
import java.awt.*;
import java.awt.event.*;
import javax.swing.border.*;
+import java.util.ResourceBundle;
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.util.SSLManager;
@@ -85,7 +86,7 @@
* </p>
*
* @author <a href="[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/09/05 12:21:46 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/09/05 13:52:55 $
*/
public class SSLManagerCommand implements Command {
@@ -153,7 +154,7 @@
* @return description
*/
public String getDescription() {
- return "PKCS 12 Key (*.p12)";
+ return JMeterUtils.getResString("pkcs12_desc");
}
/**
1.8 +7 -0
jakarta-jmeter/src/org/apache/jmeter/resources/messages.properties
Index: messages.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/resources/messages.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- messages.properties 2001/08/31 00:46:44 1.7
+++ messages.properties 2001/09/05 13:52:55 1.8
@@ -15,6 +15,13 @@
option=Option
appearance=Look and Feel
sslManager=SSL Manager
+pkcs12_desc=PKCS 12 Key (*.p12)
+ssl_error_title=Key Store Problem
+ssl_pass_prompt=Please type your password
+ssl_pass_title=KeyStore Password
+ssl_alias_prompt=Please type your preferred alias
+ssl_alias_select=Select your alias for the test
+ssl_alias_title=Client Alias
help=Help
about=About
remote_start=Remote Start
1.2 +9 -8 jakarta-jmeter/src/org/apache/jmeter/util/SSLManager.java
Index: SSLManager.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/util/SSLManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SSLManager.java 2001/09/05 12:21:46 1.1
+++ SSLManager.java 2001/09/05 13:52:55 1.2
@@ -69,6 +69,7 @@
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
+import java.util.ResourceBundle;
import javax.swing.JOptionPane;
@@ -88,7 +89,7 @@
* make a decision, it will pop open a dialog asking you for more information.
*
* @author <a href="[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/09/05 12:21:46 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/09/05 13:52:55 $
*/
public class SSLManager {
/** Singleton instance of the manager */
@@ -144,7 +145,7 @@
} catch (KeyStoreException e) {
JOptionPane.showMessageDialog(GuiPackage.getInstance().getMainFrame(),
e,
- "KeyStore Problem",
+
JMeterUtils.getResString("ssl_error_title"),
JOptionPane.ERROR_MESSAGE);
this.keyStore = null;
throw new RuntimeException("KeyStore Problem");
@@ -157,8 +158,8 @@
if (null == defaultpw) {
synchronized(this) {
this.defaultpw =
JOptionPane.showInputDialog(GuiPackage.getInstance().getMainFrame(),
- "KeyStore Password",
- "Input Password",
+
JMeterUtils.getResString("ssl_pass_prompt"),
+
JMeterUtils.getResString("ssl_pass_title"),
JOptionPane.QUESTION_MESSAGE);
JMeterUtils.getJMeterProperties().setProperty("javax.net.ssl.keyStorePassword",
this.defaultpw);
}
@@ -279,8 +280,8 @@
synchronized(this) {
this.defaultAlias = (String)
JOptionPane.showInputDialog(GuiPackage.getInstance().getMainFrame(),
- "Select Your Alias for the
test",
- "Client Alias",
+
JMeterUtils.getResString("ssl_alias_select"),
+
JMeterUtils.getResString("ssl_alias_title"),
JOptionPane.QUESTION_MESSAGE,
null,
aliases,
@@ -290,8 +291,8 @@
synchronized(this) {
this.defaultAlias =
JOptionPane.showInputDialog(GuiPackage.getInstance().getMainFrame(),
- "Please type your prefered
alias",
- "Client Alias",
+
JMeterUtils.getResString("ssl_alias_prompt"),
+
JMeterUtils.getResString("ssl_alias_title"),
JOptionPane.QUESTION_MESSAGE);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
