1.1 --- a/src/share/classes/com/sun/tools/example/debug/tty/TTYResources.java Fri Aug 13 11:38:30 2010 -0700
1.2 +++ b/src/share/classes/com/sun/tools/example/debug/tty/TTYResources.java Mon Aug 16 14:47:00 2010 -0700
1.3 @@ -45,7 +45,7 @@
1.4 * @return the contents of this <code>ResourceBundle</code>.
1.5 */
1.6 public Object[][] getContents() {
1.7 - return new Object[][] {
1.8 + Object[][] temp = new Object[][] {
1.9 // NOTE: The value strings in this file containing "{0}" are
1.10 // processed by the java.text.MessageFormat class. Any
1.11 // single quotes appearing in these strings need to be
1.12 @@ -449,5 +449,7 @@
1.13 "For command help type ''help'' at {0} prompt"},
1.14 // END OF MATERIAL TO LOCALIZE
1.15 };
1.16 +
1.17 + return temp;
1.18 }
1.19 }
2.1 --- a/src/share/classes/sun/applet/resources/MsgAppletViewer.java Fri Aug 13 11:38:30 2010 -0700
2.2 +++ b/src/share/classes/sun/applet/resources/MsgAppletViewer.java Mon Aug 16 14:47:00 2010 -0700
2.3 @@ -29,7 +29,7 @@
2.4 public class MsgAppletViewer extends ListResourceBundle {
2.5
2.6 public Object[][] getContents() {
2.7 - return new Object[][] {
2.8 + Object[][] temp = new Object[][] {
2.9 {"textframe.button.dismiss", "Dismiss"},
2.10 {"appletviewer.tool.title", "Applet Viewer: {0}"},
2.11 {"appletviewer.menu.applet", "Applet"},
2.12 @@ -197,5 +197,7 @@
2.13 {"appletsecurityexception.checkread.unknown", "unknown class loader type. unable to check for checking read {0}"},
2.14 {"appletsecurityexception.checkconnect.unknown", "unknown class loader type. unable to check for checking connect"},
2.15 };
2.16 +
2.17 + return temp;
2.18 }
2.19 }
3.1 --- a/src/share/classes/sun/tools/jconsole/resources/JConsoleResources.java Fri Aug 13 11:38:30 2010 -0700
3.2 +++ b/src/share/classes/sun/tools/jconsole/resources/JConsoleResources.java Mon Aug 16 14:47:00 2010 -0700
3.3 @@ -46,8 +46,6 @@
3.4 */
3.5 public class JConsoleResources extends ListResourceBundle {
3.6
3.7 - private static final String cr = System.getProperty("line.separator");
3.8 -
3.9 /**
3.10 * Returns the contents of this <code>ResourceBundle</code>.
3.11 *
3.12 @@ -56,8 +54,8 @@
3.13 * @return the contents of this <code>ResourceBundle</code>.
3.14 */
3.15 protected Object[][] getContents0() {
3.16 - return new Object[][] {
3.17 - // NOTE 1: The value strings in this file containing "{0}" are
3.18 + Object[][] temp = new Object[][] {
3.19 + // NOTE 1: The value strings in this file containing "{0}" are
3.20 // processed by the java.text.MessageFormat class. Any
3.21 // single quotes appearing in these strings need to be
3.22 // doubled up.
3.23 @@ -98,7 +96,7 @@
3.24 {"Attributes","Attributes"},
3.25 {"Blank", "Blank"},
3.26 {"BlockedCount WaitedCount",
3.27 - "Total blocked: {0} Total waited: {1}" + cr},
3.28 + "Total blocked: {0} Total waited: {1}\n"},
3.29 {"Boot class path","Boot class path"},
3.30 {"BorderedComponent.moreOrLessButton.toolTip", "Toggle to show more or less information"},
3.31 {"CPU Usage","CPU Usage"},
3.32 @@ -271,21 +269,21 @@
3.33 {"Minimize All.mnemonic", 'M'},
3.34 {"Minus Version", "This is {0} version {1}"},
3.35 {"Monitor locked",
3.36 - " - locked {0}" + cr},
3.37 + " - locked {0}\n"},
3.38 {"Motif","Motif"},
3.39 {"Name Build and Mode","{0} (build {1}, {2})"},
3.40 {"Name and Build","{0} (build {1})"},
3.41 {"Name","Name"},
3.42 {"Name: ","Name: "},
3.43 {"Name State",
3.44 - "Name: {0}" + cr +
3.45 - "State: {1}" + cr},
3.46 + "Name: {0}\n" +
3.47 + "State: {1}\n"},
3.48 {"Name State LockName",
3.49 - "Name: {0}" + cr +
3.50 - "State: {1} on {2}" + cr},
3.51 + "Name: {0}\n" +
3.52 + "State: {1} on {2}\n"},
3.53 {"Name State LockName LockOwner",
3.54 - "Name: {0}" + cr +
3.55 - "State: {1} on {2} owned by: {3}" + cr},
3.56 + "Name: {0}\n" +
3.57 + "State: {1} on {2} owned by: {3}\n"},
3.58 {"New Connection...", "New Connection..."},
3.59 {"New Connection....mnemonic", 'N'},
3.60 {"New value applied","New value applied"},
3.61 @@ -351,7 +349,7 @@
3.62 {"Size Mb","{0} Mb"},
3.63 {"Source","Source"},
3.64 {"Stack trace",
3.65 - cr + "Stack trace: " + cr},
3.66 + "\nStack trace: \n"},
3.67 {"Success:","Success:"},
3.68 // Note: SummaryTab.headerDateTimeFormat can be one the following:
3.69 // 1. A combination of two styles for date and time, using the
3.70 @@ -433,22 +431,27 @@
3.71 {"plot", "plot"},
3.72 {"visualize","visualize"},
3.73 {"zz usage text",
3.74 - "Usage: {0} [ -interval=n ] [ -notile ] [ -pluginpath <path> ] [ -version ] [ connection ... ]" + cr +
3.75 - cr +
3.76 - " -interval Set the update interval to n seconds (default is 4 seconds)" + cr +
3.77 - " -notile Do not tile windows initially (for two or more connections)" + cr +
3.78 - " -pluginpath Specify the path that jconsole uses to look up the plugins" + cr +
3.79 - " -version Print program version" + cr +
3.80 - cr +
3.81 - " connection = pid || host:port || JMX URL (service:jmx:<protocol>://...)" + cr +
3.82 - " pid The process id of a target process" + cr +
3.83 - " host A remote host name or IP address" + cr +
3.84 - " port The port number for the remote connection" + cr +
3.85 - cr +
3.86 - " -J Specify the input arguments to the Java virtual machine" + cr +
3.87 + "Usage: {0} [ -interval=n ] [ -notile ] [ -pluginpath <path> ] [ -version ] [ connection ... ]\n\n" +
3.88 + " -interval Set the update interval to n seconds (default is 4 seconds)\n" +
3.89 + " -notile Do not tile windows initially (for two or more connections)\n" +
3.90 + " -pluginpath Specify the path that jconsole uses to look up the plugins\n\n" +
3.91 + " -version Print program version\n" +
3.92 + " connection = pid || host:port || JMX URL (service:jmx:<protocol>://...)\n" +
3.93 + " pid The process id of a target process\n" +
3.94 + " host A remote host name or IP address\n" +
3.95 + " port The port number for the remote connection\n\n" +
3.96 + " -J Specify the input arguments to the Java virtual machine\n" +
3.97 " on which jconsole is running"},
3.98 // END OF MATERIAL TO LOCALIZE
3.99 };
3.100 +
3.101 + String ls = System.getProperty("line.separator");
3.102 + for(int i=0;i<temp.length;i++) {
3.103 + temp[i][1] = temp[i][1].toString().replaceAll("\n",ls);
3.104 + }
3.105 +
3.106 + return temp;
3.107 +
3.108 }
3.109
3.110 public synchronized Object[][] getContents() {
4.1 --- a/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii.java Fri Aug 13 11:38:30 2010 -0700
4.2 +++ b/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii.java Mon Aug 16 14:47:00 2010 -0700
4.3 @@ -30,12 +30,14 @@
4.4 public class MsgNative2ascii extends ListResourceBundle {
4.5
4.6 public Object[][] getContents() {
4.7 - return new Object[][] {
4.8 + Object[][] temp = new Object[][] {
4.9 {"err.bad.arg", "-encoding requires argument"},
4.10 {"err.cannot.read", "{0} could not be read."},
4.11 {"err.cannot.write", "{0} could not be written."},
4.12 {"usage", "Usage: native2ascii" +
4.13 " [-reverse] [-encoding encoding] [inputfile [outputfile]]"},
4.14 };
4.15 +
4.16 + return temp;
4.17 }
4.18 }