harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r470895 [1/3] - in /incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt: geom/ im/ image/ image/renderable/ print/
Date Fri, 03 Nov 2006 16:45:03 GMT
Author: hindessm
Date: Fri Nov  3 08:45:01 2006
New Revision: 470895

URL: http://svn.apache.org/viewvc?view=rev&rev=470895
Log:
Applied patch 4.2 from "[#HARMONY-1313] [classlib][internationalization]
Internationalization of the awt module".

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/AffineTransform.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Arc2D.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Area.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/CubicCurve2D.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Ellipse2D.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/FlatteningPathIterator.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/GeneralPath.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Line2D.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Point2D.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/QuadCurve2D.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Rectangle2D.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/RoundRectangle2D.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/im/InputMethodHighlight.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/im/InputSubset.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/AffineTransformOp.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/AwtImageBackdoorAccessorImpl.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/BandCombineOp.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/BandedSampleModel.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/BufferedImage.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/BufferedImageFilter.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/ColorConvertOp.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/ColorModel.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/ComponentColorModel.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/ComponentSampleModel.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/ConvolveOp.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/CropImageFilter.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/DataBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/DirectColorModel.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/ImageFilter.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/IndexColorModel.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/Kernel.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/LookupOp.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/LookupTable.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/MemoryImageSource.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/MultiPixelPackedSampleModel.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/PackedColorModel.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/PixelGrabber.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/PixelInterleavedSampleModel.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/Raster.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/ReplicateScaleFilter.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/RescaleOp.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/SampleModel.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/SinglePixelPackedSampleModel.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/WritableRaster.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/renderable/RenderableImage.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/renderable/RenderableImageOp.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/renderable/RenderableImageProducer.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/print/Book.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/print/PageFormat.java
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/print/PrinterJob.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/AffineTransform.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/AffineTransform.java?view=diff&rev=470895&r1=470894&r2=470895
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/AffineTransform.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/AffineTransform.java Fri Nov  3 08:45:01 2006
@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.io.Serializable;
 
