Refactor a few more nls messages.
git-svn-id: https://svn.apache.org/repos/asf/harmony/enhanced/classlib/trunk@909428 13f79535-47bb-0310-9956-ffa450edef68
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 63a6e28..d6aae31 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
@@ -38,3 +38,6 @@
luni.15=Unable to connect to identd to verify user.
luni.16=Failure - user ids do not match.
luni.17=Success
+luni.18=Length out of bounds \: {0}
+luni.19=the methods named {0} must have the same return type
+luni.1A=Host is unresolved\: {0}
diff --git a/modules/luni/src/main/java/org/apache/harmony/luni/internal/process/ProcessInputStream.java b/modules/luni/src/main/java/org/apache/harmony/luni/internal/process/ProcessInputStream.java
index e533aac..fcf36d2 100644
--- a/modules/luni/src/main/java/org/apache/harmony/luni/internal/process/ProcessInputStream.java
+++ b/modules/luni/src/main/java/org/apache/harmony/luni/internal/process/ProcessInputStream.java
@@ -20,7 +20,7 @@
import java.io.FileDescriptor;
import java.io.IOException;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
class ProcessInputStream extends java.io.InputStream {
@@ -124,11 +124,11 @@
}
if (nbytes > buffer.length || nbytes < 0) {
// K0031=Length out of bounds \: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", nbytes)); //$NON-NLS-1$
+ throw new ArrayIndexOutOfBoundsException(Messages.getString("luni.18", nbytes)); //$NON-NLS-1$
}
if (offset < 0 || offset > buffer.length - nbytes) {
// K002e=Offset out of bounds \: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset)); //$NON-NLS-1$
+ throw new ArrayIndexOutOfBoundsException(Messages.getString("luni.12", offset)); //$NON-NLS-1$
}
return readImpl(buffer, offset, nbytes, handle);
}
diff --git a/modules/luni/src/main/java/org/apache/harmony/luni/internal/reflect/ProxyMethod.java b/modules/luni/src/main/java/org/apache/harmony/luni/internal/reflect/ProxyMethod.java
index ab1cb83..2144825 100644
--- a/modules/luni/src/main/java/org/apache/harmony/luni/internal/reflect/ProxyMethod.java
+++ b/modules/luni/src/main/java/org/apache/harmony/luni/internal/reflect/ProxyMethod.java
@@ -19,7 +19,7 @@
import java.lang.reflect.Method;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
class ProxyMethod {
Method method;
@@ -86,7 +86,7 @@
// substitute returnType of method with that of otherMethod
method = otherMethod;
} else {
- throw new IllegalArgumentException(Msg.getString("K00f2",
+ throw new IllegalArgumentException(Messages.getString("luni.19",
method.getName()));
}
}
diff --git a/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java b/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java
index 7ae9de6..370774f 100644
--- a/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java
+++ b/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java
@@ -34,7 +34,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;
import org.apache.harmony.luni.util.PriviAction;
/**
@@ -368,7 +368,7 @@
} catch (UnknownHostException e) {
// this is never expected to happen as we should not have gotten
// here if the address is not resolvable
- throw new SocketException(Msg.getString("K0317", inetAddr.getHostName())); //$NON-NLS-1$
+ throw new SocketException(Messages.getString("luni.1A", inetAddr.getHostName())); //$NON-NLS-1$
}
connectedPort = port;
isNativeConnected = true;
