java-decompiler: post-import cleanup (code style issues)

src/org/jetbrains/java/decompiler/util/DataInputFullStream.java

@@ -25,14 +25,14 @@ public class DataInputFullStream extends DataInputStream {
     super(in);
   }
 
-  public final int readFull(byte b[]) throws IOException {
+  public final int readFull(byte[] b) throws IOException {
 
     int length = b.length;
     byte[] btemp = new byte[length];
     int pos = 0;
 
     int bytes_read = -1;
-    for (; ; ) {
+    while (true) {
       bytes_read = read(btemp, 0, length - pos);
       if (bytes_read == -1) {
         return -1;

src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java

@@ -122,9 +122,7 @@ public class FastSparseSetFactory<E> {
       System.arraycopy(data, 0, cpdata, 0, arrlength);
       System.arraycopy(next, 0, cpnext, 0, arrlength);
 
-      FastSparseSet<E> copy = new FastSparseSet<E>(factory, cpdata, cpnext);
-
-      return copy;
+      return new FastSparseSet<E>(factory, cpdata, cpnext);
     }
 
     private int[] ensureCapacity(int index) {

src/org/jetbrains/java/decompiler/util/InterpreterUtil.java

@@ -27,27 +27,26 @@ import java.util.List;
 public class InterpreterUtil {
 
   public static void copyFile(File in, File out) throws IOException {
-    FileChannel inChannel = new FileInputStream(in).getChannel();
-    FileChannel outChannel = new FileOutputStream(out).getChannel();
+    FileInputStream inStream = new FileInputStream(in);
     try {
-      // magic number for Windows, 64Mb - 32Kb)
-      int maxCount = (64 * 1024 * 1024) - (32 * 1024);
-      long size = inChannel.size();
-      long position = 0;
-      while (position < size) {
-        position += inChannel.transferTo(position, maxCount, outChannel);
+      FileOutputStream outStream = new FileOutputStream(out);
+      try {
+        FileChannel inChannel = inStream.getChannel();
+        FileChannel outChannel = outStream.getChannel();
+        // magic number for Windows, 64Mb - 32Kb)
+        int maxCount = (64 * 1024 * 1024) - (32 * 1024);
+        long size = inChannel.size();
+        long position = 0;
+        while (position < size) {
+          position += inChannel.transferTo(position, maxCount, outChannel);
+        }
+      }
+      finally {
+        outStream.close();
       }
-    }
-    catch (IOException e) {
-      throw e;
     }
     finally {
-      if (inChannel != null) {
-        inChannel.close();
-      }
-      if (outChannel != null) {
-        outChannel.close();
-      }
+      inStream.close();
     }
   }
 
@@ -74,12 +73,10 @@ public class InterpreterUtil {
   public static boolean equalSets(Collection<?> c1, Collection<?> c2) {
 
     if (c1 == null) {
-      return c2 == null ? true : false;
+      return c2 == null;
     }
-    else {
-      if (c2 == null) {
-        return false;
-      }
+    else if (c2 == null) {
+      return false;
     }
 
     if (c1.size() != c2.size()) {

src/org/jetbrains/java/decompiler/util/SFormsFastMap.java

@@ -243,9 +243,9 @@ public class SFormsFastMap<E> {
     return arrnew;
   }
 
-  public static interface IElementsUnion<E> {
-    public E union(E first, E second);
+  public interface IElementsUnion<E> {
+    E union(E first, E second);
 
-    public E copy(E element);
+    E copy(E element);
   }
 }

src/org/jetbrains/java/decompiler/util/SFormsFastMapOld.java

@@ -217,10 +217,10 @@ public class SFormsFastMapOld<E> {
     }
   }
 
-  public static interface IElementsUnion<E> {
-    public E union(E first, E second);
+  public interface IElementsUnion<E> {
+    E union(E first, E second);
 
-    public E copy(E element);
+    E copy(E element);
   }
 
   //	public class SFormsFastMapIterator implements Iterator<Entry<Integer, E>> {

src/org/jetbrains/java/decompiler/util/VBStyleCollection.java

@@ -106,7 +106,7 @@ public class VBStyleCollection<E, K> extends ArrayList<E> {
   }
 
   public void removeWithKey(K key) {
-    int index = ((Integer)map.get(key)).intValue();
+    int index = map.get(key).intValue();
     addToListIndex(index + 1, -1);
     super.remove(index);
     lstKeys.remove(index);