More nls refactoring.

git-svn-id: https://svn.apache.org/repos/asf/harmony/enhanced/classlib/trunk@909529 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpConfiguration.java b/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpConfiguration.java
index 55d762d..ed6a1e5 100644
--- a/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpConfiguration.java
+++ b/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpConfiguration.java
@@ -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();
diff --git a/modules/luni/src/main/java/org/apache/harmony/luni/internal/nls/messages.properties b/modules/luni/src/main/java/org/apache/harmony/luni/internal/nls/messages.properties
index 4bb73f5..e79e1c7 100644
--- a/modules/luni/src/main/java/org/apache/harmony/luni/internal/nls/messages.properties
+++ b/modules/luni/src/main/java/org/apache/harmony/luni/internal/nls/messages.properties
@@ -87,3 +87,4 @@
 luni.46=The flags are {0}
 luni.47=Invalid UUID string
 luni.48=day of week\: {0}
+luni.49=SocketAddress {0} not supported