DatagramSocketImpl.java (localPort): Fixed typo to match JDK.

* java/net/DatagramSocketImpl.java (localPort): Fixed typo to match JDK.
	* java/net/natPlainDatagramSocketImpl.cc (bind): ditto.
	* java/text/ChoiceFormat.java (nextDouble(double, boolean)): Method
	is not final per JDK.
	* java/util/PropertyResourceBundle.java (handleGetObject): Method is
	public per JDK.
	* java/util/zip/DataFormatException.java: Class extends Exception.
	* java/util/zip/Deflater.java (finalize): Method is protected per JDK.
	* java/util/zip/ZipEntry.java: Class implements ZipConstants.
	* java/util/zip/ZipInputStream.java: ditto.
	(closeEntry): Changed method name to match JDK spec.

From-SVN: r27717
This commit is contained in:
Warren Levy 1999-06-23 12:24:59 +00:00 committed by Warren Levy
parent 25e1e04927
commit 05dfd09c0c
9 changed files with 26 additions and 12 deletions

View File

@ -1,3 +1,17 @@
1999-06-23 Warren Levy <warrenl@cygnus.com>
* java/net/DatagramSocketImpl.java (localPort): Fixed typo to match JDK.
* java/net/natPlainDatagramSocketImpl.cc (bind): ditto.
* java/text/ChoiceFormat.java (nextDouble(double, boolean)): Method
is not final per JDK.
* java/util/PropertyResourceBundle.java (handleGetObject): Method is
public per JDK.
* java/util/zip/DataFormatException.java: Class extends Exception.
* java/util/zip/Deflater.java (finalize): Method is protected per JDK.
* java/util/zip/ZipEntry.java: Class implements ZipConstants.
* java/util/zip/ZipInputStream.java: ditto.
(closeEntry): Changed method name to match JDK spec.
1999-06-21 Tom Tromey <tromey@cygnus.com> 1999-06-21 Tom Tromey <tromey@cygnus.com>
* java/lang/ieeefp.h (__IEEE_LITTLE_ENDIAN): Define for alpha. * java/lang/ieeefp.h (__IEEE_LITTLE_ENDIAN): Define for alpha.

View File

@ -25,7 +25,7 @@ import java.io.FileDescriptor;
public abstract class DatagramSocketImpl implements SocketOptions public abstract class DatagramSocketImpl implements SocketOptions
{ {
protected int localport; protected int localPort;
protected FileDescriptor fd; protected FileDescriptor fd;
public DatagramSocketImpl() public DatagramSocketImpl()
@ -57,6 +57,6 @@ public abstract class DatagramSocketImpl implements SocketOptions
protected int getLocalPort() protected int getLocalPort()
{ {
return localport; return localPort;
} }
} }

View File

@ -113,9 +113,9 @@ java::net::PlainDatagramSocketImpl::bind (jint lport,
{ {
socklen_t addrlen = sizeof(u); socklen_t addrlen = sizeof(u);
if (lport != 0) if (lport != 0)
localport = lport; localPort = lport;
else if (::getsockname (fnum, (sockaddr*) &u, &addrlen) == 0) else if (::getsockname (fnum, (sockaddr*) &u, &addrlen) == 0)
localport = ntohs (u.address.sin_port); localPort = ntohs (u.address.sin_port);
else else
goto error; goto error;
return; return;

View File

@ -182,7 +182,7 @@ public class ChoiceFormat extends NumberFormat
return nextDouble (d, true); return nextDouble (d, true);
} }
public static final double nextDouble (double d, boolean next) public static double nextDouble (double d, boolean next)
{ {
if (Double.isInfinite(d) || Double.isNaN(d)) if (Double.isInfinite(d) || Double.isNaN(d))
return d; return d;

View File

@ -40,7 +40,7 @@ public class PropertyResourceBundle extends ResourceBundle
parent.getKeys ()); parent.getKeys ());
} }
protected Object handleGetObject (String key) public Object handleGetObject (String key)
{ {
return properties.getProperty(key); return properties.getProperty(key);
} }

View File

@ -19,7 +19,7 @@ package java.util.zip;
* Believed complete and correct. * Believed complete and correct.
*/ */
public class DataFormatException extends java.io.IOException public class DataFormatException extends Exception
{ {
public DataFormatException () public DataFormatException ()
{ {

View File

@ -63,7 +63,7 @@ public class Deflater
public native void end (); public native void end ();
public void finalize () protected void finalize ()
{ {
end (); end ();
} }

View File

@ -19,7 +19,7 @@ package java.util.zip;
* Status: Believed complete and correct. * Status: Believed complete and correct.
*/ */
public class ZipEntry public class ZipEntry implements ZipConstants
{ {
// These values were determined using a simple test program. // These values were determined using a simple test program.
public static final int STORED = 0; public static final int STORED = 0;

View File

@ -26,7 +26,7 @@ import java.io.*;
// we probably should. FIXME. // we probably should. FIXME.
public class ZipInputStream extends InflaterInputStream public class ZipInputStream extends InflaterInputStream implements ZipConstants
{ {
public ZipInputStream (InputStream in) public ZipInputStream (InputStream in)
{ {
@ -36,7 +36,7 @@ public class ZipInputStream extends InflaterInputStream
public ZipEntry getNextEntry () throws IOException public ZipEntry getNextEntry () throws IOException
{ {
if (current != null) if (current != null)
closeZipEntry(); closeEntry();
if (in.read() != 'P' if (in.read() != 'P'
|| in.read() != 'K') || in.read() != 'K')
return null; return null;
@ -184,7 +184,7 @@ public class ZipInputStream extends InflaterInputStream
+ ((byte1 & 0xFF) << 8) + (byte0 & 0xFF); + ((byte1 & 0xFF) << 8) + (byte0 & 0xFF);
} }
public void closeZipEntry () throws IOException public void closeEntry () throws IOException
{ {
if (current != null) if (current != null)
{ {