Index: gnu/java/awt/ComponentDataBlitOp.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/ComponentDataBlitOp.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 ComponentDataBlitOp.java
--- gnu/java/awt/ComponentDataBlitOp.java	22 Jan 2002 22:26:56 -0000	1.2
+++ gnu/java/awt/ComponentDataBlitOp.java	27 Feb 2004 10:55:47 -0000
@@ -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.
 
@@ -52,7 +52,7 @@
  */
 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)
   {
Index: gnu/java/awt/image/ImageDecoder.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/image/ImageDecoder.java,v
retrieving revision 1.9
diff -u -b -B -r1.9 ImageDecoder.java
--- gnu/java/awt/image/ImageDecoder.java	2 Dec 2003 19:42:09 -0000	1.9
+++ gnu/java/awt/image/ImageDecoder.java	27 Feb 2004 10:55:47 -0000
@@ -1,5 +1,5 @@
 /* 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.
 
@@ -37,11 +37,14 @@
 
 package gnu.java.awt.image;
 
-import java.awt.*;
-import java.awt.image.*;
-import java.util.*;
-import java.io.*;
+import java.awt.image.ImageConsumer;
+import java.awt.image.ImageProducer;
+import java.io.ByteArrayInputStream;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.IOException;
 import java.net.URL;
+import java.util.Vector;
 
 public abstract class ImageDecoder implements ImageProducer 
 {
@@ -52,8 +55,6 @@
   int offset;
   int length;
   InputStream input;
-
-  public static ColorModel cm;
 
   static
   {