Source walk/Spring clean/Parameterize/Enhance et.al.

The following were applied during multiple itterations through the source.
 * Parameterize raw types.
 * Mark unused members.
 * Annotate override and deprecated methods.
 * Convert loops to enhance for loop.
 * Remove redundant else statements.
 * Widening collection type references.
 * Optimize code for improved readability.
 * Squash compiler warnings.
 * Identify smells.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/main/javassist/util/proxy/ProxyObjectInputStream.java b/src/main/javassist/util/proxy/ProxyObjectInputStream.java
index 25ae4d20..2992cc95 100644
--- a/src/main/javassist/util/proxy/ProxyObjectInputStream.java
+++ b/src/main/javassist/util/proxy/ProxyObjectInputStream.java
@@ -63,13 +63,14 @@ public class ProxyObjectInputStream extends ObjectInputStream
         }
     }
 
+    @Override
     protected ObjectStreamClass readClassDescriptor() throws IOException, ClassNotFoundException {
         boolean isProxy = readBoolean();
         if (isProxy) {
             String name = (String)readObject();
-            Class superClass = loader.loadClass(name);
+            Class<?> superClass = loader.loadClass(name);
             int length = readInt();
-            Class[] interfaces = new Class[length];
+            Class<?>[] interfaces = new Class[length];
             for (int i = 0; i < length; i++) {
                 name = (String)readObject();
                 interfaces[i] = loader.loadClass(name);
@@ -84,11 +85,10 @@ public class ProxyObjectInputStream extends ObjectInputStream
             factory.setUseWriteReplace(false);
             factory.setSuperclass(superClass);
             factory.setInterfaces(interfaces);
-            Class proxyClass = factory.createClass(signature);
+            Class<?> proxyClass = factory.createClass(signature);
             return ObjectStreamClass.lookup(proxyClass);
-        } else {
-            return super.readClassDescriptor();
         }
+        return super.readClassDescriptor();
     }
 
     /**