From c7e7e3b3f077642db11f11a1c587ad36ab212ad3 Mon Sep 17 00:00:00 2001
From: Alexey Andreev <Alexey.Andreev@jetbrains.com>
Date: Tue, 20 Nov 2018 15:21:55 +0300
Subject: [PATCH] Fix IDEA plugin build

---
 .../teavm/idea/jps/util/ExceptionUtil.java    | 32 -------------------
 .../java/org/teavm/idea/jps/TeaVMBuilder.java |  4 +--
 .../main/java/org/teavm/idea}/DaemonUtil.java |  2 +-
 .../org/teavm/idea/TeaVMDaemonComponent.java  |  1 -
 4 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 tools/idea/jps-common/src/main/java/org/teavm/idea/jps/util/ExceptionUtil.java
 rename tools/idea/{jps-common/src/main/java/org/teavm/idea/jps/util => plugin/src/main/java/org/teavm/idea}/DaemonUtil.java (98%)

diff --git a/tools/idea/jps-common/src/main/java/org/teavm/idea/jps/util/ExceptionUtil.java b/tools/idea/jps-common/src/main/java/org/teavm/idea/jps/util/ExceptionUtil.java
deleted file mode 100644
index f6921ca59..000000000
--- a/tools/idea/jps-common/src/main/java/org/teavm/idea/jps/util/ExceptionUtil.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  Copyright 2017 Alexey Andreev.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.teavm.idea.jps.util;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-public final class ExceptionUtil {
-    private ExceptionUtil() {
-    }
-
-    public static String exceptionToString(Throwable e) {
-        StringWriter writer = new StringWriter();
-        PrintWriter output = new PrintWriter(writer);
-        e.printStackTrace(output);
-        output.close();
-        return writer.toString();
-    }
-}
diff --git a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilder.java b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilder.java
index 93cb72158..a38e4b626 100644
--- a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilder.java
+++ b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilder.java
@@ -81,9 +81,9 @@ public class TeaVMBuilder extends TargetBuilder<BuildRootDescriptor, TeaVMBuildT
 
             build.perform(target.getModule(), target);
         } catch (BuildException e) {
-            context.processMessage(CompilerMessage.createInternalBuilderError("TeaVM", e.getCause()));
+            context.processMessage(new CompilerMessage("TeaVM", e.getCause()));
         } catch (Exception e) {
-            context.processMessage(CompilerMessage.createInternalBuilderError("TeaVM", e));
+            context.processMessage(new CompilerMessage("TeaVM", e));
         }
     }
 
diff --git a/tools/idea/jps-common/src/main/java/org/teavm/idea/jps/util/DaemonUtil.java b/tools/idea/plugin/src/main/java/org/teavm/idea/DaemonUtil.java
similarity index 98%
rename from tools/idea/jps-common/src/main/java/org/teavm/idea/jps/util/DaemonUtil.java
rename to tools/idea/plugin/src/main/java/org/teavm/idea/DaemonUtil.java
index 0b4b41da8..78cc05ab7 100644
--- a/tools/idea/jps-common/src/main/java/org/teavm/idea/jps/util/DaemonUtil.java
+++ b/tools/idea/plugin/src/main/java/org/teavm/idea/DaemonUtil.java
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.teavm.idea.jps.util;
+package org.teavm.idea;
 
 import com.intellij.ide.plugins.IdeaPluginDescriptor;
 import com.intellij.ide.plugins.PluginManager;
diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMDaemonComponent.java b/tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMDaemonComponent.java
index 99373dfbb..3cb43053f 100644
--- a/tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMDaemonComponent.java
+++ b/tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMDaemonComponent.java
@@ -22,7 +22,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jetbrains.annotations.NotNull;
 import org.teavm.idea.jps.model.TeaVMJpsWorkspaceConfiguration;
-import org.teavm.idea.jps.util.DaemonUtil;
 import org.teavm.tooling.daemon.BuildDaemon;
 import org.teavm.tooling.daemon.DaemonInfo;
 import org.teavm.tooling.daemon.DaemonLog;