diff options
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/net/DatagramSocketImpl.java | 4 | ||||
| -rw-r--r-- | libjava/java/net/natPlainDatagramSocketImpl.cc | 4 | ||||
| -rw-r--r-- | libjava/java/text/ChoiceFormat.java | 2 | ||||
| -rw-r--r-- | libjava/java/util/PropertyResourceBundle.java | 2 | ||||
| -rw-r--r-- | libjava/java/util/zip/DataFormatException.java | 2 | ||||
| -rw-r--r-- | libjava/java/util/zip/Deflater.java | 2 | ||||
| -rw-r--r-- | libjava/java/util/zip/ZipEntry.java | 2 | ||||
| -rw-r--r-- | libjava/java/util/zip/ZipInputStream.java | 6 |
8 files changed, 12 insertions, 12 deletions
diff --git a/libjava/java/net/DatagramSocketImpl.java b/libjava/java/net/DatagramSocketImpl.java index 9ae61cf..da4c2ce 100644 --- a/libjava/java/net/DatagramSocketImpl.java +++ b/libjava/java/net/DatagramSocketImpl.java @@ -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; } } diff --git a/libjava/java/net/natPlainDatagramSocketImpl.cc b/libjava/java/net/natPlainDatagramSocketImpl.cc index ef2a3cb..6825950 100644 --- a/libjava/java/net/natPlainDatagramSocketImpl.cc +++ b/libjava/java/net/natPlainDatagramSocketImpl.cc @@ -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; diff --git a/libjava/java/text/ChoiceFormat.java b/libjava/java/text/ChoiceFormat.java index bed62a7..bd0ccab 100644 --- a/libjava/java/text/ChoiceFormat.java +++ b/libjava/java/text/ChoiceFormat.java @@ -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; diff --git a/libjava/java/util/PropertyResourceBundle.java b/libjava/java/util/PropertyResourceBundle.java index 706e427..a1f9900 100644 --- a/libjava/java/util/PropertyResourceBundle.java +++ b/libjava/java/util/PropertyResourceBundle.java @@ -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); } diff --git a/libjava/java/util/zip/DataFormatException.java b/libjava/java/util/zip/DataFormatException.java index 258f47f..9e67b75 100644 --- a/libjava/java/util/zip/DataFormatException.java +++ b/libjava/java/util/zip/DataFormatException.java @@ -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 () { diff --git a/libjava/java/util/zip/Deflater.java b/libjava/java/util/zip/Deflater.java index 3c45b28..202b220 100644 --- a/libjava/java/util/zip/Deflater.java +++ b/libjava/java/util/zip/Deflater.java @@ -63,7 +63,7 @@ public class Deflater public native void end (); - public void finalize () + protected void finalize () { end (); } diff --git a/libjava/java/util/zip/ZipEntry.java b/libjava/java/util/zip/ZipEntry.java index 7035ab5..9bd3c41 100644 --- a/libjava/java/util/zip/ZipEntry.java +++ b/libjava/java/util/zip/ZipEntry.java @@ -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; diff --git a/libjava/java/util/zip/ZipInputStream.java b/libjava/java/util/zip/ZipInputStream.java index 224e785..41b092d 100644 --- a/libjava/java/util/zip/ZipInputStream.java +++ b/libjava/java/util/zip/ZipInputStream.java @@ -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) { |