You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/02/12 17:58:03 UTC
svn commit: r909500 - in
/harmony/enhanced/classlib/trunk/modules/luni/src/main/java: java/util/
org/apache/harmony/luni/internal/nls/
Author: hindessm
Date: Fri Feb 12 16:58:01 2010
New Revision: 909500
URL: http://svn.apache.org/viewvc?rev=909500&view=rev
Log:
More nls refactoring.
Modified:
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Arrays.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/BitSet.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Collections.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/MissingFormatArgumentException.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/ResourceBundle.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/SimpleTimeZone.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Timer.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/UUID.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/UnknownFormatConversionException.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/UnknownFormatFlagsException.java
harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/nls/messages.properties
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Arrays.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Arrays.java?rev=909500&r1=909499&r2=909500&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Arrays.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Arrays.java Fri Feb 12 16:58:01 2010
@@ -20,7 +20,7 @@
import java.io.Serializable;
import java.lang.reflect.Array;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
/**
* {@code Arrays} contains static methods which operate on arrays.
@@ -1667,17 +1667,17 @@
private static void checkBounds(int arrLength, int start, int end) {
if (start > end) {
- // K0033=Start index ({0}) is greater than end index ({1})
- throw new IllegalArgumentException(Msg.getString("K0033", //$NON-NLS-1$
+ // luni.35=Start index ({0}) is greater than end index ({1})
+ throw new IllegalArgumentException(Messages.getString("luni.35", //$NON-NLS-1$
Integer.valueOf(start), Integer.valueOf(end)));
}
if (start < 0) {
- // K0052=Array index out of range\: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K0052", start)); //$NON-NLS-1$
+ // luni.36=Array index out of range\: {0}
+ throw new ArrayIndexOutOfBoundsException(Messages.getString("luni.36", start)); //$NON-NLS-1$
}
if (end > arrLength) {
- // K0052=Array index out of range\: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K0052", end)); //$NON-NLS-1$
+ // luni.36=Array index out of range\: {0}
+ throw new ArrayIndexOutOfBoundsException(Messages.getString("luni.36", end)); //$NON-NLS-1$
}
}
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/BitSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/BitSet.java?rev=909500&r1=909499&r2=909500&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/BitSet.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/BitSet.java Fri Feb 12 16:58:01 2010
@@ -21,7 +21,7 @@
import java.io.ObjectInputStream;
import java.io.Serializable;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
/**
* The {@code BitSet} class implements a bit field. Each element in a
@@ -240,7 +240,7 @@
public boolean get(int pos) {
if (pos < 0) {
// Negative index specified
- throw new IndexOutOfBoundsException(Msg.getString("K0006")); //$NON-NLS-1$
+ throw new IndexOutOfBoundsException(Messages.getString("luni.37")); //$NON-NLS-1$
}
int arrayPos = pos >> OFFSET;
@@ -267,7 +267,7 @@
*/
public BitSet get(int pos1, int pos2) {
if (pos1 < 0 || pos2 < 0 || pos2 < pos1) {
- throw new IndexOutOfBoundsException(Msg.getString("K0006")); //$NON-NLS-1$
+ throw new IndexOutOfBoundsException(Messages.getString("luni.37")); //$NON-NLS-1$
}
int last = actualArrayLength << OFFSET;
@@ -338,7 +338,7 @@
*/
public void set(int pos) {
if (pos < 0) {
- throw new IndexOutOfBoundsException(Msg.getString("K0006")); //$NON-NLS-1$
+ throw new IndexOutOfBoundsException(Messages.getString("luni.37")); //$NON-NLS-1$
}
int len = (pos >> OFFSET) + 1;
@@ -388,7 +388,7 @@
*/
public void set(int pos1, int pos2) {
if (pos1 < 0 || pos2 < 0 || pos2 < pos1) {
- throw new IndexOutOfBoundsException(Msg.getString("K0006")); //$NON-NLS-1$
+ throw new IndexOutOfBoundsException(Messages.getString("luni.37")); //$NON-NLS-1$
}
if (pos1 == pos2) {
@@ -477,7 +477,7 @@
public void clear(int pos) {
if (pos < 0) {
// Negative index specified
- throw new IndexOutOfBoundsException(Msg.getString("K0006")); //$NON-NLS-1$
+ throw new IndexOutOfBoundsException(Messages.getString("luni.37")); //$NON-NLS-1$
}
if (!needClear) {
@@ -507,7 +507,7 @@
*/
public void clear(int pos1, int pos2) {
if (pos1 < 0 || pos2 < 0 || pos2 < pos1) {
- throw new IndexOutOfBoundsException(Msg.getString("K0006")); //$NON-NLS-1$
+ throw new IndexOutOfBoundsException(Messages.getString("luni.37")); //$NON-NLS-1$
}
if (!needClear) {
@@ -552,7 +552,7 @@
*/
public void flip(int pos) {
if (pos < 0) {
- throw new IndexOutOfBoundsException(Msg.getString("K0006")); //$NON-NLS-1$
+ throw new IndexOutOfBoundsException(Messages.getString("luni.37")); //$NON-NLS-1$
}
int len = (pos >> OFFSET) + 1;
@@ -582,7 +582,7 @@
*/
public void flip(int pos1, int pos2) {
if (pos1 < 0 || pos2 < 0 || pos2 < pos1) {
- throw new IndexOutOfBoundsException(Msg.getString("K0006")); //$NON-NLS-1$
+ throw new IndexOutOfBoundsException(Messages.getString("luni.37")); //$NON-NLS-1$
}
if (pos1 == pos2) {
@@ -851,7 +851,7 @@
*/
public int nextSetBit(int pos) {
if (pos < 0) {
- throw new IndexOutOfBoundsException(Msg.getString("K0006")); //$NON-NLS-1$
+ throw new IndexOutOfBoundsException(Messages.getString("luni.37")); //$NON-NLS-1$
}
if (pos >= actualArrayLength << OFFSET) {
@@ -897,7 +897,7 @@
*/
public int nextClearBit(int pos) {
if (pos < 0) {
- throw new IndexOutOfBoundsException(Msg.getString("K0006")); //$NON-NLS-1$
+ throw new IndexOutOfBoundsException(Messages.getString("luni.37")); //$NON-NLS-1$
}
int length = actualArrayLength;
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Collections.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Collections.java?rev=909500&r1=909499&r2=909500&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Collections.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Collections.java Fri Feb 12 16:58:01 2010
@@ -24,7 +24,7 @@
import java.lang.reflect.Array;
import org.apache.harmony.luni.internal.nls.Messages;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
/**
* {@code Collections} contains static methods which operate on
@@ -1596,8 +1596,8 @@
public static <T> void copy(List<? super T> destination,
List<? extends T> source) {
if (destination.size() < source.size()) {
- // K0032=Source size {0} does not fit into destination
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K0032", source.size())); //$NON-NLS-1$
+ // luni.38=Source size {0} does not fit into destination
+ throw new ArrayIndexOutOfBoundsException(Messages.getString("luni.38", source.size())); //$NON-NLS-1$
}
Iterator<? extends T> srcIt = source.iterator();
ListIterator<? super T> destIt = destination.listIterator();
@@ -1605,8 +1605,8 @@
try {
destIt.next();
} catch (NoSuchElementException e) {
- // K0032=Source size {0} does not fit into destination
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K0032", source.size())); //$NON-NLS-1$
+ // luni.38=Source size {0} does not fit into destination
+ throw new ArrayIndexOutOfBoundsException(Messages.getString("luni.38", source.size())); //$NON-NLS-1$
}
destIt.set(srcIt.next());
}
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/MissingFormatArgumentException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/MissingFormatArgumentException.java?rev=909500&r1=909499&r2=909500&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/MissingFormatArgumentException.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/MissingFormatArgumentException.java Fri Feb 12 16:58:01 2010
@@ -16,7 +16,7 @@
package java.util;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
/**
* A {@code MissingFormatArgumentException} will be thrown if there is no
@@ -60,6 +60,6 @@
*/
@Override
public String getMessage() {
- return Msg.getString("K0348", s);
+ return Messages.getString("luni.39", s);
}
}
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/ResourceBundle.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/ResourceBundle.java?rev=909500&r1=909499&r2=909500&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/ResourceBundle.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/ResourceBundle.java Fri Feb 12 16:58:01 2010
@@ -23,7 +23,7 @@
import java.security.PrivilegedAction;
import org.apache.harmony.kernel.vm.VM;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
/**
* {@code ResourceBundle} is an abstract class which is the superclass of classes which
@@ -209,7 +209,7 @@
"_" + Locale.getDefault(), true, loader)) != null) { //$NON-NLS-1$
return bundle;
}
- throw new MissingResourceException(Msg.getString("KA029", bundleName, locale), bundleName + '_' + locale, //$NON-NLS-1$
+ throw new MissingResourceException(Messages.getString("luni.3A", bundleName, locale), bundleName + '_' + locale, //$NON-NLS-1$
""); //$NON-NLS-1$
}
throw new NullPointerException();
@@ -236,7 +236,7 @@
if ((bundle = handleGetBundle(bundleName, localeName, true, loader)) != null) {
return bundle;
}
- throw new MissingResourceException(Msg.getString("KA029", bundleName, locale), bundleName + '_' + locale, //$NON-NLS-1$
+ throw new MissingResourceException(Messages.getString("luni.3A", bundleName, locale), bundleName + '_' + locale, //$NON-NLS-1$
""); //$NON-NLS-1$
}
throw new NullPointerException();
@@ -282,7 +282,7 @@
last = theParent;
theParent = theParent.parent;
} while (theParent != null);
- throw new MissingResourceException(Msg.getString("KA029", last.getClass().getName(), key), last.getClass().getName(), key); //$NON-NLS-1$
+ throw new MissingResourceException(Messages.getString("luni.3A", last.getClass().getName(), key), last.getClass().getName(), key); //$NON-NLS-1$
}
/**
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/SimpleTimeZone.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/SimpleTimeZone.java?rev=909500&r1=909499&r2=909500&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/SimpleTimeZone.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/SimpleTimeZone.java Fri Feb 12 16:58:01 2010
@@ -24,7 +24,7 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
/**
* {@code SimpleTimeZone} is a concrete subclass of {@code TimeZone}
@@ -252,8 +252,8 @@
setID(name);
rawOffset = offset;
if (daylightSavings <= 0) {
- throw new IllegalArgumentException(Msg.getString(
- "K00e9", daylightSavings)); //$NON-NLS-1$
+ throw new IllegalArgumentException(Messages.getString(
+ "luni.3B", daylightSavings)); //$NON-NLS-1$
}
dstSavings = daylightSavings;
@@ -378,7 +378,7 @@
public int getOffset(int era, int year, int month, int day, int dayOfWeek,
int time) {
if (era != GregorianCalendar.BC && era != GregorianCalendar.AD) {
- throw new IllegalArgumentException(Msg.getString("K00ea", era)); //$NON-NLS-1$
+ throw new IllegalArgumentException(Messages.getString("luni.3C", era)); //$NON-NLS-1$
}
checkRange(month, dayOfWeek, time);
if (month != Calendar.FEBRUARY || day != 29 || !isLeapYear(year)) {
@@ -464,20 +464,20 @@
private void checkRange(int month, int dayOfWeek, int time) {
if (month < Calendar.JANUARY || month > Calendar.DECEMBER) {
- throw new IllegalArgumentException(Msg.getString("K00e5", month)); //$NON-NLS-1$
+ throw new IllegalArgumentException(Messages.getString("luni.3D", month)); //$NON-NLS-1$
}
if (dayOfWeek < Calendar.SUNDAY || dayOfWeek > Calendar.SATURDAY) {
- throw new IllegalArgumentException(Msg
- .getString("K00e7", dayOfWeek)); //$NON-NLS-1$
+ throw new IllegalArgumentException(Messages
+ .getString("luni.48", dayOfWeek)); //$NON-NLS-1$
}
if (time < 0 || time >= 24 * 3600000) {
- throw new IllegalArgumentException(Msg.getString("K00e8", time)); //$NON-NLS-1$
+ throw new IllegalArgumentException(Messages.getString("luni.3E", time)); //$NON-NLS-1$
}
}
private void checkDay(int month, int day) {
if (day <= 0 || day > GregorianCalendar.DaysInMonth[month]) {
- throw new IllegalArgumentException(Msg.getString("K00e6", day)); //$NON-NLS-1$
+ throw new IllegalArgumentException(Messages.getString("luni.3F", day)); //$NON-NLS-1$
}
}
@@ -503,8 +503,8 @@
checkDay(endMonth, endDay);
} else {
if (endDay < -5 || endDay > 5) {
- throw new IllegalArgumentException(Msg.getString(
- "K00f8", endDay)); //$NON-NLS-1$
+ throw new IllegalArgumentException(Messages.getString(
+ "luni.40", endDay)); //$NON-NLS-1$
}
}
}
@@ -627,8 +627,8 @@
checkDay(startMonth, startDay);
} else {
if (startDay < -5 || startDay > 5) {
- throw new IllegalArgumentException(Msg.getString(
- "K00f8", startDay)); //$NON-NLS-1$
+ throw new IllegalArgumentException(Messages.getString(
+ "luni.40", startDay)); //$NON-NLS-1$
}
}
}
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Timer.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Timer.java?rev=909500&r1=909499&r2=909500&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Timer.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Timer.java Fri Feb 12 16:58:01 2010
@@ -17,7 +17,7 @@
package java.util;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
/**
* {@code Timer}s are used to schedule jobs for execution in a background process. A
@@ -563,22 +563,22 @@
boolean fixed) {
synchronized (impl) {
if (impl.cancelled) {
- throw new IllegalStateException(Msg.getString("K00f3")); //$NON-NLS-1$
+ throw new IllegalStateException(Messages.getString("luni.41")); //$NON-NLS-1$
}
long when = delay + System.currentTimeMillis();
if (when < 0) {
- throw new IllegalArgumentException(Msg.getString("K00f5")); //$NON-NLS-1$
+ throw new IllegalArgumentException(Messages.getString("luni.42")); //$NON-NLS-1$
}
synchronized (task.lock) {
if (task.isScheduled()) {
- throw new IllegalStateException(Msg.getString("K00f6")); //$NON-NLS-1$
+ throw new IllegalStateException(Messages.getString("luni.43")); //$NON-NLS-1$
}
if (task.cancelled) {
- throw new IllegalStateException(Msg.getString("K00f7")); //$NON-NLS-1$
+ throw new IllegalStateException(Messages.getString("luni.44")); //$NON-NLS-1$
}
task.when = when;
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/UUID.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/UUID.java?rev=909500&r1=909499&r2=909500&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/UUID.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/UUID.java Fri Feb 12 16:58:01 2010
@@ -24,7 +24,7 @@
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
/**
* UUID is an immutable representation of a 128-bit universally unique
@@ -225,7 +225,7 @@
// should have and only can have four "-" in UUID
if (i != position.length || lastPosition != -1) {
- throw new IllegalArgumentException(Msg.getString("KA014") + uuid); //$NON-NLS-1$
+ throw new IllegalArgumentException(Messages.getString("luni.47") + uuid); //$NON-NLS-1$
}
long m1 = Long.parseLong(uuid.substring(0, position[0]), 16);
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/UnknownFormatConversionException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/UnknownFormatConversionException.java?rev=909500&r1=909499&r2=909500&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/UnknownFormatConversionException.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/UnknownFormatConversionException.java Fri Feb 12 16:58:01 2010
@@ -15,7 +15,7 @@
*/
package java.util;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
/**
* An {@code UnknownFormatConversionException} will be thrown if the format
@@ -55,6 +55,6 @@
*/
@Override
public String getMessage() {
- return Msg.getString("K0349", s);
+ return Messages.getString("luni.45", s);
}
}
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/UnknownFormatFlagsException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/UnknownFormatFlagsException.java?rev=909500&r1=909499&r2=909500&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/UnknownFormatFlagsException.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/UnknownFormatFlagsException.java Fri Feb 12 16:58:01 2010
@@ -16,7 +16,7 @@
package java.util;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
/**
* An {@code UnknownFormatFlagsException} will be thrown if there is
@@ -60,7 +60,7 @@
*/
@Override
public String getMessage() {
- // K034a=The flags are {0}
- return Msg.getString("K034a", flags); //$NON-NLS-1$
+ // luni.46=The flags are {0}
+ return Messages.getString("luni.46", flags); //$NON-NLS-1$
}
}
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/nls/messages.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/nls/messages.properties?rev=909500&r1=909499&r2=909500&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/nls/messages.properties (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/nls/messages.properties Fri Feb 12 16:58:01 2010
@@ -67,3 +67,23 @@
luni.32=Cannot find \!/
luni.33=Inputstream of the JarURLConnection has been closed
luni.34=Jar entry not specified
+luni.35=Start index ({0}) is greater than end index ({1})
+luni.36=Array index out of range\: {0}
+luni.37=Negative index specified
+luni.38=Source size {0} does not fit into destination
+luni.39=Format specifier '{0}'
+luni.3A=Can't find resource for bundle {0}, key {1}
+luni.3B=DST offset\: {0}
+luni.3C=era\: {0}
+luni.3D=month\: {0}
+luni.3E=time\: {0}
+luni.3F=day of month\: {0}
+luni.40=day of week in month\: {0}
+luni.41=Timer was cancelled
+luni.42=Illegal delay to start the TimerTask
+luni.43=TimerTask is scheduled already
+luni.44=TimerTask is cancelled
+luni.45=Conversion is '{0}'
+luni.46=The flags are {0}
+luni.47=Invalid UUID string
+luni.48=day of week\: {0}