From 8e516441f1294adaa1767dc5816d084902cf2e3b Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 25 Jan 2013 21:06:38 +0400 Subject: [PATCH] Version-related classes moved to the appropriate package --- idea/src/META-INF/plugin.xml | 2 +- .../plugin/quickfix/AbsentJdkAnnotationsNotifications.java | 1 + .../ConfigureKotlinLibraryNotificationProvider.java | 4 ++-- .../{quickfix => versions}/KotlinRuntimeLibraryUtil.java | 7 +++---- .../plugin/versions/OutdatedKotlinRuntimeNotification.java | 1 - 5 files changed, 7 insertions(+), 8 deletions(-) rename idea/src/org/jetbrains/jet/plugin/{quickfix => versions}/ConfigureKotlinLibraryNotificationProvider.java (99%) rename idea/src/org/jetbrains/jet/plugin/{quickfix => versions}/KotlinRuntimeLibraryUtil.java (99%) diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 9934e6e965f..c692cd5c856 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -221,7 +221,7 @@ - + diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AbsentJdkAnnotationsNotifications.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AbsentJdkAnnotationsNotifications.java index 85dfe991c8f..7f588e29fa9 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AbsentJdkAnnotationsNotifications.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AbsentJdkAnnotationsNotifications.java @@ -31,6 +31,7 @@ import com.intellij.ui.EditorNotificationPanel; import com.intellij.ui.EditorNotifications; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.plugin.JetFileType; +import org.jetbrains.jet.plugin.versions.KotlinRuntimeLibraryUtil; public class AbsentJdkAnnotationsNotifications extends EditorNotifications.Provider { private static final Key KEY = Key.create("add.kotlin.jdk.annotations"); diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ConfigureKotlinLibraryNotificationProvider.java b/idea/src/org/jetbrains/jet/plugin/versions/ConfigureKotlinLibraryNotificationProvider.java similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/quickfix/ConfigureKotlinLibraryNotificationProvider.java rename to idea/src/org/jetbrains/jet/plugin/versions/ConfigureKotlinLibraryNotificationProvider.java index 7b7c64902e3..1567a0e3292 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ConfigureKotlinLibraryNotificationProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/versions/ConfigureKotlinLibraryNotificationProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.jet.plugin.versions; import com.intellij.ProjectTopics; import com.intellij.icons.AllIcons; @@ -52,7 +52,7 @@ import com.intellij.util.messages.MessageBusConnection; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.plugin.JetFileType; -import org.jetbrains.jet.plugin.versions.OutdatedKotlinRuntimeNotification; +import org.jetbrains.jet.plugin.quickfix.JsModuleSetUp; import javax.swing.*; import java.awt.*; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/KotlinRuntimeLibraryUtil.java b/idea/src/org/jetbrains/jet/plugin/versions/KotlinRuntimeLibraryUtil.java similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/quickfix/KotlinRuntimeLibraryUtil.java rename to idea/src/org/jetbrains/jet/plugin/versions/KotlinRuntimeLibraryUtil.java index d3c388eb203..88636591f1f 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/KotlinRuntimeLibraryUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/versions/KotlinRuntimeLibraryUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.jet.plugin.versions; import com.google.common.base.Predicate; import com.google.common.collect.Collections2; @@ -47,15 +47,14 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.java.AbiVersionUtil; import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames; -import org.jetbrains.jet.plugin.versions.KotlinAbiVersionIndex; import org.jetbrains.jet.utils.PathUtil; import java.io.File; import java.io.IOException; -import java.util.jar.Attributes; -import java.util.jar.JarFile; import java.util.Collection; import java.util.Set; +import java.util.jar.Attributes; +import java.util.jar.JarFile; import static org.jetbrains.jet.plugin.project.JsModuleDetector.isJsModule; diff --git a/idea/src/org/jetbrains/jet/plugin/versions/OutdatedKotlinRuntimeNotification.java b/idea/src/org/jetbrains/jet/plugin/versions/OutdatedKotlinRuntimeNotification.java index 01cc032275f..dfbdadb0795 100644 --- a/idea/src/org/jetbrains/jet/plugin/versions/OutdatedKotlinRuntimeNotification.java +++ b/idea/src/org/jetbrains/jet/plugin/versions/OutdatedKotlinRuntimeNotification.java @@ -26,7 +26,6 @@ import com.intellij.openapi.ui.Messages; import com.intellij.util.text.VersionComparatorUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.plugin.JetPluginUtil; -import org.jetbrains.jet.plugin.quickfix.KotlinRuntimeLibraryUtil; import javax.swing.event.HyperlinkEvent;