diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 27f9f17ac9f..0729eec2713 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -6,7 +6,7 @@
@snapshot@
JetBrains Inc.
-
+
JUnit
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AbsentJdkAnnotationsNotifications.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AbsentJdkAnnotationsNotifications.java
index 56e80d4df8f..7fc726d8c60 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/AbsentJdkAnnotationsNotifications.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AbsentJdkAnnotationsNotifications.java
@@ -17,6 +17,7 @@
package org.jetbrains.jet.plugin.quickfix;
import com.intellij.openapi.compiler.CompilerManager;
+import com.intellij.openapi.fileEditor.FileEditor;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtil;
import com.intellij.openapi.project.Project;
@@ -35,7 +36,7 @@ import org.jetbrains.jet.plugin.JetFileType;
* @author Evgeny Gerashchenko
* @since 7/22/12
*/
-public class AbsentJdkAnnotationsNotifications implements EditorNotifications.Provider {
+public class AbsentJdkAnnotationsNotifications extends EditorNotifications.Provider {
private static final Key KEY = Key.create("add.kotlin.jdk.annotations");
private final Project project;
@@ -46,7 +47,7 @@ public class AbsentJdkAnnotationsNotifications implements EditorNotifications.Pr
@Override
@Nullable
- public EditorNotificationPanel createNotificationPanel(VirtualFile file) {
+ public EditorNotificationPanel createNotificationPanel(VirtualFile file, FileEditor fileEditor) {
if (file.getFileType() != JetFileType.INSTANCE) return null;
if (CompilerManager.getInstance(project).isExcludedFromCompilation(file)) return null;
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ConfigureKotlinLibraryNotificationProvider.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ConfigureKotlinLibraryNotificationProvider.java
index 840bd74de1a..85848e0c4f9 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ConfigureKotlinLibraryNotificationProvider.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ConfigureKotlinLibraryNotificationProvider.java
@@ -25,6 +25,7 @@ import com.intellij.openapi.fileChooser.FileChooserDescriptor;
import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
import com.intellij.openapi.fileChooser.FileChooserFactory;
import com.intellij.openapi.fileChooser.FileTextField;
+import com.intellij.openapi.fileEditor.FileEditor;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtilCore;
import com.intellij.openapi.progress.ProcessCanceledException;
@@ -55,6 +56,7 @@ import com.intellij.ui.EditorNotificationPanel;
import com.intellij.ui.EditorNotifications;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
import org.jetbrains.jet.plugin.JetFileType;
import org.jetbrains.jet.utils.PathUtil;
@@ -65,8 +67,7 @@ import java.io.IOException;
import static org.jetbrains.jet.plugin.project.JsModuleDetector.isJsModule;
-// TODO change "implements" to "extends" on updating to IDEA 122.598+
-public class ConfigureKotlinLibraryNotificationProvider implements EditorNotifications.Provider {
+public class ConfigureKotlinLibraryNotificationProvider extends EditorNotifications.Provider {
private static final Key KEY = Key.create("configure.kotlin.library");
public static final String LIBRARY_NAME = "KotlinRuntime";
public static final String KOTLIN_RUNTIME_JAR = "kotlin-runtime.jar";
@@ -82,9 +83,8 @@ public class ConfigureKotlinLibraryNotificationProvider implements EditorNotific
}
@Override
- // TODO change signature on updating to IDEA 122.598+
- //public EditorNotificationPanel createNotificationPanel(VirtualFile file, FileEditor fileEditor) {
- public EditorNotificationPanel createNotificationPanel(VirtualFile file) {
+ @Nullable
+ public EditorNotificationPanel createNotificationPanel(VirtualFile file, FileEditor fileEditor) {
try {
if (file.getFileType() != JetFileType.INSTANCE) return null;
diff --git a/update_dependencies.xml b/update_dependencies.xml
index cfe00bf9f51..5e91685ef5b 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -3,14 +3,14 @@