ExceptionUtils rewritten in Kotlin

compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java

@@ -42,7 +42,7 @@ import org.jetbrains.jet.config.CommonConfigurationKeys;
 import org.jetbrains.jet.config.CompilerConfiguration;
 import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
 import org.jetbrains.jet.lang.resolve.name.FqName;
-import org.jetbrains.jet.utils.ExceptionUtils;
+import org.jetbrains.jet.utils.UtilsPackage;
 import org.jetbrains.jet.utils.KotlinPaths;
 import org.jetbrains.jet.utils.PathUtil;
 
@@ -206,10 +206,10 @@ public class CompileEnvironmentUtil {
             throw new CompileEnvironmentException("Invalid jar path " + jarPath, e);
         }
         catch (IOException e) {
-            throw ExceptionUtils.rethrow(e);
+            throw UtilsPackage.rethrow(e);
         }
         finally {
-            ExceptionUtils.closeQuietly(outputStream);
+            UtilsPackage.closeQuietly(outputStream);
         }
     }
 

compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplFromTerminal.java

@@ -22,7 +22,7 @@ import jline.console.ConsoleReader;
 import jline.console.history.FileHistory;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.config.CompilerConfiguration;
-import org.jetbrains.jet.utils.ExceptionUtils;
+import org.jetbrains.jet.utils.UtilsPackage;
 
 import java.io.File;
 import java.io.PrintWriter;
@@ -59,7 +59,7 @@ public class ReplFromTerminal {
             consoleReader.setHistoryEnabled(true);
             consoleReader.setHistory(new FileHistory(new File(new File(System.getProperty("user.home")), ".kotlin_history")));
         } catch (Exception e) {
-            throw ExceptionUtils.rethrow(e);
+            throw UtilsPackage.rethrow(e);
         }
     }
 
@@ -72,13 +72,13 @@ public class ReplFromTerminal {
                 try {
                     waitRepl.wait();
                 } catch (Throwable e) {
-                    throw ExceptionUtils.rethrow(e);
+                    throw UtilsPackage.rethrow(e);
                 }
             }
             if (replInterpreter != null) {
                 return replInterpreter;
             }
-            throw ExceptionUtils.rethrow(replInitializationFailed);
+            throw UtilsPackage.rethrow(replInitializationFailed);
         }
     }
 
@@ -94,7 +94,7 @@ public class ReplFromTerminal {
                 }
             }
         } catch (Exception e) {
-            throw ExceptionUtils.rethrow(e);
+            throw UtilsPackage.rethrow(e);
         } finally {
             try {
                 ((FileHistory) consoleReader.getHistory()).flush();
@@ -132,7 +132,7 @@ public class ReplFromTerminal {
             }
         }
         catch (Exception e) {
-            throw ExceptionUtils.rethrow(e);
+            throw UtilsPackage.rethrow(e);
         }
     }
 

compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java

@@ -60,7 +60,7 @@ import org.jetbrains.jet.lang.types.lang.InlineUtil;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 import org.jetbrains.jet.plugin.JetLanguage;
 import org.jetbrains.jet.storage.LockBasedStorageManager;
-import org.jetbrains.jet.utils.ExceptionUtils;
+import org.jetbrains.jet.utils.UtilsPackage;
 
 import java.io.File;
 import java.io.PrintWriter;
@@ -119,7 +119,7 @@ public class ReplInterpreter {
                 classpath.add(file.toURI().toURL());
             }
             catch (MalformedURLException e) {
-                throw ExceptionUtils.rethrow(e);
+                throw UtilsPackage.rethrow(e);
             }
         }
 
@@ -281,7 +281,7 @@ public class ReplInterpreter {
             PrintWriter writer = new PrintWriter(System.err);
             classLoader.dumpClasses(writer);
             writer.flush();
-            throw ExceptionUtils.rethrow(e);
+            throw UtilsPackage.rethrow(e);
         }
     }
 

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClass.java

@@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.storage.NotNullLazyValue;
 import org.jetbrains.jet.storage.NullableLazyValue;
 import org.jetbrains.jet.storage.StorageManager;
