harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r909986 [4/6] - in /harmony/enhanced/classlib/branches/java6: ./ depends/jars/ depends/libs/ make/ modules/auth/src/main/java/common/org/apache/harmony/auth/ modules/auth/src/main/java/windows/org/apache/harmony/auth/ modules/awt/src/main/j...
Date Sun, 14 Feb 2010 08:40:48 GMT
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PushbackInputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PushbackInputStream.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PushbackInputStream.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PushbackInputStream.java Sun Feb 14 08:40:42 2010
@@ -17,7 +17,7 @@
 
 package java.io;
 
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * Wraps an existing {@link InputStream} and adds functionality to "push back"
@@ -67,7 +67,7 @@
     public PushbackInputStream(InputStream in, int size) {
         super(in);
         if (size <= 0) {
-            throw new IllegalArgumentException(Msg.getString("K0058")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.A3")); //$NON-NLS-1$
         }
         buf = (in == null) ? null : new byte[size];
         pos = size;
@@ -177,17 +177,17 @@
     @Override
     public int read(byte[] buffer, int offset, int length) throws IOException {
         if (buf == null) {
-            // K0059=Stream is closed
-            throw new IOException(Msg.getString("K0059")); //$NON-NLS-1$
+            // luni.24=Stream is closed
+            throw new IOException(Messages.getString("luni.24")); //$NON-NLS-1$
         }
         // Force buffer null check first!
         if (offset > buffer.length || offset < 0) {
-            // K002e=Offset out of bounds \: {0}
-            throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset)); //$NON-NLS-1$
+            // luni.12=Offset out of bounds \: {0}
+            throw new ArrayIndexOutOfBoundsException(Messages.getString("luni.12", offset)); //$NON-NLS-1$
         }
         if (length < 0 || length > buffer.length - offset) {
-            // K0031=Length out of bounds \: {0}
-            throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", length)); //$NON-NLS-1$
+            // luni.18=Length out of bounds \: {0}
+            throw new ArrayIndexOutOfBoundsException(Messages.getString("luni.18", length)); //$NON-NLS-1$
         }
 
         int copiedBytes = 0, copyLength = 0, newOffset = offset;
@@ -228,7 +228,7 @@
     @Override
     public long skip(long count) throws IOException {
         if (in == null) {
-            throw new IOException(Msg.getString("K0059")); //$NON-NLS-1$
+            throw new IOException(Messages.getString("luni.24")); //$NON-NLS-1$
         }
         if (count <= 0) {
             return 0;
@@ -293,20 +293,20 @@
     public void unread(byte[] buffer, int offset, int length)
             throws IOException {
         if (length > pos) {
-            // K007e=Pushback buffer full
-            throw new IOException(Msg.getString("K007e")); //$NON-NLS-1$
+            // luni.D3=Pushback buffer full
+            throw new IOException(Messages.getString("luni.D3")); //$NON-NLS-1$
         }
         if (offset > buffer.length || offset < 0) {
-            // K002e=Offset out of bounds \: {0}
-            throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset)); //$NON-NLS-1$
+            // luni.12=Offset out of bounds \: {0}
+            throw new ArrayIndexOutOfBoundsException(Messages.getString("luni.12", offset)); //$NON-NLS-1$
         }
         if (length < 0 || length > buffer.length - offset) {
-            // K0031=Length out of bounds \: {0}
-            throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", length)); //$NON-NLS-1$
+            // luni.18=Length out of bounds \: {0}
+            throw new ArrayIndexOutOfBoundsException(Messages.getString("luni.18", length)); //$NON-NLS-1$
         }
         if (buf == null) {
-            // K0059=Stream is closed
-            throw new IOException(Msg.getString("K0059")); //$NON-NLS-1$
+            // luni.24=Stream is closed
+            throw new IOException(Messages.getString("luni.24")); //$NON-NLS-1$
         }
 
         System.arraycopy(buffer, offset, buf, pos - length, length);
@@ -333,7 +333,7 @@
             throw new IOException();
         }
         if (pos == 0) {
-            throw new IOException(Msg.getString("K007e")); //$NON-NLS-1$
+            throw new IOException(Messages.getString("luni.D3")); //$NON-NLS-1$
         }
         buf[--pos] = (byte) oneByte;
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PushbackReader.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PushbackReader.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PushbackReader.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/PushbackReader.java Sun Feb 14 08:40:42 2010
@@ -17,7 +17,7 @@
 
 package java.io;
 
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * Wraps an existing {@link Reader} and adds functionality to "push back"
@@ -67,7 +67,7 @@
     public PushbackReader(Reader in, int size) {
         super(in);
         if (size <= 0) {
-            throw new IllegalArgumentException(Msg.getString("K0058")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.A3")); //$NON-NLS-1$
         }
         buf = new char[size];
         pos = size;
@@ -101,7 +101,7 @@
      */
     @Override
     public void mark(int readAheadLimit) throws IOException {
-        throw new IOException(Msg.getString("K007f")); //$NON-NLS-1$
+        throw new IOException(Messages.getString("luni.D4")); //$NON-NLS-1$
     }
 
     /**
@@ -136,7 +136,7 @@
     public int read() throws IOException {
         synchronized (lock) {
             if (buf == null) {
-                throw new IOException(Msg.getString("K0059")); //$NON-NLS-1$
+                throw new IOException(Messages.getString("luni.24")); //$NON-NLS-1$
             }
             /* Is there a pushback character available? */
             if (pos < buf.length) {
@@ -179,7 +179,7 @@
     public int read(char[] buffer, int offset, int count) throws IOException {
         synchronized (lock) {
             if (null == buf) {
-                throw new IOException(Msg.getString("K0059")); //$NON-NLS-1$
+                throw new IOException(Messages.getString("luni.24")); //$NON-NLS-1$
             }
             // avoid int overflow
             if (offset < 0 || count < 0 || offset > buffer.length - count) {
@@ -231,7 +231,7 @@
     public boolean ready() throws IOException {
         synchronized (lock) {
             if (buf == null) {
-                throw new IOException(Msg.getString("K0080")); //$NON-NLS-1$
+                throw new IOException(Messages.getString("luni.D5")); //$NON-NLS-1$
             }
             return (buf.length - pos > 0 || in.ready());
         }
@@ -247,7 +247,7 @@
      */
     @Override
     public void reset() throws IOException {
-        throw new IOException(Msg.getString("K007f")); //$NON-NLS-1$
+        throw new IOException(Messages.getString("luni.D4")); //$NON-NLS-1$
     }
 
     /**
@@ -305,21 +305,21 @@
     public void unread(char[] buffer, int offset, int length) throws IOException {
         synchronized (lock) {
             if (buf == null) {
-                // K0059=Stream is closed
-                throw new IOException(Msg.getString("K0059")); //$NON-NLS-1$
+                // luni.24=Stream is closed
+                throw new IOException(Messages.getString("luni.24")); //$NON-NLS-1$
             }
             if (length > pos) {
-                // K007e=Pushback buffer full
-                throw new IOException(Msg.getString("K007e")); //$NON-NLS-1$
+                // luni.D3=Pushback buffer full
+                throw new IOException(Messages.getString("luni.D3")); //$NON-NLS-1$
             }
             // Force buffer null check first!
             if (offset > buffer.length - length || offset < 0) {
-                // K002e=Offset out of bounds \: {0}
-                throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset)); //$NON-NLS-1$
+                // luni.12=Offset out of bounds \: {0}
+                throw new ArrayIndexOutOfBoundsException(Messages.getString("luni.12", offset)); //$NON-NLS-1$
             }
             if (length < 0) {
-                // K0031=Length out of bounds \: {0}
-                throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", length)); //$NON-NLS-1$
+                // luni.18=Length out of bounds \: {0}
+                throw new ArrayIndexOutOfBoundsException(Messages.getString("luni.18", length)); //$NON-NLS-1$
             }
 
             for (int i = offset + length - 1; i >= offset; i--) {
@@ -345,10 +345,10 @@
     public void unread(int oneChar) throws IOException {
         synchronized (lock) {
             if (buf == null) {
-                throw new IOException(Msg.getString("K0059")); //$NON-NLS-1$
+                throw new IOException(Messages.getString("luni.24")); //$NON-NLS-1$
             }
             if (pos == 0) {
-                throw new IOException(Msg.getString("K007e")); //$NON-NLS-1$
+                throw new IOException(Messages.getString("luni.D3")); //$NON-NLS-1$
             }
             buf[--pos] = (char) oneChar;
         }
@@ -373,7 +373,7 @@
         }
         synchronized (lock) {
             if (buf == null) {
-                throw new IOException(Msg.getString("K0059")); //$NON-NLS-1$
+                throw new IOException(Messages.getString("luni.24")); //$NON-NLS-1$
             }
             if (count == 0) {
                 return 0;

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/RandomAccessFile.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/RandomAccessFile.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/RandomAccessFile.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/RandomAccessFile.java Sun Feb 14 08:40:42 2010
@@ -21,7 +21,7 @@
 
 import org.apache.harmony.luni.platform.IFileSystem;
 import org.apache.harmony.luni.platform.Platform;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 import org.apache.harmony.luni.util.Util;
 
 import org.apache.harmony.nio.FileChannelFactory;
@@ -125,7 +125,7 @@
                 options = IFileSystem.O_RDWRSYNC;
             }
         } else {
-            throw new IllegalArgumentException(Msg.getString("K0081")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.A2")); //$NON-NLS-1$
         }
 
         SecurityManager security = System.getSecurityManager();
@@ -479,7 +479,7 @@
     public final void readFully(byte[] buffer, int offset, int count)
             throws IOException {
         if (buffer == null) {
-            throw new NullPointerException(Msg.getString("K0047")); //$NON-NLS-1$
+            throw new NullPointerException(Messages.getString("luni.11")); //$NON-NLS-1$
         }
         // avoid int overflow
         if (offset < 0 || offset > buffer.length || count < 0
@@ -691,7 +691,7 @@
     public void seek(long pos) throws IOException {
         if (pos < 0) {
             // seek position is negative
-            throw new IOException(Msg.getString("K0347")); //$NON-NLS-1$
+            throw new IOException(Messages.getString("luni.BB")); //$NON-NLS-1$
         }
         openCheck();
         synchronized (repositionLock) {
@@ -1036,7 +1036,7 @@
             }
         }
         if (utfCount > 65535) {
-            throw new UTFDataFormatException(Msg.getString("K0068")); //$NON-NLS-1$
+            throw new UTFDataFormatException(Messages.getString("luni.AB")); //$NON-NLS-1$
         }
         byte utfBytes[] = new byte[utfCount + 2];
         int utfIndex = 2;

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/StringBufferInputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/StringBufferInputStream.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/StringBufferInputStream.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/StringBufferInputStream.java Sun Feb 14 08:40:42 2010
@@ -17,7 +17,7 @@
 
 package java.io;
 
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * A specialized {@link InputStream} that reads bytes from a {@code String} in
@@ -112,17 +112,17 @@
             return -1;
         }
         if (b == null) {
-            // K0047=buffer is null
-            throw new NullPointerException(Msg.getString("K0047")); //$NON-NLS-1$
+            // luni.11=buffer is null
+            throw new NullPointerException(Messages.getString("luni.11")); //$NON-NLS-1$
         }
         // avoid int overflow
         if (offset < 0 || offset > b.length) {
-            // K002e=Offset out of bounds \: {0}
-            throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset)); //$NON-NLS-1$
+            // luni.12=Offset out of bounds \: {0}
+            throw new ArrayIndexOutOfBoundsException(Messages.getString("luni.12", offset)); //$NON-NLS-1$
         }
         if (length < 0 || length > b.length - offset) {
-            // K0031=Length out of bounds \: {0}
-            throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", length)); //$NON-NLS-1$
+            // luni.18=Length out of bounds \: {0}
+            throw new ArrayIndexOutOfBoundsException(Messages.getString("luni.18", length)); //$NON-NLS-1$
         }
 
         if (length == 0) {

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/StringReader.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/StringReader.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/StringReader.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/io/StringReader.java Sun Feb 14 08:40:42 2010
@@ -17,7 +17,7 @@
 
 package java.io;
 
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * A specialized {@link Reader} that reads characters from a {@code String} in
@@ -89,7 +89,7 @@
 
         synchronized (lock) {
             if (isClosed()) {
-                throw new IOException(Msg.getString("K0083")); //$NON-NLS-1$
+                throw new IOException(Messages.getString("luni.D6")); //$NON-NLS-1$
             }
             markpos = pos;
         }
@@ -120,7 +120,7 @@
     public int read() throws IOException {
         synchronized (lock) {
             if (isClosed()) {
-                throw new IOException(Msg.getString("K0083")); //$NON-NLS-1$
+                throw new IOException(Messages.getString("luni.D6")); //$NON-NLS-1$
             }
             if (pos != count) {
                 return str.charAt(pos++);
@@ -154,16 +154,16 @@
     public int read(char buf[], int offset, int len) throws IOException {
         synchronized (lock) {
             if (isClosed()) {
-                // K0083=StringReader is closed.
-                throw new IOException(Msg.getString("K0083")); //$NON-NLS-1$
+                // luni.D6=StringReader is closed.
+                throw new IOException(Messages.getString("luni.D6")); //$NON-NLS-1$
             }
             if (offset < 0 || offset > buf.length) {
-                // K002e=Offset out of bounds \: {0}
-                throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset)); //$NON-NLS-1$
+                // luni.12=Offset out of bounds \: {0}
+                throw new ArrayIndexOutOfBoundsException(Messages.getString("luni.12", offset)); //$NON-NLS-1$
             }
             if (len < 0 || len > buf.length - offset) {
-                // K0031=Length out of bounds \: {0}
-                throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", len)); //$NON-NLS-1$
+                // luni.18=Length out of bounds \: {0}
+                throw new ArrayIndexOutOfBoundsException(Messages.getString("luni.18", len)); //$NON-NLS-1$
             }
             if (len == 0) {
                 return 0;
@@ -193,7 +193,7 @@
     public boolean ready() throws IOException {
         synchronized (lock) {
             if (isClosed()) {
-                throw new IOException(Msg.getString("K0083")); //$NON-NLS-1$
+                throw new IOException(Messages.getString("luni.D6")); //$NON-NLS-1$
             }
             return true;
         }
@@ -214,7 +214,7 @@
     public void reset() throws IOException {
         synchronized (lock) {
             if (isClosed()) {
-                throw new IOException(Msg.getString("K0083")); //$NON-NLS-1$
+                throw new IOException(Messages.getString("luni.D6")); //$NON-NLS-1$
             }
             pos = markpos != -1 ? markpos : 0;
         }
@@ -244,7 +244,7 @@
     public long skip(long ns) throws IOException {
         synchronized (lock) {
             if (isClosed()) {
-                throw new IOException(Msg.getString("K0083")); //$NON-NLS-1$
+                throw new IOException(Messages.getString("luni.D6")); //$NON-NLS-1$
             }
 
             int minSkip = -pos;

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/AbstractStringBuilder.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/AbstractStringBuilder.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/AbstractStringBuilder.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/AbstractStringBuilder.java Sun Feb 14 08:40:42 2010
@@ -20,7 +20,7 @@
 import java.io.InvalidObjectException;
 import java.util.Arrays;
 
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * A modifiable {@link CharSequence sequence of characters} for use in creating
@@ -64,7 +64,7 @@
             val = new char[0];
         }
         if (val.length < len) {
-            throw new InvalidObjectException(Msg.getString("K0199")); //$NON-NLS-1$
+            throw new InvalidObjectException(Messages.getString("luni.4A")); //$NON-NLS-1$
         }
 
         shared = false;
@@ -121,12 +121,12 @@
     final void append0(char[] chars, int offset, int length) {
         // Force null check of chars first!
         if (offset > chars.length || offset < 0) {
-            // K002e=Offset out of bounds \: {0}
-            throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset)); //$NON-NLS-1$
+            // luni.12=Offset out of bounds \: {0}
+            throw new ArrayIndexOutOfBoundsException(Messages.getString("luni.12", offset)); //$NON-NLS-1$
         }
         if (length < 0 || chars.length - offset < length) {
-            // K0031=Length out of bounds \: {0}
-            throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", length)); //$NON-NLS-1$
+            // luni.18=Length out of bounds \: {0}
+            throw new ArrayIndexOutOfBoundsException(Messages.getString("luni.18", length)); //$NON-NLS-1$
         }
 
         int newSize = count + length;

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/ArrayIndexOutOfBoundsException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/ArrayIndexOutOfBoundsException.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/ArrayIndexOutOfBoundsException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/ArrayIndexOutOfBoundsException.java Sun Feb 14 08:40:42 2010
@@ -17,7 +17,7 @@
 
 package java.lang;
 
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * Thrown when the an array is indexed with a value less than zero, or greater
@@ -44,8 +44,8 @@
      *            the invalid index.
      */
     public ArrayIndexOutOfBoundsException(int index) {
-        // K0052=Array index out of range\: {0}
-        super(Msg.getString("K0052", index)); //$NON-NLS-1$
+        // luni.36=Array index out of range\: {0}
+        super(Messages.getString("luni.36", index)); //$NON-NLS-1$
     }
 
     /**

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/ClassCastException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/ClassCastException.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/ClassCastException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/ClassCastException.java Sun Feb 14 08:40:42 2010
@@ -17,7 +17,7 @@
 
 package java.lang;
 
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * Thrown when a program attempts to cast a an object to a type with which it is
@@ -55,7 +55,7 @@
      *            the class being cast to.
      */
     ClassCastException(Class<?> instanceClass, Class<?> castClass) {
-        super(Msg.getString("K0340", instanceClass.getName(), castClass //$NON-NLS-1$
+        super(Messages.getString("luni.4B", instanceClass.getName(), castClass //$NON-NLS-1$
                 .getName()));
     }
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/Enum.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/Enum.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/Enum.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/Enum.java Sun Feb 14 08:40:42 2010
@@ -21,7 +21,7 @@
 import java.security.AccessController;
 import java.security.PrivilegedExceptionAction;
 
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * The superclass of all enumerated types. Actual enumeration types inherit from
@@ -113,8 +113,8 @@
      */
     @Override
     protected final Object clone() throws CloneNotSupportedException {
-        // KA004=Enums may not be cloned
-        throw new CloneNotSupportedException(Msg.getString("KA004")); //$NON-NLS-1$
+        // luni.4C=Enums may not be cloned
+        throw new CloneNotSupportedException(Messages.getString("luni.4C")); //$NON-NLS-1$
     }
 
     /**
@@ -167,21 +167,21 @@
      */
     public static <T extends Enum<T>> T valueOf(Class<T> enumType, String name) {
         if ((enumType == null) || (name == null)) {
-            // KA001=Argument must not be null
-            throw new NullPointerException(Msg.getString("KA001")); //$NON-NLS-1$
+            // luni.4D=Argument must not be null
+            throw new NullPointerException(Messages.getString("luni.4D")); //$NON-NLS-1$
         }
         T[] values = getValues(enumType);
         if (values == null) {
-            // KA005={0} is not an enum type
-            throw new IllegalArgumentException(Msg.getString("KA005", enumType)); //$NON-NLS-1$
+            // luni.4E={0} is not an enum type
+            throw new IllegalArgumentException(Messages.getString("luni.4E", enumType)); //$NON-NLS-1$
         }
         for (T enumConst : values) {
             if (enumConst.name.equals(name)) {
                 return enumConst;
             }
         }
-        // KA006={0} is not a constant in the enum type {1}
-        throw new IllegalArgumentException(Msg.getString("KA006", name, //$NON-NLS-1$
+        // luni.4F={0} is not a constant in the enum type {1}
+        throw new IllegalArgumentException(Messages.getString("luni.4F", name, //$NON-NLS-1$
                 enumType));
     }
 

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/EnumConstantNotPresentException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/EnumConstantNotPresentException.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/EnumConstantNotPresentException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/EnumConstantNotPresentException.java Sun Feb 14 08:40:42 2010
@@ -16,7 +16,7 @@
 
 package java.lang;
 
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * Thrown if an {@code enum} constant does not exist for a particular name.
@@ -46,7 +46,7 @@
     public EnumConstantNotPresentException(Class<? extends Enum> enumType,
             String constantName) {
         // luni.03=The enum constant {0}.{1} is missing
-        super(Msg.getString("luni.03", enumType.getName(), constantName)); //$NON-NLS-1$
+        super(Messages.getString("luni.03", enumType.getName(), constantName)); //$NON-NLS-1$
         this.enumType = enumType;
         this.constantName = constantName;
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/Math.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/Math.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/Math.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/Math.java Sun Feb 14 08:40:42 2010
@@ -732,7 +732,23 @@
      *            the exponent of the operation.
      * @return {@code x} to the power of {@code y}.
      */
-    public static native double pow(double x, double y);
+    public static double pow(double x, double y) {
+        if (x < 0.0 && x != Double.NEGATIVE_INFINITY) {
+            if (y != Double.NEGATIVE_INFINITY && y != Double.POSITIVE_INFINITY) {  // is finit
+                if (y == Math.ceil(y)) {  // is integer
+                    double absx = Math.abs(x);
+                    if (y % 2 == 0.0) {
+                        return doPow(absx, y);
+                    }
+                    return -1.0 * doPow(absx, y);
+                }
+                return Double.NaN;
+            }
+        }
+        return doPow(x, y);
+    }
+
+    private static native double doPow(double x, double y);
 
     /**
      * Returns the double conversion of the result of rounding the argument to

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/StringIndexOutOfBoundsException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/StringIndexOutOfBoundsException.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/StringIndexOutOfBoundsException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/StringIndexOutOfBoundsException.java Sun Feb 14 08:40:42 2010
@@ -18,7 +18,7 @@
 package java.lang;
 
 
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * Thrown when the a string is indexed with a value less than zero, or greater
@@ -45,7 +45,7 @@
      *            the index which is out of bounds.
      */    
     public StringIndexOutOfBoundsException(int index) {
-        super(Msg.getString("K0055", index)); //$NON-NLS-1$
+        super(Messages.getString("luni.55", index)); //$NON-NLS-1$
     }
 
     /**

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/reflect/Proxy.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/reflect/Proxy.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/reflect/Proxy.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/reflect/Proxy.java Sun Feb 14 08:40:42 2010
@@ -25,7 +25,7 @@
 
 import org.apache.harmony.luni.internal.reflect.ProxyClassFile;
 
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * {@code Proxy} defines methods for creating dynamic proxy classes and instances.
@@ -102,22 +102,22 @@
             }
             String name = next.getName();
             if (!next.isInterface()) {
-                throw new IllegalArgumentException(Msg.getString("K00ed", name)); //$NON-NLS-1$
+                throw new IllegalArgumentException(Messages.getString("luni.50", name)); //$NON-NLS-1$
             }
             if (loader != next.getClassLoader()) {
                 try {
                     if (next != Class.forName(name, false, loader)) {
-                        throw new IllegalArgumentException(Msg.getString(
-                                "K00ee", name)); //$NON-NLS-1$
+                        throw new IllegalArgumentException(Messages.getString(
+                                "luni.51", name)); //$NON-NLS-1$
                     }
                 } catch (ClassNotFoundException ex) {
-                    throw new IllegalArgumentException(Msg.getString("K00ee", //$NON-NLS-1$
+                    throw new IllegalArgumentException(Messages.getString("luni.51", //$NON-NLS-1$
                             name));
                 }
             }
             for (int j = i + 1; j < length; j++) {
                 if (next == interfaces[j]) {
-                    throw new IllegalArgumentException(Msg.getString("K00ef", //$NON-NLS-1$
+                    throw new IllegalArgumentException(Messages.getString("luni.52", //$NON-NLS-1$
                             name));
                 }
             }
@@ -127,7 +127,7 @@
                 if (commonPackageName == null) {
                     commonPackageName = p;
                 } else if (!commonPackageName.equals(p)) {
-                    throw new IllegalArgumentException(Msg.getString("K00f0")); //$NON-NLS-1$
+                    throw new IllegalArgumentException(Messages.getString("luni.53")); //$NON-NLS-1$
                 }
             }
         }
@@ -269,7 +269,7 @@
             return ((Proxy) proxy).h;
         }
 
-        throw new IllegalArgumentException(Msg.getString("K00f1")); //$NON-NLS-1$
+        throw new IllegalArgumentException(Messages.getString("luni.54")); //$NON-NLS-1$
     }
 
     private static native Class<?> defineClassImpl(ClassLoader classLoader,

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/DatagramPacket.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/DatagramPacket.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/DatagramPacket.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/DatagramPacket.java Sun Feb 14 08:40:42 2010
@@ -17,7 +17,7 @@
 
 package java.net;
 
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * This class represents a datagram packet which contains data either to be sent
@@ -192,7 +192,7 @@
     public synchronized void setData(byte[] buf, int anOffset, int aLength) {
         if (0 > anOffset || anOffset > buf.length || 0 > aLength
                 || aLength > buf.length - anOffset) {
-            throw new IllegalArgumentException(Msg.getString("K002f")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.13")); //$NON-NLS-1$
         }
         data = buf;
         offset = anOffset;
@@ -232,7 +232,7 @@
      */
     public synchronized void setLength(int len) {
         if (0 > len || offset + len > data.length) {
-            throw new IllegalArgumentException(Msg.getString("K002f")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.13")); //$NON-NLS-1$
         }
         length = len;
         capacity = len;
@@ -246,7 +246,7 @@
      */
     synchronized void setLengthOnly(int len) {
         if (0 > len || offset + len > data.length) {
-            throw new IllegalArgumentException(Msg.getString("K002f")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.13")); //$NON-NLS-1$
         }
         length = len;
     }
@@ -259,7 +259,7 @@
      */
     public synchronized void setPort(int aPort) {
         if (aPort < 0 || aPort > 65535) {
-            throw new IllegalArgumentException(Msg.getString("K0325", aPort)); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.56", aPort)); //$NON-NLS-1$
         }
         port = aPort;
     }
@@ -326,10 +326,13 @@
      */
     public synchronized void setSocketAddress(SocketAddress sockAddr) {
         if (!(sockAddr instanceof InetSocketAddress)) {
-            throw new IllegalArgumentException(Msg.getString(
-                    "K0316", sockAddr == null ? null : sockAddr.getClass())); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString(
+                    "luni.49", sockAddr == null ? null : sockAddr.getClass())); //$NON-NLS-1$
         }
         InetSocketAddress inetAddr = (InetSocketAddress) sockAddr;
+        if(inetAddr.isUnresolved()){
+            throw new IllegalArgumentException(Messages.getString("luni.57"));
+        }
         port = inetAddr.getPort();
         address = inetAddr.getAddress();
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/DatagramSocket.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/DatagramSocket.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/DatagramSocket.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/DatagramSocket.java Sun Feb 14 08:40:42 2010
@@ -22,7 +22,7 @@
 
 import org.apache.harmony.luni.net.PlainDatagramSocketImpl;
 import org.apache.harmony.luni.platform.Platform;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * This class implements a UDP socket for sending and receiving {@code
@@ -112,7 +112,7 @@
      */
     void checkListen(int aPort) {
         if (aPort < 0 || aPort > 65535) {
-            throw new IllegalArgumentException(Msg.getString("K0325", aPort)); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.56", aPort)); //$NON-NLS-1$
         }
         SecurityManager security = System.getSecurityManager();
         if (security != null) {
@@ -144,7 +144,7 @@
      */
     public void connect(InetAddress anAddress, int aPort) {
         if (anAddress == null || aPort < 0 || aPort > 65535) {
-            throw new IllegalArgumentException(Msg.getString("K0032")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.38")); //$NON-NLS-1$
         }
 
         synchronized (lock) {
@@ -433,7 +433,7 @@
         if (address != null) { // The socket is connected
             if (packAddr != null) {
                 if (!address.equals(packAddr) || port != pack.getPort()) {
-                    throw new IllegalArgumentException(Msg.getString("K0034")); //$NON-NLS-1$
+                    throw new IllegalArgumentException(Messages.getString("luni.58")); //$NON-NLS-1$
                 }
             } else {
                 pack.setAddress(address);
@@ -444,7 +444,7 @@
             if (packAddr == null) {
                 if (pack.getPort() == -1) {
                     // KA019 Destination address is null
-                    throw new NullPointerException(Msg.getString("KA019")); //$NON-NLS-1$
+                    throw new NullPointerException(Messages.getString("luni.59")); //$NON-NLS-1$
                 }
                 return;
             }
@@ -474,7 +474,7 @@
      */
     public synchronized void setSendBufferSize(int size) throws SocketException {
         if (size < 1) {
-            throw new IllegalArgumentException(Msg.getString("K0035")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.5A")); //$NON-NLS-1$
         }
         checkClosedAndBind(false);
         impl.setOption(SocketOptions.SO_SNDBUF, Integer.valueOf(size));
@@ -494,7 +494,7 @@
     public synchronized void setReceiveBufferSize(int size)
             throws SocketException {
         if (size < 1) {
-            throw new IllegalArgumentException(Msg.getString("K0035")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.5A")); //$NON-NLS-1$
         }
         checkClosedAndBind(false);
         impl.setOption(SocketOptions.SO_RCVBUF, Integer.valueOf(size));
@@ -515,7 +515,7 @@
      */
     public synchronized void setSoTimeout(int timeout) throws SocketException {
         if (timeout < 0) {
-            throw new IllegalArgumentException(Msg.getString("K0036")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.5B")); //$NON-NLS-1$
         }
         checkClosedAndBind(false);
         impl.setOption(SocketOptions.SO_TIMEOUT, Integer.valueOf(timeout));
@@ -542,7 +542,7 @@
             security.checkSetFactory();
         }
         if (factory != null) {
-            throw new SocketException(Msg.getString("K0044")); //$NON-NLS-1$
+            throw new SocketException(Messages.getString("luni.5C")); //$NON-NLS-1$
         }
         factory = fac;
     }
@@ -577,8 +577,8 @@
     public DatagramSocket(SocketAddress localAddr) throws SocketException {
         if (localAddr != null) {
             if (!(localAddr instanceof InetSocketAddress)) {
-                throw new IllegalArgumentException(Msg.getString(
-                        "K0316", localAddr.getClass())); //$NON-NLS-1$
+                throw new IllegalArgumentException(Messages.getString(
+                        "luni.49", localAddr.getClass())); //$NON-NLS-1$
             }
             checkListen(((InetSocketAddress) localAddr).getPort());
         }
@@ -599,7 +599,7 @@
 
     void checkClosedAndBind(boolean bind) throws SocketException {
         if (isClosed()) {
-            throw new SocketException(Msg.getString("K003d")); //$NON-NLS-1$
+            throw new SocketException(Messages.getString("luni.0C")); //$NON-NLS-1$
         }
         if (bind && !isBound()) {
             checkListen(0);
@@ -627,14 +627,14 @@
         InetAddress addr = InetAddress.ANY;
         if (localAddr != null) {
             if (!(localAddr instanceof InetSocketAddress)) {
-                throw new IllegalArgumentException(Msg.getString(
-                        "K0316", localAddr.getClass())); //$NON-NLS-1$
+                throw new IllegalArgumentException(Messages.getString(
+                        "luni.49", localAddr.getClass())); //$NON-NLS-1$
             }
             InetSocketAddress inetAddr = (InetSocketAddress) localAddr;
             addr = inetAddr.getAddress();
             if (addr == null) {
-                throw new SocketException(Msg.getString(
-                        "K0317", inetAddr.getHostName())); //$NON-NLS-1$
+                throw new SocketException(Messages.getString(
+                        "luni.1A", inetAddr.getHostName())); //$NON-NLS-1$
             }
             localPort = inetAddr.getPort();
             checkListen(localPort);
@@ -656,18 +656,18 @@
      */
     public void connect(SocketAddress remoteAddr) throws SocketException {
         if (remoteAddr == null) {
-            throw new IllegalArgumentException(Msg.getString("K0318")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.5D")); //$NON-NLS-1$
         }
 
         if (!(remoteAddr instanceof InetSocketAddress)) {
-            throw new IllegalArgumentException(Msg.getString(
-                    "K0316", remoteAddr.getClass())); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString(
+                    "luni.49", remoteAddr.getClass())); //$NON-NLS-1$
         }
 
         InetSocketAddress inetAddr = (InetSocketAddress) remoteAddr;
         if (inetAddr.getAddress() == null) {
-            throw new SocketException(Msg.getString(
-                    "K0317", inetAddr.getHostName())); //$NON-NLS-1$
+            throw new SocketException(Messages.getString(
+                    "luni.1A", inetAddr.getHostName())); //$NON-NLS-1$
         }
 
         synchronized (lock) {

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/HttpURLConnection.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/HttpURLConnection.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/HttpURLConnection.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/HttpURLConnection.java Sun Feb 14 08:40:42 2010
@@ -19,7 +19,7 @@
 
 import java.io.IOException;
 
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * This abstract subclass of {@code URLConnection} defines methods for managing
@@ -426,7 +426,7 @@
      */
     public void setRequestMethod(String method) throws ProtocolException {
         if (connected) {
-            throw new ProtocolException(Msg.getString("K0037")); //$NON-NLS-1$
+            throw new ProtocolException(Messages.getString("luni.5E")); //$NON-NLS-1$
         }
         for (int i = 0; i < methodTokens.length; i++) {
             if (methodTokens[i].equals(method)) {
@@ -502,13 +502,13 @@
      */
     public void setFixedLengthStreamingMode(int contentLength) {
         if (super.connected) {
-            throw new IllegalStateException(Msg.getString("K0079")); //$NON-NLS-1$
+            throw new IllegalStateException(Messages.getString("luni.5F")); //$NON-NLS-1$
         }
         if (0 < chunkLength) {
-            throw new IllegalStateException(Msg.getString("KA003")); //$NON-NLS-1$
+            throw new IllegalStateException(Messages.getString("luni.60")); //$NON-NLS-1$
         }
         if (0 > contentLength) {
-            throw new IllegalArgumentException(Msg.getString("K0051")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.61")); //$NON-NLS-1$
         }
         this.fixedContentLength = contentLength;
     }
@@ -527,10 +527,10 @@
      */
     public void setChunkedStreamingMode(int chunklen) {
         if (super.connected) {
-            throw new IllegalStateException(Msg.getString("K0079")); //$NON-NLS-1$
+            throw new IllegalStateException(Messages.getString("luni.5F")); //$NON-NLS-1$
         }
         if (0 <= fixedContentLength) {
-            throw new IllegalStateException(Msg.getString("KA003")); //$NON-NLS-1$
+            throw new IllegalStateException(Messages.getString("luni.60")); //$NON-NLS-1$
         }
         if (0 >= chunklen) {
             chunkLength = DEFAULT_CHUNK_LENGTH;

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/Inet6Address.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/Inet6Address.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/Inet6Address.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/Inet6Address.java Sun Feb 14 08:40:42 2010
@@ -24,7 +24,7 @@
 import java.util.Enumeration;
 
 import org.apache.harmony.luni.util.Inet6Util;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * This class represents a 128 bit long IPv6 address.
@@ -105,8 +105,8 @@
     public static Inet6Address getByAddress(String host, byte[] addr,
             int scope_id) throws UnknownHostException {
         if (null == addr || 16 != addr.length) {
-            // KA020=Illegal IPv6 address
-            throw new UnknownHostException(Msg.getString("KA020")); //$NON-NLS-1$
+            // luni.62=Illegal IPv6 address
+            throw new UnknownHostException(Messages.getString("luni.62")); //$NON-NLS-1$
         }
         if (scope_id < 0) {
             scope_id = 0;
@@ -163,8 +163,8 @@
         // if no address matches the type of addr, throws an
         // UnknownHostException.
         if (!address.scope_id_set) {
-            // KA021=Scope id is not found for the given address
-            throw new UnknownHostException(Msg.getString("KA021")); //$NON-NLS-1$
+            // luni.63=Scope id is not found for the given address
+            throw new UnknownHostException(Messages.getString("luni.63")); //$NON-NLS-1$
         }
         return address;
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/InetAddress.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/InetAddress.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/InetAddress.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/InetAddress.java Sun Feb 14 08:40:42 2010
@@ -33,7 +33,7 @@
 import org.apache.harmony.luni.platform.INetworkSystem;
 import org.apache.harmony.luni.platform.Platform;
 import org.apache.harmony.luni.util.Inet6Util;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 import org.apache.harmony.luni.util.PriviAction;
 
 /**
@@ -813,7 +813,7 @@
     public boolean isReachable(NetworkInterface netif, final int ttl,
             final int timeout) throws IOException {
         if (0 > ttl || 0 > timeout) {
-            throw new IllegalArgumentException(Msg.getString("K0051")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.61")); //$NON-NLS-1$
         }
         boolean reachable = false;
         if (null == netif) {
@@ -1038,8 +1038,8 @@
             return new Inet6Address(copy_address, scope_id);
         }
 
-        // K0339=Invalid IP Address is neither 4 or 16 bytes
-        throw new UnknownHostException(Msg.getString("K0339")); //$NON-NLS-1$
+        // luni.64=Invalid IP Address is neither 4 or 16 bytes
+        throw new UnknownHostException(Messages.getString("luni.64")); //$NON-NLS-1$
     }
 
     private static boolean isIPv4MappedAddress(byte ipAddress[]) {
@@ -1137,7 +1137,7 @@
             return new Inet6Address(ipAddress, hostName, scope_id);
         }
 
-        throw new UnknownHostException(Msg.getString("K0332", hostName)); //$NON-NLS-1$
+        throw new UnknownHostException(Messages.getString("luni.65", hostName)); //$NON-NLS-1$
     }
 
     /**

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/MulticastSocket.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/MulticastSocket.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/MulticastSocket.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/MulticastSocket.java Sun Feb 14 08:40:42 2010
@@ -21,7 +21,7 @@
 import java.util.Enumeration;
 
 import org.apache.harmony.luni.net.PlainDatagramSocketImpl;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * This class implements a multicast socket for sending and receiving IP
@@ -196,7 +196,7 @@
     public void joinGroup(InetAddress groupAddr) throws IOException {
         checkClosedAndBind(false);
         if (!groupAddr.isMulticastAddress()) {
-            throw new IOException(Msg.getString("K0039")); //$NON-NLS-1$
+            throw new IOException(Messages.getString("luni.66")); //$NON-NLS-1$
         }
         SecurityManager security = System.getSecurityManager();
         if (security != null) {
@@ -227,27 +227,27 @@
             NetworkInterface netInterface) throws IOException {
         checkClosedAndBind(false);
         if (null == groupAddress) {
-            throw new IllegalArgumentException(Msg.getString("K0318")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.5D")); //$NON-NLS-1$
         }
 
         if ((netInterface != null) && (netInterface.getFirstAddress() == null)) {
             // this is ok if we could set it at the
-            throw new SocketException(Msg.getString("K0335")); //$NON-NLS-1$
+            throw new SocketException(Messages.getString("luni.67")); //$NON-NLS-1$
         }
 
         if (!(groupAddress instanceof InetSocketAddress)) {
-            throw new IllegalArgumentException(Msg.getString(
-                    "K0316", groupAddress.getClass())); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString(
+                    "luni.49", groupAddress.getClass())); //$NON-NLS-1$
         }
 
         InetAddress groupAddr = ((InetSocketAddress) groupAddress).getAddress();
 
         if (groupAddr == null) {
-            throw new SocketException(Msg.getString("K0331")); //$NON-NLS-1$
+            throw new SocketException(Messages.getString("luni.68")); //$NON-NLS-1$
         }
 
         if (!groupAddr.isMulticastAddress()) {
-            throw new IOException(Msg.getString("K0039")); //$NON-NLS-1$
+            throw new IOException(Messages.getString("luni.66")); //$NON-NLS-1$
         }
 
         SecurityManager security = System.getSecurityManager();
@@ -272,7 +272,7 @@
     public void leaveGroup(InetAddress groupAddr) throws IOException {
         checkClosedAndBind(false);
         if (!groupAddr.isMulticastAddress()) {
-            throw new IOException(Msg.getString("K003a")); //$NON-NLS-1$
+            throw new IOException(Messages.getString("luni.69")); //$NON-NLS-1$
         }
         SecurityManager security = System.getSecurityManager();
         if (security != null) {
@@ -301,27 +301,27 @@
             NetworkInterface netInterface) throws IOException {
         checkClosedAndBind(false);
         if (null == groupAddress) {
-            throw new IllegalArgumentException(Msg.getString("K0318")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.5D")); //$NON-NLS-1$
         }
 
         if ((netInterface != null) && (netInterface.getFirstAddress() == null)) {
             // this is ok if we could set it at the
-            throw new SocketException(Msg.getString("K0335")); //$NON-NLS-1$
+            throw new SocketException(Messages.getString("luni.67")); //$NON-NLS-1$
         }
 
         if (!(groupAddress instanceof InetSocketAddress)) {
-            throw new IllegalArgumentException(Msg.getString(
-                    "K0316", groupAddress.getClass())); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString(
+                    "luni.49", groupAddress.getClass())); //$NON-NLS-1$
         }
 
         InetAddress groupAddr = ((InetSocketAddress) groupAddress).getAddress();
 
         if (groupAddr == null) {
-            throw new SocketException(Msg.getString("K0331")); //$NON-NLS-1$
+            throw new SocketException(Messages.getString("luni.68")); //$NON-NLS-1$
         }
 
         if (!groupAddr.isMulticastAddress()) {
-            throw new IOException(Msg.getString("K003a")); //$NON-NLS-1$
+            throw new IOException(Messages.getString("luni.69")); //$NON-NLS-1$
         }
         SecurityManager security = System.getSecurityManager();
         if (security != null) {
@@ -415,7 +415,7 @@
                 // Ignored
             }
         } else if (addr instanceof Inet6Address) {
-            throw new SocketException(Msg.getString("K0338")); //$NON-NLS-1$
+            throw new SocketException(Messages.getString("luni.6A")); //$NON-NLS-1$
         }
     }
 
@@ -437,13 +437,13 @@
 
         if (netInterface == null) {
             // throw a socket exception indicating that we do not support this
-            throw new SocketException(Msg.getString("K0334")); //$NON-NLS-1$
+            throw new SocketException(Messages.getString("luni.6B")); //$NON-NLS-1$
         }
 
         InetAddress firstAddress = netInterface.getFirstAddress();
         if (firstAddress == null) {
             // this is ok if we could set it at the
-            throw new SocketException(Msg.getString("K0335")); //$NON-NLS-1$
+            throw new SocketException(Messages.getString("luni.67")); //$NON-NLS-1$
         }
 
         if (netInterface.getIndex() == NetworkInterface.UNSET_INTERFACE_INDEX) {
@@ -490,7 +490,7 @@
                  * interfaces which have no IPV4 address and which does not have
                  * the network interface index not set correctly
                  */
-                throw new SocketException(Msg.getString("K0335")); //$NON-NLS-1$
+                throw new SocketException(Messages.getString("luni.67")); //$NON-NLS-1$
             }
         } else {
             // set the address using IP_MULTICAST_IF to make sure this
@@ -526,7 +526,7 @@
     public void setTimeToLive(int ttl) throws IOException {
         checkClosedAndBind(false);
         if (ttl < 0 || ttl > 255) {
-            throw new IllegalArgumentException(Msg.getString("K003c")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.6C")); //$NON-NLS-1$
         }
         impl.setTimeToLive(ttl);
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/NetworkInterface.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/NetworkInterface.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/NetworkInterface.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/NetworkInterface.java Sun Feb 14 08:40:42 2010
@@ -23,7 +23,7 @@
 import java.util.List;
 import java.util.Vector;
 
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * This class is used to represent a network interface of the local device. An
@@ -227,7 +227,7 @@
             throws SocketException {
 
         if (interfaceName == null) {
-            throw new NullPointerException(Msg.getString("K0330")); //$NON-NLS-1$
+            throw new NullPointerException(Messages.getString("luni.6D")); //$NON-NLS-1$
         }
 
         /*
@@ -263,7 +263,7 @@
             throws SocketException {
 
         if (address == null) {
-            throw new NullPointerException(Msg.getString("K0331")); //$NON-NLS-1$
+            throw new NullPointerException(Messages.getString("luni.68")); //$NON-NLS-1$
         }
 
         /*

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/Proxy.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/Proxy.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/Proxy.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/Proxy.java Sun Feb 14 08:40:42 2010
@@ -15,7 +15,7 @@
  */
 package java.net;
 
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * This class represents proxy server settings. A created instance of {@code
@@ -61,8 +61,8 @@
          * SocketAddress must NOT be null.
          */
         if (type == Type.DIRECT || null == sa) {
-            // KA022=Illegal Proxy.Type or SocketAddress argument
-            throw new IllegalArgumentException(Msg.getString("KA022")); //$NON-NLS-1$
+            // luni.6E=Illegal Proxy.Type or SocketAddress argument
+            throw new IllegalArgumentException(Messages.getString("luni.6E")); //$NON-NLS-1$
         }
         this.type = type;
         address = sa;

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/ProxySelectorImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/ProxySelectorImpl.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/ProxySelectorImpl.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/ProxySelectorImpl.java Sun Feb 14 08:40:42 2010
@@ -25,7 +25,7 @@
 import java.util.List;
 import java.util.Properties;
 
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 import org.apache.harmony.luni.util.PriviAction;
 
 /**
@@ -75,8 +75,8 @@
     @Override
     public void connectFailed(URI uri, SocketAddress sa, IOException ioe) {
         if (null == uri || null == sa || null == ioe) {
-            // "KA001=Argument must not be null"
-            throw new IllegalArgumentException(Msg.getString("KA001")); //$NON-NLS-1$
+            // luni.4D=Argument must not be null"
+            throw new IllegalArgumentException(Messages.getString("luni.4D")); //$NON-NLS-1$
         }
     }
 
@@ -84,8 +84,8 @@
     public List<Proxy> select(URI uri) {
         // argument check
         if (null == uri) {
-            // KA001=Argument must not be null
-            throw new IllegalArgumentException(Msg.getString("KA001")); //$NON-NLS-1$
+            // luni.4D=Argument must not be null
+            throw new IllegalArgumentException(Messages.getString("luni.4D")); //$NON-NLS-1$
         }
         // check scheme
         String scheme = uri.getScheme();

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/ServerSocket.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/ServerSocket.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/ServerSocket.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/ServerSocket.java Sun Feb 14 08:40:42 2010
@@ -22,7 +22,7 @@
 
 import org.apache.harmony.luni.net.PlainServerSocketImpl;
 import org.apache.harmony.luni.platform.Platform;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * This class represents a server-side socket that waits for incoming client
@@ -147,7 +147,7 @@
     public Socket accept() throws IOException {
         checkClosedAndCreate(false);
         if (!isBound()) {
-            throw new SocketException(Msg.getString("K031f")); //$NON-NLS-1$
+            throw new SocketException(Messages.getString("luni.6F")); //$NON-NLS-1$
         }
 
         Socket aSocket = new Socket();
@@ -173,7 +173,7 @@
      */
     void checkListen(int aPort) {
         if (aPort < 0 || aPort > 65535) {
-            throw new IllegalArgumentException(Msg.getString("K0325", aPort)); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.56", aPort)); //$NON-NLS-1$
         }
         SecurityManager security = System.getSecurityManager();
         if (security != null) {
@@ -296,7 +296,7 @@
             security.checkSetFactory();
         }
         if (factory != null) {
-            throw new SocketException(Msg.getString("K0042")); //$NON-NLS-1$
+            throw new SocketException(Messages.getString("luni.70")); //$NON-NLS-1$
         }
         factory = aFactory;
     }
@@ -314,7 +314,7 @@
     public synchronized void setSoTimeout(int timeout) throws SocketException {
         checkClosedAndCreate(true);
         if (timeout < 0) {
-            throw new IllegalArgumentException(Msg.getString("K0036")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.5B")); //$NON-NLS-1$
         }
         impl.setOption(SocketOptions.SO_TIMEOUT, Integer.valueOf(timeout));
     }
@@ -380,19 +380,19 @@
     public void bind(SocketAddress localAddr, int backlog) throws IOException {
         checkClosedAndCreate(true);
         if (isBound()) {
-            throw new BindException(Msg.getString("K0315")); //$NON-NLS-1$
+            throw new BindException(Messages.getString("luni.71")); //$NON-NLS-1$
         }
         int port = 0;
         InetAddress addr = InetAddress.ANY;
         if (localAddr != null) {
             if (!(localAddr instanceof InetSocketAddress)) {
-                throw new IllegalArgumentException(Msg.getString(
-                        "K0316", localAddr.getClass())); //$NON-NLS-1$
+                throw new IllegalArgumentException(Messages.getString(
+                        "luni.49", localAddr.getClass())); //$NON-NLS-1$
             }
             InetSocketAddress inetAddr = (InetSocketAddress) localAddr;
             if ((addr = inetAddr.getAddress()) == null) {
-                throw new SocketException(Msg.getString(
-                        "K0317", inetAddr.getHostName())); //$NON-NLS-1$
+                throw new SocketException(Messages.getString(
+                        "luni.1A", inetAddr.getHostName())); //$NON-NLS-1$
             }
             port = inetAddr.getPort();
         }
@@ -450,7 +450,7 @@
      */
     private void checkClosedAndCreate(boolean create) throws SocketException {
         if (isClosed()) {
-            throw new SocketException(Msg.getString("K003d")); //$NON-NLS-1$
+            throw new SocketException(Messages.getString("luni.0C")); //$NON-NLS-1$
         }
 
         if (!create || isCreated) {
@@ -512,7 +512,7 @@
     public void setReceiveBufferSize(int size) throws SocketException {
         checkClosedAndCreate(true);
         if (size < 1) {
-            throw new IllegalArgumentException(Msg.getString("K0035")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.5A")); //$NON-NLS-1$
         }
         impl.setOption(SocketOptions.SO_RCVBUF, Integer.valueOf(size));
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/Socket.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/Socket.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/Socket.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/Socket.java Sun Feb 14 08:40:42 2010
@@ -26,7 +26,7 @@
 import org.apache.harmony.luni.net.NetUtil;
 import org.apache.harmony.luni.net.PlainSocketImpl;
 import org.apache.harmony.luni.platform.Platform;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 import org.apache.harmony.luni.util.PriviAction;
 
 /**
@@ -106,8 +106,8 @@
      */
     public Socket(Proxy proxy) {
         if (null == proxy || Proxy.Type.HTTP == proxy.type()) {
-            // KA023=Proxy is null or invalid type
-            throw new IllegalArgumentException(Msg.getString("KA023")); //$NON-NLS-1$
+            // luni.73=Proxy is null or invalid type
+            throw new IllegalArgumentException(Messages.getString("luni.73")); //$NON-NLS-1$
         }
         InetSocketAddress address = (InetSocketAddress) proxy.address();
         if (null != address) {
@@ -315,7 +315,7 @@
      */
     void checkDestination(InetAddress destAddr, int dstPort) {
         if (dstPort < 0 || dstPort > 65535) {
-            throw new IllegalArgumentException(Msg.getString("K0032")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.38")); //$NON-NLS-1$
         }
         checkConnectPermission(destAddr.getHostName(), dstPort);
     }
@@ -371,7 +371,7 @@
     public InputStream getInputStream() throws IOException {
         checkClosedAndCreate(false);
         if (isInputShutdown()) {
-            throw new SocketException(Msg.getString("K0321")); //$NON-NLS-1$
+            throw new SocketException(Messages.getString("luni.74")); //$NON-NLS-1$
         }
         return impl.getInputStream();
     }
@@ -429,7 +429,7 @@
     public OutputStream getOutputStream() throws IOException {
         checkClosedAndCreate(false);
         if (isOutputShutdown()) {
-            throw new SocketException(Msg.getString("KA00f")); //$NON-NLS-1$
+            throw new SocketException(Messages.getString("luni.75")); //$NON-NLS-1$
         }
         return impl.getOutputStream();
     }
@@ -550,7 +550,7 @@
             security.checkSetFactory();
         }
         if (factory != null) {
-            throw new SocketException(Msg.getString("K0044")); //$NON-NLS-1$
+            throw new SocketException(Messages.getString("luni.5C")); //$NON-NLS-1$
         }
         factory = fac;
     }
@@ -569,7 +569,7 @@
     public synchronized void setSendBufferSize(int size) throws SocketException {
         checkClosedAndCreate(true);
         if (size < 1) {
-            throw new IllegalArgumentException(Msg.getString("K0035")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.5A")); //$NON-NLS-1$
         }
         impl.setOption(SocketOptions.SO_SNDBUF, Integer.valueOf(size));
     }
@@ -589,7 +589,7 @@
             throws SocketException {
         checkClosedAndCreate(true);
         if (size < 1) {
-            throw new IllegalArgumentException(Msg.getString("K0035")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.5A")); //$NON-NLS-1$
         }
         impl.setOption(SocketOptions.SO_RCVBUF, Integer.valueOf(size));
     }
@@ -610,7 +610,7 @@
     public void setSoLinger(boolean on, int timeout) throws SocketException {
         checkClosedAndCreate(true);
         if (on && timeout < 0) {
-            throw new IllegalArgumentException(Msg.getString("K0045")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.76")); //$NON-NLS-1$
         }
         int val = on ? (65535 < timeout ? 65535 : timeout) : -1;
         impl.setOption(SocketOptions.SO_LINGER, Integer.valueOf(val));
@@ -632,7 +632,7 @@
     public synchronized void setSoTimeout(int timeout) throws SocketException {
         checkClosedAndCreate(true);
         if (timeout < 0) {
-            throw new IllegalArgumentException(Msg.getString("K0036")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.5B")); //$NON-NLS-1$
         }
         impl.setOption(SocketOptions.SO_TIMEOUT, Integer.valueOf(timeout));
     }
@@ -672,7 +672,7 @@
             throws IOException {
 
         if (localPort < 0 || localPort > 65535) {
-            throw new IllegalArgumentException(Msg.getString("K0046")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.77")); //$NON-NLS-1$
         }
 
         InetAddress addr = localAddress == null ? InetAddress.ANY
@@ -720,7 +720,7 @@
      */
     public void shutdownInput() throws IOException {
         if (isInputShutdown()) {
-            throw new SocketException(Msg.getString("K0321")); //$NON-NLS-1$
+            throw new SocketException(Messages.getString("luni.74")); //$NON-NLS-1$
         }
         checkClosedAndCreate(false);
         impl.shutdownInput();
@@ -739,7 +739,7 @@
      */
     public void shutdownOutput() throws IOException {
         if (isOutputShutdown()) {
-            throw new SocketException(Msg.getString("KA00f")); //$NON-NLS-1$
+            throw new SocketException(Messages.getString("luni.75")); //$NON-NLS-1$
         }
         checkClosedAndCreate(false);
         impl.shutdownOutput();
@@ -755,11 +755,11 @@
      */
     private void checkClosedAndCreate(boolean create) throws SocketException {
         if (isClosed()) {
-            throw new SocketException(Msg.getString("K003d")); //$NON-NLS-1$
+            throw new SocketException(Messages.getString("luni.0C")); //$NON-NLS-1$
         }
         if (!create) {
             if (!isConnected()) {
-                throw new SocketException(Msg.getString("K0320")); //$NON-NLS-1$
+                throw new SocketException(Messages.getString("luni.78")); //$NON-NLS-1$
                 // a connected socket must be created
             }
 
@@ -859,20 +859,20 @@
     public void bind(SocketAddress localAddr) throws IOException {
         checkClosedAndCreate(true);
         if (isBound()) {
-            throw new BindException(Msg.getString("K0315")); //$NON-NLS-1$
+            throw new BindException(Messages.getString("luni.71")); //$NON-NLS-1$
         }
 
         int port = 0;
         InetAddress addr = InetAddress.ANY;
         if (localAddr != null) {
             if (!(localAddr instanceof InetSocketAddress)) {
-                throw new IllegalArgumentException(Msg.getString(
-                        "K0316", localAddr.getClass())); //$NON-NLS-1$
+                throw new IllegalArgumentException(Messages.getString(
+                        "luni.49", localAddr.getClass())); //$NON-NLS-1$
             }
             InetSocketAddress inetAddr = (InetSocketAddress) localAddr;
             if ((addr = inetAddr.getAddress()) == null) {
-                throw new SocketException(Msg.getString(
-                        "K0317", inetAddr.getHostName())); //$NON-NLS-1$
+                throw new SocketException(Messages.getString(
+                        "luni.1A", inetAddr.getHostName())); //$NON-NLS-1$
             }
             port = inetAddr.getPort();
         }
@@ -926,23 +926,23 @@
             throws IOException {
         checkClosedAndCreate(true);
         if (timeout < 0) {
-            throw new IllegalArgumentException(Msg.getString("K0036")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.5B")); //$NON-NLS-1$
         }
         if (isConnected()) {
-            throw new SocketException(Msg.getString("K0079")); //$NON-NLS-1$
+            throw new SocketException(Messages.getString("luni.5F")); //$NON-NLS-1$
         }
         if (remoteAddr == null) {
-            throw new IllegalArgumentException(Msg.getString("K0318")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.5D")); //$NON-NLS-1$
         }
 
         if (!(remoteAddr instanceof InetSocketAddress)) {
-            throw new IllegalArgumentException(Msg.getString(
-                    "K0316", remoteAddr.getClass())); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString(
+                    "luni.49", remoteAddr.getClass())); //$NON-NLS-1$
         }
         InetSocketAddress inetAddr = (InetSocketAddress) remoteAddr;
         InetAddress addr;
         if ((addr = inetAddr.getAddress()) == null) {
-            throw new UnknownHostException(Msg.getString("K0317", remoteAddr));//$NON-NLS-1$
+            throw new UnknownHostException(Messages.getString("luni.1A", remoteAddr));//$NON-NLS-1$
         }
         int port = inetAddr.getPort();
 
@@ -1096,7 +1096,7 @@
      */
     public void sendUrgentData(int value) throws IOException {
         if (!impl.supportsUrgentData()) {
-            throw new SocketException(Msg.getString("K0333")); //$NON-NLS-1$
+            throw new SocketException(Messages.getString("luni.79")); //$NON-NLS-1$
         }
         impl.sendUrgentData(value);
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/SocketImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/SocketImpl.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/SocketImpl.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/SocketImpl.java Sun Feb 14 08:40:42 2010
@@ -24,7 +24,7 @@
 
 import org.apache.harmony.luni.platform.INetworkSystem;
 import org.apache.harmony.luni.platform.Platform;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * This class is the base of all streaming socket implementation classes.
@@ -294,8 +294,8 @@
      *             always because this method should be overridden.
      */
     protected void shutdownInput() throws IOException {
-        // KA025=Method has not been implemented
-        throw new IOException(Msg.getString("KA025"));//$NON-NLS-1$
+        // luni.72=Method has not been implemented
+        throw new IOException(Messages.getString("luni.72"));//$NON-NLS-1$
     }
 
     /**
@@ -308,8 +308,8 @@
      *             always because this method should be overridden.
      */
     protected void shutdownOutput() throws IOException {
-        // KA025=Method has not been implemented
-        throw new IOException(Msg.getString("KA025"));//$NON-NLS-1$
+        // luni.72=Method has not been implemented
+        throw new IOException(Messages.getString("luni.72"));//$NON-NLS-1$
     }
 
     /**

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/SocketPermission.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/SocketPermission.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/SocketPermission.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/SocketPermission.java Sun Feb 14 08:40:42 2010
@@ -25,7 +25,7 @@
 import java.security.PermissionCollection;
 
 import org.apache.harmony.luni.util.Inet6Util;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * Regulates the access to network operations available through sockets through
@@ -232,7 +232,7 @@
             } else if (action.equals(actionNames[SP_RESOLVE])) {
                 // do nothing
             } else {
-                throw new IllegalArgumentException(Msg.getString("K0048", //$NON-NLS-1$
+                throw new IllegalArgumentException(Messages.getString("luni.7A", //$NON-NLS-1$
                         action));
             }
         }
@@ -338,12 +338,12 @@
            portMax = Integer.valueOf(strPortMax).intValue();
            
            if (portMin > portMax) {
-               // K0049=MinPort is greater than MaxPort\: {0}
-               throw new IllegalArgumentException(Msg.getString("K0049", port)); //$NON-NLS-1$
+               // luni.7B=MinPort is greater than MaxPort\: {0}
+               throw new IllegalArgumentException(Messages.getString("luni.7B", port)); //$NON-NLS-1$
            }
        } catch (NumberFormatException e) {
-           // K004a=Invalid port number specified\: {0}
-           throw new IllegalArgumentException(Msg.getString("K004a", port)); //$NON-NLS-1$
+           // luni.7C=Invalid port number specified\: {0}
+           throw new IllegalArgumentException(Messages.getString("luni.7C", port)); //$NON-NLS-1$
        }
     }
 
@@ -450,22 +450,22 @@
             if (Inet6Util.isIP6AddressInFullForm(host)) {
                 return host.toLowerCase();
             }
-            // K004a=Invalid port number specified\: {0}
-            throw new IllegalArgumentException(Msg.getString("K004a", host));
+            // luni.7C=Invalid port number specified\: {0}
+            throw new IllegalArgumentException(Messages.getString("luni.7C", host));
         }
         // forward bracket found
         int bbracketIdx = host.indexOf(']');
         if (-1 == bbracketIdx) {
             // no back bracket found, wrong
-            // K004a=Invalid port number specified\: {0}
-            throw new IllegalArgumentException(Msg.getString("K004a", host));
+            // luni.7C=Invalid port number specified\: {0}
+            throw new IllegalArgumentException(Messages.getString("luni.7C", host));
         }
         host = host.substring(0, bbracketIdx + 1);
         if (Inet6Util.isValidIP6Address(host)) {
             return host.toLowerCase();
         }
-        // K004a=Invalid port number specified\: {0}
-        throw new IllegalArgumentException(Msg.getString("K004a", host));
+        // luni.7C=Invalid port number specified\: {0}
+        throw new IllegalArgumentException(Messages.getString("luni.7C", host));
     }
 
     /**



Mime
View raw message