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

Refactor providers

Browse Source
This commit is contained in:
Nikolay Krasko
2013-03-06 19:31:28 +04:00
parent c4bc984c94
commit 15fc21cf27
2 changed files with 67 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/framework/JSLibraryDescription.java
+4 -5
View File
@@ -42,11 +42,12 @@ public class JSLibraryDescription extends CustomLibraryDescription {
public static final String LIBRARY_NAME = "KotlinJavaScript"; public static final String LIBRARY_NAME = "KotlinJavaScript";
private static final String JAVA_SCRIPT_LIBRARY_CREATION = "JavaScript Library Creation"; private static final String JAVA_SCRIPT_LIBRARY_CREATION = "JavaScript Library Creation";
private static final Set<LibraryKind> libraryKinds = Sets.newHashSet(KOTLIN_JAVASCRIPT_KIND);
@NotNull @NotNull
@Override @Override
public Set<? extends LibraryKind> getSuitableLibraryKinds() { public Set<? extends LibraryKind> getSuitableLibraryKinds() {
return Sets.newHashSet(KOTLIN_JAVASCRIPT_KIND); return libraryKinds;
} }
@Nullable @Nullable
@@ -55,7 +56,8 @@ public class JSLibraryDescription extends CustomLibraryDescription {
CreateJavaScriptLibraryDialog dialog = new CreateJavaScriptLibraryDialog(null, "Create Kotlin JavaScript Library", contextDirectory); CreateJavaScriptLibraryDialog dialog = new CreateJavaScriptLibraryDialog(null, "Create Kotlin JavaScript Library", contextDirectory);
dialog.show(); dialog.show();
if (dialog.isOK()) { if (!dialog.isOK()) return null;
KotlinPaths paths = PathUtil.getKotlinPathsForIdeaPlugin(); KotlinPaths paths = PathUtil.getKotlinPathsForIdeaPlugin();
File libraryFile = paths.getJsLibJarPath(); File libraryFile = paths.getJsLibJarPath();
@@ -101,7 +103,4 @@ public class JSLibraryDescription extends CustomLibraryDescription {
} }
}; };
} }
return null;
}
} }
idea/src/org/jetbrains/jet/plugin/framework/JavaRuntimeLibraryDescription.java
+4 -6
View File
@@ -28,7 +28,6 @@ import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.plugin.JetPluginUtil;
import org.jetbrains.jet.plugin.framework.ui.CreateJavaLibraryDialog; import org.jetbrains.jet.plugin.framework.ui.CreateJavaLibraryDialog;
import org.jetbrains.jet.plugin.framework.ui.FileUIUtils; import org.jetbrains.jet.plugin.framework.ui.FileUIUtils;
import org.jetbrains.jet.utils.KotlinPaths; import org.jetbrains.jet.utils.KotlinPaths;
@@ -43,11 +42,12 @@ public class JavaRuntimeLibraryDescription extends CustomLibraryDescription {
public static final String LIBRARY_NAME = "KotlinJavaRuntime"; public static final String LIBRARY_NAME = "KotlinJavaRuntime";
private static final String JAVA_RUNTIME_LIBRARY_CREATION = "Java Runtime Library Creation"; private static final String JAVA_RUNTIME_LIBRARY_CREATION = "Java Runtime Library Creation";
private static final Set<LibraryKind> libraryKinds = Sets.newHashSet(KOTLIN_JAVA_RUNTIME_KIND);
@NotNull @NotNull
@Override @Override
public Set<? extends LibraryKind> getSuitableLibraryKinds() { public Set<? extends LibraryKind> getSuitableLibraryKinds() {
return Sets.newHashSet(KOTLIN_JAVA_RUNTIME_KIND); return libraryKinds;
} }
@Nullable @Nullable
@@ -56,7 +56,8 @@ public class JavaRuntimeLibraryDescription extends CustomLibraryDescription {
CreateJavaLibraryDialog dialog = new CreateJavaLibraryDialog(null, "Create Kotlin Java Runtime Library", contextDirectory); CreateJavaLibraryDialog dialog = new CreateJavaLibraryDialog(null, "Create Kotlin Java Runtime Library", contextDirectory);
dialog.show(); dialog.show();
if (dialog.isOK()) { if (!dialog.isOK()) return null;
KotlinPaths paths = PathUtil.getKotlinPathsForIdeaPlugin(); KotlinPaths paths = PathUtil.getKotlinPathsForIdeaPlugin();
File libraryFile = paths.getRuntimePath(); File libraryFile = paths.getRuntimePath();
@@ -85,7 +86,4 @@ public class JavaRuntimeLibraryDescription extends CustomLibraryDescription {
} }
}; };
} }
return null;
}
} }