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:
parent
25e1e04927
commit
05dfd09c0c
9 changed files with 26 additions and 12 deletions
|
@ -25,7 +25,7 @@ import java.io.FileDescriptor;
|
|||
|
||||
public abstract class DatagramSocketImpl implements SocketOptions
|
||||
{
|
||||
protected int localport;
|
||||
protected int localPort;
|
||||
protected FileDescriptor fd;
|
||||
|
||||
public DatagramSocketImpl()
|
||||
|
@ -57,6 +57,6 @@ public abstract class DatagramSocketImpl implements SocketOptions
|
|||
|
||||
protected int getLocalPort()
|
||||
{
|
||||
return localport;
|
||||
return localPort;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -113,9 +113,9 @@ java::net::PlainDatagramSocketImpl::bind (jint lport,
|
|||
{
|
||||
socklen_t addrlen = sizeof(u);
|
||||
if (lport != 0)
|
||||
localport = lport;
|
||||
localPort = lport;
|
||||
else if (::getsockname (fnum, (sockaddr*) &u, &addrlen) == 0)
|
||||
localport = ntohs (u.address.sin_port);
|
||||
localPort = ntohs (u.address.sin_port);
|
||||
else
|
||||
goto error;
|
||||
return;
|
||||
|
|
|
@ -182,7 +182,7 @@ public class ChoiceFormat extends NumberFormat
|
|||
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))
|
||||
return d;
|
||||
|
|
|
@ -40,7 +40,7 @@ public class PropertyResourceBundle extends ResourceBundle
|
|||
parent.getKeys ());
|
||||
}
|
||||
|
||||
protected Object handleGetObject (String key)
|
||||
public Object handleGetObject (String key)
|
||||
{
|
||||
return properties.getProperty(key);
|
||||
}
|
||||
|
|
|
@ -19,7 +19,7 @@ package java.util.zip;
|
|||
* Believed complete and correct.
|
||||
*/
|
||||
|
||||
public class DataFormatException extends java.io.IOException
|
||||
public class DataFormatException extends Exception
|
||||
{
|
||||
public DataFormatException ()
|
||||
{
|
||||
|
|
|
@ -63,7 +63,7 @@ public class Deflater
|
|||
|
||||
public native void end ();
|
||||
|
||||
public void finalize ()
|
||||
protected void finalize ()
|
||||
{
|
||||
end ();
|
||||
}
|
||||
|
|
|
@ -19,7 +19,7 @@ package java.util.zip;
|
|||
* Status: Believed complete and correct.
|
||||
*/
|
||||
|
||||
public class ZipEntry
|
||||
public class ZipEntry implements ZipConstants
|
||||
{
|
||||
// These values were determined using a simple test program.
|
||||
public static final int STORED = 0;
|
||||
|
|
|
@ -26,7 +26,7 @@ import java.io.*;
|
|||
// we probably should. FIXME.
|
||||
|
||||
|
||||
public class ZipInputStream extends InflaterInputStream
|
||||
public class ZipInputStream extends InflaterInputStream implements ZipConstants
|
||||
{
|
||||
public ZipInputStream (InputStream in)
|
||||
{
|
||||
|
@ -36,7 +36,7 @@ public class ZipInputStream extends InflaterInputStream
|
|||
public ZipEntry getNextEntry () throws IOException
|
||||
{
|
||||
if (current != null)
|
||||
closeZipEntry();
|
||||
closeEntry();
|
||||
if (in.read() != 'P'
|
||||
|| in.read() != 'K')
|
||||
return null;
|
||||
|
@ -184,7 +184,7 @@ public class ZipInputStream extends InflaterInputStream
|
|||
+ ((byte1 & 0xFF) << 8) + (byte0 & 0xFF);
|
||||
}
|
||||
|
||||
public void closeZipEntry () throws IOException
|
||||
public void closeEntry () throws IOException
|
||||
{
|
||||
if (current != null)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue