azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated IDEA to 122.639.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-10-29 18:43:22 +04:00
parent af3690309b
commit 4a7a31d830
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/META-INF/plugin.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<version>@snapshot@</version>
<vendor url="http://www.jetbrains.com">JetBrains Inc.</vendor>
<idea-version since-build="122.327" until-build="122.9999" />
<idea-version since-build="122.639" until-build="122.9999" />
<depends optional="true">JUnit</depends>
idea/src/org/jetbrains/jet/plugin/quickfix/AbsentJdkAnnotationsNotifications.java
+3 -2
View File
@@ -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<EditorNotificationPanel> {
public class AbsentJdkAnnotationsNotifications extends EditorNotifications.Provider<EditorNotificationPanel> {
private static final Key<EditorNotificationPanel> 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;
idea/src/org/jetbrains/jet/plugin/quickfix/ConfigureKotlinLibraryNotificationProvider.java
+5 -5
View File
@@ -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<EditorNotificationPanel> {
public class ConfigureKotlinLibraryNotificationProvider extends EditorNotifications.Provider<EditorNotificationPanel> {
private static final Key<EditorNotificationPanel> 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;
update_dependencies.xml
+2 -2
View File
@@ -3,14 +3,14 @@
<target name="update" depends="fetch-third-party">
<execute_update
base.url="http://teamcity.jetbrains.com/guestAuth/repository/download/bt343/70697:id"
base.url="http://teamcity.jetbrains.com/guestAuth/repository/download/bt343/71201:id"
build.zip="ideaIC-122.SNAPSHOT.win.zip"
/>
</target>
<target name="jb_update" depends="fetch-third-party">
<execute_update
base.url="http://buildserver.labs.intellij.net/guestAuth/repository/download/bt662/1574020:id"
base.url="http://buildserver.labs.intellij.net/guestAuth/repository/download/bt662/1596369:id"
build.zip="ideaIC-122.SNAPSHOT.win.zip"
/>
</target>