+import org.apache.harmony.awt.internal.nls.Messages;
 import org.apache.harmony.misc.HashCode;
 
 public class AffineTransform implements Cloneable, Serializable {
@@ -391,7 +392,8 @@
     public AffineTransform createInverse() throws NoninvertibleTransformException {
         double det = getDeterminant();
         if (Math.abs(det) < ZERO) {
-            throw new NoninvertibleTransformException("Determinant is zero");
+            // awt.204=Determinant is zero
+            throw new NoninvertibleTransformException(Messages.getString("awt.204")); //$NON-NLS-1$
         }
         return new AffineTransform(
                  m11 / det, // m00
@@ -501,7 +503,8 @@
     public Point2D inverseTransform(Point2D src, Point2D dst) throws NoninvertibleTransformException {
         double det = getDeterminant();
         if (Math.abs(det) < ZERO) {
-            throw new NoninvertibleTransformException("Determinant is zero");
+            // awt.204=Determinant is zero
+            throw new NoninvertibleTransformException(Messages.getString("awt.204")); //$NON-NLS-1$
         }
 
         if (dst == null) {
@@ -524,7 +527,8 @@
     {
         double det = getDeterminant();
         if (Math.abs(det) < ZERO) {
-            throw new NoninvertibleTransformException("Determinant is zero");
+            // awt.204=Determinant is zero
+            throw new NoninvertibleTransformException(Messages.getString("awt.204")); //$NON-NLS-1$
         }
 
         while (--length >= 0) {
@@ -552,8 +556,8 @@
     public String toString() {
         return
             getClass().getName() +
-            "[[" + m00 + ", " + m01 + ", " + m02 + "], ["
-                + m10 + ", " + m11 + ", " + m12 + "]]";
+            "[[" + m00 + ", " + m01 + ", " + m02 + "], [" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+                + m10 + ", " + m11 + ", " + m12 + "]]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     @Override

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Arc2D.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Arc2D.java?view=diff&rev=470895&r1=470894&r2=470895
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Arc2D.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Arc2D.java Fri Nov  3 08:45:01 2006
@@ -22,6 +22,8 @@
 
 import java.util.NoSuchElementException;
 
+import org.apache.harmony.awt.internal.nls.Messages;
+
 public abstract class Arc2D extends RectangularShape {
 
     public final static int OPEN = 0;
@@ -394,7 +396,8 @@
 
         public int currentSegment(double[] coords) {
             if (isDone()) {
-                throw new NoSuchElementException("Iiterator out of bounds");
+                // awt.4B=Iterator out of bounds
+                throw new NoSuchElementException(Messages.getString("awt.4B")); //$NON-NLS-1$
             }
             int type;
             int count;
@@ -438,7 +441,8 @@
 
         public int currentSegment(float[] coords) {
             if (isDone()) {
-                throw new NoSuchElementException("Iiterator out of bounds");
+                // awt.4B=Iterator out of bounds
+                throw new NoSuchElementException(Messages.getString("awt.4B")); //$NON-NLS-1$
             }
             int type;
             int count;
@@ -510,7 +514,8 @@
 
     public void setArcType(int type) {
         if (type != OPEN && type != CHORD && type != PIE) {
-            throw new IllegalArgumentException("Invalid type of Arc: " + type);
+            // awt.205=Invalid type of Arc: {0}
+            throw new IllegalArgumentException(Messages.getString("awt.205", type)); //$NON-NLS-1$
         }
         this.type = type;
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Area.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Area.java?view=diff&rev=470895&r1=470894&r2=470895
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Area.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Area.java Fri Nov  3 08:45:01 2006
@@ -26,6 +26,8 @@
 import java.awt.geom.Rectangle2D;
 import java.util.NoSuchElementException;
 
+import org.apache.harmony.awt.internal.nls.Messages;
+
 public class Area implements Shape, Cloneable {
 
     /**
@@ -51,11 +53,13 @@
         }
 
         public int currentSegment(double[] coords) {
-            throw new NoSuchElementException("Iterator out of bounds");
+            // awt.4B=Iterator out of bounds
+            throw new NoSuchElementException(Messages.getString("awt.4B")); //$NON-NLS-1$
         }
 
         public int currentSegment(float[] coords) {
-            throw new NoSuchElementException("Iterator out of bounds");
+            // awt.4B=Iterator out of bounds
+            throw new NoSuchElementException(Messages.getString("awt.4B")); //$NON-NLS-1$
         }
 
     }
@@ -93,7 +97,7 @@
     }
 
     public boolean equals(Area obj) {
-        throw new RuntimeException("Not implemented");
+        throw new RuntimeException("Not implemented"); //$NON-NLS-1$
     }
 
     public boolean intersects(double x, double y, double width, double height) {
@@ -124,11 +128,11 @@
     }
 
     public void add(Area area) {
-        throw new RuntimeException("Not implemented");
+        throw new RuntimeException("Not implemented"); //$NON-NLS-1$
     }
 
     public void exclusiveOr(Area area) {
-        throw new RuntimeException("Not implemented");
+        throw new RuntimeException("Not implemented"); //$NON-NLS-1$
     }
 
     /**
@@ -169,27 +173,27 @@
     }
 
     public void subtract(Area area) {
-        throw new RuntimeException("Not implemented");
+        throw new RuntimeException("Not implemented"); //$NON-NLS-1$
     }
 
     public boolean isEmpty() {
-        throw new RuntimeException("Not implemented");
+        throw new RuntimeException("Not implemented"); //$NON-NLS-1$
     }
 
     public boolean isPolygonal() {
-        throw new RuntimeException("Not implemented");
+        throw new RuntimeException("Not implemented"); //$NON-NLS-1$
     }
 
     public boolean isRectangular() {
-        throw new RuntimeException("Not implemented");
+        throw new RuntimeException("Not implemented"); //$NON-NLS-1$
     }
 
     public boolean isSingular() {
-        throw new RuntimeException("Not implemented");
+        throw new RuntimeException("Not implemented"); //$NON-NLS-1$
     }
 
     public void reset() {
-        throw new RuntimeException("Not implemented");
+        throw new RuntimeException("Not implemented"); //$NON-NLS-1$
     }
 
     public void transform(AffineTransform t) {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/CubicCurve2D.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/CubicCurve2D.java?view=diff&rev=470895&r1=470894&r2=470895
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/CubicCurve2D.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/CubicCurve2D.java Fri Nov  3 08:45:01 2006
@@ -25,6 +25,7 @@
 import java.util.NoSuchElementException;
 
 import org.apache.harmony.awt.gl.Crossing;
+import org.apache.harmony.awt.internal.nls.Messages;
 
 public abstract class CubicCurve2D implements Shape, Cloneable {
 
@@ -288,7 +289,7 @@
 
         public int currentSegment(double[] coords) {
             if (isDone()) {
-                throw new NoSuchElementException("Iiterator out of bounds");
+                throw new NoSuchElementException(Messages.getString("awt.4B")); //$NON-NLS-1$
             }
             int type;
             int count;
@@ -315,7 +316,7 @@
 
         public int currentSegment(float[] coords) {
             if (isDone()) {
-                throw new NoSuchElementException("Iiterator out of bounds");
+                throw new NoSuchElementException(Messages.getString("awt.4B")); //$NON-NLS-1$
             }
             int type;
             int count;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Ellipse2D.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Ellipse2D.java?view=diff&rev=470895&r1=470894&r2=470895
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Ellipse2D.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Ellipse2D.java Fri Nov  3 08:45:01 2006
@@ -22,6 +22,8 @@
 
 import java.util.NoSuchElementException;
 
+import org.apache.harmony.awt.internal.nls.Messages;
+
 public abstract class Ellipse2D extends RectangularShape {
 
     public static class Float extends Ellipse2D {
@@ -222,7 +224,8 @@
 
         public int currentSegment(double[] coords) {
             if (isDone()) {
-                throw new NoSuchElementException("Iiterator out of bounds");
+                // awt.4B=Iterator out of bounds
+                throw new NoSuchElementException(Messages.getString("awt.4B")); //$NON-NLS-1$
             }
             if (index == 5) {
                 return SEG_CLOSE;
@@ -253,7 +256,8 @@
 
         public int currentSegment(float[] coords) {
             if (isDone()) {
-                throw new NoSuchElementException("Iiterator out of bounds");
+                // awt.4B=Iterator out of bounds
+                throw new NoSuchElementException(Messages.getString("awt.4B")); //$NON-NLS-1$
             }
             if (index == 5) {
                 return SEG_CLOSE;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/FlatteningPathIterator.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/FlatteningPathIterator.java?view=diff&rev=470895&r1=470894&r2=470895
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/FlatteningPathIterator.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/FlatteningPathIterator.java Fri Nov  3 08:45:01 2006
@@ -22,6 +22,8 @@
 
 import java.util.NoSuchElementException;
 
+import org.apache.harmony.awt.internal.nls.Messages;
+
 public class FlatteningPathIterator implements PathIterator {
 
     /**
@@ -110,13 +112,16 @@
 
     public FlatteningPathIterator(PathIterator path, double flatness, int limit) {
         if (flatness < 0.0) {
-            throw new IllegalArgumentException("Flatness is less then zero");
+            // awt.206=Flatness is less then zero
+            throw new IllegalArgumentException(Messages.getString("awt.206")); //$NON-NLS-1$
         }
         if (limit < 0) {
-            throw new IllegalArgumentException("Limit is less then zero");
+            // awt.207=Limit is less then zero
+            throw new IllegalArgumentException(Messages.getString("awt.207")); //$NON-NLS-1$
         }
         if (path == null) {
-            throw new NullPointerException("Path is null");
+            // awt.208=Path is null
+            throw new NullPointerException(Messages.getString("awt.208")); //$NON-NLS-1$
         }
         this.p = path;
         this.flatness = flatness;
@@ -262,7 +267,8 @@
 
     public int currentSegment(float[] coords) {
         if (isDone()) {
-            throw new NoSuchElementException("Iiterator out of bounds");
+            // awt.4B=Iterator out of bounds
+            throw new NoSuchElementException(Messages.getString("awt.4Bx")); //$NON-NLS-1$
         }
         evaluate();
         int type = bufType;
@@ -278,7 +284,8 @@
 
     public int currentSegment(double[] coords) {
         if (isDone()) {
-            throw new NoSuchElementException("Iterator out of bounds");
+            // awt.4B=Iterator out of bounds
+            throw new NoSuchElementException(Messages.getString("awt.4B")); //$NON-NLS-1$
         }
         evaluate();
         int type = bufType;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/GeneralPath.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/GeneralPath.java?view=diff&rev=470895&r1=470894&r2=470895
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/GeneralPath.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/GeneralPath.java Fri Nov  3 08:45:01 2006
@@ -25,6 +25,7 @@
 import java.util.NoSuchElementException;
 
 import org.apache.harmony.awt.gl.Crossing;
+import org.apache.harmony.awt.internal.nls.Messages;
 
 public final class GeneralPath implements Shape, Cloneable {
 
@@ -133,7 +134,8 @@
 
         public int currentSegment(double[] coords) {
             if (isDone()) {
-                throw new NoSuchElementException("Iterator out of bounds");
+                // awt.4B=Iterator out of bounds
+                throw new NoSuchElementException(Messages.getString("awt.4B")); //$NON-NLS-1$
             }
             int type = p.types[typeIndex];
             int count = GeneralPath.pointShift[type];
@@ -149,7 +151,8 @@
 
         public int currentSegment(float[] coords) {
             if (isDone()) {
-                throw new NoSuchElementException("Iterator out of bounds");
+                // awt.4B=Iterator out of bounds
+                throw new NoSuchElementException(Messages.getString("awt.4B")); //$NON-NLS-1$
             }
             int type = p.types[typeIndex];
             int count = GeneralPath.pointShift[type];
@@ -186,7 +189,8 @@
 
     public void setWindingRule(int rule) {
         if (rule != WIND_EVEN_ODD && rule != WIND_NON_ZERO) {
-            throw new java.lang.IllegalArgumentException("Invalid winding rule value");
+            // awt.209=Invalid winding rule value
+            throw new java.lang.IllegalArgumentException(Messages.getString("awt.209")); //$NON-NLS-1$
         }
         this.rule = rule;
     }
@@ -201,8 +205,8 @@
      */
     void checkBuf(int pointCount, boolean checkMove) {
         if (checkMove && typeSize == 0) {
-            throw new IllegalPathStateException(
-                    "First segment should be SEG_MOVETO type");
+            // awt.20A=First segment should be SEG_MOVETO type
+            throw new IllegalPathStateException(Messages.getString("awt.20A")); //$NON-NLS-1$
         }
         if (typeSize == types.length) {
             byte tmp[] = new byte[typeSize + BUFFER_CAPACITY];

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Line2D.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Line2D.java?view=diff&rev=470895&r1=470894&r2=470895
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Line2D.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Line2D.java Fri Nov  3 08:45:01 2006
@@ -24,6 +24,8 @@
 import java.awt.Shape;
 import java.util.NoSuchElementException;
 
+import org.apache.harmony.awt.internal.nls.Messages;
+
 public abstract class Line2D implements Shape, Cloneable {
 
     public static class Float extends Line2D {
@@ -247,7 +249,8 @@
 
         public int currentSegment(double[] coords) {
             if (isDone()) {
-                throw new NoSuchElementException("Iiterator out of bounds");
+                // awt.4B=Iterator out of bounds
+                throw new NoSuchElementException(Messages.getString("awt.4B")); //$NON-NLS-1$
             }
             int type;
             if (index == 0) {
@@ -267,7 +270,8 @@
 
         public int currentSegment(float[] coords) {
             if (isDone()) {
-                throw new NoSuchElementException("Iiterator out of bounds");
+                // awt.4B=Iterator out of bounds
+                throw new NoSuchElementException(Messages.getString("awt.4B")); //$NON-NLS-1$
             }
             int type;
             if (index == 0) {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Point2D.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Point2D.java?view=diff&rev=470895&r1=470894&r2=470895
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Point2D.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Point2D.java Fri Nov  3 08:45:01 2006
@@ -60,7 +60,7 @@
 
         @Override
         public String toString() {
-            return getClass().getName() + "[x=" + x + ",y=" + y + "]";
+            return getClass().getName() + "[x=" + x + ",y=" + y + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
     }
 
@@ -95,7 +95,7 @@
 
         @Override
         public String toString() {
-            return getClass().getName() + "[x=" + x + ",y=" + y + "]";
+            return getClass().getName() + "[x=" + x + ",y=" + y + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         }
     }
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/QuadCurve2D.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/QuadCurve2D.java?view=diff&rev=470895&r1=470894&r2=470895
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/QuadCurve2D.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/QuadCurve2D.java Fri Nov  3 08:45:01 2006
@@ -25,6 +25,7 @@
 import java.util.NoSuchElementException;
 
 import org.apache.harmony.awt.gl.Crossing;
+import org.apache.harmony.awt.internal.nls.Messages;
 
 public abstract class QuadCurve2D implements Shape, Cloneable {
 
@@ -241,7 +242,8 @@
 
         public int currentSegment(double[] coords) {
             if (isDone()) {
-                throw new NoSuchElementException("Iterator out of bounds");
+                // awt.4B=Iterator out of bounds
+                throw new NoSuchElementException(Messages.getString("awt.4B")); //$NON-NLS-1$
             }
             int type;
             int count;
@@ -266,7 +268,8 @@
 
         public int currentSegment(float[] coords) {
             if (isDone()) {
-                throw new NoSuchElementException("Iterator out of bounds");
+                // awt.4B=Iterator out of bounds
+                throw new NoSuchElementException(Messages.getString("awt.4B")); //$NON-NLS-1$
             }
             int type;
             int count;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Rectangle2D.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Rectangle2D.java?view=diff&rev=470895&r1=470894&r2=470895
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Rectangle2D.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Rectangle2D.java Fri Nov  3 08:45:01 2006
@@ -22,6 +22,7 @@
 
 import java.util.NoSuchElementException;
 
+import org.apache.harmony.awt.internal.nls.Messages;
 import org.apache.harmony.misc.HashCode;
 
 public abstract class Rectangle2D extends RectangularShape {
@@ -153,7 +154,7 @@
         public String toString() {
             // The output format based on 1.5 release behaviour. It could be obtained in the following way
             // System.out.println(new Rectangle2D.Float().toString())
-            return getClass().getName() + "[x=" + x + ",y=" + y + ",width=" + width + ",height=" + height + "]";
+            return getClass().getName() + "[x=" + x + ",y=" + y + ",width=" + width + ",height=" + height + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
         }
     }
 
@@ -262,7 +263,7 @@
         public String toString() {
             // The output format based on 1.5 release behaviour. It could be obtained in the following way
             // System.out.println(new Rectangle2D.Double().toString())
-            return getClass().getName() + "[x=" + x + ",y=" + y + ",width=" + width + ",height=" + height + "]";
+            return getClass().getName() + "[x=" + x + ",y=" + y + ",width=" + width + ",height=" + height + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
         }
     }
 
@@ -332,7 +333,7 @@
 
         public int currentSegment(double[] coords) {
             if (isDone()) {
-                throw new NoSuchElementException("Iterator out of bounds");
+                throw new NoSuchElementException(Messages.getString("awt.4B")); //$NON-NLS-1$
             }
             if (index == 5) {
                 return SEG_CLOSE;
@@ -371,7 +372,7 @@
 
         public int currentSegment(float[] coords) {
             if (isDone()) {
-                throw new NoSuchElementException("Iterator out of bounds");
+                throw new NoSuchElementException(Messages.getString("awt.4B")); //$NON-NLS-1$
             }
             if (index == 5) {
                 return SEG_CLOSE;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/RoundRectangle2D.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/RoundRectangle2D.java?view=diff&rev=470895&r1=470894&r2=470895
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/RoundRectangle2D.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/RoundRectangle2D.java Fri Nov  3 08:45:01 2006
@@ -22,6 +22,8 @@
 
 import java.util.NoSuchElementException;
 
+import org.apache.harmony.awt.internal.nls.Messages;
+
 public abstract class RoundRectangle2D extends RectangularShape {
 
     public static class Float extends RoundRectangle2D {
@@ -307,8 +309,8 @@
 
         public int currentSegment(double[] coords) {
             if (isDone()) {
-                throw new NoSuchElementException(
-                        "RoundRectangle2D iterator out of bounds");
+                // awt.4B=Iterator out of bounds
+                throw new NoSuchElementException(Messages.getString("awt.4B")); //$NON-NLS-1$
             }
             if (index == points.length) {
                 return SEG_CLOSE;
@@ -327,8 +329,8 @@
 
         public int currentSegment(float[] coords) {
             if (isDone()) {
-                throw new NoSuchElementException(
-                        "RoundRectangle2D iterator out of bounds");
+                // awt.4B=Iterator out of bounds
+                throw new NoSuchElementException(Messages.getString("awt.4B")); //$NON-NLS-1$
             }
             if (index == points.length) {
                 return SEG_CLOSE;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/im/InputMethodHighlight.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/im/InputMethodHighlight.java?view=diff&rev=470895&r1=470894&r2=470895
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/im/InputMethodHighlight.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/im/InputMethodHighlight.java Fri Nov  3 08:45:01 2006
@@ -23,6 +23,8 @@
 import java.util.Map;
 import java.awt.font.TextAttribute;
 
+import org.apache.harmony.awt.internal.nls.Messages;
+
 public class InputMethodHighlight {
 
     public static final int RAW_TEXT = 0;
@@ -55,8 +57,8 @@
     public InputMethodHighlight(boolean selected, int state,
                                 int variation, Map<java.awt.font.TextAttribute, ?> style) {
         if ((state != RAW_TEXT) && (state != CONVERTED_TEXT)) {
-            throw new IllegalArgumentException("unknown input method" +
-                    " highlight state");
+            // awt.20B=unknown input method highlight state
+            throw new IllegalArgumentException(Messages.getString("awt.20B")); //$NON-NLS-1$
         }
         this.selected = selected;
         this.state = state;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/im/InputSubset.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/im/InputSubset.java?view=diff&rev=470895&r1=470894&r2=470895
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/im/InputSubset.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/im/InputSubset.java Fri Nov  3 08:45:01 2006
@@ -22,29 +22,29 @@
 
 public final class InputSubset extends Character.Subset {
 
-    public static final InputSubset LATIN = new InputSubset("LATIN");
+    public static final InputSubset LATIN = new InputSubset("LATIN"); //$NON-NLS-1$
 
     public static final InputSubset 
-        LATIN_DIGITS = new InputSubset("LATIN_DIGITS");
+        LATIN_DIGITS = new InputSubset("LATIN_DIGITS"); //$NON-NLS-1$
 
     public static final InputSubset 
-        TRADITIONAL_HANZI = new InputSubset("TRADITIONAL_HANZI");
+        TRADITIONAL_HANZI = new InputSubset("TRADITIONAL_HANZI"); //$NON-NLS-1$
 
     public static final InputSubset 
-        SIMPLIFIED_HANZI = new InputSubset("SIMPLIFIED_HANZI");
+        SIMPLIFIED_HANZI = new InputSubset("SIMPLIFIED_HANZI"); //$NON-NLS-1$
 
-    public static final InputSubset KANJI = new InputSubset("KANJI");
+    public static final InputSubset KANJI = new InputSubset("KANJI"); //$NON-NLS-1$
 
-    public static final InputSubset HANJA = new InputSubset("HANJA");
+    public static final InputSubset HANJA = new InputSubset("HANJA"); //$NON-NLS-1$
 
     public static final InputSubset 
-        HALFWIDTH_KATAKANA = new InputSubset("HALFWIDTH_KATAKANA");
+        HALFWIDTH_KATAKANA = new InputSubset("HALFWIDTH_KATAKANA"); //$NON-NLS-1$
 
     public static final InputSubset 
-        FULLWIDTH_LATIN = new InputSubset("FULLWIDTH_LATIN");
+        FULLWIDTH_LATIN = new InputSubset("FULLWIDTH_LATIN"); //$NON-NLS-1$
 
     public static final InputSubset 
-        FULLWIDTH_DIGITS = new InputSubset("FULLWIDTH_DIGITS");
+        FULLWIDTH_DIGITS = new InputSubset("FULLWIDTH_DIGITS"); //$NON-NLS-1$
 
     private InputSubset(String name) {
         super(name);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/AffineTransformOp.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/AffineTransformOp.java?view=diff&rev=470895&r1=470894&r2=470895
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/AffineTransformOp.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/AffineTransformOp.java Fri Nov  3 08:45:01 2006
@@ -29,6 +29,7 @@
 import java.util.Arrays;
 
 import org.apache.harmony.awt.gl.AwtImageBackdoorAccessor;
+import org.apache.harmony.awt.internal.nls.Messages;
 
 public class AffineTransformOp implements BufferedImageOp, RasterOp {
     public static final int TYPE_NEAREST_NEIGHBOR = 1;
@@ -70,13 +71,15 @@
 
     public AffineTransformOp(AffineTransform xform, int interp) {
         if (Math.abs(xform.getDeterminant()) <= Double.MIN_VALUE) {
-            throw new ImagingOpException("Unable to invert transform " + xform);
+            // awt.24F=Unable to invert transform {0}
+            throw new ImagingOpException(Messages.getString("awt.24F", xform)); //$NON-NLS-1$
         }
 
         this.at = (AffineTransform) xform.clone();
 
         if (interp != TYPE_NEAREST_NEIGHBOR && interp != TYPE_BILINEAR && interp != TYPE_BICUBIC) {
-            throw new IllegalArgumentException("Unknown interpolation type: " + interp);
+            // awt.250=Unknown interpolation type: {0}
+            throw new IllegalArgumentException(Messages.getString("awt.250", interp)); //$NON-NLS-1$
         }
 
         this.iType = interp;
@@ -154,10 +157,9 @@
         double dstHeight = newBounds.getY() + newBounds.getHeight();
 
         if (dstWidth <= 0 || dstHeight <= 0) {
+            // awt.251=Transformed width ({0}) and height ({1}) should be greater than 0
             throw new RasterFormatException(
-                    "Transformed width ("+dstWidth+") and " +
-                    "height ("+dstHeight+") should be greater than 0"
-            );
+                    Messages.getString("awt.251", dstWidth, dstHeight)); //$NON-NLS-1$
         }
 
         if (destCM != null) {
@@ -198,7 +200,8 @@
 
     public final BufferedImage filter(BufferedImage src, BufferedImage dst) {
         if (src == dst) {
-            throw new IllegalArgumentException("Source can't be same as the destination");
+            // awt.252=Source can't be same as the destination
+            throw new IllegalArgumentException(Messages.getString("awt.252")); //$NON-NLS-1$
         }
 
         ColorModel srcCM = src.getColorModel();
@@ -233,7 +236,8 @@
 
         // Skip alpha channel for TYPE_INT_RGB images
         if (slowFilter(src.getRaster(), dst.getRaster()) != 0) {
-            throw new ImagingOpException ("Unable to transform source");
+            // awt.21F=Unable to transform source
+            throw new ImagingOpException (Messages.getString("awt.21F")); //$NON-NLS-1$
         // TODO - uncomment
         //if (ippFilter(src.getRaster(), dst.getRaster(), src.getType()) != 0)
             //throw new ImagingOpException ("Unable to transform source");
@@ -252,19 +256,20 @@
 
     public final WritableRaster filter(Raster src, WritableRaster dst) {
         if (src == dst) {
-            throw new IllegalArgumentException("Source can't be same as the destination");
+            // awt.252=Source can't be same as the destination
+            throw new IllegalArgumentException(Messages.getString("awt.252")); //$NON-NLS-1$
         }
 
         if (dst == null) {
             dst = createCompatibleDestRaster(src);
         } else if (src.getNumBands() != dst.getNumBands()) {
-            throw new IllegalArgumentException(
-                    "Different number of bands in source and destination"
-            );
+            // awt.253=Different number of bands in source and destination
+            throw new IllegalArgumentException(Messages.getString("awt.253")); //$NON-NLS-1$
         }
 
         if (slowFilter(src, dst) != 0) {
-            throw new ImagingOpException("Unable to transform source");
+            // awt.21F=Unable to transform source
+            throw new ImagingOpException(Messages.getString("awt.21F")); //$NON-NLS-1$
         // TODO - uncomment
         //if (ippFilter(src, dst, BufferedImage.TYPE_CUSTOM) != 0)
         //    throw new ImagingOpException("Unable to transform source");

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/AwtImageBackdoorAccessorImpl.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/AwtImageBackdoorAccessorImpl.java?view=diff&rev=470895&r1=470894&r2=470895
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/AwtImageBackdoorAccessorImpl.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/AwtImageBackdoorAccessorImpl.java Fri Nov  3 08:45:01 2006
@@ -35,6 +35,7 @@
 import org.apache.harmony.awt.gl.GLVolatileImage;
 import org.apache.harmony.awt.gl.Surface;
 import org.apache.harmony.awt.gl.image.DataBufferListener;
+import org.apache.harmony.awt.internal.nls.Messages;
 
 /**
  * This class not part of public API. It useful for receiving package private
@@ -76,8 +77,9 @@
         } else if (db instanceof DataBufferDouble){
             return ((DataBufferDouble)db).getData();
         } else {
-            throw new IllegalArgumentException("Wrong Data Buffer type - " +
-                    db.getClass());
+            // awt.235=Wrong Data Buffer type : {0}
+            throw new IllegalArgumentException(Messages.getString("awt.235", //$NON-NLS-1$
+                    db.getClass()));
         }
     }
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/BandCombineOp.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/BandCombineOp.java?view=diff&rev=470895&r1=470894&r2=470895
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/BandCombineOp.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/BandCombineOp.java Fri Nov  3 08:45:01 2006
@@ -29,6 +29,7 @@
 import java.util.Arrays;
 
 import org.apache.harmony.awt.gl.AwtImageBackdoorAccessor;
+import org.apache.harmony.awt.internal.nls.Messages;
 
 public class BandCombineOp implements RasterOp {
     static final int offsets3c[] = {16, 8, 0};
@@ -95,8 +96,10 @@
     public WritableRaster createCompatibleDestRaster (Raster src) {
         int numBands = src.getNumBands();
         if (mxWidth != numBands && mxWidth != (numBands+1) || numBands != mxHeight) {
-            throw new IllegalArgumentException("Number of bands in the source raster ("+ numBands
-                    + ") is incompatible with the matrix [" + mxWidth + "x" + mxHeight + "]");
+            // awt.254=Number of bands in the source raster ({0}) is
+            //          incompatible with the matrix [{1}x{2}]
+            throw new IllegalArgumentException(Messages.getString("awt.254", //$NON-NLS-1$
+                    new Object[]{numBands, mxWidth, mxHeight}));
         }
 
         return src.createCompatibleWritableRaster(src.getWidth(), src.getHeight());
@@ -106,27 +109,26 @@
         int numBands = src.getNumBands();
 
         if (mxWidth != numBands && mxWidth != (numBands+1)) {
+            // awt.254=Number of bands in the source raster ({0}) is
+            //          incompatible with the matrix [{1}x{2}]
             throw new IllegalArgumentException(
-                    "Number of bands in the source raster ("+ numBands
-                    + ") is incompatible with the matrix [" + mxWidth +
-                    "x" + mxHeight + "]"
-            );
+                    Messages.getString("awt.254", //$NON-NLS-1$
+                    new Object[]{numBands, mxWidth, mxHeight}));
         }
 
         if (dst == null) {
             dst = createCompatibleDestRaster(src);
         } else if (dst.getNumBands() != mxHeight) {
-            throw new IllegalArgumentException(
-                    "Number of bands in the destination raster (" +
-                    dst.getNumBands() + ") is incompatible with the matrix [" +
-                    mxWidth + "x" + mxHeight + "]"
-            );
+            // awt.255=Number of bands in the destination raster ({0}) is incompatible with the matrix [{1}x{2}]
+            throw new IllegalArgumentException(Messages.getString("awt.255", //$NON-NLS-1$
+                    new Object[]{dst.getNumBands(), mxWidth, mxHeight}));
         }
 
         // XXX - todo
         //if (ippFilter(src, dst) != 0)
         if (verySlowFilter(src, dst) != 0) {
-            throw new ImagingOpException ("Unable to transform source");
+            // awt.21F=Unable to transform source
+            throw new ImagingOpException (Messages.getString("awt.21F")); //$NON-NLS-1$
         }
 
         return dst;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/BandedSampleModel.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/BandedSampleModel.java?view=diff&rev=470895&r1=470894&r2=470895
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/BandedSampleModel.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/BandedSampleModel.java Fri Nov  3 08:45:01 2006
@@ -20,6 +20,8 @@
  */
 package java.awt.image;
 
+import org.apache.harmony.awt.internal.nls.Messages;
+
 public final class BandedSampleModel extends ComponentSampleModel {
 
     private static int[] createIndices(int numBands) {
@@ -85,9 +87,8 @@
     @Override
     public SampleModel createSubsetSampleModel(int[] bands) {
         if (bands.length > numBands) {
-            throw new RasterFormatException("The number of the bands" +
-                    " in the subset is greater than the number of bands" +
-                    " in the sample model");
+            // awt.64=The number of the bands in the subset is greater than the number of bands in the sample model
+            throw new RasterFormatException(Messages.getString("awt.64")); //$NON-NLS-1$
         }
 
         int indices[] = new int[bands.length];
@@ -233,8 +234,8 @@
     @Override
     public int getSample(int x, int y, int b, DataBuffer data) {
         if (x < 0 || y < 0 || x >= this.width || y >= this.height) {
-            throw new ArrayIndexOutOfBoundsException(
-                    "Coordinates are not in bounds");
+            // awt.63=Coordinates are not in bounds
+            throw new ArrayIndexOutOfBoundsException(Messages.getString("awt.63")); //$NON-NLS-1$
         }
 
         return data.getElem(bankIndices[b], y * scanlineStride + x +
@@ -244,8 +245,8 @@
     @Override
     public double getSampleDouble(int x, int y, int b, DataBuffer data) {
         if (x < 0 || y < 0 || x >= this.width || y >= this.height) {
-            throw new ArrayIndexOutOfBoundsException("Coordinates are" +
-                    " not in bounds");
+            // awt.63=Coordinates are not in bounds
+            throw new ArrayIndexOutOfBoundsException(Messages.getString("awt.63")); //$NON-NLS-1$
         }
 
         return data.getElemDouble(bankIndices[b], y * scanlineStride + x +
@@ -255,8 +256,8 @@
     @Override
     public float getSampleFloat(int x, int y, int b, DataBuffer data) {
         if (x < 0 || y < 0 || x >= this.width || y >= this.height) {
-            throw new ArrayIndexOutOfBoundsException("Coordinates are" +
-                    " not in bounds");
+            // awt.63=Coordinates are not in bounds
+            throw new ArrayIndexOutOfBoundsException(Messages.getString("awt.63")); //$NON-NLS-1$
         }
 
         return data.getElemFloat(bankIndices[b], y * scanlineStride + x +
@@ -359,8 +360,8 @@
     @Override
     public void setSample(int x, int y, int b, double s, DataBuffer data) {
         if (x < 0 || y < 0 || x >= this.width || y >= this.height) {
-            throw new ArrayIndexOutOfBoundsException("Coordinates are" +
-                    " not in bounds");
+            // awt.63=Coordinates are not in bounds
+            throw new ArrayIndexOutOfBoundsException(Messages.getString("awt.63")); //$NON-NLS-1$
         }
 
         data.setElemDouble(bankIndices[b], y * scanlineStride + x +
@@ -370,8 +371,8 @@
     @Override
     public void setSample(int x, int y, int b, float s, DataBuffer data) {
         if (x < 0 || y < 0 || x >= this.width || y >= this.height) {
-            throw new ArrayIndexOutOfBoundsException("Coordinates are" +
-                    " not in bounds");
+            // awt.63=Coordinates are not in bounds
+            throw new ArrayIndexOutOfBoundsException(Messages.getString("awt.63")); //$NON-NLS-1$
         }
 
         data.setElemFloat(bankIndices[b], y * scanlineStride + x +
@@ -381,8 +382,8 @@
     @Override
     public void setSample(int x, int y, int b, int s, DataBuffer data) {
         if (x < 0 || y < 0 || x >= this.width || y >= this.height) {
-            throw new ArrayIndexOutOfBoundsException("Coordinates are" +
-                    " not in bounds");
+            // awt.63=Coordinates are not in bounds
+            throw new ArrayIndexOutOfBoundsException(Messages.getString("awt.63")); //$NON-NLS-1$
         }
 
         data.setElem(bankIndices[b], y * scanlineStride + x +

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/BufferedImage.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/BufferedImage.java?view=diff&rev=470895&r1=470894&r2=470895
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/BufferedImage.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/BufferedImage.java Fri Nov  3 08:45:01 2006
@@ -35,6 +35,7 @@
 import org.apache.harmony.awt.gl.ImageSurface;
 import org.apache.harmony.awt.gl.Surface;
 import org.apache.harmony.awt.gl.image.BufferedImageSource;
+import org.apache.harmony.awt.internal.nls.Messages;
 
 
 public class BufferedImage extends 
@@ -109,13 +110,13 @@
     public BufferedImage(ColorModel cm, WritableRaster raster,
             boolean isRasterPremultiplied, Hashtable<?, ?> properties) {
         if (!cm.isCompatibleRaster(raster)) {
-            throw new IllegalArgumentException("The raster is" +
-                    " incompatible with this ColorModel");
+            // awt.4D=The raster is incompatible with this ColorModel
+            throw new IllegalArgumentException(Messages.getString("awt.4D")); //$NON-NLS-1$
         }
 
         if (raster.getMinX() != 0 || raster.getMinY() != 0) {
-            throw new IllegalArgumentException("minX or minY of" +
-                    " this raster not equal to zero");
+            // awt.228=minX or minY of this raster not equal to zero
+            throw new IllegalArgumentException(Messages.getString("awt.228")); //$NON-NLS-1$
         }
 
         this.cm  = cm;
@@ -134,8 +135,8 @@
         switch (imageType) {
         case TYPE_BYTE_BINARY:
             if (cm.hasAlpha()) {
-                throw new IllegalArgumentException("This image type" +
-                        " can't have alpha");
+                // awt.227=This image type can't have alpha
+                throw new IllegalArgumentException(Messages.getString("awt.227")); //$NON-NLS-1$
             }
             int pixel_bits = 0;
             int mapSize = cm.getMapSize();
@@ -146,9 +147,8 @@
             } else if (mapSize <= 16) {
                 pixel_bits = 4;
             } else {
-                throw new IllegalArgumentException("The imageType is" +
-                        " TYPE_BYTE_BINARY and the color map has more" +
-                        " than 16 entries");
+                // awt.221=The imageType is TYPE_BYTE_BINARY and the color map has more than 16 entries
+                throw new IllegalArgumentException(Messages.getString("awt.221")); //$NON-NLS-1$
             }
 
             raster = Raster.createPackedRaster(DataBuffer.TYPE_BYTE, width,
@@ -161,14 +161,14 @@
             break;
 
         default:
-            throw new IllegalArgumentException("The imageType is not" +
-                    " TYPE_BYTE_BINARY or TYPE_BYTE_INDEXED ");
+            // awt.222=The imageType is not TYPE_BYTE_BINARY or TYPE_BYTE_INDEXED
+            throw new IllegalArgumentException(Messages.getString("awt.222")); //$NON-NLS-1$
 
         }
 
         if (!cm.isCompatibleRaster(raster)) {
-            throw new IllegalArgumentException("The imageType is" +
-                    " not compatible with ColorModel");
+            // awt.223=The imageType is not compatible with ColorModel
+            throw new IllegalArgumentException(Messages.getString("awt.223")); //$NON-NLS-1$
         }
 
         this.cm = cm;
@@ -349,7 +349,8 @@
             }
             break;
         default:
-            throw new IllegalArgumentException("Unknown image type");
+            // awt.224=Unknown image type
+            throw new IllegalArgumentException(Messages.getString("awt.224")); //$NON-NLS-1$
         }
         this.imageType = imageType;
         imageSurf = createImageSurface(imageType);
@@ -362,7 +363,8 @@
 
     public Object getProperty(String name) {
         if(name == null) {
-            throw new NullPointerException("Property name is null");
+            // awt.225=Property name is null
+            throw new NullPointerException(Messages.getString("awt.225")); //$NON-NLS-1$
         }
         if (properties == null) {
             return null;
@@ -439,16 +441,16 @@
 
     @Override
     public String toString() {
-        return "BufferedImage@" + Integer.toHexString(hashCode()) +
-            ": type = " + imageType + " " + cm + " " + raster;
+        return "BufferedImage@" + Integer.toHexString(hashCode()) + //$NON-NLS-1$
+            ": type = " + imageType + " " + cm + " " + raster; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     public WritableRaster getWritableTile(int tileX, int tileY) {
         if (tileX == 0 && tileY == 0) {
             return raster;
         }
-        throw new ArrayIndexOutOfBoundsException("Both tileX and" +
-                " tileY are not equal to 0");
+        // awt.226=Both tileX and tileY are not equal to 0
+        throw new ArrayIndexOutOfBoundsException(Messages.getString("awt.226")); //$NON-NLS-1$
     }
 
     public WritableRaster getRaster() {
@@ -490,8 +492,8 @@
         if (tileX == 0 && tileY == 0) {
             return raster;
         }
-        throw new ArrayIndexOutOfBoundsException("Both tileX and" +
-                " tileY are not equal to 0");
+        // awt.226=Both tileX and tileY are not equal to 0
+        throw new ArrayIndexOutOfBoundsException(Messages.getString("awt.226")); //$NON-NLS-1$
     }
 
     public Raster getData() {
@@ -597,8 +599,8 @@
         if (tileX == 0 && tileY == 0) {
             return true;
         }
-        throw new ArrayIndexOutOfBoundsException("Both tileX and tileY" +
-                " are not equal to 0");
+        // awt.226=Both tileX and tileY are not equal to 0
+        throw new ArrayIndexOutOfBoundsException(Messages.getString("awt.226")); //$NON-NLS-1$
     }
 
     public void releaseWritableTile(int tileX, int tileY) {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/BufferedImageFilter.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/BufferedImageFilter.java?view=diff&rev=470895&r1=470894&r2=470895
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/BufferedImageFilter.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/BufferedImageFilter.java Fri Nov  3 08:45:01 2006
@@ -309,7 +309,6 @@
         if (createdValidBuffer == false) {
             cm = ColorModel.getRGBdefault();
             raster = cm.createCompatibleWritableRaster(width, height);
-            System.out.println(raster +" "+ width +" "+ height);
             iData = accessor.getDataInt(raster.getDataBuffer());
             bData = null;
             forcedRGB = true;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/ColorConvertOp.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/ColorConvertOp.java?view=diff&rev=470895&r1=470894&r2=470895
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/ColorConvertOp.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/ColorConvertOp.java Fri Nov  3 08:45:01 2006
@@ -34,6 +34,7 @@
 import org.apache.harmony.awt.gl.color.ColorConverter;
 import org.apache.harmony.awt.gl.color.ColorScaler;
 import org.apache.harmony.awt.gl.color.ICC_Transform;
+import org.apache.harmony.awt.internal.nls.Messages;
 
 public class ColorConvertOp implements BufferedImageOp, RasterOp {
     // Unused but required by interfaces
@@ -225,7 +226,7 @@
     
     public ColorConvertOp(ColorSpace srcCS, ColorSpace dstCS, RenderingHints hints) {
         if (srcCS == null || dstCS == null) {
-            throw new NullPointerException("Null ColorSpace passed as a parameter");
+            throw new NullPointerException(Messages.getString("awt.25B")); //$NON-NLS-1$
         }
         
         renderingHints = hints;
@@ -255,7 +256,7 @@
 
     public ColorConvertOp(ICC_Profile profiles[], RenderingHints hints) {
         if (profiles == null) {
-            throw new NullPointerException("Null profiles passed as a parameter");
+            throw new NullPointerException(Messages.getString("awt.25C")); //$NON-NLS-1$
         }
 
         renderingHints = hints;
@@ -274,7 +275,7 @@
 
     public ColorConvertOp(ColorSpace cs, RenderingHints hints) {
         if (cs == null) {
-            throw new NullPointerException("Null ColorSpace passed as a parameter");
+            throw new NullPointerException(Messages.getString("awt.25B")); //$NON-NLS-1$
         }
         
         renderingHints = hints;
@@ -295,8 +296,7 @@
 
     public final WritableRaster filter(Raster src, WritableRaster dst) {
         if (conversionSequence.length < 2) {
-            throw new IllegalArgumentException(
-                    "Source or destination color space is not defined");
+            throw new IllegalArgumentException(Messages.getString("awt.25D")); //$NON-NLS-1$
         }
 
         ICC_Profile srcPf = null, dstPf = null; // unused if isICC is false
@@ -329,25 +329,23 @@
         // Check that source and destination rasters are compatible with
         // transforms and with each other
         if (src.getNumBands() != nSrcColorComps) {
-            throw new IllegalArgumentException(
-                    "Incorrect number of source raster bands. " +
-                    "Should be equal to the number of color " + 
-                    "components of source colorspace.");
+            // awt.25E=Incorrect number of source raster bands. Should be equal
+            //          to the number of color components of source colorspace.
+            throw new IllegalArgumentException(Messages.getString("awt.25E")); //$NON-NLS-1$
         }
         
         if (dst != null) { // Check destination raster
             if (dst.getNumBands() !=
                 nDstColorComps) {
-                throw new IllegalArgumentException(
-                        "Incorrect number of destination raster bands. " +
-                        "Should be equal to the number of color " + 
-                        "components of destination colorspace.");
+                // awt.25F=Incorrect number of destination raster bands. Should
+                //          be equal to the number of color components of destination
+                //          colorspace.
+                throw new IllegalArgumentException(Messages.getString("awt.25F")); //$NON-NLS-1$
             }
             
             if (src.getWidth() != dst.getWidth() ||
                src.getHeight() != dst.getHeight()) {
-                throw new IllegalArgumentException(
-                    "Incompatible rasters - width or height differs");
+                throw new IllegalArgumentException(Messages.getString("awt.260")); //$NON-NLS-1$
             }
             
         } else {
@@ -396,7 +394,7 @@
         int nSpaces = conversionSequence.length;
         
         if (nSpaces < 1) {
-            throw new IllegalArgumentException("Destination color space is undefined");
+            throw new IllegalArgumentException(Messages.getString("awt.261")); //$NON-NLS-1$
         }
         
         // Get destination color space
@@ -421,7 +419,7 @@
 
     public final BufferedImage filter(BufferedImage src, BufferedImage dst) {
         if (dst == null && conversionSequence.length < 1) {
-            throw new IllegalArgumentException("Destionation color space should be defined");
+            throw new IllegalArgumentException(Messages.getString("awt.262")); //$NON-NLS-1$
         }
 
         ColorModel srcCM = src.getColorModel();
@@ -437,8 +435,7 @@
           
           if (src.getWidth() != dst.getWidth() ||
              src.getHeight() != dst.getHeight()) {
-              throw new IllegalArgumentException(
-                  "Incompatible images - width or height differs");
+              throw new IllegalArgumentException(Messages.getString("awt.263")); //$NON-NLS-1$
           }
 
             if (dst.getColorModel() instanceof IndexColorModel) {
@@ -593,7 +590,7 @@
         int nSpaces = conversionSequence.length;
         
         if (nSpaces < 2) {
-            throw new IllegalArgumentException("Destination color space is undefined");
+            throw new IllegalArgumentException(Messages.getString("awt.261")); //$NON-NLS-1$
         }
         
         Object lastCS = conversionSequence[nSpaces-1];

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/ColorModel.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/ColorModel.java?view=diff&rev=470895&r1=470894&r2=470895
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/ColorModel.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/ColorModel.java Fri Nov  3 08:45:01 2006
@@ -24,6 +24,8 @@
 import java.awt.color.ColorSpace;
 import java.util.Arrays;
 
+import org.apache.harmony.awt.internal.nls.Messages;
+
 public abstract class ColorModel implements Transparency {
 
     protected int pixel_bits;  // Pixel length in bits
@@ -56,36 +58,38 @@
             int transferType) {
 
         if (pixel_bits < 1) {
-            throw new IllegalArgumentException("The number of bits" +
-                    " in the pixel values is less than 1");
+            // awt.26B=The number of bits in the pixel values is less than 1
+            throw new IllegalArgumentException(Messages.getString("awt.26B")); //$NON-NLS-1$
         }
 
         if (bits == null) {
-            throw new NullPointerException("bits is null");
+            // awt.26C=bits is null
+            throw new NullPointerException(Messages.getString("awt.26C")); //$NON-NLS-1$
         }
 
         int sum = 0;
         for (int element : bits) {
             if (element < 0) {
-                throw new IllegalArgumentException("The elements in" +
-                        " bits is less than 0");
+                // awt.26D=The elements in bits is less than 0
+                throw new IllegalArgumentException(Messages.getString("awt.26D")); //$NON-NLS-1$
             }
             sum += element;
         }
 
         if (sum < 1) {
-            throw new NullPointerException("The sum of the number" +
-                    " of bits in bits is less than 1");
+            // awt.26E=The sum of the number of bits in bits is less than 1
+            throw new NullPointerException(Messages.getString("awt.26E")); //$NON-NLS-1$
         }
 
         if (cspace == null) {
-            throw new IllegalArgumentException("The cspace is null");
+            // awt.26F=The cspace is null
+            throw new IllegalArgumentException(Messages.getString("awt.26F")); //$NON-NLS-1$
         }
 
         if (transparency < Transparency.OPAQUE ||
                transparency > Transparency.TRANSLUCENT) {
-            throw new IllegalArgumentException("The transparency " +
-                    "is not a valid value");
+            // awt.270=The transparency is not a valid value
+            throw new IllegalArgumentException(Messages.getString("awt.270")); //$NON-NLS-1$
         }
 
         this.pixel_bits = pixel_bits;
@@ -119,8 +123,8 @@
     public ColorModel(int bits) {
 
         if (bits < 1) {
-            throw new IllegalArgumentException("The number of " +
-                    "bits in bits is less than 1");
+            // awt.271=The number of bits in bits is less than 1
+            throw new IllegalArgumentException(Messages.getString("awt.271")); //$NON-NLS-1$
         }
 
         pixel_bits = bits;
@@ -137,8 +141,8 @@
     }
 
     public Object getDataElements(int[] components, int offset, Object obj) {
-        throw new UnsupportedOperationException("This method is not " +
-                "supported by this ColorModel");
+        throw new UnsupportedOperationException("This method is not " + //$NON-NLS-1$
+                "supported by this ColorModel"); //$NON-NLS-1$
     }
 
     public Object getDataElements(float[] normComponents, int normOffset,
@@ -149,8 +153,8 @@
     }
 
     public Object getDataElements(int rgb, Object pixel) {
-        throw new UnsupportedOperationException("This method is not " +
-                "supported by this ColorModel");
+        throw new UnsupportedOperationException("This method is not " + //$NON-NLS-1$
+                "supported by this ColorModel"); //$NON-NLS-1$
     }
 
     public WritableRaster getAlphaRaster(WritableRaster raster) {
@@ -159,8 +163,8 @@
 
     public ColorModel coerceData(WritableRaster raster,
             boolean isAlphaPremultiplied) {
-        throw new UnsupportedOperationException("This method is not " +
-                "supported by this ColorModel");
+        throw new UnsupportedOperationException("This method is not " + //$NON-NLS-1$
+                "supported by this ColorModel"); //$NON-NLS-1$
     }
 
     @Override
@@ -170,17 +174,17 @@
         // ColorModel cm = new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB,
         // false, false, Transparency.OPAQUE, DataBuffer.TYPE_BYTE);
         // System.out.println(cm.toString());
-        return "ColorModel: Color Space = " + cs.toString() + "; has alpha = "
-                + hasAlpha + "; is alpha premultipied = "
-                + isAlphaPremultiplied + "; transparency = " + transparency
-                + "; number color components = " + numColorComponents
-                + "; pixel bits = " + pixel_bits + "; transfer type = "
+        return "ColorModel: Color Space = " + cs.toString() + "; has alpha = " //$NON-NLS-1$ //$NON-NLS-2$
+                + hasAlpha + "; is alpha premultipied = " //$NON-NLS-1$
+                + isAlphaPremultiplied + "; transparency = " + transparency //$NON-NLS-1$
+                + "; number color components = " + numColorComponents //$NON-NLS-1$
+                + "; pixel bits = " + pixel_bits + "; transfer type = " //$NON-NLS-1$ //$NON-NLS-2$
                 + transferType;
     }
 
     public int[] getComponents(Object pixel, int[] components, int offset) {
-        throw new UnsupportedOperationException("This method is not " +
-                "supported by this ColorModel");
+        throw new UnsupportedOperationException("This method is not " + //$NON-NLS-1$
+                "supported by this ColorModel"); //$NON-NLS-1$
     }
 
     public float[] getNormalizedComponents(Object pixel,
@@ -230,23 +234,23 @@
     }
 
     public WritableRaster createCompatibleWritableRaster(int w, int h) {
-        throw new UnsupportedOperationException("This method is not " +
-                "supported by this ColorModel");
+        throw new UnsupportedOperationException("This method is not " + //$NON-NLS-1$
+                "supported by this ColorModel"); //$NON-NLS-1$
     }
 
     public boolean isCompatibleSampleModel(SampleModel sm) {
-        throw new UnsupportedOperationException("This method is not " +
-                "supported by this ColorModel");
+        throw new UnsupportedOperationException("This method is not " + //$NON-NLS-1$
+                "supported by this ColorModel"); //$NON-NLS-1$
     }
 
     public SampleModel createCompatibleSampleModel(int w, int h) {
-        throw new UnsupportedOperationException("This method is not " +
-                "supported by this ColorModel");
+        throw new UnsupportedOperationException("This method is not " + //$NON-NLS-1$
+                "supported by this ColorModel"); //$NON-NLS-1$
     }
 
     public boolean isCompatibleRaster(Raster raster) {
-        throw new UnsupportedOperationException("This method is not " +
-                "supported by this ColorModel");
+        throw new UnsupportedOperationException("This method is not " + //$NON-NLS-1$
+                "supported by this ColorModel"); //$NON-NLS-1$
     }
 
     public final ColorSpace getColorSpace() {
@@ -256,21 +260,21 @@
     public float[] getNormalizedComponents(int[] components, int offset,
             float normComponents[], int normOffset) {
         if (bits == null) {
-            throw new UnsupportedOperationException("The bits is null");
+            // awt.26C=bits is null
+            throw new UnsupportedOperationException(Messages.getString("awt.26C")); //$NON-NLS-1$
         }
 
         if (components.length - offset < numComponents) {
-            throw new IllegalArgumentException("The length of components " +
-                    "minus offset is less than numComponents ");
+            // awt.272=The length of components minus offset is less than numComponents
+            throw new IllegalArgumentException(Messages.getString("awt.272")); //$NON-NLS-1$
         }
 
         if (normComponents == null) {
             normComponents = new float[numComponents + offset];
         } else {
             if (normComponents.length - normOffset < numComponents) {
-                throw new IllegalArgumentException("The length of " +
-                        "normComponents minus normOffset is " +
-                        "less than numComponents ");
+                // awt.273=The length of normComponents minus normOffset is less than numComponents
+                throw new IllegalArgumentException(Messages.getString("awt.273")); //$NON-NLS-1$
             }
         }
 
@@ -302,28 +306,29 @@
     }
 
     public int getDataElement(int[] components, int offset) {
-        throw new UnsupportedOperationException("This method is not " +
-                "supported by this ColorModel");
+        throw new UnsupportedOperationException("This method is not " + //$NON-NLS-1$
+                "supported by this ColorModel"); //$NON-NLS-1$
     }
 
     public int[] getUnnormalizedComponents(float normComponents[],
             int normOffset, int components[], int offset) {
 
         if (bits == null) {
-            throw new UnsupportedOperationException("The bits is null");
+            // awt.26C=bits is null
+            throw new UnsupportedOperationException(Messages.getString("awt.26C")); //$NON-NLS-1$
         }
 
         if (normComponents.length - normOffset < numComponents) {
-            throw new IllegalArgumentException("The length of normComponents " +
-                    "minus normOffset is less than numComponents ");
+            // awt.273=The length of normComponents minus normOffset is less than numComponents
+            throw new IllegalArgumentException(Messages.getString("awt.273")); //$NON-NLS-1$
         }
 
         if (components == null) {
             components = new int[numComponents + offset];
         } else {
             if (components.length - offset < numComponents) {
-                throw new IllegalArgumentException("The length of components " +
-                        "minus offset is less than numComponents ");
+                // awt.272=The length of components minus offset is less than numComponents
+                throw new IllegalArgumentException(Messages.getString("awt.272")); //$NON-NLS-1$
             }
         }
 
@@ -354,8 +359,8 @@
     }
 
     public int[] getComponents(int pixel, int components[], int offset) {
-        throw new UnsupportedOperationException("This method is not " +
-                "supported by this ColorModel");
+        throw new UnsupportedOperationException("This method is not " + //$NON-NLS-1$
+                "supported by this ColorModel"); //$NON-NLS-1$
     }
 
     public abstract int getRed(int pixel);
@@ -369,13 +374,13 @@
 
     public int getComponentSize(int componentIdx) {
         if (bits == null) {
-            throw new NullPointerException("The number of bits array is null");
+            // awt.26C=bits is null
+            throw new NullPointerException(Messages.getString("awt.26C")); //$NON-NLS-1$
         }
 
         if (componentIdx < 0 || componentIdx >= bits.length) {
-            throw new ArrayIndexOutOfBoundsException(
-                    "componentIdx is greater than the number of components " +
-                    "or less than zero");
+            // awt.274=componentIdx is greater than the number of components or less than zero
+            throw new ArrayIndexOutOfBoundsException(Messages.getString("awt.274")); //$NON-NLS-1$
         }
 
         return bits[componentIdx];
@@ -495,8 +500,8 @@
         case DataBuffer.TYPE_BYTE:
             byte[] bPixel = (byte[]) obj;
             if(bPixel.length > 1) {
-                throw new UnsupportedOperationException("This pixel " +
-                        "representation is not suuported by tis Color Model");
+                // awt.275=This pixel representation is not suuported by tis Color Model
+                throw new UnsupportedOperationException(Messages.getString("awt.275")); //$NON-NLS-1$
             }
             pixel = bPixel[0] & 0xff;
             break;
@@ -504,8 +509,8 @@
         case DataBuffer.TYPE_USHORT:
             short[] sPixel = (short[]) obj;
             if(sPixel.length > 1) {
-                throw new UnsupportedOperationException("This pixel " +
-                    "representation is not suuported by tis Color Model");
+                // awt.275=This pixel representation is not suuported by tis Color Model
+                throw new UnsupportedOperationException(Messages.getString("awt.275")); //$NON-NLS-1$
             }
             pixel = sPixel[0] & 0xffff;
             break;
@@ -513,15 +518,16 @@
         case DataBuffer.TYPE_INT:
             int[] iPixel = (int[]) obj;
             if(iPixel.length > 1) {
-                throw new UnsupportedOperationException("This pixel " +
-                    "representation is not suuported by tis Color Model");
+                // awt.275=This pixel representation is not suuported by tis Color Model
+                throw new UnsupportedOperationException(Messages.getString("awt.275")); //$NON-NLS-1$
             }
             pixel = iPixel[0];
             break;
 
         default:
-            throw new UnsupportedOperationException("This transferType (" +
-                   transferType + ")is not supported");
+            // awt.22D=This transferType ( {0} ) is not supported by this color model
+            throw new UnsupportedOperationException(Messages.getString("awt.22D", //$NON-NLS-1$
+                   transferType));
 
         }
         return pixel;



Mime
View raw message