harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r909428 - in /harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni: internal/nls/messages.properties internal/process/ProcessInputStream.java internal/reflect/ProxyMethod.java net/PlainDatagramSocketImpl.java
Date Fri, 12 Feb 2010 14:35:09 GMT
Author: hindessm
Date: Fri Feb 12 14:35:07 2010
New Revision: 909428

URL: http://svn.apache.org/viewvc?rev=909428&view=rev
Log:
Refactor a few more nls messages.

Modified:
    harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/nls/messages.properties
    harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/process/ProcessInputStream.java
    harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/reflect/ProxyMethod.java
    harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/nls/messages.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/nls/messages.properties?rev=909428&r1=909427&r2=909428&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/nls/messages.properties
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/nls/messages.properties
Fri Feb 12 14:35:07 2010
@@ -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}

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/process/ProcessInputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/process/ProcessInputStream.java?rev=909428&r1=909427&r2=909428&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/process/ProcessInputStream.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/process/ProcessInputStream.java
Fri Feb 12 14:35:07 2010
@@ -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);
         }

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/reflect/ProxyMethod.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/reflect/ProxyMethod.java?rev=909428&r1=909427&r2=909428&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/reflect/ProxyMethod.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/reflect/ProxyMethod.java
Fri Feb 12 14:35:07 2010
@@ -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()));
             }
         }        

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java?rev=909428&r1=909427&r2=909428&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java
Fri Feb 12 14:35:07 2010
@@ -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;



Mime
View raw message