--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources.java Fri Aug 13 11:38:30 2010 -0700
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources.java Mon Aug 16 14:47:00 2010 -0700
@@ -45,7 +45,7 @@
* @return the contents of this <code>ResourceBundle</code>.
*/
public Object[][] getContents() {
- return new Object[][] {
+ Object[][] temp = new Object[][] {
// NOTE: The value strings in this file containing "{0}" are
// processed by the java.text.MessageFormat class. Any
// single quotes appearing in these strings need to be
@@ -449,5 +449,7 @@
"For command help type ''help'' at {0} prompt"},
// END OF MATERIAL TO LOCALIZE
};
+
+ return temp;
}
}
--- a/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer.java Fri Aug 13 11:38:30 2010 -0700
+++ b/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer.java Mon Aug 16 14:47:00 2010 -0700
@@ -29,7 +29,7 @@
public class MsgAppletViewer extends ListResourceBundle {
public Object[][] getContents() {
- return new Object[][] {
+ Object[][] temp = new Object[][] {
{"textframe.button.dismiss", "Dismiss"},
{"appletviewer.tool.title", "Applet Viewer: {0}"},
{"appletviewer.menu.applet", "Applet"},
@@ -197,5 +197,7 @@
{"appletsecurityexception.checkread.unknown", "unknown class loader type. unable to check for checking read {0}"},
{"appletsecurityexception.checkconnect.unknown", "unknown class loader type. unable to check for checking connect"},
};
+
+ return temp;
}
}
--- a/jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources.java Fri Aug 13 11:38:30 2010 -0700
+++ b/jdk/src/share/classes/sun/tools/jconsole/resources/JConsoleResources.java Mon Aug 16 14:47:00 2010 -0700
@@ -46,8 +46,6 @@
*/
public class JConsoleResources extends ListResourceBundle {
- private static final String cr = System.getProperty("line.separator");
-
/**
* Returns the contents of this <code>ResourceBundle</code>.
*
@@ -56,8 +54,8 @@
* @return the contents of this <code>ResourceBundle</code>.
*/
protected Object[][] getContents0() {
- return new Object[][] {
- // NOTE 1: The value strings in this file containing "{0}" are
+ Object[][] temp = new Object[][] {
+ // NOTE 1: The value strings in this file containing "{0}" are
// processed by the java.text.MessageFormat class. Any
// single quotes appearing in these strings need to be
// doubled up.
@@ -98,7 +96,7 @@
{"Attributes","Attributes"},
{"Blank", "Blank"},
{"BlockedCount WaitedCount",
- "Total blocked: {0} Total waited: {1}" + cr},
+ "Total blocked: {0} Total waited: {1}\n"},
{"Boot class path","Boot class path"},
{"BorderedComponent.moreOrLessButton.toolTip", "Toggle to show more or less information"},
{"CPU Usage","CPU Usage"},
@@ -271,21 +269,21 @@
{"Minimize All.mnemonic", 'M'},
{"Minus Version", "This is {0} version {1}"},
{"Monitor locked",
- " - locked {0}" + cr},
+ " - locked {0}\n"},
{"Motif","Motif"},
{"Name Build and Mode","{0} (build {1}, {2})"},
{"Name and Build","{0} (build {1})"},
{"Name","Name"},
{"Name: ","Name: "},
{"Name State",
- "Name: {0}" + cr +
- "State: {1}" + cr},
+ "Name: {0}\n" +
+ "State: {1}\n"},
{"Name State LockName",
- "Name: {0}" + cr +
- "State: {1} on {2}" + cr},
+ "Name: {0}\n" +
+ "State: {1} on {2}\n"},
{"Name State LockName LockOwner",
- "Name: {0}" + cr +
- "State: {1} on {2} owned by: {3}" + cr},
+ "Name: {0}\n" +
+ "State: {1} on {2} owned by: {3}\n"},
{"New Connection...", "New Connection..."},
{"New Connection....mnemonic", 'N'},
{"New value applied","New value applied"},
@@ -351,7 +349,7 @@
{"Size Mb","{0} Mb"},
{"Source","Source"},
{"Stack trace",
- cr + "Stack trace: " + cr},
+ "\nStack trace: \n"},
{"Success:","Success:"},
// Note: SummaryTab.headerDateTimeFormat can be one the following:
// 1. A combination of two styles for date and time, using the
@@ -433,22 +431,27 @@
{"plot", "plot"},
{"visualize","visualize"},
{"zz usage text",
- "Usage: {0} [ -interval=n ] [ -notile ] [ -pluginpath <path> ] [ -version ] [ connection ... ]" + cr +
- cr +
- " -interval Set the update interval to n seconds (default is 4 seconds)" + cr +
- " -notile Do not tile windows initially (for two or more connections)" + cr +
- " -pluginpath Specify the path that jconsole uses to look up the plugins" + cr +
- " -version Print program version" + cr +
- cr +
- " connection = pid || host:port || JMX URL (service:jmx:<protocol>://...)" + cr +
- " pid The process id of a target process" + cr +
- " host A remote host name or IP address" + cr +
- " port The port number for the remote connection" + cr +
- cr +
- " -J Specify the input arguments to the Java virtual machine" + cr +
+ "Usage: {0} [ -interval=n ] [ -notile ] [ -pluginpath <path> ] [ -version ] [ connection ... ]\n\n" +
+ " -interval Set the update interval to n seconds (default is 4 seconds)\n" +
+ " -notile Do not tile windows initially (for two or more connections)\n" +
+ " -pluginpath Specify the path that jconsole uses to look up the plugins\n\n" +
+ " -version Print program version\n" +
+ " connection = pid || host:port || JMX URL (service:jmx:<protocol>://...)\n" +
+ " pid The process id of a target process\n" +
+ " host A remote host name or IP address\n" +
+ " port The port number for the remote connection\n\n" +
+ " -J Specify the input arguments to the Java virtual machine\n" +
" on which jconsole is running"},
// END OF MATERIAL TO LOCALIZE
};
+
+ String ls = System.getProperty("line.separator");
+ for(int i=0;i<temp.length;i++) {
+ temp[i][1] = temp[i][1].toString().replaceAll("\n",ls);
+ }
+
+ return temp;
+
}
public synchronized Object[][] getContents() {
--- a/jdk/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii.java Fri Aug 13 11:38:30 2010 -0700
+++ b/jdk/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii.java Mon Aug 16 14:47:00 2010 -0700
@@ -30,12 +30,14 @@
public class MsgNative2ascii extends ListResourceBundle {
public Object[][] getContents() {
- return new Object[][] {
+ Object[][] temp = new Object[][] {
{"err.bad.arg", "-encoding requires argument"},
{"err.cannot.read", "{0} could not be read."},
{"err.cannot.write", "{0} could not be written."},
{"usage", "Usage: native2ascii" +
" [-reverse] [-encoding encoding] [inputfile [outputfile]]"},
};
+
+ return temp;
}
}