harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r501036 - in /harmony/enhanced/classlib/trunk/modules/awt: make/exclude.common src/main/java/common/java/awt/image/Raster.java src/main/java/common/org/apache/harmony/awt/internal/nls/messages.properties
Date Mon, 29 Jan 2007 13:21:16 GMT
Author: ayza
Date: Mon Jan 29 05:21:15 2007
New Revision: 501036

URL: http://svn.apache.org/viewvc?view=rev&rev=501036
Log:
Reverting invalid patch for HARMONY-2885 ([classlib][awt] Compatibility: java.awt.image.Raster.createRaster()
doesn't throw RasterFormatException if DataBuffer type is incorrect)

Modified:
    harmony/enhanced/classlib/trunk/modules/awt/make/exclude.common
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/image/Raster.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/make/exclude.common
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/make/exclude.common?view=diff&rev=501036&r1=501035&r2=501036
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/make/exclude.common (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/make/exclude.common Mon Jan 29 05:21:15 2007
@@ -39,5 +39,6 @@
 java/awt/font/LineBreakMeasurerTest.java
 java/awt/font/TextLayoutTest.java
 java/awt/font/TextMeasurerTest.java
+java/awt/image/RasterTest.java
 org/apache/harmony/awt/gl/MultiRectAreaLineCashTest.java
 org/apache/harmony/awt/gl/MultiRectAreaRectCashTest.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=501036&r1=501035&r2=501036
==============================================================================
--- 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
Mon Jan 29 05:21:15 2007
@@ -534,11 +534,6 @@
             throw new NullPointerException(Messages.getString("awt.27F")); //$NON-NLS-1$
         }
 
-        if (sm.dataType != db.dataType) {
-            // awt.293=SampleModel and DataBuffer have different data types
-            throw new RasterFormatException(Messages.getString("awt.293")); //$NON-NLS-1$
-        }
-        
         if (location == null) {
             location = new Point(0, 0);
         }

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=501036&r1=501035&r2=501036
==============================================================================
--- 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
Mon Jan 29 05:21:15 2007
@@ -482,7 +482,6 @@
 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.293=SampleModel and DataBuffer have different data types
 awt.294=pixel is null
 awt.295=data is null
 



Mime
View raw message