-import org.jetbrains.jet.utils.ExceptionUtils;
+import org.jetbrains.jet.utils.UtilsPackage;
 
 import java.io.IOException;
 
@@ -81,7 +81,7 @@ public class VirtualFileKotlinClass implements KotlinJvmBinaryClass {
             }, SKIP_CODE | SKIP_DEBUG | SKIP_FRAMES);
         }
         catch (IOException e) {
-            throw ExceptionUtils.rethrow(e);
+            throw UtilsPackage.rethrow(e);
         }
         return classNameRef.get();
     }
@@ -113,7 +113,7 @@ public class VirtualFileKotlinClass implements KotlinJvmBinaryClass {
             }, SKIP_CODE | SKIP_DEBUG | SKIP_FRAMES);
         }
         catch (IOException e) {
-            throw ExceptionUtils.rethrow(e);
+            throw UtilsPackage.rethrow(e);
         }
     }
 
@@ -197,7 +197,7 @@ public class VirtualFileKotlinClass implements KotlinJvmBinaryClass {
             }, SKIP_CODE | SKIP_DEBUG | SKIP_FRAMES);
         }
         catch (IOException e) {
-            throw ExceptionUtils.rethrow(e);
+            throw UtilsPackage.rethrow(e);
         }
     }
 

compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassData.java

@@ -18,7 +18,7 @@ package org.jetbrains.jet.descriptors.serialization;
 
 import com.google.protobuf.ExtensionRegistryLite;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.utils.ExceptionUtils;
+import org.jetbrains.jet.utils.UtilsPackage;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -34,7 +34,7 @@ public final class ClassData {
             return new ClassData(nameResolver, classProto);
         }
         catch (IOException e) {
-            throw ExceptionUtils.rethrow(e);
+            throw UtilsPackage.rethrow(e);
         }
     }
 
@@ -66,7 +66,7 @@ public final class ClassData {
             return result.toByteArray();
         }
         catch (IOException e) {
-            throw ExceptionUtils.rethrow(e);
+            throw UtilsPackage.rethrow(e);
         }
     }
 }

compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameSerializationUtil.java

@@ -17,7 +17,7 @@
 package org.jetbrains.jet.descriptors.serialization;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.utils.ExceptionUtils;
+import org.jetbrains.jet.utils.UtilsPackage;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -35,7 +35,7 @@ public class NameSerializationUtil {
             return new NameResolver(simpleNames, qualifiedNames);
         }
         catch (IOException e) {
-            throw ExceptionUtils.rethrow(e);
+            throw UtilsPackage.rethrow(e);
         }
     }
 
@@ -57,7 +57,7 @@ public class NameSerializationUtil {
             qualifiedNameTable.writeDelimitedTo(out);
         }
         catch (IOException e) {
-            throw ExceptionUtils.rethrow(e);
+            throw UtilsPackage.rethrow(e);
         }
     }
 

compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/PackageData.java

@@ -18,7 +18,7 @@ package org.jetbrains.jet.descriptors.serialization;
 
 import com.google.protobuf.ExtensionRegistryLite;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.utils.ExceptionUtils;
+import org.jetbrains.jet.utils.UtilsPackage;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -34,7 +34,7 @@ public final class PackageData {
             return new PackageData(nameResolver, packageProto);
         }
         catch (IOException e) {
-            throw ExceptionUtils.rethrow(e);
+            throw UtilsPackage.rethrow(e);
         }
     }
 
@@ -66,7 +66,7 @@ public final class PackageData {
             return result.toByteArray();
         }
         catch (IOException e) {
-            throw ExceptionUtils.rethrow(e);
+            throw UtilsPackage.rethrow(e);
         }
     }
 }

compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java

@@ -41,7 +41,7 @@ import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
 import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
-import org.jetbrains.jet.utils.ExceptionUtils;
+import org.jetbrains.jet.utils.UtilsPackage;
 import org.jetbrains.jet.utils.KotlinVfsUtil;
 
 import java.io.File;
