harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r926805 - in /harmony/enhanced/trunk/classlib/modules/awt/src/main/java: common/java/awt/ common/java/awt/image/ common/org/apache/harmony/awt/internal/nls/ unix/org/apache/harmony/awt/wtk/linux/ windows/org/apache/harmony/awt/gl/windows/
Date Tue, 23 Mar 2010 21:53:11 GMT
Author: hindessm
Date: Tue Mar 23 21:53:10 2010
New Revision: 926805

URL: http://svn.apache.org/viewvc?rev=926805&view=rev
Log:
NLS and minor typo fixes.

Modified:
    harmony/enhanced/trunk/classlib/modules/awt/src/main/java/common/java/awt/BorderLayout.java
    harmony/enhanced/trunk/classlib/modules/awt/src/main/java/common/java/awt/image/ByteLookupTable.java
    harmony/enhanced/trunk/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/internal/nls/messages.properties
    harmony/enhanced/trunk/classlib/modules/awt/src/main/java/unix/org/apache/harmony/awt/wtk/linux/LinuxCursorFactory.java
    harmony/enhanced/trunk/classlib/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WGLGraphicsConfiguration.java

Modified: harmony/enhanced/trunk/classlib/modules/awt/src/main/java/common/java/awt/BorderLayout.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/awt/src/main/java/common/java/awt/BorderLayout.java?rev=926805&r1=926804&r2=926805&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/awt/src/main/java/common/java/awt/BorderLayout.java
(original)
+++ harmony/enhanced/trunk/classlib/modules/awt/src/main/java/common/java/awt/BorderLayout.java
Tue Mar 23 21:53:10 2010
@@ -173,7 +173,7 @@ public class BorderLayout implements Lay
         toolkit.lockAWT();
         try {
             if (comp == null) {
-                throw new NullPointerException("Component is null");
+                throw new NullPointerException(Messages.getString("awt.185"));
             }
             if ((constraints == null) || (constraints instanceof String)) {
                 addLayoutComponent((String) constraints, comp);

Modified: harmony/enhanced/trunk/classlib/modules/awt/src/main/java/common/java/awt/image/ByteLookupTable.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/awt/src/main/java/common/java/awt/image/ByteLookupTable.java?rev=926805&r1=926804&r2=926805&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/awt/src/main/java/common/java/awt/image/ByteLookupTable.java
(original)
+++ harmony/enhanced/trunk/classlib/modules/awt/src/main/java/common/java/awt/image/ByteLookupTable.java
Tue Mar 23 21:53:10 2010
@@ -22,12 +22,14 @@
 
 package java.awt.image;
 
+import org.apache.harmony.awt.internal.nls.Messages;
+
 public class ByteLookupTable extends LookupTable {
     private byte data[][];
     public ByteLookupTable(int offset, byte[] data) {
         super(offset, 1);
         if (data.length < 1)
-            throw new IllegalArgumentException("Length of data should not be less then one");
+            throw new IllegalArgumentException(Messages.getString("awt.29E"));
         this.data = new byte[1][data.length];
         // The data array stored as a reference
         this.data[0] = data;

Modified: harmony/enhanced/trunk/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/internal/nls/messages.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/internal/nls/messages.properties?rev=926805&r1=926804&r2=926805&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/internal/nls/messages.properties
(original)
+++ harmony/enhanced/trunk/classlib/modules/awt/src/main/java/common/org/apache/harmony/awt/internal/nls/messages.properties
Tue Mar 23 21:53:10 2010
@@ -341,8 +341,8 @@ awt.202=shrinkRightLimit must be a posit
 awt.203=Offset limit should be greater than current position
 awt.204=Determinant is zero
 awt.205=Invalid type of Arc: {0}
-awt.206=Flatness is less then zero
-awt.207=Limit is less then zero
+awt.206=Flatness is less than zero
+awt.207=Limit is less than zero
 awt.208=Path is null
 awt.209=Invalid winding rule value
 awt.20A=First segment should be SEG_MOVETO type
@@ -384,7 +384,7 @@ awt.22D=This transferType ( {0} ) is not
 awt.22E=w or h is less than or equal to zero
 awt.22F=The product of w and h is greater than Integer.MAX_VALUE
 awt.230=dataType is not one of the supported data types
-awt.231=Number of bands must be more then 0
+awt.231=Number of bands must be more than 0
 awt.232=Offset should be not less than zero
 awt.233=Number of components should be positive
 awt.234=Width or Height equals zero
@@ -490,6 +490,9 @@ awt.298=dataBuffer is too small
 awt.299=Font file can not be read
 awt.29A=Neither Printable nor Pageable specified
 awt.29B=Printer not found
+awt.29C=Cursor Image is null
+awt.29D=Cannot make opengl context current
+awt.29E=Length of data should not be less than one
 
 awt.err.00=file dialog {0} error!
 awt.err.01=error: {0}

Modified: harmony/enhanced/trunk/classlib/modules/awt/src/main/java/unix/org/apache/harmony/awt/wtk/linux/LinuxCursorFactory.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/awt/src/main/java/unix/org/apache/harmony/awt/wtk/linux/LinuxCursorFactory.java?rev=926805&r1=926804&r2=926805&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/awt/src/main/java/unix/org/apache/harmony/awt/wtk/linux/LinuxCursorFactory.java
(original)
+++ harmony/enhanced/trunk/classlib/modules/awt/src/main/java/unix/org/apache/harmony/awt/wtk/linux/LinuxCursorFactory.java
Tue Mar 23 21:53:10 2010
@@ -95,7 +95,7 @@ public class LinuxCursorFactory extends 
         int width = img.getWidth(null);
         int height = img.getHeight(null);
         BufferedImage bufImg = Utils.getBufferedImage(img);
-        if(bufImg == null) throw new NullPointerException("Cursor Image is null");
+        if(bufImg == null) throw new NullPointerException(Messages.getString("awt.29C"));
 
         //must convert image into TYPE_BYTE_BINARY format of depth 1
         BufferedImage bmpSrc = convertTo1Bit(bufImg);

Modified: harmony/enhanced/trunk/classlib/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WGLGraphicsConfiguration.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/classlib/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WGLGraphicsConfiguration.java?rev=926805&r1=926804&r2=926805&view=diff
==============================================================================
--- harmony/enhanced/trunk/classlib/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WGLGraphicsConfiguration.java
(original)
+++ harmony/enhanced/trunk/classlib/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WGLGraphicsConfiguration.java
Tue Mar 23 21:53:10 2010
@@ -33,6 +33,7 @@ import org.apache.harmony.awt.ContextSto
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.awt.image.VolatileImage;
+import org.apache.harmony.awt.internal.nls.Messages;
 
 public class WGLGraphicsConfiguration
         extends WinGraphicsConfiguration
@@ -260,7 +261,7 @@ public class WGLGraphicsConfiguration
 
             if (wgl.wglMakeCurrent(hdc, oglContext) == 0) {
                 w32.ReleaseDC(drawable, hdc);
-                throw new IllegalStateException("Cannot make opengl context current");
+                throw new IllegalStateException(Messages.getString("awt.29D"));
             }
 
             if(oshdc == 0) {



Mime
View raw message