svn commit: r487328 - in /harmony/enhanced/classlib/trunk/modules/awt/src: main/java/common/java/awt/image/Raster.java test/api/java/common/java/awt/image/RasterTest.java

[ap...@apache.org]

Author: apetrenko
Date: Thu Dec 14 12:02:07 2006
New Revision: 487328

URL: http://svn.apache.org/viewvc?view=rev&rev=487328
Log:
Patch for HARMONY-2717 "[classlib][awt] Compatibility: java.awt.image.Raster.createPackedRaster(DataBuffer,int int,int ,int[] ,Point ) throws RasterFormatException while RI throws NPE"

Added:
    harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/image/RasterTest.java   (with props)
Modified:
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/Raster.java

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/Raster.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/Raster.java?view=diff&rev=487328&r1=487327&r2=487328
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/Raster.java (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/Raster.java Thu Dec 14 12:02:07 2006
@@ -327,6 +327,10 @@
 
     public static WritableRaster createPackedRaster(DataBuffer dataBuffer,
             int w, int h, int scanlineStride, int bandMasks[], Point location) {
+        if (dataBuffer == null) {
+            // awt.278=dataBuffer is null
+            throw new NullPointerException(Messages.getString("awt.278")); //$NON-NLS-1$
+        }
 
         if (w <= 0 || h <= 0) {
             // awt.22E=w or h is less than or equal to zero
@@ -346,11 +350,6 @@
         if (bandMasks == null) {
             // awt.27C=bandMasks is null
             throw new RasterFormatException(Messages.getString("awt.27C")); //$NON-NLS-1$
-        }
-
-        if (dataBuffer == null) {
-            // awt.278=dataBuffer is null
-            throw new NullPointerException(Messages.getString("awt.278")); //$NON-NLS-1$
         }
 
         if (dataBuffer.getNumBanks() > 1) {

Added: harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/image/RasterTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/image/RasterTest.java?view=auto&rev=487328
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/image/RasterTest.java (added)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/image/RasterTest.java Thu Dec 14 12:02:07 2006
@@ -0,0 +1,36 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+
+package java.awt.image;
+
+import junit.framework.TestCase;
+
+public class RasterTest extends TestCase {
+    // A regression test for harmony-2717
+    public void test_createPackedRaster()
+    {
+        try {
+            Raster.createPackedRaster(null, -32, Integer.MAX_VALUE, 35, new int[] {}, null);
+            fail("Exception expected");
+        } catch (NullPointerException expectedException) {
+            System.out.println(expectedException +" was thrown");
+        } catch (RasterFormatException expectedException) {
+            fail(expectedException +" was thrown");
+        }
+    }
+}

Propchange: harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/image/RasterTest.java
------------------------------------------------------------------------------
    svn:eol-style = native