[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: added missing final modifiers
Kaffe CVS
cvs-commits at kaffe.org
Fri Nov 26 10:28:34 PST 2004
PatchSet 5487
Date: 2004/11/26 18:24:19
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: added missing final modifiers
2004-11-26 Dalibor Topic <robilad at kaffe.org>
* libraries/javalib/java/awt/image/AffineTransformOp.java,
libraries/javalib/java/awt/image/ColorConvertOp.java,
libraries/javalib/java/awt/image/LookupOp.java,
libraries/javalib/java/awt/image/RescaleOp.java:
Resynced with GNU Classpath.
2004-11-17 Michael Koch <konqueror at gmx.de>
* java/awt/image/AffineTransformOp.java,
java/awt/image/ColorConvertOp.java,
java/awt/image/LookupOp.java,
java/awt/image/RescaleOp.java:
Added final keywords where they belong.
Members:
ChangeLog:1.3033->1.3034
libraries/javalib/java/awt/image/AffineTransformOp.java:1.4->1.5
libraries/javalib/java/awt/image/ColorConvertOp.java:1.2->1.3
libraries/javalib/java/awt/image/LookupOp.java:1.2->1.3
libraries/javalib/java/awt/image/RescaleOp.java:1.3->1.4
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3033 kaffe/ChangeLog:1.3034
--- kaffe/ChangeLog:1.3033 Fri Nov 26 18:08:48 2004
+++ kaffe/ChangeLog Fri Nov 26 18:24:19 2004
@@ -1,5 +1,21 @@
2004-11-26 Dalibor Topic <robilad at kaffe.org>
+ * libraries/javalib/java/awt/image/AffineTransformOp.java,
+ libraries/javalib/java/awt/image/ColorConvertOp.java,
+ libraries/javalib/java/awt/image/LookupOp.java,
+ libraries/javalib/java/awt/image/RescaleOp.java:
+ Resynced with GNU Classpath.
+
+ 2004-11-17 Michael Koch <konqueror at gmx.de>
+
+ * java/awt/image/AffineTransformOp.java,
+ java/awt/image/ColorConvertOp.java,
+ java/awt/image/LookupOp.java,
+ java/awt/image/RescaleOp.java:
+ Added final keywords where they belong.
+
+2004-11-26 Dalibor Topic <robilad at kaffe.org>
+
* libraries/javalib/java/awt/CardLayout.java,
libraries/javalib/java/awt/Component.java,
libraries/javalib/java/awt/Font.java,
Index: kaffe/libraries/javalib/java/awt/image/AffineTransformOp.java
diff -u kaffe/libraries/javalib/java/awt/image/AffineTransformOp.java:1.4 kaffe/libraries/javalib/java/awt/image/AffineTransformOp.java:1.5
--- kaffe/libraries/javalib/java/awt/image/AffineTransformOp.java:1.4 Sun Nov 7 21:10:17 2004
+++ kaffe/libraries/javalib/java/awt/image/AffineTransformOp.java Fri Nov 26 18:24:20 2004
@@ -164,7 +164,7 @@
* @param dst destination image
* @return transformed source image
*/
- public BufferedImage filter (BufferedImage src, BufferedImage dst)
+ public final BufferedImage filter (BufferedImage src, BufferedImage dst)
{
if (dst == src)
@@ -195,7 +195,7 @@
* @param dst destination raster
* @return transformed raster
*/
- public WritableRaster filter (Raster src, WritableRaster dst)
+ public final WritableRaster filter (Raster src, WritableRaster dst)
{
if (dst == src)
throw new IllegalArgumentException("src image cannot be the same as"
@@ -297,7 +297,7 @@
* @param src image to be transformed
* @return bounds of the transformed image.
*/
- public Rectangle2D getBounds2D (BufferedImage src)
+ public final Rectangle2D getBounds2D (BufferedImage src)
{
return getBounds2D (src.getRaster());
}
@@ -308,7 +308,7 @@
* @param src raster to be transformed
* @return bounds of the transformed raster.
*/
- public Rectangle2D getBounds2D (Raster src)
+ public final Rectangle2D getBounds2D (Raster src)
{
// determine new size for the transformed raster.
// Need to calculate transformed coordinates of the lower right
@@ -327,7 +327,7 @@
*
* @return interpolation type
*/
- public int getInterpolationType ()
+ public final int getInterpolationType ()
{
if(hints.containsValue (RenderingHints.VALUE_INTERPOLATION_BILINEAR))
return TYPE_BILINEAR;
@@ -352,7 +352,7 @@
*
* @return rendering hints
*/
- public RenderingHints getRenderingHints ()
+ public final RenderingHints getRenderingHints ()
{
return hints;
}
@@ -362,7 +362,7 @@
*
* @return transform
*/
- public AffineTransform getTransform ()
+ public final AffineTransform getTransform ()
{
return transform;
}
Index: kaffe/libraries/javalib/java/awt/image/ColorConvertOp.java
diff -u kaffe/libraries/javalib/java/awt/image/ColorConvertOp.java:1.2 kaffe/libraries/javalib/java/awt/image/ColorConvertOp.java:1.3
--- kaffe/libraries/javalib/java/awt/image/ColorConvertOp.java:1.2 Sun Nov 7 21:10:18 2004
+++ kaffe/libraries/javalib/java/awt/image/ColorConvertOp.java Fri Nov 26 18:24:20 2004
@@ -1,5 +1,5 @@
/* ColorModel.java --
-Copyright (C) 2004 Free Software Foundation
+ Copyright (C) 2004 Free Software Foundation
This file is part of GNU Classpath.
@@ -35,6 +35,7 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package java.awt.image;
import java.awt.Graphics2D;
@@ -156,7 +157,7 @@
* @see java.awt.image.BufferedImageOp#filter(java.awt.image.BufferedImage,
java.awt.image.BufferedImage)
*/
- public BufferedImage filter(BufferedImage src, BufferedImage dst)
+ public final BufferedImage filter(BufferedImage src, BufferedImage dst)
{
// TODO: The plan is to create a scanline buffer for intermediate buffers.
// For now we just suck it up and create intermediate buffers.
@@ -204,13 +205,13 @@
null);
}
- public ICC_Profile[] getICC_Profiles()
+ public final ICC_Profile[] getICC_Profiles()
{
return profiles;
}
/** Return the rendering hints for this op. */
- public RenderingHints getRenderingHints()
+ public final RenderingHints getRenderingHints()
{
return hints;
}
@@ -218,7 +219,7 @@
/* (non-Javadoc)
* @see java.awt.image.RasterOp#filter(java.awt.image.Raster, java.awt.image.WritableRaster)
*/
- public WritableRaster filter(Raster src, WritableRaster dest)
+ public final WritableRaster filter(Raster src, WritableRaster dest)
{
if (!rasterValid)
throw new IllegalArgumentException();
@@ -258,7 +259,7 @@
* @param dst The destination point.
* @see java.awt.image.RasterOp#getPoint2D(java.awt.geom.Point2D, java.awt.geom.Point2D)
*/
- public Point2D getPoint2D(Point2D src, Point2D dst)
+ public final Point2D getPoint2D(Point2D src, Point2D dst)
{
if (dst == null) return (Point2D)src.clone();
dst.setLocation(src);
@@ -268,7 +269,7 @@
/* (non-Javadoc)
* @see java.awt.image.BufferedImageOp#getBounds2D(java.awt.image.BufferedImage)
*/
- public Rectangle2D getBounds2D(BufferedImage src)
+ public final Rectangle2D getBounds2D(BufferedImage src)
{
return src.getRaster().getBounds();
}
@@ -276,7 +277,7 @@
/* (non-Javadoc)
* @see java.awt.image.RasterOp#getBounds2D(java.awt.image.Raster)
*/
- public Rectangle2D getBounds2D(Raster src)
+ public final Rectangle2D getBounds2D(Raster src)
{
return src.getBounds();
}
Index: kaffe/libraries/javalib/java/awt/image/LookupOp.java
diff -u kaffe/libraries/javalib/java/awt/image/LookupOp.java:1.2 kaffe/libraries/javalib/java/awt/image/LookupOp.java:1.3
--- kaffe/libraries/javalib/java/awt/image/LookupOp.java:1.2 Thu Nov 11 01:33:51 2004
+++ kaffe/libraries/javalib/java/awt/image/LookupOp.java Fri Nov 26 18:24:20 2004
@@ -1,5 +1,5 @@
/* LookupOp.java -- Filter that converts each pixel using a lookup table.
-Copyright (C) 2004 Free Software Foundation
+ Copyright (C) 2004 Free Software Foundation
This file is part of GNU Classpath.
@@ -34,6 +34,7 @@
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package java.awt.image;
Index: kaffe/libraries/javalib/java/awt/image/RescaleOp.java
diff -u kaffe/libraries/javalib/java/awt/image/RescaleOp.java:1.3 kaffe/libraries/javalib/java/awt/image/RescaleOp.java:1.4
--- kaffe/libraries/javalib/java/awt/image/RescaleOp.java:1.3 Sun Nov 7 21:10:19 2004
+++ kaffe/libraries/javalib/java/awt/image/RescaleOp.java Fri Nov 26 18:24:20 2004
@@ -34,6 +34,7 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package java.awt.image;
import java.awt.RenderingHints;
@@ -42,8 +43,7 @@
import java.util.Arrays;
/**
- * @author Jerry Quinn <jlquinn at optonline.net>
- *
+ * @author Jerry Quinn (jlquinn at optonline.net)
*/
public class RescaleOp implements BufferedImageOp, RasterOp
{
@@ -101,7 +101,7 @@
/* (non-Javadoc)
* @see java.awt.image.BufferedImageOp#filter(java.awt.image.BufferedImage, java.awt.image.BufferedImage)
*/
- public BufferedImage filter(BufferedImage src, BufferedImage dst)
+ public final BufferedImage filter(BufferedImage src, BufferedImage dst)
{
// TODO Make sure premultiplied alpha is handled correctly.
// TODO See that color conversion is handled.
@@ -134,7 +134,7 @@
/* (non-Javadoc)
* @see java.awt.image.RasterOp#filter(java.awt.image.Raster, java.awt.image.WritableRaster)
*/
- public WritableRaster filter(Raster src, WritableRaster dest)
+ public final WritableRaster filter(Raster src, WritableRaster dest)
{
if (dest == null) dest = src.createCompatibleWritableRaster();
@@ -193,7 +193,7 @@
/* (non-Javadoc)
* @see java.awt.image.BufferedImageOp#getBounds2D(java.awt.image.BufferedImage)
*/
- public Rectangle2D getBounds2D(BufferedImage src)
+ public final Rectangle2D getBounds2D(BufferedImage src)
{
return src.getRaster().getBounds();
}
@@ -201,7 +201,7 @@
/* (non-Javadoc)
* @see java.awt.image.RasterOp#getBounds2D(java.awt.image.Raster)
*/
- public Rectangle2D getBounds2D(Raster src)
+ public final Rectangle2D getBounds2D(Raster src)
{
return src.getBounds();
}
@@ -209,7 +209,7 @@
/* (non-Javadoc)
* @see java.awt.image.BufferedImageOp#getPoint2D(java.awt.geom.Point2D, java.awt.geom.Point2D)
*/
- public Point2D getPoint2D(Point2D src, Point2D dst) {
+ public final Point2D getPoint2D(Point2D src, Point2D dst) {
if (dst == null) dst = (Point2D) src.clone();
else dst.setLocation(src);
return dst;
More information about the kaffe
mailing list