* 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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@27717 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 4 insertions, 4 deletions

diff --git a/libjava/java/net/DatagramSocketImpl.java b/libjava/java/net/DatagramSocketImpl.java
index 9ae61cfc129..da4c2cef820 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 ef2a3cbdf88..68259509f10 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;