I'm checking this in.
This is more simple fixes pointed out by the reverse japi page.
I'm trying to flush out the simple ones so that we can more easily
focus on the real bugs. (There are a few of these lurking around.)
Tom
2006-03-15 Tom Tromey <[EMAIL PROTECTED]>
* 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.
Index: java/nio/MappedByteBuffer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/MappedByteBuffer.java,v
retrieving revision 1.13
diff -u -r1.13 MappedByteBuffer.java
--- java/nio/MappedByteBuffer.java 2 Jul 2005 20:32:39 -0000 1.13
+++ java/nio/MappedByteBuffer.java 16 Mar 2006 01:05:28 -0000
@@ -85,7 +85,7 @@
forceImpl();
}
- public void finalize()
+ protected void finalize()
throws Throwable
{
unmapImpl();
Index: java/text/Bidi.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/Bidi.java,v
retrieving revision 1.2
diff -u -r1.2 Bidi.java
--- java/text/Bidi.java 31 Dec 2005 10:45:47 -0000 1.2
+++ java/text/Bidi.java 16 Mar 2006 01:05:29 -0000
@@ -47,7 +47,7 @@
* 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
Index: java/util/zip/Deflater.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/zip/Deflater.java,v
retrieving revision 1.6
diff -u -r1.6 Deflater.java
--- java/util/zip/Deflater.java 2 Jul 2005 20:32:44 -0000 1.6
+++ java/util/zip/Deflater.java 16 Mar 2006 01:05:29 -0000
@@ -221,7 +221,6 @@
* 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()
{
Index: java/util/zip/Inflater.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/zip/Inflater.java,v
retrieving revision 1.8
diff -u -r1.8 Inflater.java
--- java/util/zip/Inflater.java 13 Jul 2005 08:48:28 -0000 1.8
+++ java/util/zip/Inflater.java 16 Mar 2006 01:05:29 -0000
@@ -199,7 +199,6 @@
* 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 ()
{
Index: java/util/zip/ZipConstants.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/zip/ZipConstants.java,v
retrieving revision 1.7
diff -u -r1.7 ZipConstants.java
--- java/util/zip/ZipConstants.java 21 Feb 2006 09:21:53 -0000 1.7
+++ java/util/zip/ZipConstants.java 16 Mar 2006 01:05:29 -0000
@@ -85,9 +85,6 @@
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;
Index: java/util/zip/ZipFile.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/zip/ZipFile.java,v
retrieving revision 1.28
diff -u -r1.28 ZipFile.java
--- java/util/zip/ZipFile.java 15 Feb 2006 09:25:40 -0000 1.28
+++ java/util/zip/ZipFile.java 16 Mar 2006 01:05:29 -0000
@@ -75,6 +75,11 @@
*/
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;
Index: javax/imageio/stream/ImageOutputStream.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/imageio/stream/ImageOutputStream.java,v
retrieving revision 1.4
diff -u -r1.4 ImageOutputStream.java
--- javax/imageio/stream/ImageOutputStream.java 2 Jul 2005 20:32:45 -0000
1.4
+++ javax/imageio/stream/ImageOutputStream.java 16 Mar 2006 01:05:29 -0000
@@ -54,7 +54,7 @@
extends ImageInputStream, DataOutput
{
/**
- * @param postion
+ * @param position
*
* @throws IOException if an errror occurs
*/
Index: javax/imageio/stream/ImageOutputStreamImpl.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/imageio/stream/ImageOutputStreamImpl.java,v
retrieving revision 1.3
diff -u -r1.3 ImageOutputStreamImpl.java
--- javax/imageio/stream/ImageOutputStreamImpl.java 2 Jul 2005 20:32:45
-0000 1.3
+++ javax/imageio/stream/ImageOutputStreamImpl.java 16 Mar 2006 01:05:29
-0000
@@ -52,7 +52,7 @@
// Do nothing here.
}
- protected void flushBits()
+ protected final void flushBits()
throws IOException
{
// FIXME: Implement me.
