diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-02-26 19:31:57 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-02-26 19:31:57 +0000 |
| commit | 4b9abdac0b9b26362308959b78b8952d99050995 (patch) | |
| tree | 6b471dc180ba454be55a6a97709057891f7f0a2f /libjava | |
| parent | 4657ee94b49cecd79d4a296fada598ffd3919629 (diff) | |
| download | ppe42-gcc-4b9abdac0b9b26362308959b78b8952d99050995.tar.gz ppe42-gcc-4b9abdac0b9b26362308959b78b8952d99050995.zip | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@78517 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 8 | ||||
| -rw-r--r-- | libjava/gnu/java/awt/ComponentDataBlitOp.java | 4 | ||||
| -rw-r--r-- | libjava/gnu/java/awt/image/ImageDecoder.java | 15 |
3 files changed, 18 insertions, 9 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index faa9f8d9664..5984f37c9d2 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,13 @@ 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> + * gnu/java/nio/DatagramChannelImpl.java (send): Check if target address is resolved. diff --git a/libjava/gnu/java/awt/ComponentDataBlitOp.java b/libjava/gnu/java/awt/ComponentDataBlitOp.java index ffbe02c00a6..3b2fa7f2ee0 100644 --- a/libjava/gnu/java/awt/ComponentDataBlitOp.java +++ b/libjava/gnu/java/awt/ComponentDataBlitOp.java @@ -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 @@ import java.awt.RenderingHints; */ 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) { diff --git a/libjava/gnu/java/awt/image/ImageDecoder.java b/libjava/gnu/java/awt/image/ImageDecoder.java index e4402f8553f..ce7163d5601 100644 --- a/libjava/gnu/java/awt/image/ImageDecoder.java +++ b/libjava/gnu/java/awt/image/ImageDecoder.java @@ -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 @@ exception statement from your version. */ 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 { @@ -53,8 +56,6 @@ public abstract class ImageDecoder implements ImageProducer int length; InputStream input; - public static ColorModel cm; - static { // FIXME: there was some broken code here that looked like |
