diff --git a/build.xml b/build.xml index 17929f4d6e3..456b4189b0d 100644 --- a/build.xml +++ b/build.xml @@ -426,7 +426,7 @@ + depends="init,prepareDist,injectorsGenerator,generateInjectors,compiler,compilerSources,antTools,jdkHeaders,runtime,lang,jslib"/> diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index caa8ddcfc31..25197fa32c1 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -36,10 +36,6 @@ - - - diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ConfigureKotlinLibraryNotificationProvider.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ConfigureKotlinLibraryNotificationProvider.java index 593679c205c..8d0169ece5c 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ConfigureKotlinLibraryNotificationProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ConfigureKotlinLibraryNotificationProvider.java @@ -50,7 +50,6 @@ import com.intellij.ui.EditorNotificationPanel; import com.intellij.ui.EditorNotifications; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.plugin.JetFileType; -import org.jetbrains.jet.plugin.actions.SetUpJsModuleAction; import org.jetbrains.jet.utils.PathUtil; import javax.swing.*; @@ -174,7 +173,7 @@ public class ConfigureKotlinLibraryNotificationProvider implements EditorNotific } private void setUpJSModule(@NotNull Module module) { - SetUpJsModuleAction.doSetUpModule(module.getProject()); + JsModuleSetUp.doSetUpModule(module.getProject()); updateNotifications(); } diff --git a/idea/src/org/jetbrains/jet/plugin/actions/SetUpJsModuleAction.java b/idea/src/org/jetbrains/jet/plugin/quickfix/JsModuleSetUp.java similarity index 91% rename from idea/src/org/jetbrains/jet/plugin/actions/SetUpJsModuleAction.java rename to idea/src/org/jetbrains/jet/plugin/quickfix/JsModuleSetUp.java index 197f10e9cd4..288b75ca6c9 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/SetUpJsModuleAction.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/JsModuleSetUp.java @@ -14,13 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.actions; +package org.jetbrains.jet.plugin.quickfix; import com.intellij.notification.Notification; import com.intellij.notification.NotificationType; import com.intellij.notification.Notifications; -import com.intellij.openapi.actionSystem.AnAction; -import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ModuleRootManager; @@ -40,13 +38,9 @@ import static org.jetbrains.jet.plugin.k2jsrun.K2JSRunnerUtils.copyFileToDir; /** * @author Pavel Talanov */ -public final class SetUpJsModuleAction extends AnAction { - @Override - public void actionPerformed(AnActionEvent event) { - if (event == null) { - return; - } - doSetUpModule(event.getProject()); +public final class JsModuleSetUp { + + private JsModuleSetUp() { } public static void doSetUpModule(@Nullable Project project) {