@@ -97,7 +97,7 @@ public class LightClassUtil {
                                    FileUtil.toSystemIndependentName(BUILT_INS_SRC_DIR.getAbsolutePath()));
                 }
                 catch (MalformedURLException e) {
-                    throw ExceptionUtils.rethrow(e);
+                    throw UtilsPackage.rethrow(e);
                 }
             }
 

compiler/tests/org/jetbrains/jet/MockLibraryUtil.java

@@ -20,7 +20,7 @@ import com.intellij.util.io.ZipUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.cli.common.ExitCode;
 import org.jetbrains.jet.cli.jvm.K2JVMCompiler;
-import org.jetbrains.jet.utils.ExceptionUtils;
+import org.jetbrains.jet.utils.UtilsPackage;
 import org.jetbrains.jet.utils.PathUtil;
 
 import java.io.*;
@@ -53,7 +53,7 @@ public class MockLibraryUtil {
             return jarFile;
         }
         catch (IOException e) {
-            throw ExceptionUtils.rethrow(e);
+            throw UtilsPackage.rethrow(e);
         }
     }
 
@@ -73,7 +73,7 @@ public class MockLibraryUtil {
             assertEquals(new String(outStream.toByteArray()), ExitCode.OK.name(), invocationResult.name());
         }
         catch (Throwable e) {
-            throw ExceptionUtils.rethrow(e);
+            throw UtilsPackage.rethrow(e);
         }
     }
 

compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java

@@ -39,7 +39,7 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
 import org.jetbrains.jet.lang.diagnostics.*;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.BindingContext;
-import org.jetbrains.jet.utils.ExceptionUtils;
+import org.jetbrains.jet.utils.UtilsPackage;
 import org.junit.Assert;
 
 import java.io.File;
@@ -85,7 +85,7 @@ public abstract class BaseDiagnosticsTest extends JetLiteFixture {
             JetTestUtils.mkdirs(javaFilesDir);
         }
         catch (IOException e) {
-            throw ExceptionUtils.rethrow(e);
+            throw UtilsPackage.rethrow(e);
         }
         return javaFilesDir;
     }
@@ -97,7 +97,7 @@ public abstract class BaseDiagnosticsTest extends JetLiteFixture {
             Files.write(content, javaFile, Charset.forName("utf-8"));
             return true;
         } catch (Exception e) {
-            throw ExceptionUtils.rethrow(e);
+            throw UtilsPackage.rethrow(e);
         }
     }
 

compiler/tests/org/jetbrains/jet/cli/CliBaseTest.java

@@ -28,7 +28,7 @@ import org.jetbrains.jet.cli.common.ExitCode;
 import org.jetbrains.jet.cli.js.K2JSCompiler;
 import org.jetbrains.jet.cli.jvm.K2JVMCompiler;
 import org.jetbrains.jet.test.Tmpdir;
-import org.jetbrains.jet.utils.ExceptionUtils;
+import org.jetbrains.jet.utils.UtilsPackage;
 import org.junit.Rule;
 import org.junit.rules.TestName;
 
@@ -54,7 +54,7 @@ public class CliBaseTest {
             return Pair.create(bytes.toString("utf-8"), exitCode);
         }
         catch (Exception e) {
-            throw ExceptionUtils.rethrow(e);
+            throw UtilsPackage.rethrow(e);
         }
         finally {
             System.setOut(origOut);

compiler/tests/org/jetbrains/jet/codegen/AbstractBytecodeTextTest.java

@@ -20,7 +20,7 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.ConfigurationKind;
-import org.jetbrains.jet.utils.ExceptionUtils;
+import org.jetbrains.jet.utils.UtilsPackage;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -54,7 +54,7 @@ public abstract class AbstractBytecodeTextTest extends CodegenTestCase {
         }
         catch (Throwable e) {
             System.out.println(text);
-            ExceptionUtils.rethrow(e);
+            UtilsPackage.rethrow(e);
         }
     }
 

compiler/tests/org/jetbrains/jet/codegen/CodegenTestUtil.java

@@ -32,7 +32,7 @@ import org.jetbrains.jet.config.CompilerConfiguration;
 import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
 import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
 import org.jetbrains.jet.lang.types.lang.InlineUtil;
