--- a/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java Tue Nov 09 18:57:12 2010 +0000
+++ b/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java Thu Nov 11 15:51:12 2010 +0800
@@ -228,9 +228,7 @@
if (pubKey == null) {
newWarning = true;
MessageFormat form = new MessageFormat(rb.getString
- ("Warning: A public key for alias " +
- "'signers[i]' does not exist. " +
- "Make sure a KeyStore is properly configured."));
+ ("Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured."));
Object[] source = {signers[i]};
warnings.addElement(form.format(source));
}
@@ -248,7 +246,7 @@
} catch (ClassNotFoundException fnfe) {
newWarning = true;
MessageFormat form = new MessageFormat(rb.getString
- ("Warning: Class not found: class"));
+ ("Warning.Class.not.found.class"));
Object[] source = {pe.getPrincipalClass()};
warnings.addElement(form.format(source));
}
@@ -264,13 +262,13 @@
} catch (ClassNotFoundException fnfe) {
newWarning = true;
MessageFormat form = new MessageFormat(rb.getString
- ("Warning: Class not found: class"));
+ ("Warning.Class.not.found.class"));
Object[] source = {pe.permission};
warnings.addElement(form.format(source));
} catch (InvocationTargetException ite) {
newWarning = true;
MessageFormat form = new MessageFormat(rb.getString
- ("Warning: Invalid argument(s) for constructor: arg"));
+ ("Warning.Invalid.argument.s.for.constructor.arg"));
Object[] source = {pe.permission};
warnings.addElement(form.format(source));
}
@@ -285,9 +283,7 @@
if (pubKey == null) {
newWarning = true;
MessageFormat form = new MessageFormat(rb.getString
- ("Warning: A public key for alias " +
- "'signers[i]' does not exist. " +
- "Make sure a KeyStore is properly configured."));
+ ("Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured."));
Object[] source = {signers[i]};
warnings.addElement(form.format(source));
}
@@ -615,7 +611,7 @@
Thread.currentThread().getContextClassLoader());
if (!PRIN.isAssignableFrom(pc)) {
MessageFormat form = new MessageFormat(rb.getString
- ("Illegal Principal Type: type"));
+ ("Illegal.Principal.Type.type"));
Object[] source = {type};
throw new InstantiationException(form.format(source));
}
@@ -691,7 +687,7 @@
policyFileName = args[n];
} else {
MessageFormat form = new MessageFormat(rb.getString
- ("Illegal option: option"));
+ ("Illegal.option.option"));
Object[] source = { flags };
System.err.println(form.format(source));
usage();
@@ -700,10 +696,10 @@
}
static void usage() {
- System.out.println(rb.getString("Usage: policytool [options]"));
+ System.out.println(rb.getString("Usage.policytool.options."));
System.out.println();
System.out.println(rb.getString
- (" [-file <file>] policy file location"));
+ (".file.file.policy.file.location"));
System.out.println();
System.exit(1);
@@ -903,23 +899,23 @@
public static final String SAVE_POLICY_FILE =
PolicyTool.rb.getString("Save");
public static final String SAVE_AS_POLICY_FILE =
- PolicyTool.rb.getString("Save As");
+ PolicyTool.rb.getString("Save.As");
public static final String VIEW_WARNINGS =
- PolicyTool.rb.getString("View Warning Log");
+ PolicyTool.rb.getString("View.Warning.Log");
public static final String QUIT =
PolicyTool.rb.getString("Exit");
public static final String ADD_POLICY_ENTRY =
- PolicyTool.rb.getString("Add Policy Entry");
+ PolicyTool.rb.getString("Add.Policy.Entry");
public static final String EDIT_POLICY_ENTRY =
- PolicyTool.rb.getString("Edit Policy Entry");
+ PolicyTool.rb.getString("Edit.Policy.Entry");
public static final String REMOVE_POLICY_ENTRY =
- PolicyTool.rb.getString("Remove Policy Entry");
+ PolicyTool.rb.getString("Remove.Policy.Entry");
public static final String EDIT_KEYSTORE =
PolicyTool.rb.getString("Edit");
public static final String ADD_PUBKEY_ALIAS =
- PolicyTool.rb.getString("Add Public Key Alias");
+ PolicyTool.rb.getString("Add.Public.Key.Alias");
public static final String REMOVE_PUBKEY_ALIAS =
- PolicyTool.rb.getString("Remove Public Key Alias");
+ PolicyTool.rb.getString("Remove.Public.Key.Alias");
/* gridbag index for components in the main window (MW) */
public static final int MW_FILENAME_LABEL = 0;
@@ -968,13 +964,13 @@
// policy entry listing
- Label label = new Label(PolicyTool.rb.getString("Policy File:"));
+ Label label = new Label(PolicyTool.rb.getString("Policy.File."));
addNewComponent(this, label, MW_FILENAME_LABEL,
0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
TOP_BOTTOM_PADDING);
TextField tf = new TextField(50);
tf.getAccessibleContext().setAccessibleName(
- PolicyTool.rb.getString("Policy File:"));
+ PolicyTool.rb.getString("Policy.File."));
tf.setEditable(false);
addNewComponent(this, tf, MW_FILENAME_TEXTFIELD,
1, 0, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
@@ -1056,7 +1052,7 @@
// display the error
MessageFormat form = new MessageFormat(PolicyTool.rb.getString
- ("Could not open policy file: policyFile: e.toString()"));
+ ("Could.not.open.policy.file.policyFile.e.toString."));
Object[] source = {policyFile, e.toString()};
displayErrorDialog(null, form.format(source));
}
@@ -1133,7 +1129,7 @@
*/
void displayToolWindow(String args[]) {
- setTitle(PolicyTool.rb.getString("Policy Tool"));
+ setTitle(PolicyTool.rb.getString("Policy.Tool"));
setResizable(true);
addWindowListener(new ToolWindowListener(this));
setBounds(135, 80, 500, 500);
@@ -1146,9 +1142,7 @@
if (tool.newWarning == true) {
displayStatusDialog(this, PolicyTool.rb.getString
- ("Errors have occurred while opening the " +
- "policy configuration. View the Warning Log " +
- "for more information."));
+ ("Errors.have.occurred.while.opening.the.policy.configuration.View.the.Warning.Log.for.more.information."));
}
}
@@ -1231,7 +1225,7 @@
ta.setEditable(false);
for (int i = 0; i < tool.warnings.size(); i++) {
ta.append(tool.warnings.elementAt(i));
- ta.append(PolicyTool.rb.getString("\n"));
+ ta.append(PolicyTool.rb.getString("NEWLINE"));
}
addNewComponent(wd, ta, 0,
0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
@@ -1332,22 +1326,22 @@
/* popup menus */
public static final String PERM =
PolicyTool.rb.getString
- ("Permission: ");
+ ("Permission.");
public static final String PRIN_TYPE =
- PolicyTool.rb.getString("Principal Type:");
+ PolicyTool.rb.getString("Principal.Type.");
public static final String PRIN_NAME =
- PolicyTool.rb.getString("Principal Name:");
+ PolicyTool.rb.getString("Principal.Name.");
/* more popu menus */
public static final String PERM_NAME =
PolicyTool.rb.getString
- ("Target Name: ");
+ ("Target.Name.");
/* and more popup menus */
public static final String PERM_ACTIONS =
PolicyTool.rb.getString
- ("Actions: ");
+ ("Actions.");
/* gridbag index for display OverWriteFile (OW) components */
public static final int OW_LABEL = 0;
@@ -1540,7 +1534,7 @@
// ask the user if they want to over write the existing file
MessageFormat form = new MessageFormat(PolicyTool.rb.getString
- ("OK to overwrite existing file filename?"));
+ ("OK.to.overwrite.existing.file.filename."));
Object[] source = {filename};
Label label = new Label(form.format(source));
tw.addNewComponent(this, label, OW_LABEL,
@@ -1584,12 +1578,12 @@
PolicyEntry entries[] = null;
TaggedList prinList = new TaggedList(3, false);
prinList.getAccessibleContext().setAccessibleName(
- PolicyTool.rb.getString("Principal List"));
+ PolicyTool.rb.getString("Principal.List"));
prinList.addActionListener
(new EditPrinButtonListener(tool, tw, this, edit));
TaggedList permList = new TaggedList(10, false);
permList.getAccessibleContext().setAccessibleName(
- PolicyTool.rb.getString("Permission List"));
+ PolicyTool.rb.getString("Permission.List"));
permList.addActionListener
(new EditPermButtonListener(tool, tw, this, edit));
@@ -1627,7 +1621,7 @@
}
// codebase label and textfield
- Label label = new Label(PolicyTool.rb.getString("CodeBase:"));
+ Label label = new Label(PolicyTool.rb.getString("CodeBase."));
tw.addNewComponent(this, label, PE_CODEBASE_LABEL,
0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH);
TextField tf;
@@ -1635,19 +1629,19 @@
new TextField(entries[listIndex].getGrantEntry().codeBase, 60) :
new TextField(60));
tf.getAccessibleContext().setAccessibleName(
- PolicyTool.rb.getString("Code Base"));
+ PolicyTool.rb.getString("Code.Base"));
tw.addNewComponent(this, tf, PE_CODEBASE_TEXTFIELD,
1, 0, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH);
// signedby label and textfield
- label = new Label(PolicyTool.rb.getString("SignedBy:"));
+ label = new Label(PolicyTool.rb.getString("SignedBy."));
tw.addNewComponent(this, label, PE_SIGNEDBY_LABEL,
0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH);
tf = (edit ?
new TextField(entries[listIndex].getGrantEntry().signedBy, 60) :
new TextField(60));
tf.getAccessibleContext().setAccessibleName(
- PolicyTool.rb.getString("Signed By:"));
+ PolicyTool.rb.getString("Signed.By."));
tw.addNewComponent(this, tf, PE_SIGNEDBY_TEXTFIELD,
1, 1, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH);
@@ -1655,19 +1649,19 @@
Panel panel = new Panel();
panel.setLayout(new GridBagLayout());
- Button button = new Button(PolicyTool.rb.getString("Add Principal"));
+ Button button = new Button(PolicyTool.rb.getString("Add.Principal"));
button.addActionListener
(new AddPrinButtonListener(tool, tw, this, edit));
tw.addNewComponent(panel, button, PE_ADD_PRIN_BUTTON,
0, 0, 1, 1, 100.0, 0.0, GridBagConstraints.HORIZONTAL);
- button = new Button(PolicyTool.rb.getString("Edit Principal"));
+ button = new Button(PolicyTool.rb.getString("Edit.Principal"));
button.addActionListener(new EditPrinButtonListener
(tool, tw, this, edit));
tw.addNewComponent(panel, button, PE_EDIT_PRIN_BUTTON,
1, 0, 1, 1, 100.0, 0.0, GridBagConstraints.HORIZONTAL);
- button = new Button(PolicyTool.rb.getString("Remove Principal"));
+ button = new Button(PolicyTool.rb.getString("Remove.Principal"));
button.addActionListener(new RemovePrinButtonListener
(tool, tw, this, edit));
tw.addNewComponent(panel, button, PE_REMOVE_PRIN_BUTTON,
@@ -1677,7 +1671,7 @@
1, 2, 1, 1, 0.0, 0.0, GridBagConstraints.HORIZONTAL);
// principal label and list
- label = new Label(PolicyTool.rb.getString("Principals:"));
+ label = new Label(PolicyTool.rb.getString("Principals."));
tw.addNewComponent(this, label, PE_PRIN_LABEL,
0, 3, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
tw.BOTTOM_PADDING);
@@ -1689,20 +1683,20 @@
panel = new Panel();
panel.setLayout(new GridBagLayout());
- button = new Button(PolicyTool.rb.getString(" Add Permission"));
+ button = new Button(PolicyTool.rb.getString(".Add.Permission"));
button.addActionListener(new AddPermButtonListener
(tool, tw, this, edit));
tw.addNewComponent(panel, button, PE_ADD_PERM_BUTTON,
0, 0, 1, 1, 100.0, 0.0, GridBagConstraints.HORIZONTAL);
- button = new Button(PolicyTool.rb.getString(" Edit Permission"));
+ button = new Button(PolicyTool.rb.getString(".Edit.Permission"));
button.addActionListener(new EditPermButtonListener
(tool, tw, this, edit));
tw.addNewComponent(panel, button, PE_EDIT_PERM_BUTTON,
1, 0, 1, 1, 100.0, 0.0, GridBagConstraints.HORIZONTAL);
- button = new Button(PolicyTool.rb.getString("Remove Permission"));
+ button = new Button(PolicyTool.rb.getString("Remove.Permission"));
button.addActionListener(new RemovePermButtonListener
(tool, tw, this, edit));
tw.addNewComponent(panel, button, PE_REMOVE_PERM_BUTTON,
@@ -1808,7 +1802,7 @@
// KeyStore label and textfield
Label label = new Label
- (PolicyTool.rb.getString("KeyStore URL:"));
+ (PolicyTool.rb.getString("KeyStore.URL."));
tw.addNewComponent(this, label, KSD_NAME_LABEL,
0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
tw.BOTTOM_PADDING);
@@ -1816,45 +1810,45 @@
// URL to U R L, so that accessibility reader will pronounce well
tf.getAccessibleContext().setAccessibleName(
- PolicyTool.rb.getString("KeyStore U R L:"));
+ PolicyTool.rb.getString("KeyStore.U.R.L."));
tw.addNewComponent(this, tf, KSD_NAME_TEXTFIELD,
1, 0, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
tw.BOTTOM_PADDING);
// KeyStore type and textfield
- label = new Label(PolicyTool.rb.getString("KeyStore Type:"));
+ label = new Label(PolicyTool.rb.getString("KeyStore.Type."));
tw.addNewComponent(this, label, KSD_TYPE_LABEL,
0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
tw.BOTTOM_PADDING);
tf = new TextField(tool.getKeyStoreType(), 30);
tf.getAccessibleContext().setAccessibleName(
- PolicyTool.rb.getString("KeyStore Type:"));
+ PolicyTool.rb.getString("KeyStore.Type."));
tw.addNewComponent(this, tf, KSD_TYPE_TEXTFIELD,
1, 1, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
tw.BOTTOM_PADDING);
// KeyStore provider and textfield
label = new Label(PolicyTool.rb.getString
- ("KeyStore Provider:"));
+ ("KeyStore.Provider."));
tw.addNewComponent(this, label, KSD_PROVIDER_LABEL,
0, 2, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
tw.BOTTOM_PADDING);
tf = new TextField(tool.getKeyStoreProvider(), 30);
tf.getAccessibleContext().setAccessibleName(
- PolicyTool.rb.getString("KeyStore Provider:"));
+ PolicyTool.rb.getString("KeyStore.Provider."));
tw.addNewComponent(this, tf, KSD_PROVIDER_TEXTFIELD,
1, 2, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
tw.BOTTOM_PADDING);
// KeyStore password URL and textfield
label = new Label(PolicyTool.rb.getString
- ("KeyStore Password URL:"));
+ ("KeyStore.Password.URL."));
tw.addNewComponent(this, label, KSD_PWD_URL_LABEL,
0, 3, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
tw.BOTTOM_PADDING);
tf = new TextField(tool.getKeyStorePwdURL(), 30);
tf.getAccessibleContext().setAccessibleName(
- PolicyTool.rb.getString("KeyStore Password U R L:"));
+ PolicyTool.rb.getString("KeyStore.Password.U.R.L."));
tw.addNewComponent(this, tf, KSD_PWD_URL_TEXTFIELD,
1, 3, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
tw.BOTTOM_PADDING);
@@ -1909,8 +1903,8 @@
// description label
Label label = (edit ?
- new Label(PolicyTool.rb.getString(" Edit Principal:")) :
- new Label(PolicyTool.rb.getString(" Add New Principal:")));
+ new Label(PolicyTool.rb.getString(".Edit.Principal.")) :
+ new Label(PolicyTool.rb.getString(".Add.New.Principal.")));
tw.addNewComponent(newTD, label, PRD_DESC_LABEL,
0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
tw.TOP_BOTTOM_PADDING);
@@ -2016,8 +2010,8 @@
// description label
Label label = (edit ?
- new Label(PolicyTool.rb.getString(" Edit Permission:")) :
- new Label(PolicyTool.rb.getString(" Add New Permission:")));
+ new Label(PolicyTool.rb.getString(".Edit.Permission.")) :
+ new Label(PolicyTool.rb.getString(".Add.New.Permission.")));
tw.addNewComponent(newTD, label, PD_DESC_LABEL,
0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
tw.TOP_BOTTOM_PADDING);
@@ -2084,13 +2078,13 @@
tw.LR_PADDING);
// signedby label and textfield
- label = new Label(PolicyTool.rb.getString("Signed By:"));
+ label = new Label(PolicyTool.rb.getString("Signed.By."));
tw.addNewComponent(newTD, label, PD_SIGNEDBY_LABEL,
0, 4, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
tw.LR_PADDING);
tf = (edit ? new TextField(editMe.signedBy, 40) : new TextField(40));
tf.getAccessibleContext().setAccessibleName(
- PolicyTool.rb.getString("Signed By:"));
+ PolicyTool.rb.getString("Signed.By."));
tw.addNewComponent(newTD, tf, PD_SIGNEDBY_TEXTFIELD,
1, 4, 1, 1, 0.0, 0.0, GridBagConstraints.BOTH,
tw.LR_PADDING);
@@ -2135,12 +2129,10 @@
if ((pclass.equals(PolicyParser.PrincipalEntry.WILDCARD_CLASS)) &&
(!pname.equals(PolicyParser.PrincipalEntry.WILDCARD_NAME))) {
throw new Exception
- (PolicyTool.rb.getString("Cannot Specify Principal " +
- "with a Wildcard Class without a Wildcard Name"));
+ (PolicyTool.rb.getString("Cannot.Specify.Principal.with.a.Wildcard.Class.without.a.Wildcard.Name"));
} else if (pname.equals("")) {
throw new Exception
- (PolicyTool.rb.getString("Cannot Specify Principal " +
- "without a Name"));
+ (PolicyTool.rb.getString("Cannot.Specify.Principal.without.a.Name"));
} else if (pclass.equals("")) {
// make this consistent with what PolicyParser does
// when it sees an empty principal class
@@ -2188,7 +2180,7 @@
if (permission.equals("") ||
(!permission.equals(ALL_PERM_CLASS) && name == null)) {
throw new InvalidParameterException(PolicyTool.rb.getString
- ("Permission and Target Name must have a value"));
+ ("Permission.and.Target.Name.must.have.a.value"));
}
// When the permission is FilePermission, we need to check the name
@@ -2205,12 +2197,7 @@
char result = tw.displayYesNoDialog(this,
PolicyTool.rb.getString("Warning"),
PolicyTool.rb.getString(
- "Warning: File name may include escaped backslash characters. " +
- "It is not necessary to escape backslash characters " +
- "(the tool escapes characters as necessary when writing " +
- "the policy contents to the persistent store).\n\n" +
- "Click on Retain to retain the entered name, or click on " +
- "Edit to edit the name."),
+ "Warning.File.name.may.include.escaped.backslash.characters.It.is.not.necessary.to.escape.backslash.characters.the.tool.escapes"),
PolicyTool.rb.getString("Retain"),
PolicyTool.rb.getString("Edit")
);
@@ -2244,9 +2231,7 @@
if (pubKey == null) {
MessageFormat form = new MessageFormat
(PolicyTool.rb.getString
- ("Warning: A public key for alias " +
- "'signers[i]' does not exist. " +
- "Make sure a KeyStore is properly configured."));
+ ("Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured."));
Object[] source = {signers[i]};
tool.warnings.addElement(form.format(source));
tw.displayStatusDialog(this, form.format(source));
@@ -2276,7 +2261,7 @@
// ask the user do they really want to do this?
Label label = new Label
- (PolicyTool.rb.getString("Remove this Policy Entry?"));
+ (PolicyTool.rb.getString("Remove.this.Policy.Entry."));
tw.addNewComponent(this, label, CRPE_LABEL1,
0, 0, 2, 1, 0.0, 0.0, GridBagConstraints.BOTH,
tw.BOTTOM_PADDING);
@@ -2340,7 +2325,7 @@
// pop up a dialog box for the user to enter a filename.
FileDialog fd = new FileDialog
- (tw, PolicyTool.rb.getString("Save As"), FileDialog.SAVE);
+ (tw, PolicyTool.rb.getString("Save.As"), FileDialog.SAVE);
fd.addWindowListener(new WindowAdapter() {
public void windowClosing(WindowEvent e) {
e.getWindow().setVisible(false);
@@ -2362,7 +2347,7 @@
if (saveAsFile.exists()) {
// display a dialog box for the user to enter policy info
ToolDialog td = new ToolDialog
- (PolicyTool.rb.getString("Overwrite File"), tool, tw, true);
+ (PolicyTool.rb.getString("Overwrite.File"), tool, tw, true);
td.displayOverWriteFileDialog(filename, nextEvent);
} else {
try {
@@ -2371,7 +2356,7 @@
// display status
MessageFormat form = new MessageFormat(PolicyTool.rb.getString
- ("Policy successfully written to filename"));
+ ("Policy.successfully.written.to.filename"));
Object[] source = {filename};
tw.displayStatusDialog(null, form.format(source));
@@ -2388,7 +2373,7 @@
} catch (FileNotFoundException fnfe) {
if (filename == null || filename.equals("")) {
tw.displayErrorDialog(null, new FileNotFoundException
- (PolicyTool.rb.getString("null filename")));
+ (PolicyTool.rb.getString("null.filename")));
} else {
tw.displayErrorDialog(null, fnfe);
}
@@ -2411,7 +2396,7 @@
setLayout(new GridBagLayout());
Label label = new Label
- (PolicyTool.rb.getString("Save changes?"));
+ (PolicyTool.rb.getString("Save.changes."));
tw.addNewComponent(this, label, USC_LABEL,
0, 0, 3, 1, 0.0, 0.0, GridBagConstraints.BOTH,
tw.L_TOP_BOTTOM_PADDING);
@@ -2535,9 +2520,7 @@
// inform user of warnings
if (tool.newWarning == true) {
tw.displayStatusDialog(null, PolicyTool.rb.getString
- ("Errors have occurred while opening the " +
- "policy configuration. View the Warning Log " +
- "for more information."));
+ ("Errors.have.occurred.while.opening.the.policy.configuration.View.the.Warning.Log.for.more.information."));
}
} catch (Exception e) {
@@ -2556,7 +2539,7 @@
// display the error
MessageFormat form = new MessageFormat(PolicyTool.rb.getString
- ("Could not open policy file: policyFile: e.toString()"));
+ ("Could.not.open.policy.file.policyFile.e.toString."));
Object[] source = {policyFile, e.toString()};
tw.displayErrorDialog(null, form.format(source));
}
@@ -2708,7 +2691,7 @@
// display the permission list for a policy entry
ToolDialog td = new ToolDialog
- (PolicyTool.rb.getString("Policy Entry"), tool, tw, true);
+ (PolicyTool.rb.getString("Policy.Entry"), tool, tw, true);
td.displayPolicyEntryDialog(true);
}
}
@@ -2732,7 +2715,7 @@
// ask user if they want to save changes
ToolDialog td = new ToolDialog
- (PolicyTool.rb.getString("Save Changes"), tool, tw, true);
+ (PolicyTool.rb.getString("Save.Changes"), tool, tw, true);
td.displayUserSave(td.QUIT);
// the above method will perform the QUIT as long as the
@@ -2743,7 +2726,7 @@
// ask user if they want to save changes
ToolDialog td = new ToolDialog
- (PolicyTool.rb.getString("Save Changes"), tool, tw, true);
+ (PolicyTool.rb.getString("Save.Changes"), tool, tw, true);
td.displayUserSave(td.NEW);
// the above method will perform the NEW as long as the
@@ -2754,7 +2737,7 @@
// ask user if they want to save changes
ToolDialog td = new ToolDialog
- (PolicyTool.rb.getString("Save Changes"), tool, tw, true);
+ (PolicyTool.rb.getString("Save.Changes"), tool, tw, true);
td.displayUserSave(td.OPEN);
// the above method will perform the OPEN as long as the
@@ -2771,7 +2754,7 @@
if (filename == null || filename.length() == 0) {
// user wants to SAVE AS
ToolDialog td = new ToolDialog
- (PolicyTool.rb.getString("Save As"), tool, tw, true);
+ (PolicyTool.rb.getString("Save.As"), tool, tw, true);
td.displaySaveAsDialog(td.NOACTION);
} else {
try {
@@ -2781,13 +2764,13 @@
// display status
MessageFormat form = new MessageFormat
(PolicyTool.rb.getString
- ("Policy successfully written to filename"));
+ ("Policy.successfully.written.to.filename"));
Object[] source = {filename};
tw.displayStatusDialog(null, form.format(source));
} catch (FileNotFoundException fnfe) {
if (filename == null || filename.equals("")) {
tw.displayErrorDialog(null, new FileNotFoundException
- (PolicyTool.rb.getString("null filename")));
+ (PolicyTool.rb.getString("null.filename")));
} else {
tw.displayErrorDialog(null, fnfe);
}
@@ -2800,7 +2783,7 @@
// user wants to SAVE AS
ToolDialog td = new ToolDialog
- (PolicyTool.rb.getString("Save As"), tool, tw, true);
+ (PolicyTool.rb.getString("Save.As"), tool, tw, true);
td.displaySaveAsDialog(td.NOACTION);
} else if (PolicyTool.collator.compare(e.getActionCommand(),
@@ -2830,7 +2813,7 @@
// display a dialog box for the user to enter policy info
ToolDialog td = new ToolDialog
- (PolicyTool.rb.getString("Policy Entry"), tool, tw, true);
+ (PolicyTool.rb.getString("Policy.Entry"), tool, tw, true);
td.displayPolicyEntryDialog(false);
} else if (PolicyTool.collator.compare(e.getActionCommand(),
@@ -2841,13 +2824,13 @@
int index = list.getSelectedIndex();
if (index < 0) {
tw.displayErrorDialog(null, new Exception
- (PolicyTool.rb.getString("No Policy Entry selected")));
+ (PolicyTool.rb.getString("No.Policy.Entry.selected")));
return;
}
// ask the user if they really want to remove the policy entry
ToolDialog td = new ToolDialog(PolicyTool.rb.getString
- ("Remove Policy Entry"), tool, tw, true);
+ ("Remove.Policy.Entry"), tool, tw, true);
td.displayConfirmRemovePolicyEntry();
} else if (PolicyTool.collator.compare(e.getActionCommand(),
@@ -2858,13 +2841,13 @@
int index = list.getSelectedIndex();
if (index < 0) {
tw.displayErrorDialog(null, new Exception
- (PolicyTool.rb.getString("No Policy Entry selected")));
+ (PolicyTool.rb.getString("No.Policy.Entry.selected")));
return;
}
// display the permission list for a policy entry
ToolDialog td = new ToolDialog
- (PolicyTool.rb.getString("Policy Entry"), tool, tw, true);
+ (PolicyTool.rb.getString("Policy.Entry"), tool, tw, true);
td.displayPolicyEntryDialog(true);
} else if (PolicyTool.collator.compare(e.getActionCommand(),
@@ -2906,7 +2889,7 @@
// display status
MessageFormat form = new MessageFormat
(PolicyTool.rb.getString
- ("Policy successfully written to filename"));
+ ("Policy.successfully.written.to.filename"));
Object[] source = {filename};
tw.displayStatusDialog(null, form.format(source));
@@ -2925,7 +2908,7 @@
} catch (FileNotFoundException fnfe) {
if (filename == null || filename.equals("")) {
tw.displayErrorDialog(null, new FileNotFoundException
- (PolicyTool.rb.getString("null filename")));
+ (PolicyTool.rb.getString("null.filename")));
} else {
tw.displayErrorDialog(null, fnfe);
}
@@ -2977,9 +2960,7 @@
if (pubKey == null) {
MessageFormat form = new MessageFormat
(PolicyTool.rb.getString
- ("Warning: A public key for alias " +
- "'signers[i]' does not exist. " +
- "Make sure a KeyStore is properly configured."));
+ ("Warning.A.public.key.for.alias.signers.i.does.not.exist.Make.sure.a.KeyStore.is.properly.configured."));
Object[] source = {signers[i]};
tool.warnings.addElement(form.format(source));
tw.displayStatusDialog(td, form.format(source));
@@ -3047,7 +3028,7 @@
tool.modified = true;
} catch (Exception ex) {
MessageFormat form = new MessageFormat(PolicyTool.rb.getString
- ("Unable to open KeyStore: ex.toString()"));
+ ("Unable.to.open.KeyStore.ex.toString."));
Object[] source = {ex.toString()};
tw.displayErrorDialog(td, form.format(source));
return;
@@ -3143,7 +3124,7 @@
} catch (ClassNotFoundException cnfe) {
MessageFormat form = new MessageFormat
(PolicyTool.rb.getString
- ("Warning: Class not found: class"));
+ ("Warning.Class.not.found.class"));
Object[] source = {pppe.getPrincipalClass()};
tool.warnings.addElement(form.format(source));
tw.displayStatusDialog(infoDialog, form.format(source));
@@ -3204,7 +3185,7 @@
tool.verifyPermission(pppe.permission, pppe.name, pppe.action);
} catch (ClassNotFoundException cnfe) {
MessageFormat form = new MessageFormat(PolicyTool.rb.getString
- ("Warning: Class not found: class"));
+ ("Warning.Class.not.found.class"));
Object[] source = {pppe.permission};
tool.warnings.addElement(form.format(source));
tw.displayStatusDialog(infoDialog, form.format(source));
@@ -3259,7 +3240,7 @@
if (prinIndex < 0) {
tw.displayErrorDialog(td, new Exception
- (PolicyTool.rb.getString("No principal selected")));
+ (PolicyTool.rb.getString("No.principal.selected")));
return;
}
// remove the principal from the display
@@ -3293,7 +3274,7 @@
if (permIndex < 0) {
tw.displayErrorDialog(td, new Exception
- (PolicyTool.rb.getString("No permission selected")));
+ (PolicyTool.rb.getString("No.permission.selected")));
return;
}
// remove the permission from the display
@@ -3334,7 +3315,7 @@
if (prinIndex < 0) {
tw.displayErrorDialog(td, new Exception
- (PolicyTool.rb.getString("No principal selected")));
+ (PolicyTool.rb.getString("No.principal.selected")));
return;
}
td.displayPrincipalDialog(editPolicyEntry, true);
@@ -3373,7 +3354,7 @@
if (permIndex < 0) {
tw.displayErrorDialog(td, new Exception
- (PolicyTool.rb.getString("No permission selected")));
+ (PolicyTool.rb.getString("No.permission.selected")));
return;
}
td.displayPermissionDialog(editPolicyEntry, true);
@@ -3668,7 +3649,7 @@
// display status
MessageFormat form = new MessageFormat
(PolicyTool.rb.getString
- ("Policy successfully written to filename"));
+ ("Policy.successfully.written.to.filename"));
Object[] source = {filename};
tw.displayStatusDialog(null, form.format(source));
@@ -3900,7 +3881,7 @@
"getLoginConfiguration",
"setLoginConfiguration",
"createLoginConfiguration.<" +
- PolicyTool.rb.getString("configuration type") + ">",
+ PolicyTool.rb.getString("configuration.type") + ">",
"refreshLoginConfiguration"
},
null);
@@ -4117,7 +4098,7 @@
"setSecurityManager",
"createSecurityManager",
"getenv.<" +
- PolicyTool.rb.getString("environment variable name") + ">",
+ PolicyTool.rb.getString("environment.variable.name") + ">",
"exitVM",
"shutdownHooks",
"setFactory",
@@ -4129,11 +4110,11 @@
"readFileDescriptor",
"writeFileDescriptor",
"loadLibrary.<" +
- PolicyTool.rb.getString("library name") + ">",
+ PolicyTool.rb.getString("library.name") + ">",
"accessClassInPackage.<" +
- PolicyTool.rb.getString("package name")+">",
+ PolicyTool.rb.getString("package.name")+">",
"defineClassInPackage.<" +
- PolicyTool.rb.getString("package name")+">",
+ PolicyTool.rb.getString("package.name")+">",
"accessDeclaredMembers",
"queuePrintJob",
"getStackTrace",
@@ -4156,15 +4137,15 @@
"getPolicy",
"setPolicy",
"createPolicy.<" +
- PolicyTool.rb.getString("policy type") + ">",
+ PolicyTool.rb.getString("policy.type") + ">",
"getProperty.<" +
- PolicyTool.rb.getString("property name") + ">",
+ PolicyTool.rb.getString("property.name") + ">",
"setProperty.<" +
- PolicyTool.rb.getString("property name") + ">",
+ PolicyTool.rb.getString("property.name") + ">",
"insertProvider.<" +
- PolicyTool.rb.getString("provider name") + ">",
+ PolicyTool.rb.getString("provider.name") + ">",
"removeProvider.<" +
- PolicyTool.rb.getString("provider name") + ">",
+ PolicyTool.rb.getString("provider.name") + ">",
//"setSystemScope",
//"setIdentityPublicKey",
//"setIdentityInfo",
@@ -4172,11 +4153,11 @@
//"removeIdentityCertificate",
//"printIdentity",
"clearProviderProperties.<" +
- PolicyTool.rb.getString("provider name") + ">",
+ PolicyTool.rb.getString("provider.name") + ">",
"putProviderProperty.<" +
- PolicyTool.rb.getString("provider name") + ">",
+ PolicyTool.rb.getString("provider.name") + ">",
"removeProviderProperty.<" +
- PolicyTool.rb.getString("provider name") + ">",
+ PolicyTool.rb.getString("provider.name") + ">",
//"getSignerPrivateKey",
//"setSignerKeyPair"
},