Fixed Java warnings reported by Eclipse, fixes #541

13 files changed, 7 insertions, 48 deletions

diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/InputStream.java b/java/src/Ice/src/main/java/com/zeroc/Ice/InputStream.java
index c2f1c6eb9ab..0cc6c481dbd 100644
--- a/java/src/Ice/src/main/java/com/zeroc/Ice/InputStream.java
+++ b/java/src/Ice/src/main/java/com/zeroc/Ice/InputStream.java
@@ -1679,7 +1679,6 @@ public class InputStream
     }
 
     final static java.nio.charset.Charset _utf8 = java.nio.charset.Charset.forName("UTF8");
-    private java.nio.charset.CharsetEncoder _charEncoder = null;
 
     /**
      * Extracts a string from the stream.
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/Util.java b/java/src/Ice/src/main/java/com/zeroc/Ice/Util.java
index 7434c876725..87923196f2a 100644
--- a/java/src/Ice/src/main/java/com/zeroc/Ice/Util.java
+++ b/java/src/Ice/src/main/java/com/zeroc/Ice/Util.java
@@ -619,14 +619,13 @@ public final class Util
      * @param <T> The result type.
      * @return The InvocationFuture object.
      **/
-    @SuppressWarnings("unchecked")
     static public <T> InvocationFuture<T> getInvocationFuture(java.util.concurrent.CompletableFuture<T> f)
     {
         if(!(f instanceof InvocationFuture))
         {
             throw new IllegalArgumentException("future did not originate from an asynchronous proxy invocation");
         }
-        return (InvocationFuture)f;
+        return (InvocationFuture<T>)f;
     }
 
     /**
@@ -643,7 +642,6 @@ public final class Util
         }
 
         StringBuilder buf = new StringBuilder(id.length());
-        String pkg = null;
         for(int i = 0; i < _iceTypeIdPrefixes.length; ++i)
         {
             if(id.startsWith(_iceTypeIdPrefixes[i]))
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointHostResolver.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointHostResolver.java
index 0c61ae34a9d..a862b70257c 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointHostResolver.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/EndpointHostResolver.java
@@ -95,7 +95,7 @@ class EndpointHostResolver
                     }
 
                     java.util.List<java.net.InetSocketAddress> addresses =
-                        Network.getAddresses(host, port, _protocol, selType, _preferIPv6, true);
+                        Network.getAddresses(host, port, protocol, selType, _preferIPv6, true);
 
                     if(obsv != null)
                     {
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutgoingAsync.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutgoingAsync.java
index d6b38bf121d..0bb88d24bf4 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutgoingAsync.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/OutgoingAsync.java
@@ -5,7 +5,6 @@
 package com.zeroc.IceInternal;
 
 import com.zeroc.Ice.FormatType;
-import com.zeroc.Ice.InputStream;
 import com.zeroc.Ice._ObjectPrxI;
 import com.zeroc.Ice.OperationInterruptedException;
 import com.zeroc.Ice.OperationMode;
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyIceInvoke.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyIceInvoke.java
index 62d1b81c5f3..ce786b67afa 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyIceInvoke.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyIceInvoke.java
@@ -4,14 +4,6 @@
 
 package com.zeroc.IceInternal;
 
-import com.zeroc.Ice.FormatType;
-import com.zeroc.Ice.InputStream;
-import com.zeroc.Ice.OperationInterruptedException;
-import com.zeroc.Ice.OutputStream;
-import com.zeroc.Ice.UserException;
-import com.zeroc.Ice.UnknownException;
-import com.zeroc.Ice.UnknownUserException;
-
 public class ProxyIceInvoke extends ProxyOutgoingAsyncBaseI<com.zeroc.Ice.Object.Ice_invokeResult>
 {
     public ProxyIceInvoke(com.zeroc.Ice.ObjectPrx prx, String operation, com.zeroc.Ice.OperationMode mode,
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPool.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPool.java
index 9f45dec5505..11586a9c647 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPool.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPool.java
@@ -76,8 +76,6 @@ public final class ThreadPool implements java.util.concurrent.Executor
         }
     }
 
-    private static ThreadPoolWorkItem _interruptWorkItem = new InterruptWorkItem();
-
     //
     // Exception raised by the thread pool work queue when the thread pool is destroyed.
     //
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPoolWorkQueue.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPoolWorkQueue.java
index 07d56b83d72..3cdda5de0f4 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPoolWorkQueue.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPoolWorkQueue.java
@@ -4,8 +4,6 @@
 
 package com.zeroc.IceInternal;
 
-import java.util.List;
-
 final class ThreadPoolWorkQueue extends EventHandler
 {
     ThreadPoolWorkQueue(Instance instance, ThreadPool threadPool, Selector selector)
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpMulticastServerTransceiver.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpMulticastServerTransceiver.java
index 345c3bc0ca2..447eb4df935 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpMulticastServerTransceiver.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/UdpMulticastServerTransceiver.java
@@ -385,7 +385,6 @@ final class UdpMulticastServerTransceiver implements Transceiver
             while(true)
             {
                 MulticastSocket socket;
-                int size;
                 Buffer buf = null;
 
                 synchronized(this)
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/Util.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/Util.java
index 818d114b8c2..d90890ea7a8 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/Util.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/Util.java
@@ -224,29 +224,6 @@ public final class Util
         return java.lang.Thread.NORM_PRIORITY;
     }
 
-    private static String fixKwd(String name)
-    {
-        //
-        // Keyword list. *Must* be kept in alphabetical order. Note that checkedCast and uncheckedCast
-        // are not Java keywords, but are in this list to prevent illegal code being generated if
-        // someone defines Slice operations with that name.
-        //
-        final String[] keywordList =
-        {
-            "abstract", "assert", "boolean", "break", "byte", "case", "catch",
-            "char", "checkedCast", "class", "clone", "const", "continue", "default", "do",
-            "double", "else", "enum", "equals", "extends", "false", "final", "finalize",
-            "finally", "float", "for", "getClass", "goto", "hashCode", "if",
-            "implements", "import", "instanceof", "int", "interface", "long",
-            "native", "new", "notify", "notifyAll", "null", "package", "private",
-            "protected", "public", "return", "short", "static", "strictfp", "super", "switch",
-            "synchronized", "this", "throw", "throws", "toString", "transient",
-            "true", "try", "uncheckedCast", "void", "volatile", "wait", "while"
-        };
-        boolean found =  java.util.Arrays.binarySearch(keywordList, name) >= 0;
-        return found ? "_" + name : name;
-    }
-
     //
     // Return true if we're running on Android.
     //
diff --git a/java/src/IceBT/src/main/java/com/zeroc/IceBT/ConnectorI.java b/java/src/IceBT/src/main/java/com/zeroc/IceBT/ConnectorI.java
index ebe2e3e267e..32208546946 100644
--- a/java/src/IceBT/src/main/java/com/zeroc/IceBT/ConnectorI.java
+++ b/java/src/IceBT/src/main/java/com/zeroc/IceBT/ConnectorI.java
@@ -7,9 +7,6 @@ package com.zeroc.IceBT;
 import com.zeroc.IceInternal.Connector;
 import com.zeroc.IceInternal.HashUtil;
 import com.zeroc.IceInternal.Transceiver;
-import com.zeroc.Ice.SocketException;
-
-import java.util.UUID;
 
 final class ConnectorI implements Connector
 {
diff --git a/java/src/IceBT/src/main/java/com/zeroc/IceBT/EndpointI.java b/java/src/IceBT/src/main/java/com/zeroc/IceBT/EndpointI.java
index cf485a1fa44..f31bfda679b 100644
--- a/java/src/IceBT/src/main/java/com/zeroc/IceBT/EndpointI.java
+++ b/java/src/IceBT/src/main/java/com/zeroc/IceBT/EndpointI.java
@@ -12,7 +12,6 @@ import com.zeroc.IceInternal.Transceiver;
 import com.zeroc.Ice.EndpointParseException;
 import com.zeroc.Ice.EndpointSelectionType;
 import com.zeroc.Ice.InputStream;
-import com.zeroc.Ice.MarshalException;
 import com.zeroc.Ice.OutputStream;
 
 import android.bluetooth.BluetoothAdapter;
diff --git a/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/ConnectorI.java b/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/ConnectorI.java
index 410646a8962..8e95cfc62ad 100644
--- a/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/ConnectorI.java
+++ b/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/ConnectorI.java
@@ -4,8 +4,6 @@
 
 package com.zeroc.IceSSL;
 
-import com.zeroc.IceInternal.Network;
-
 final class ConnectorI implements com.zeroc.IceInternal.Connector
 {
     @Override
diff --git a/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/TransceiverI.java b/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/TransceiverI.java
index 632b88b494f..4b9e201dead 100644
--- a/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/TransceiverI.java
+++ b/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/TransceiverI.java
@@ -394,6 +394,11 @@ final class TransceiverI implements com.zeroc.IceInternal.Transceiver
                     {
                         break;
                     }
+                    default: // 1.9 introduced NEEDS_UNWRAP_AGAIN for DTLS
+                    {
+                        assert(false);
+                        break;
+                    }
                     }
                     break;
                 }