-import org.jetbrains.jet.utils.ExceptionUtils;
+import org.jetbrains.jet.utils.UtilsPackage;
 
 import java.io.File;
 import java.io.IOException;
@@ -115,7 +115,7 @@ public class CodegenTestUtil {
             return javaClassesTempDirectory;
         }
         catch (IOException e) {
-            throw ExceptionUtils.rethrow(e);
+            throw UtilsPackage.rethrow(e);
         }
     }
 

compiler/tests/org/jetbrains/jet/codegen/LineNumberTest.java

@@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.test.TestCaseWithTmpdir;
-import org.jetbrains.jet.utils.ExceptionUtils;
+import org.jetbrains.jet.utils.UtilsPackage;
 
 import java.io.File;
 import java.io.IOException;
@@ -80,7 +80,7 @@ public class LineNumberTest extends TestCaseWithTmpdir {
             text = FileUtil.loadFile(file);
         }
         catch (IOException e) {
-            throw ExceptionUtils.rethrow(e);
+            throw UtilsPackage.rethrow(e);
         }
 
         return JetTestUtils.createFile(file.getName(), text, environment.getProject());
@@ -121,7 +121,7 @@ public class LineNumberTest extends TestCaseWithTmpdir {
             }
             catch (Throwable e) {
                 System.out.println(factory.createText());
-                throw ExceptionUtils.rethrow(e);
+                throw UtilsPackage.rethrow(e);
             }
         }
 

compiler/tests/org/jetbrains/jet/codegen/ScriptGenTest.java

@@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.parsing.JetScriptDefinition;
 import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider;
 import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter;
 import org.jetbrains.jet.lang.resolve.ScriptNameUtil;
-import org.jetbrains.jet.utils.ExceptionUtils;
+import org.jetbrains.jet.utils.UtilsPackage;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
@@ -81,7 +81,7 @@ public class ScriptGenTest extends CodegenTestCase {
         }
         catch (Throwable e) {
             System.out.println(generateToText());
-            throw ExceptionUtils.rethrow(e);
+            throw UtilsPackage.rethrow(e);
         }
     }
 

compiler/tests/org/jetbrains/jet/codegen/generated/AbstractBlackBoxCodegenTest.java

@@ -26,7 +26,7 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
 import org.jetbrains.jet.codegen.CodegenTestCase;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.psi.JetPsiUtil;
-import org.jetbrains.jet.utils.ExceptionUtils;
+import org.jetbrains.jet.utils.UtilsPackage;
 
 import java.io.File;
 import java.lang.reflect.Method;
@@ -102,7 +102,7 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase {
         }
         catch (Throwable e) {
             System.out.println(generateToText());
-            throw ExceptionUtils.rethrow(e);
+            throw UtilsPackage.rethrow(e);
         }
     }
 }

compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java

@@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
 import org.jetbrains.jet.test.TestCaseWithTmpdir;
 import org.jetbrains.jet.test.util.DescriptorValidator;
 import org.jetbrains.jet.test.util.RecursiveDescriptorComparator;
-import org.jetbrains.jet.utils.ExceptionUtils;
+import org.jetbrains.jet.utils.UtilsPackage;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -129,7 +129,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir {
             return outputFile;
         }
         catch (IOException e) {
-            throw ExceptionUtils.rethrow(e);
+            throw UtilsPackage.rethrow(e);
         }
     }
 

compiler/tests/org/jetbrains/jet/test/Tmpdir.java

@@ -20,7 +20,7 @@ import com.google.common.io.Files;
 import com.intellij.openapi.util.io.FileUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.JetTestUtils;
-import org.jetbrains.jet.utils.ExceptionUtils;
+import org.jetbrains.jet.utils.UtilsPackage;
 import org.junit.rules.TestWatcher;
 import org.junit.runner.Description;
 
@@ -37,7 +37,7 @@ public class Tmpdir extends TestWatcher {
             tmpDir = Files.createTempDir().getCanonicalFile();
         }
         catch (IOException e) {
-            throw ExceptionUtils.rethrow(e);
+            throw UtilsPackage.rethrow(e);
         }
     }