From f4f9e8be28142ebb4b85026eef6505055a31b68a Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 3 Sep 2014 13:00:51 +0400
Subject: java-decompiler: cleanups

- better signatures
- accurate suppression
- unused symbols
- typos
---
 .../java/decompiler/util/InterpreterUtil.java      | 23 +++++++++-------------
 1 file changed, 9 insertions(+), 14 deletions(-)

(limited to 'src/org/jetbrains/java/decompiler/util')

diff --git a/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java b/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java
index 89e11c0..cc4e4bd 100644
--- a/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java
+++ b/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java
@@ -25,6 +25,10 @@ import java.util.HashSet;
 import java.util.List;
 
 public class InterpreterUtil {
+  public static final boolean IS_WINDOWS = System.getProperty("os.name", "").startsWith("Windows");
+
+  private static final int CHANNEL_WINDOW_SIZE = IS_WINDOWS ? 64 * 1024 * 1024 - (32 * 1024) : 64 * 1024 * 1024;  // magic number for Windows
+  private static final int BUFFER_SIZE = 16* 1024;
 
   public static void copyFile(File in, File out) throws IOException {
     FileInputStream inStream = new FileInputStream(in);
@@ -33,12 +37,9 @@ public class InterpreterUtil {
       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;
+        long size = inChannel.size(), position = 0;
         while (position < size) {
-          position += inChannel.transferTo(position, maxCount, outChannel);
+          position += inChannel.transferTo(position, CHANNEL_WINDOW_SIZE, outChannel);
         }
       }
       finally {
@@ -50,11 +51,9 @@ public class InterpreterUtil {
     }
   }
 
-  public static void copyInputStream(InputStream in, OutputStream out) throws IOException {
-
-    byte[] buffer = new byte[1024];
+  public static void copyStream(InputStream in, OutputStream out) throws IOException {
+    byte[] buffer = new byte[BUFFER_SIZE];
     int len;
-
     while ((len = in.read(buffer)) >= 0) {
       out.write(buffer, 0, len);
     }
@@ -69,9 +68,7 @@ public class InterpreterUtil {
     return buf.toString();
   }
 
-
   public static boolean equalSets(Collection<?> c1, Collection<?> c2) {
-
     if (c1 == null) {
       return c2 == null;
     }
@@ -93,7 +90,6 @@ public class InterpreterUtil {
   }
 
   public static boolean equalObjectArrays(Object[] first, Object[] second) {
-
     if (first == null || second == null) {
       return equalObjects(first, second);
     }
@@ -113,12 +109,11 @@ public class InterpreterUtil {
   }
 
   public static boolean equalLists(List<?> first, List<?> second) {
-
     if (first == null) {
       return second == null;
     }
     else if (second == null) {
-      return first == null;
+      return false;
     }
 
     if (first.size() == second.size()) {
-- 
cgit v1.2.3