harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apetre...@apache.org
Subject svn commit: r489095 - in /harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common: java/awt/image/LookupOp.java org/apache/harmony/awt/internal/nls/messages.properties
Date Wed, 20 Dec 2006 14:07:46 GMT
Author: apetrenko
Date: Wed Dec 20 06:07:45 2006
New Revision: 489095

URL: http://svn.apache.org/viewvc?view=rev&rev=489095
Log:
Additional patch for HARMONY-1632 "[classlib][awt]Compatibility: java.awt.image.LookupOp.filter()
throws ArrayIndexOutOfBoundsException while RI throws IllegalArgumentException"
I18N

Modified:
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/LookupOp.java
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/internal/nls/messages.properties

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/LookupOp.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/LookupOp.java?view=diff&rev=489095&r1=489094&r2=489095
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/LookupOp.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/LookupOp.java
Wed Dec 20 06:07:45 2006
@@ -59,7 +59,7 @@
 
     public LookupOp(LookupTable lookup, RenderingHints hints) {
         if (lookup == null){
-            throw new NullPointerException(Messages.getString("awt.01", "lookup"));
+            throw new NullPointerException(Messages.getString("awt.01", "lookup")); //$NON-NLS-1$
//$NON-NLS-2$
         }
         lut = lookup;
         this.hints = hints;
@@ -195,15 +195,11 @@
             dst = createCompatibleDestImage(src, null);
         } else {
             if (src.getWidth() != dst.getWidth()){
-                throw new IllegalArgumentException(
-                        "Source and destination images do not have " +
-                        "the same width!");
+                throw new IllegalArgumentException(Messages.getString("awt.291")); //$NON-NLS-1$
             }
 
             if (src.getHeight() != dst.getHeight()){
-                throw new IllegalArgumentException(
-                        "Source and destination images do not have " +
-                        "the same height!");
+                throw new IllegalArgumentException(Messages.getString("awt.292")); //$NON-NLS-1$
             }
 
             if (!srcCM.equals(dst.getColorModel())) {

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/internal/nls/messages.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/internal/nls/messages.properties?view=diff&rev=489095&r1=489094&r2=489095
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/internal/nls/messages.properties
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/internal/nls/messages.properties
Wed Dec 20 06:07:45 2006
@@ -480,6 +480,8 @@
 awt.28E=Length of dataArray is less than size + offset
 awt.28F=Source and destination rasters do not have the same width!
 awt.290=Source and destination rasters do not have the same height!
+awt.291=Source and destination images do not have the same width!
+awt.292=Source and destination images do not have the same height!
 
 awt.err.00=file dialog {0} error!
 awt.err.01=error: {0}



Mime
View raw message