This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: gnu.java.awt
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Wed, 25 Feb 2004 21:04:48 +0100
- Subject: Patch: gnu.java.awt
Hi list,
I wrote a little patch to cleanup a bit.
Okay to commit to trunk ?
Michael
2004-02-25 Michael Koch <konqueror@gmx.de>
* gnu/java/awt/ComponentDataBlitOp.java
(INSTANCE): Made final.
* gnu/java/awt/image/ImageDecoder.java:
Reworked imports.
(cm): Unused, removed.
Index: gnu/java/awt/ComponentDataBlitOp.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/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:39:48 -0000 1.2
+++ gnu/java/awt/ComponentDataBlitOp.java 25 Feb 2004 19:58:45 -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: /cvs/gcc/gcc/libjava/gnu/java/awt/image/ImageDecoder.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 ImageDecoder.java
--- gnu/java/awt/image/ImageDecoder.java 10 Jan 2004 21:32:22 -0000 1.3
+++ gnu/java/awt/image/ImageDecoder.java 25 Feb 2004 19:58:45 -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
{