diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | java/nio/MappedByteBuffer.java | 2 | ||||
| -rw-r--r-- | java/text/Bidi.java | 2 | ||||
| -rw-r--r-- | java/util/zip/Deflater.java | 1 | ||||
| -rw-r--r-- | java/util/zip/Inflater.java | 1 | ||||
| -rw-r--r-- | java/util/zip/ZipConstants.java | 3 | ||||
| -rw-r--r-- | java/util/zip/ZipFile.java | 5 | ||||
| -rw-r--r-- | javax/imageio/stream/ImageOutputStream.java | 2 | ||||
| -rw-r--r-- | javax/imageio/stream/ImageOutputStreamImpl.java | 2 |
9 files changed, 22 insertions, 9 deletions
@@ -1,3 +1,16 @@ +2006-03-15 Tom Tromey <tromey@redhat.com> + + * javax/imageio/stream/ImageOutputStreamImpl.java (flushBits): Now + final. + * javax/imageio/stream/ImageOutputStream.java (flushBefore): Javadoc + fix. + * java/util/zip/ZipFile.java (ENDNRD): New constant. + * java/util/zip/ZipConstants.java (ENDNRD, ENDDCD): Removed. + * java/util/zip/Inflater.java (end): Not deprecated. + * java/util/zip/Deflater.java (end): Not deprecated. + * java/text/Bidi.java (Bidi): Now final. + * java/nio/MappedByteBuffer.java (finalize): Now protected. + 2006-03-15 Keith Seitz <keiths@redhat.com> * gnu/classpath/jdwp/util/Location.java: Rewrite using VMMethod. diff --git a/java/nio/MappedByteBuffer.java b/java/nio/MappedByteBuffer.java index fa25bb7f1..25b099307 100644 --- a/java/nio/MappedByteBuffer.java +++ b/java/nio/MappedByteBuffer.java @@ -85,7 +85,7 @@ public abstract class MappedByteBuffer extends ByteBuffer forceImpl(); } - public void finalize() + protected void finalize() throws Throwable { unmapImpl(); diff --git a/java/text/Bidi.java b/java/text/Bidi.java index 57b9a88df..0a4d471c7 100644 --- a/java/text/Bidi.java +++ b/java/text/Bidi.java @@ -47,7 +47,7 @@ package java.text; * Annex #9: The Bidirectional Algorithm</a>. A full implementation is * <a href="http://fribidi.org/">GNU FriBidi</a>. */ -public class Bidi +public final class Bidi { /** * Returns false if all characters in the text between start and end diff --git a/java/util/zip/Deflater.java b/java/util/zip/Deflater.java index 7bc1a1911..a4ec0e643 100644 --- a/java/util/zip/Deflater.java +++ b/java/util/zip/Deflater.java @@ -221,7 +221,6 @@ public class Deflater * where the compressor allocates native memory. * If you call any method (even reset) afterwards the behaviour is * <i>undefined</i>. - * @deprecated Just clear all references to deflater instead. */ public void end() { diff --git a/java/util/zip/Inflater.java b/java/util/zip/Inflater.java index 76de891fa..f1616d601 100644 --- a/java/util/zip/Inflater.java +++ b/java/util/zip/Inflater.java @@ -199,7 +199,6 @@ public class Inflater * with Sun's JDK, where the compressor allocates native memory. * If you call any method (even reset) afterwards the behaviour is * <i>undefined</i>. - * @deprecated Just clear all references to inflater instead. */ public void end () { diff --git a/java/util/zip/ZipConstants.java b/java/util/zip/ZipConstants.java index 6d664196a..bdf94506b 100644 --- a/java/util/zip/ZipConstants.java +++ b/java/util/zip/ZipConstants.java @@ -85,9 +85,6 @@ interface ZipConstants long ENDSIG = 'P'|('K'<<8)|(5<<16)|(6<<24); int ENDHDR = 22; - /* The following two fields are missing in SUN JDK */ - int ENDNRD = 4; - int ENDDCD = 6; int ENDSUB = 8; int ENDTOT = 10; int ENDSIZ = 12; diff --git a/java/util/zip/ZipFile.java b/java/util/zip/ZipFile.java index 7307ee9a4..fbfdf7d1a 100644 --- a/java/util/zip/ZipFile.java +++ b/java/util/zip/ZipFile.java @@ -75,6 +75,11 @@ public class ZipFile implements ZipConstants */ public static final int OPEN_DELETE = 0x4; + /** + * This field isn't defined in the JDK's ZipConstants, but should be. + */ + static final int ENDNRD = 4; + // Name of this zip file. private final String name; diff --git a/javax/imageio/stream/ImageOutputStream.java b/javax/imageio/stream/ImageOutputStream.java index 49a1bcf33..4688ad935 100644 --- a/javax/imageio/stream/ImageOutputStream.java +++ b/javax/imageio/stream/ImageOutputStream.java @@ -54,7 +54,7 @@ public interface ImageOutputStream extends ImageInputStream, DataOutput { /** - * @param postion + * @param position * * @throws IOException if an errror occurs */ diff --git a/javax/imageio/stream/ImageOutputStreamImpl.java b/javax/imageio/stream/ImageOutputStreamImpl.java index c708a2368..8ff09e5ff 100644 --- a/javax/imageio/stream/ImageOutputStreamImpl.java +++ b/javax/imageio/stream/ImageOutputStreamImpl.java @@ -52,7 +52,7 @@ public abstract class ImageOutputStreamImpl extends ImageInputStreamImpl // Do nothing here. } - protected void flushBits() + protected final void flushBits() throws IOException { // FIXME: Implement me. |