* 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

5 files changed, 7 insertions, 7 deletions

diff --git a/libjava/java/util/PropertyResourceBundle.java b/libjava/java/util/PropertyResourceBundle.java
index 706e4279443..a1f99002265 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 258f47f16a3..9e67b753650 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 3c45b285544..202b2203de1 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 7035ab50074..9bd3c41a9ab 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 224e7859cfc..41b092d8133 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)
       {