harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r909986 [5/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/net/URI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URI.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URI.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URI.java Sun Feb 14 08:40:42 2010
@@ -24,7 +24,7 @@
 import java.io.UnsupportedEncodingException;
 import java.util.StringTokenizer;
 
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * This class represents an instance of a URI as defined by RFC 2396.
@@ -163,7 +163,7 @@
 
         if (scheme != null && path != null && path.length() > 0
                 && path.charAt(0) != '/') {
-            throw new URISyntaxException(path, Msg.getString("K0302")); //$NON-NLS-1$
+            throw new URISyntaxException(path, Messages.getString("luni.82")); //$NON-NLS-1$
         }
 
         StringBuilder uri = new StringBuilder();
@@ -267,7 +267,7 @@
             String fragment) throws URISyntaxException {
         if (scheme != null && path != null && path.length() > 0
                 && path.charAt(0) != '/') {
-            throw new URISyntaxException(path, Msg.getString("K0302")); //$NON-NLS-1$
+            throw new URISyntaxException(path, Messages.getString("luni.82")); //$NON-NLS-1$
         }
 
         StringBuilder uri = new StringBuilder();
@@ -332,13 +332,13 @@
                 absolute = true;
                 scheme = temp.substring(0, index);
                 if (scheme.length() == 0) {
-                    throw new URISyntaxException(uri, Msg.getString("K0342"), //$NON-NLS-1$
+                    throw new URISyntaxException(uri, Messages.getString("luni.83"), //$NON-NLS-1$
                             index);
                 }
                 validateScheme(uri, scheme, 0);
                 schemespecificpart = temp.substring(index + 1);
                 if (schemespecificpart.length() == 0) {
-                    throw new URISyntaxException(uri, Msg.getString("K0303"), //$NON-NLS-1$
+                    throw new URISyntaxException(uri, Messages.getString("luni.84"), //$NON-NLS-1$
                             index + 1);
                 }
             } else {
@@ -370,8 +370,8 @@
                         authority = temp.substring(2);
                         if (authority.length() == 0 && query == null
                                 && fragment == null) {
-                            throw new URISyntaxException(uri, Msg
-                                    .getString("K0304"), uri.length()); //$NON-NLS-1$
+                            throw new URISyntaxException(uri, Messages
+                                    .getString("luni.9F"), uri.length()); //$NON-NLS-1$
                         }
 
                         path = ""; //$NON-NLS-1$
@@ -409,13 +409,13 @@
             // first char needs to be an alpha char
             char ch = scheme.charAt(0);
             if (!((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'))) {
-                throw new URISyntaxException(uri, Msg.getString("K0305"), 0); //$NON-NLS-1$
+                throw new URISyntaxException(uri, Messages.getString("luni.85"), 0); //$NON-NLS-1$
             }
 
             try {
                 URIEncoderDecoder.validateSimple(scheme, "+-."); //$NON-NLS-1$
             } catch (URISyntaxException e) {
-                throw new URISyntaxException(uri, Msg.getString("K0305"), index //$NON-NLS-1$
+                throw new URISyntaxException(uri, Messages.getString("luni.85"), index //$NON-NLS-1$
                         + e.getIndex());
             }
         }
@@ -425,7 +425,7 @@
             try {
                 URIEncoderDecoder.validate(ssp, allLegal);
             } catch (URISyntaxException e) {
-                throw new URISyntaxException(uri, Msg.getString("K0306", e //$NON-NLS-1$
+                throw new URISyntaxException(uri, Messages.getString("luni.86", e //$NON-NLS-1$
                         .getReason()), index + e.getIndex());
             }
         }
@@ -435,7 +435,7 @@
             try {
                 URIEncoderDecoder.validate(authority, "@[]" + someLegal); //$NON-NLS-1$
             } catch (URISyntaxException e) {
-                throw new URISyntaxException(uri, Msg.getString("K0307", e //$NON-NLS-1$
+                throw new URISyntaxException(uri, Messages.getString("luni.87", e //$NON-NLS-1$
                         .getReason()), index + e.getIndex());
             }
         }
@@ -445,7 +445,7 @@
             try {
                 URIEncoderDecoder.validate(path, "/@" + someLegal); //$NON-NLS-1$
             } catch (URISyntaxException e) {
-                throw new URISyntaxException(uri, Msg.getString("K0308", e //$NON-NLS-1$
+                throw new URISyntaxException(uri, Messages.getString("luni.88", e //$NON-NLS-1$
                         .getReason()), index + e.getIndex());
             }
         }
@@ -455,7 +455,7 @@
             try {
                 URIEncoderDecoder.validate(query, allLegal);
             } catch (URISyntaxException e) {
-                throw new URISyntaxException(uri, Msg.getString("K0309", e //$NON-NLS-1$
+                throw new URISyntaxException(uri, Messages.getString("luni.89", e //$NON-NLS-1$
                         .getReason()), index + e.getIndex());
 
             }
@@ -466,7 +466,7 @@
             try {
                 URIEncoderDecoder.validate(fragment, allLegal);
             } catch (URISyntaxException e) {
-                throw new URISyntaxException(uri, Msg.getString("K030a", e //$NON-NLS-1$
+                throw new URISyntaxException(uri, Messages.getString("luni.8A", e //$NON-NLS-1$
                         .getReason()), index + e.getIndex());
             }
         }
@@ -517,14 +517,14 @@
                             if (forceServer) {
                                 throw new URISyntaxException(
                                         authority,
-                                        Msg.getString("K00b1"), hostindex + index + 1); //$NON-NLS-1$
+                                        Messages.getString("luni.8B"), hostindex + index + 1); //$NON-NLS-1$
                             }
                             return;
                         }
                     } catch (NumberFormatException e) {
                         if (forceServer) {
-                            throw new URISyntaxException(authority, Msg
-                                    .getString("K00b1"), hostindex + index + 1); //$NON-NLS-1$
+                            throw new URISyntaxException(authority, Messages
+                                    .getString("luni.8B"), hostindex + index + 1); //$NON-NLS-1$
                         }
                         return;
                     }
@@ -535,8 +535,8 @@
 
             if (tempHost.equals("")) { //$NON-NLS-1$
                 if (forceServer) {
-                    throw new URISyntaxException(authority, Msg
-                            .getString("K030c"), hostindex); //$NON-NLS-1$
+                    throw new URISyntaxException(authority, Messages
+                            .getString("luni.A0"), hostindex); //$NON-NLS-1$
                 }
                 return;
             }
@@ -558,7 +558,7 @@
             for (int i = 0; i < userinfo.length(); i++) {
                 char ch = userinfo.charAt(i);
                 if (ch == ']' || ch == '[') {
-                    throw new URISyntaxException(uri, Msg.getString("K030d"), //$NON-NLS-1$
+                    throw new URISyntaxException(uri, Messages.getString("luni.8C"), //$NON-NLS-1$
                             index + i);
                 }
             }
@@ -574,10 +574,10 @@
                 // ipv6 address
                 if (host.charAt(host.length() - 1) != ']') {
                     throw new URISyntaxException(host,
-                            Msg.getString("K030e"), 0); //$NON-NLS-1$
+                            Messages.getString("luni.8D"), 0); //$NON-NLS-1$
                 }
                 if (!isValidIP6Address(host)) {
-                    throw new URISyntaxException(host, Msg.getString("K030f")); //$NON-NLS-1$
+                    throw new URISyntaxException(host, Messages.getString("luni.8E")); //$NON-NLS-1$
                 }
                 return true;
             }
@@ -585,7 +585,7 @@
             // '[' and ']' can only be the first char and last char
             // of the host name
             if (host.indexOf('[') != -1 || host.indexOf(']') != -1) {
-                throw new URISyntaxException(host, Msg.getString("K0310"), 0); //$NON-NLS-1$
+                throw new URISyntaxException(host, Messages.getString("luni.8F"), 0); //$NON-NLS-1$
             }
 
             int index = host.lastIndexOf('.');
@@ -597,7 +597,7 @@
                 }
                 if (forceServer) {
                     throw new URISyntaxException(host,
-                            Msg.getString("K0310"), 0); //$NON-NLS-1$
+                            Messages.getString("luni.8F"), 0); //$NON-NLS-1$
                 }
                 return false;
             }
@@ -607,7 +607,7 @@
                 return true;
             }
             if (forceServer) {
-                throw new URISyntaxException(host, Msg.getString("K0311"), 0); //$NON-NLS-1$
+                throw new URISyntaxException(host, Messages.getString("luni.90"), 0); //$NON-NLS-1$
             }
             return false;
         }
@@ -1721,7 +1721,7 @@
      */
     public URL toURL() throws MalformedURLException {
         if (!absolute) {
-            throw new IllegalArgumentException(Msg.getString("K0312") + ": " //$NON-NLS-1$//$NON-NLS-2$
+            throw new IllegalArgumentException(Messages.getString("luni.91") + ": " //$NON-NLS-1$//$NON-NLS-2$
                     + toString());
         }
         return new URL(toString());

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URIEncoderDecoder.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URIEncoderDecoder.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URIEncoderDecoder.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URIEncoderDecoder.java Sun Feb 14 08:40:42 2010
@@ -20,7 +20,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.UnsupportedEncodingException;
 
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * This class is used to encode a string using the format required by {@code
@@ -54,13 +54,13 @@
             if (ch == '%') {
                 do {
                     if (i + 2 >= s.length()) {
-                        throw new URISyntaxException(s, Msg.getString("K0313"), //$NON-NLS-1$
+                        throw new URISyntaxException(s, Messages.getString("luni.7D"), //$NON-NLS-1$
                                 i);
                     }
                     int d1 = Character.digit(s.charAt(i + 1), 16);
                     int d2 = Character.digit(s.charAt(i + 2), 16);
                     if (d1 == -1 || d2 == -1) {
-                        throw new URISyntaxException(s, Msg.getString("K0314", //$NON-NLS-1$
+                        throw new URISyntaxException(s, Messages.getString("luni.7E", //$NON-NLS-1$
                                 s.substring(i, i + 3)), i);
                     }
 
@@ -73,7 +73,7 @@
                     || (ch >= '0' && ch <= '9') || legal.indexOf(ch) > -1 || (ch > 127
                     && !Character.isSpaceChar(ch) && !Character
                     .isISOControl(ch)))) {
-                throw new URISyntaxException(s, Msg.getString("K00c1"), i); //$NON-NLS-1$
+                throw new URISyntaxException(s, Messages.getString("luni.7F"), i); //$NON-NLS-1$
             }
             i++;
         }
@@ -85,7 +85,7 @@
             char ch = s.charAt(i);
             if (!((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')
                     || (ch >= '0' && ch <= '9') || legal.indexOf(ch) > -1)) {
-                throw new URISyntaxException(s, Msg.getString("K00c1"), i); //$NON-NLS-1$
+                throw new URISyntaxException(s, Messages.getString("luni.7F"), i); //$NON-NLS-1$
             }
             i++;
         }
@@ -191,14 +191,14 @@
                 out.reset();
                 do {
                     if (i + 2 >= s.length()) {
-                        throw new IllegalArgumentException(Msg.getString(
-                                "K01fe", i)); //$NON-NLS-1$
+                        throw new IllegalArgumentException(Messages.getString(
+                                "luni.80", i)); //$NON-NLS-1$
                     }
                     int d1 = Character.digit(s.charAt(i + 1), 16);
                     int d2 = Character.digit(s.charAt(i + 2), 16);
                     if (d1 == -1 || d2 == -1) {
-                        throw new IllegalArgumentException(Msg.getString(
-                                "K01ff", s.substring(i, i + 3), //$NON-NLS-1$
+                        throw new IllegalArgumentException(Messages.getString(
+                                "luni.81", s.substring(i, i + 3), //$NON-NLS-1$
                                 String.valueOf(i)));
                     }
                     out.write((byte) ((d1 << 4) + d2));

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URISyntaxException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URISyntaxException.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URISyntaxException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URISyntaxException.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;
 
 /**
  * A {@code URISyntaxException} will be thrown if some information could not be parsed
@@ -127,10 +127,10 @@
         String reason = super.getMessage();
 
         if (index != -1) {
-            return Msg.getString("K0326", //$NON-NLS-1$
+            return Messages.getString("luni.92", //$NON-NLS-1$
                     new String[] { reason, Integer.toString(index), input });
         }
-        return Msg.getString("K0327", //$NON-NLS-1$
+        return Messages.getString("luni.93", //$NON-NLS-1$
                 new String[] { reason, input });
     }
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URL.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URL.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URL.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URL.java Sun Feb 14 08:40:42 2010
@@ -24,7 +24,7 @@
 import java.util.Hashtable;
 import java.util.StringTokenizer;
 
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 import org.apache.harmony.luni.util.PriviAction;
 import org.apache.harmony.luni.util.Util;
 
@@ -136,7 +136,7 @@
     public static synchronized void setURLStreamHandlerFactory(
             URLStreamHandlerFactory streamFactory) {
         if (streamHandlerFactory != null) {
-            throw new Error(Msg.getString("K004b")); //$NON-NLS-1$
+            throw new Error(Messages.getString("luni.9A")); //$NON-NLS-1$
         }
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
@@ -273,8 +273,8 @@
             // by the values in the ("relative") spec.
             if (context == null) {
                 throw new MalformedURLException(
-                        org.apache.harmony.luni.util.Msg.getString(
-                                "K00d8", spec)); //$NON-NLS-1$
+                        Messages.getString(
+                                "luni.9B", spec)); //$NON-NLS-1$
             }
             set(context.getProtocol(), context.getHost(), context.getPort(),
                     context.getAuthority(), context.getUserInfo(), context
@@ -290,8 +290,8 @@
             setupStreamHandler();
             if (strmHandler == null) {
                 throw new MalformedURLException(
-                        org.apache.harmony.luni.util.Msg.getString(
-                                "K00b3", protocol)); //$NON-NLS-1$
+                        Messages.getString(
+                                "luni.9C", protocol)); //$NON-NLS-1$
             }
         }
 
@@ -310,8 +310,8 @@
         }
 
         if (port < -1) {
-            throw new MalformedURLException(org.apache.harmony.luni.util.Msg
-                    .getString("K0325", port)); //$NON-NLS-1$
+            throw new MalformedURLException(Messages
+                    .getString("luni.56", port)); //$NON-NLS-1$
         }
     }
 
@@ -382,7 +382,7 @@
     public URL(String protocol, String host, int port, String file,
             URLStreamHandler handler) throws MalformedURLException {
         if (port < -1) {
-            throw new MalformedURLException(Msg.getString("K0325", port)); //$NON-NLS-1$
+            throw new MalformedURLException(Messages.getString("luni.56", port)); //$NON-NLS-1$
         }
 
         if (host != null && host.indexOf(":") != -1 && host.charAt(0) != '[') { //$NON-NLS-1$
@@ -390,7 +390,7 @@
         }
 
         if (protocol == null) {
-            throw new NullPointerException(Msg.getString("K00b3", "null")); //$NON-NLS-1$ //$NON-NLS-2$
+            throw new NullPointerException(Messages.getString("luni.9C", "null")); //$NON-NLS-1$ //$NON-NLS-2$
         }
 
         this.protocol = protocol;
@@ -416,7 +416,7 @@
             setupStreamHandler();
             if (strmHandler == null) {
                 throw new MalformedURLException(
-                        Msg.getString("K00b3", protocol)); //$NON-NLS-1$
+                        Messages.getString("luni.9C", protocol)); //$NON-NLS-1$
             }
         } else {
             SecurityManager sm = System.getSecurityManager();
@@ -698,8 +698,8 @@
      */
     public URLConnection openConnection(Proxy proxy) throws IOException {
         if (proxy == null) {
-            // K034c=proxy should not be null
-            throw new IllegalArgumentException(Msg.getString("K034c")); //$NON-NLS-1$
+            // luni.9D=proxy should not be null
+            throw new IllegalArgumentException(Messages.getString("luni.9D")); //$NON-NLS-1$
         }
 
         SecurityManager sm = System.getSecurityManager();
@@ -769,7 +769,7 @@
             }
             setupStreamHandler();
             if (strmHandler == null) {
-                throw new IOException(Msg.getString("K00b3", protocol)); //$NON-NLS-1$
+                throw new IOException(Messages.getString("luni.9C", protocol)); //$NON-NLS-1$
             }
         } catch (ClassNotFoundException e) {
             throw new IOException(e.toString());

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URLClassLoader.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URLClassLoader.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URLClassLoader.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URLClassLoader.java Sun Feb 14 08:40:42 2010
@@ -46,7 +46,7 @@
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
 
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * This class loader is responsible for loading classes and resources from a
@@ -255,8 +255,8 @@
                             null, null, null, null, null);
                 } else {
                     if (packageObj.isSealed()) {
-                        throw new SecurityException(Msg
-                                .getString("K004c")); //$NON-NLS-1$
+                        throw new SecurityException(Messages
+                                .getString("luni.A1")); //$NON-NLS-1$
                     }
                 }
             }
@@ -431,8 +431,8 @@
                         }
                     }
                     if (exception) {
-                        throw new SecurityException(Msg
-                                .getString("K0352", packageName)); //$NON-NLS-1$
+                        throw new SecurityException(Messages
+                                .getString("luni.A1", packageName)); //$NON-NLS-1$
                     }
                 }
             }
@@ -1002,8 +1002,8 @@
     private synchronized void makeNewHandler() {
         while (!searchList.isEmpty()) {
             URL nextCandidate = searchList.remove(0);
-            if (nextCandidate == null) {  // KA024=One of urls is null
-                throw new NullPointerException(Msg.getString("KA024")); //$NON-NLS-1$
+            if (nextCandidate == null) {  // luni.94=One of urls is null
+                throw new NullPointerException(Messages.getString("luni.94")); //$NON-NLS-1$
             }
             if (!handlerMap.containsKey(nextCandidate)) {
                 URLHandler result;

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URLConnection.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URLConnection.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URLConnection.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URLConnection.java Sun Feb 14 08:40:42 2010
@@ -30,7 +30,7 @@
 import java.util.StringTokenizer;
 
 import org.apache.harmony.luni.internal.net.www.MimeTable;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 import org.apache.harmony.luni.util.PriviAction;
 
 /**
@@ -439,7 +439,7 @@
      */
     public Map<String, List<String>> getRequestProperties() {
         if (connected) {
-            throw new IllegalStateException(Msg.getString("K0037")); //$NON-NLS-1$
+            throw new IllegalStateException(Messages.getString("luni.5E")); //$NON-NLS-1$
         }
         return Collections.emptyMap();
     }
@@ -460,10 +460,10 @@
      */
     public void addRequestProperty(String field, String newValue) {
         if (connected) {
-            throw new IllegalStateException(Msg.getString("K0037")); //$NON-NLS-1$
+            throw new IllegalStateException(Messages.getString("luni.5E")); //$NON-NLS-1$
         }
         if (field == null) {
-            throw new NullPointerException(Msg.getString("KA007")); //$NON-NLS-1$
+            throw new NullPointerException(Messages.getString("luni.95")); //$NON-NLS-1$
         }
     }
 
@@ -559,7 +559,7 @@
      *             if no InputStream could be created.
      */
     public InputStream getInputStream() throws IOException {
-        throw new UnknownServiceException(Msg.getString("K004d")); //$NON-NLS-1$
+        throw new UnknownServiceException(Messages.getString("luni.96")); //$NON-NLS-1$
     }
 
     /**
@@ -585,7 +585,7 @@
      *             if no OutputStream could be created.
      */
     public OutputStream getOutputStream() throws IOException {
-        throw new UnknownServiceException(Msg.getString("K005f")); //$NON-NLS-1$
+        throw new UnknownServiceException(Messages.getString("luni.97")); //$NON-NLS-1$
     }
 
     /**
@@ -618,7 +618,7 @@
      */
     public String getRequestProperty(String field) {
         if (connected) {
-            throw new IllegalStateException(Msg.getString("K0037")); //$NON-NLS-1$
+            throw new IllegalStateException(Messages.getString("luni.5E")); //$NON-NLS-1$
         }
         return null;
     }
@@ -782,7 +782,7 @@
      */
     public void setAllowUserInteraction(boolean newValue) {
         if (connected) {
-            throw new IllegalStateException(Msg.getString("K0037")); //$NON-NLS-1$
+            throw new IllegalStateException(Messages.getString("luni.5E")); //$NON-NLS-1$
         }
         this.allowUserInteraction = newValue;
     }
@@ -801,7 +801,7 @@
     public static synchronized void setContentHandlerFactory(
             ContentHandlerFactory contentFactory) {
         if (contentHandlerFactory != null) {
-            throw new Error(Msg.getString("K004e")); //$NON-NLS-1$
+            throw new Error(Messages.getString("luni.98")); //$NON-NLS-1$
         }
         SecurityManager sManager = System.getSecurityManager();
         if (sManager != null) {
@@ -851,7 +851,7 @@
      */
     public void setDefaultUseCaches(boolean newValue) {
         if (connected) {
-            throw new IllegalAccessError(Msg.getString("K0037")); //$NON-NLS-1$
+            throw new IllegalAccessError(Messages.getString("luni.5E")); //$NON-NLS-1$
         }
         defaultUseCaches = newValue;
     }
@@ -869,7 +869,7 @@
      */
     public void setDoInput(boolean newValue) {
         if (connected) {
-            throw new IllegalStateException(Msg.getString("K0037")); //$NON-NLS-1$
+            throw new IllegalStateException(Messages.getString("luni.5E")); //$NON-NLS-1$
         }
         this.doInput = newValue;
     }
@@ -887,7 +887,7 @@
      */
     public void setDoOutput(boolean newValue) {
         if (connected) {
-            throw new IllegalStateException(Msg.getString("K0037")); //$NON-NLS-1$
+            throw new IllegalStateException(Messages.getString("luni.5E")); //$NON-NLS-1$
         }
         this.doOutput = newValue;
     }
@@ -923,7 +923,7 @@
      */
     public void setIfModifiedSince(long newValue) {
         if (connected) {
-            throw new IllegalStateException(Msg.getString("K0037")); //$NON-NLS-1$
+            throw new IllegalStateException(Messages.getString("luni.5E")); //$NON-NLS-1$
         }
         this.ifModifiedSince = newValue;
     }
@@ -944,10 +944,10 @@
      */
     public void setRequestProperty(String field, String newValue) {
         if (connected) {
-            throw new IllegalStateException(Msg.getString("K0037")); //$NON-NLS-1$
+            throw new IllegalStateException(Messages.getString("luni.5E")); //$NON-NLS-1$
         }
         if (field == null) {
-            throw new NullPointerException(Msg.getString("KA007")); //$NON-NLS-1$
+            throw new NullPointerException(Messages.getString("luni.95")); //$NON-NLS-1$
         }
     }
 
@@ -965,7 +965,7 @@
      */
     public void setUseCaches(boolean newValue) {
         if (connected) {
-            throw new IllegalStateException(Msg.getString("K0037")); //$NON-NLS-1$
+            throw new IllegalStateException(Messages.getString("luni.5E")); //$NON-NLS-1$
         }
         this.useCaches = newValue;
     }
@@ -984,7 +984,7 @@
      */
     public void setConnectTimeout(int timeout) {
         if (0 > timeout) {
-            throw new IllegalArgumentException(Msg.getString("K0036")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.5B")); //$NON-NLS-1$
         }
         this.connectTimeout = timeout;
     }
@@ -1012,7 +1012,7 @@
      */
     public void setReadTimeout(int timeout) {
         if (0 > timeout) {
-            throw new IllegalArgumentException(Msg.getString("K0036")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.5B")); //$NON-NLS-1$
         }
         this.readTimeout = timeout;
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URLDecoder.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URLDecoder.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URLDecoder.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URLDecoder.java Sun Feb 14 08:40:42 2010
@@ -24,7 +24,7 @@
 import java.nio.charset.IllegalCharsetNameException;
 import java.nio.charset.UnsupportedCharsetException;
 
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * This class is used to decode a string which is encoded in the {@code
@@ -96,8 +96,8 @@
         // If the given encoding is an empty string throw an exception.
         if (enc.length() == 0) {
             throw new UnsupportedEncodingException(
-                    // K00a5=Invalid parameter - {0}
-                    Msg.getString("K00a5", "enc")); //$NON-NLS-1$ //$NON-NLS-2$
+                    // luni.99=Invalid parameter - {0}
+                    Messages.getString("luni.99", "enc")); //$NON-NLS-1$ //$NON-NLS-2$
         }
 
         if (s.indexOf('%') == -1) {
@@ -141,16 +141,16 @@
                 do {
                     if (i + 2 >= s.length()) {
                         throw new IllegalArgumentException(
-                                // K01fe=Incomplete % sequence at\: {0}
-                                Msg.getString("K01fe", i)); //$NON-NLS-1$
+                                // luni.80=Incomplete % sequence at\: {0}
+                                Messages.getString("luni.80", i)); //$NON-NLS-1$
                     }
                     int d1 = Character.digit(s.charAt(i + 1), 16);
                     int d2 = Character.digit(s.charAt(i + 2), 16);
                     if (d1 == -1 || d2 == -1) {
                         throw new IllegalArgumentException(
-                                // K01ff=Invalid % sequence ({0}) at\: {1}
-                                Msg.getString(
-                                        "K01ff", //$NON-NLS-1$
+                                // luni.81=Invalid % sequence ({0}) at\: {1}
+                                Messages.getString(
+                                        "luni.81", //$NON-NLS-1$
                                         s.substring(i, i + 3),
                                         String.valueOf(i)));
                     }

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URLStreamHandler.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URLStreamHandler.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URLStreamHandler.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/URLStreamHandler.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;
 import org.apache.harmony.luni.util.URLUtil;
 
 /**
@@ -61,7 +61,7 @@
      */
     protected URLConnection openConnection(URL u, Proxy proxy)
             throws IOException {
-        throw new UnsupportedOperationException(Msg.getString("K034d")); //$NON-NLS-1$
+        throw new UnsupportedOperationException(Messages.getString("luni.9E")); //$NON-NLS-1$
     }
 
     /**

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Arrays.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Arrays.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Arrays.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Arrays.java Sun Feb 14 08:40:42 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.
@@ -1927,17 +1927,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/branches/java6/modules/luni/src/main/java/java/util/BitSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/BitSet.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/BitSet.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/BitSet.java Sun Feb 14 08:40:42 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/branches/java6/modules/luni/src/main/java/java/util/Collections.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Collections.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Collections.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Collections.java Sun Feb 14 08:40:42 2010
@@ -25,7 +25,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
@@ -1597,8 +1597,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();
@@ -1606,8 +1606,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/branches/java6/modules/luni/src/main/java/java/util/MissingFormatArgumentException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/MissingFormatArgumentException.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/MissingFormatArgumentException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/MissingFormatArgumentException.java Sun Feb 14 08:40:42 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/branches/java6/modules/luni/src/main/java/java/util/ResourceBundle.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/ResourceBundle.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/ResourceBundle.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/ResourceBundle.java Sun Feb 14 08:40:42 2010
@@ -27,7 +27,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
@@ -219,7 +219,7 @@
                     + Locale.getDefault(), 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$
                     EMPTY_STRING);
         }
         throw new NullPointerException();
@@ -423,7 +423,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$
                     EMPTY_STRING);
         }
         throw new NullPointerException();
@@ -469,7 +469,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/branches/java6/modules/luni/src/main/java/java/util/Scanner.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Scanner.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Scanner.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Scanner.java Sun Feb 14 08:40:42 2010
@@ -35,6 +35,7 @@
 import java.util.regex.MatchResult;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * A parser that parses a text string of primitive types and strings with the
@@ -179,13 +180,13 @@
      */
     public Scanner(File src, String charsetName) throws FileNotFoundException {
         if (null == src) {
-            throw new NullPointerException(org.apache.harmony.luni.util.Msg
-                    .getString("KA00a")); //$NON-NLS-1$
+            throw new NullPointerException(Messages
+                    .getString("luni.DB")); //$NON-NLS-1$
         }
         FileInputStream fis = new FileInputStream(src);
         if (null == charsetName) {
-            throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg
-                    .getString("KA009")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages
+                    .getString("luni.DC")); //$NON-NLS-1$
         }
         try {
             input = new InputStreamReader(fis, charsetName);
@@ -235,8 +236,8 @@
      */
     public Scanner(InputStream src, String charsetName) {
         if (null == src) {
-            throw new NullPointerException(org.apache.harmony.luni.util.Msg
-                    .getString("KA00b")); //$NON-NLS-1$
+            throw new NullPointerException(Messages
+                    .getString("luni.AA")); //$NON-NLS-1$
         }
         try {
             input = new InputStreamReader(src, charsetName);
@@ -284,12 +285,12 @@
      */
     public Scanner(ReadableByteChannel src, String charsetName) {
         if (null == src) {
-            throw new NullPointerException(org.apache.harmony.luni.util.Msg
-                    .getString("KA00d")); //$NON-NLS-1$
+            throw new NullPointerException(Messages
+                    .getString("luni.DD")); //$NON-NLS-1$
         }
         if (null == charsetName) {
-            throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg
-                    .getString("KA009")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages
+                    .getString("luni.DC")); //$NON-NLS-1$
         }
         input = Channels.newReader(src, charsetName);
         initialization();
@@ -473,8 +474,8 @@
         checkClosed();
         checkNull(pattern);
         if (horizon < 0) {
-            throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg
-                    .getString("KA00e")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages
+                    .getString("luni.DE")); //$NON-NLS-1$
         }
         matcher.usePattern(pattern);
 
@@ -1697,8 +1698,8 @@
      */
     public Scanner useRadix(int radix) {
         if (radix < Character.MIN_RADIX || radix > Character.MAX_RADIX) {
-            throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg
-                    .getString("KA008", radix)); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages
+                    .getString("luni.DF", radix)); //$NON-NLS-1$
         }
         this.integerRadix = radix;
         return this;
@@ -1774,8 +1775,8 @@
      */
     private Pattern getIntegerPattern(int radix) {
         if (radix < Character.MIN_RADIX || radix > Character.MAX_RADIX) {
-            throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg
-                    .getString("KA00e", radix)); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages
+                    .getString("luni.DE", radix)); //$NON-NLS-1$
         }
         decimalFormat = (DecimalFormat) NumberFormat.getInstance(locale);
 

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/SimpleTimeZone.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/SimpleTimeZone.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/SimpleTimeZone.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/SimpleTimeZone.java Sun Feb 14 08:40:42 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/branches/java6/modules/luni/src/main/java/java/util/Timer.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Timer.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Timer.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/Timer.java Sun Feb 14 08:40:42 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/branches/java6/modules/luni/src/main/java/java/util/UUID.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/UUID.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/UUID.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/UUID.java Sun Feb 14 08:40:42 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/branches/java6/modules/luni/src/main/java/java/util/UnknownFormatConversionException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/UnknownFormatConversionException.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/UnknownFormatConversionException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/UnknownFormatConversionException.java Sun Feb 14 08:40:42 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
@@ -58,6 +58,6 @@
      */
     @Override
     public String getMessage() {
-        return Msg.getString("K0349", s);
+        return Messages.getString("luni.45", s);
     }
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/UnknownFormatFlagsException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/UnknownFormatFlagsException.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/UnknownFormatFlagsException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/util/UnknownFormatFlagsException.java Sun Feb 14 08:40:42 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/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/Handler.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/Handler.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/Handler.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/Handler.java Sun Feb 14 08:40:42 2010
@@ -23,7 +23,7 @@
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
 
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * This is the handler that is responsible for reading files from the file
@@ -66,8 +66,8 @@
     public URLConnection openConnection(URL url, Proxy proxy)
             throws IOException {
         if (null == url) {
-            // K034b=url and proxy can not be null
-            throw new IllegalArgumentException(Msg.getString("K034b")); //$NON-NLS-1$
+            // luni.1B=url and proxy can not be null
+            throw new IllegalArgumentException(Messages.getString("luni.1B")); //$NON-NLS-1$
         }
 
         String host = url.getHost();

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/ftp/FtpURLConnection.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/ftp/FtpURLConnection.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/ftp/FtpURLConnection.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/ftp/FtpURLConnection.java Sun Feb 14 08:40:42 2010
@@ -42,7 +42,7 @@
 
 import org.apache.harmony.luni.internal.net.www.MimeTable;
 import org.apache.harmony.luni.net.NetUtil;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 public class FtpURLConnection extends URLConnection {
 
@@ -153,7 +153,7 @@
                 reply = getReply();
             }
             if (reply != FTP_FILEOK) {
-                throw new IOException(Msg.getString("K0094")); //$NON-NLS-1$
+                throw new IOException(Messages.getString("luni.1C")); //$NON-NLS-1$
             }
         }
     }
@@ -200,8 +200,8 @@
                 }
             }
             if (!connectOK) {
-                // K0097=Unable to connect to server\: {0}
-                throw new IOException(Msg.getString("K0097", failureReason)); //$NON-NLS-1$
+                // luni.1D=Unable to connect to server\: {0}
+                throw new IOException(Messages.getString("luni.1D", failureReason)); //$NON-NLS-1$
             }
         }
     }
@@ -247,7 +247,7 @@
             dataSocket.setSoTimeout(getReadTimeout());
             acceptSocket.close();
         } catch (InterruptedIOException e) {
-            throw new IOException(Msg.getString("K0095")); //$NON-NLS-1$
+            throw new IOException(Messages.getString("luni.1E")); //$NON-NLS-1$
         }
         if (getDoInput()) {
             inputStream = new FtpURLInputStream(new BufferedInputStream(
@@ -279,7 +279,7 @@
             reply = getReply();
         }
         if (!(reply == FTP_OPENDATA || reply == FTP_TRANSFEROK)) {
-            throw new FileNotFoundException(Msg.getString("K0096", reply)); //$NON-NLS-1$
+            throw new FileNotFoundException(Messages.getString("luni.1F", reply)); //$NON-NLS-1$
         }
     }
 
@@ -376,19 +376,19 @@
         reply = getReply();
         if (reply == FTP_USERREADY) {
         } else {
-            throw new IOException(Msg.getString("K0097", url.getHost())); //$NON-NLS-1$
+            throw new IOException(Messages.getString("luni.1D", url.getHost())); //$NON-NLS-1$
         }
         write("USER " + username + "\r\n"); //$NON-NLS-1$ //$NON-NLS-2$
         reply = getReply();
         if (reply == FTP_PASWD || reply == FTP_LOGGEDIN) {
         } else {
-            throw new IOException(Msg.getString("K0098", url.getHost())); //$NON-NLS-1$
+            throw new IOException(Messages.getString("luni.20", url.getHost())); //$NON-NLS-1$
         }
         if (reply == FTP_PASWD) {
             write("PASS " + password + "\r\n"); //$NON-NLS-1$ //$NON-NLS-2$
             reply = getReply();
             if (!(reply == FTP_OK || reply == FTP_USERREADY || reply == FTP_LOGGEDIN)) {
-                throw new IOException(Msg.getString("K0098", url.getHost())); //$NON-NLS-1$
+                throw new IOException(Messages.getString("luni.20", url.getHost())); //$NON-NLS-1$
             }
         }
     }
@@ -400,7 +400,7 @@
                 + (dataPort & 255)
                 + "\r\n"); //$NON-NLS-1$
         if (getReply() != FTP_OK) {
-            throw new IOException(Msg.getString("K0099")); //$NON-NLS-1$
+            throw new IOException(Messages.getString("luni.21")); //$NON-NLS-1$
         }
     }
 
@@ -438,7 +438,7 @@
                         url.getFile().length()) + "\r\n"); //$NON-NLS-1$
         reply = getReply();
         if (!(reply == FTP_OPENDATA || reply == FTP_OK || reply == FTP_DATAOPEN)) {
-            throw new IOException(Msg.getString("K009a")); //$NON-NLS-1$
+            throw new IOException(Messages.getString("luni.22")); //$NON-NLS-1$
         }
     }
 
@@ -494,7 +494,7 @@
     private void setType() throws IOException {
         write("TYPE I\r\n"); //$NON-NLS-1$
         if (getReply() != FTP_OK) {
-            throw new IOException(Msg.getString("K009b")); //$NON-NLS-1$
+            throw new IOException(Messages.getString("luni.23")); //$NON-NLS-1$
         }
     }
 

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/ftp/Handler.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/ftp/Handler.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/ftp/Handler.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/ftp/Handler.java Sun Feb 14 08:40:42 2010
@@ -23,7 +23,7 @@
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
 
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 public class Handler extends URLStreamHandler {
     /**
@@ -57,7 +57,7 @@
     protected URLConnection openConnection(URL u, Proxy proxy)
             throws IOException {
         if (null == u || null == proxy) {
-            throw new IllegalArgumentException(Msg.getString("K034b")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.1B")); //$NON-NLS-1$
         }
         return new FtpURLConnection(u, proxy);
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Handler.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Handler.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Handler.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Handler.java Sun Feb 14 08:40:42 2010
@@ -23,7 +23,7 @@
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
 
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * This is the handler that manages all transactions between the client and a
@@ -70,7 +70,7 @@
     protected URLConnection openConnection(URL u, Proxy proxy)
             throws IOException {
         if (null == u || null == proxy) {
-            throw new IllegalArgumentException(Msg.getString("K034b")); //$NON-NLS-1$
+            throw new IllegalArgumentException(Messages.getString("luni.1B")); //$NON-NLS-1$
         }
         return new HttpURLConnectionImpl(u, getDefaultPort(), proxy);
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpConfiguration.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpConfiguration.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpConfiguration.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpConfiguration.java Sun Feb 14 08:40:42 2010
@@ -21,7 +21,7 @@
 import java.net.SocketAddress;
 import java.net.URI;
 
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * An <code>HttpConfiguration</code> contains all the details needed to create an http connection
@@ -59,8 +59,8 @@
         if (proxy.type() == Proxy.Type.HTTP) {
             SocketAddress proxyAddr = proxy.address();
             if (!(proxyAddr instanceof InetSocketAddress)) {
-               throw new IllegalArgumentException(Msg.getString(
-                   "K0316", proxyAddr.getClass())); //$NON-NLS-1$
+               throw new IllegalArgumentException(Messages.getString(
+                   "luni.49", proxyAddr.getClass())); //$NON-NLS-1$
             }
             InetSocketAddress iProxyAddr = (InetSocketAddress) proxyAddr;
             this.hostName = iProxyAddr.getHostName();
@@ -80,8 +80,8 @@
         this.uri = uri;
         SocketAddress proxyAddr = proxy.address();
         if (!(proxyAddr instanceof InetSocketAddress)) {
-           throw new IllegalArgumentException(Msg.getString(
-               "K0316", proxyAddr.getClass())); //$NON-NLS-1$
+           throw new IllegalArgumentException(Messages.getString(
+               "luni.49", proxyAddr.getClass())); //$NON-NLS-1$
         }
         InetSocketAddress iProxyAddr = (InetSocketAddress) proxyAddr;
         this.hostName = iProxyAddr.getHostName();

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpURLConnectionImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpURLConnectionImpl.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpURLConnectionImpl.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpURLConnectionImpl.java Sun Feb 14 08:40:42 2010
@@ -50,7 +50,7 @@
 import java.util.TimeZone;
 
 import org.apache.harmony.luni.util.Base64;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 import org.apache.harmony.luni.util.PriviAction;
 
 /**
@@ -175,12 +175,12 @@
         public int read(byte[] buf, int offset, int length) throws IOException {
             // Force buf null check first, and avoid int overflow
             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 (length < 0 || buf.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$
             }
             if (bytesRemaining <= 0) {
                 disconnect(false);
@@ -296,12 +296,12 @@
         public int read(byte[] buf, int offset, int length) throws IOException {
             // Force buf null check first, and avoid int overflow
             if (offset > buf.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 || buf.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$
             }
             if (bytesRemaining <= 0) {
                 readChunkSize();
@@ -431,7 +431,7 @@
         @Override
         public synchronized void flush() throws IOException {
             if (closed) {
-                throw new IOException(Msg.getString("K0059")); //$NON-NLS-1$
+                throw new IOException(Messages.getString("luni.24")); //$NON-NLS-1$
             }
             if (writeToSocket) {
                 sendCache(false);
@@ -447,7 +447,7 @@
             closed = true;
             if (writeToSocket) {
                 if (limit > 0) {
-                    throw new IOException(Msg.getString("K00a4")); //$NON-NLS-1$
+                    throw new IOException(Messages.getString("luni.25")); //$NON-NLS-1$
                 }
                 sendCache(closed);
             }
@@ -457,11 +457,11 @@
         @Override
         public synchronized void write(int data) throws IOException {
             if (closed) {
-                throw new IOException(Msg.getString("K0059")); //$NON-NLS-1$
+                throw new IOException(Messages.getString("luni.24")); //$NON-NLS-1$
             }
             if (limit >= 0) {
                 if (limit == 0) {
-                    throw new IOException(Msg.getString("K00b2")); //$NON-NLS-1$
+                    throw new IOException(Messages.getString("luni.26")); //$NON-NLS-1$
                 }
                 limit--;
             }
@@ -475,7 +475,7 @@
         public synchronized void write(byte[] buffer, int offset, int count)
                 throws IOException {
             if (closed) {
-                throw new IOException(Msg.getString("K0059")); //$NON-NLS-1$
+                throw new IOException(Messages.getString("luni.24")); //$NON-NLS-1$
             }
             if (buffer == null) {
                 throw new NullPointerException();
@@ -483,12 +483,12 @@
             // avoid int overflow
             if (offset < 0 || count < 0 || offset > buffer.length
                     || buffer.length - offset < count) {
-                throw new ArrayIndexOutOfBoundsException(Msg.getString("K002f")); //$NON-NLS-1$
+                throw new ArrayIndexOutOfBoundsException(Messages.getString("luni.13")); //$NON-NLS-1$
             }
 
             if (limit >= 0) {
                 if (count > limit) {
-                    throw new IOException(Msg.getString("K00b2")); //$NON-NLS-1$
+                    throw new IOException(Messages.getString("luni.26")); //$NON-NLS-1$
                 }
                 limit -= count;
                 cache.write(buffer, offset, count);
@@ -859,7 +859,7 @@
     @Override
     public Map<String, List<String>> getRequestProperties() {
         if (connected) {
-            throw new IllegalStateException(Msg.getString("K0091")); //$NON-NLS-1$
+            throw new IllegalStateException(Messages.getString("luni.27")); //$NON-NLS-1$
         }
         return reqHeader.getFieldMap();
     }
@@ -867,7 +867,7 @@
     @Override
     public InputStream getInputStream() throws IOException {
         if (!doInput) {
-            throw new ProtocolException(Msg.getString("K008d")); //$NON-NLS-1$
+            throw new ProtocolException(Messages.getString("luni.28")); //$NON-NLS-1$
         }
 
         // connect before sending requests
@@ -911,12 +911,12 @@
     @Override
     public OutputStream getOutputStream() throws IOException {
         if (!doOutput) {
-            throw new ProtocolException(Msg.getString("K008e")); //$NON-NLS-1$
+            throw new ProtocolException(Messages.getString("luni.29")); //$NON-NLS-1$
         }
 
         // you can't write after you read
         if (sentRequest) {
-            throw new ProtocolException(Msg.getString("K0090")); //$NON-NLS-1$
+            throw new ProtocolException(Messages.getString("luni.2A")); //$NON-NLS-1$
         }
 
         if (os != null) {
@@ -930,7 +930,7 @@
 
         // If the request method is neither PUT or POST, then you're not writing
         if (method != PUT && method != POST) {
-            throw new ProtocolException(Msg.getString("K008f", method)); //$NON-NLS-1$
+            throw new ProtocolException(Messages.getString("luni.2B", method)); //$NON-NLS-1$
         }
 
         int limit = -1;
@@ -1266,7 +1266,7 @@
     @Override
     public void setRequestProperty(String field, String newValue) {
         if (connected) {
-            throw new IllegalStateException(Msg.getString("K0092")); //$NON-NLS-1$
+            throw new IllegalStateException(Messages.getString("luni.2C")); //$NON-NLS-1$
         }
         if (field == null) {
             throw new NullPointerException();
@@ -1277,7 +1277,7 @@
     @Override
     public void addRequestProperty(String field, String value) {
         if (connected) {
-            throw new IllegalAccessError(Msg.getString("K0092")); //$NON-NLS-1$
+            throw new IllegalAccessError(Messages.getString("luni.2C")); //$NON-NLS-1$
         }
         if (field == null) {
             throw new NullPointerException();
@@ -1374,16 +1374,16 @@
             // proxy authorization failed ?
             if (responseCode == HTTP_PROXY_AUTH) {
                 if (!usingProxy()) {
-                    // KA017=Received HTTP_PROXY_AUTH (407) code while not using
-                    // proxy
-                    throw new IOException(Msg.getString("KA017")); //$NON-NLS-1$
+                    // luni.2D=Received HTTP_PROXY_AUTH (407) code while not
+                    // using proxy
+                    throw new IOException(Messages.getString("luni.2D")); //$NON-NLS-1$
                 }
                 // username/password
                 // until authorized
                 String challenge = resHeader.get("Proxy-Authenticate"); //$NON-NLS-1$
                 if (challenge == null) {
-                    // KA016=Received authentication challenge is null.
-                    throw new IOException(Msg.getString("KA016")); //$NON-NLS-1$
+                    // luni.2E=Received authentication challenge is null.
+                    throw new IOException(Messages.getString("luni.2E")); //$NON-NLS-1$
                 }
                 // drop everything and reconnect, might not be required for
                 // HTTP/1.1
@@ -1405,8 +1405,8 @@
                 // keep asking for username/password until authorized
                 String challenge = resHeader.get("WWW-Authenticate"); //$NON-NLS-1$
                 if (challenge == null) {
-                    // KA018=Received authentication challenge is null
-                    throw new IOException(Msg.getString("KA018")); //$NON-NLS-1$
+                    // luni.2E=Received authentication challenge is null
+                    throw new IOException(Messages.getString("luni.2E")); //$NON-NLS-1$
                 }
                 // drop everything and reconnect, might not be required for
                 // HTTP/1.1
@@ -1436,7 +1436,7 @@
                         && os == null) {
 
                     if (++redirect > 4) {
-                        throw new ProtocolException(Msg.getString("K0093")); //$NON-NLS-1$
+                        throw new ProtocolException(Messages.getString("luni.2F")); //$NON-NLS-1$
                     }
                     String location = getHeaderField("Location"); //$NON-NLS-1$
                     if (location != null) {
@@ -1517,11 +1517,11 @@
             try {
                 hostPort = Integer.parseInt(port);
             } catch (NumberFormatException e) {
-                throw new IllegalArgumentException(Msg.getString("K00af", port)); //$NON-NLS-1$
+                throw new IllegalArgumentException(Messages.getString("luni.30", port)); //$NON-NLS-1$
             }
             if (hostPort < 0 || hostPort > 65535) {
-                throw new IllegalArgumentException(Msg.getString("K00b0")); //$NON-NLS-1$
+                throw new IllegalArgumentException(Messages.getString("luni.31")); //$NON-NLS-1$
             }
         }
     }
-}
\ No newline at end of file
+}

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/https/Handler.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/https/Handler.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/https/Handler.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/https/Handler.java Sun Feb 14 08:40:42 2010
@@ -23,7 +23,7 @@
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
 
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 /**
  * Handler for HttpsURLConnection implementation.
@@ -39,8 +39,8 @@
     protected URLConnection openConnection(URL url, Proxy proxy)
             throws IOException {
         if ((url == null) || (proxy == null)) {
-            // K034b=url and proxy can not be null
-            throw new IllegalArgumentException(Msg.getString("K034b")); //$NON-NLS-1$
+            // luni.1B=url and proxy can not be null
+            throw new IllegalArgumentException(Messages.getString("luni.1B")); //$NON-NLS-1$
         }
         return new HttpsURLConnectionImpl(url, getDefaultPort(), proxy);
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/Handler.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/Handler.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/Handler.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/Handler.java Sun Feb 14 08:40:42 2010
@@ -23,7 +23,7 @@
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
 
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 import org.apache.harmony.luni.util.URLUtil;
 
 public class Handler extends URLStreamHandler {
@@ -68,7 +68,7 @@
             spec = ""; //$NON-NLS-1$
         }
         if (spec.indexOf("!/") == -1 && (file.indexOf("!/") == -1)) { //$NON-NLS-1$ //$NON-NLS-2$
-            throw new NullPointerException(Msg.getString("K01b6")); //$NON-NLS-1$
+            throw new NullPointerException(Messages.getString("luni.32")); //$NON-NLS-1$
         }
         if (file.equals("")) {
             file = spec;

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/JarURLConnectionImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/JarURLConnectionImpl.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/JarURLConnectionImpl.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/JarURLConnectionImpl.java Sun Feb 14 08:40:42 2010
@@ -39,7 +39,7 @@
 import java.util.jar.JarFile;
 import java.util.zip.ZipFile;
 
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
 import org.apache.harmony.luni.util.Util;
 
 /**
@@ -221,16 +221,16 @@
     @Override
     public InputStream getInputStream() throws IOException {
         if (closed) {
-            // KA027=Inputstream of the JarURLConnection has been closed
-            throw new IllegalStateException(Msg.getString("KA027")); //$NON-NLS-1$
+            // luni.33=Inputstream of the JarURLConnection has been closed
+            throw new IllegalStateException(Messages.getString("luni.33")); //$NON-NLS-1$
         }
         connect();
         if (jarInput != null) {
             return jarInput;
         }
         if (jarEntry == null) {
-            // K00fc=Jar entry not specified
-            throw new IOException(Msg.getString("K00fc")); //$NON-NLS-1$
+            // luni.34=Jar entry not specified
+            throw new IOException(Messages.getString("luni.34")); //$NON-NLS-1$
         }
         return jarInput = new JarURLConnectionInputStream(jarFile
                 .getInputStream(jarEntry), jarFile);



Mime
View raw message