2004-02-26 Michael Koch <konqueror@gmx.de>

* gnu/java/awt/ComponentDataBlitOp.java
	(INSTANCE): Made final.
	* gnu/java/awt/image/ImageDecoder.java:
	Reworked imports.
	(cm): Unused, removed.

From-SVN: r78517
This commit is contained in:
Michael Koch 2004-02-26 19:31:57 +00:00 committed by Michael Koch
parent 8c048b4851
commit 135d78c600
3 changed files with 18 additions and 9 deletions

View file

@ -1,3 +1,11 @@
2004-02-26 Michael Koch <konqueror@gmx.de>
* gnu/java/awt/ComponentDataBlitOp.java
(INSTANCE): Made final.
* gnu/java/awt/image/ImageDecoder.java:
Reworked imports.
(cm): Unused, removed.
2004-02-26 Michael Koch <konqueror@gmx.de> 2004-02-26 Michael Koch <konqueror@gmx.de>
* gnu/java/nio/DatagramChannelImpl.java * gnu/java/nio/DatagramChannelImpl.java

View file

@ -1,4 +1,4 @@
/* Copyright (C) 2000, 2002 Free Software Foundation /* Copyright (C) 2000, 2002, 2004 Free Software Foundation
This file is part of GNU Classpath. This file is part of GNU Classpath.
@ -52,7 +52,7 @@ import java.awt.RenderingHints;
*/ */
public class ComponentDataBlitOp implements RasterOp public class ComponentDataBlitOp implements RasterOp
{ {
public static ComponentDataBlitOp INSTANCE = new ComponentDataBlitOp(); public static final ComponentDataBlitOp INSTANCE = new ComponentDataBlitOp();
public WritableRaster filter(Raster src, WritableRaster dest) public WritableRaster filter(Raster src, WritableRaster dest)
{ {

View file

@ -1,5 +1,5 @@
/* ImageDecoder.java /* ImageDecoder.java
Copyright (C) 1999, 2000 Free Software Foundation, Inc. Copyright (C) 1999, 2000, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath. This file is part of GNU Classpath.
@ -37,11 +37,14 @@ exception statement from your version. */
package gnu.java.awt.image; package gnu.java.awt.image;
import java.awt.*; import java.awt.image.ImageConsumer;
import java.awt.image.*; import java.awt.image.ImageProducer;
import java.util.*; import java.io.ByteArrayInputStream;
import java.io.*; import java.io.FileInputStream;
import java.io.InputStream;
import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.util.Vector;
public abstract class ImageDecoder implements ImageProducer public abstract class ImageDecoder implements ImageProducer
{ {
@ -53,8 +56,6 @@ public abstract class ImageDecoder implements ImageProducer
int length; int length;
InputStream input; InputStream input;
public static ColorModel cm;
static static
{ {
// FIXME: there was some broken code here that looked like // FIXME: there was some broken code here that looked like