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
+40 -41
View File
@@ -42,11 +42,12 @@ public class JSLibraryDescription extends CustomLibraryDescription {
public static final String LIBRARY_NAME = "KotlinJavaScript";
private static final String JAVA_SCRIPT_LIBRARY_CREATION = "JavaScript Library Creation";
private static final Set<LibraryKind> libraryKinds = Sets.newHashSet(KOTLIN_JAVASCRIPT_KIND);
@NotNull
@Override
public Set<? extends LibraryKind> getSuitableLibraryKinds() {
return Sets.newHashSet(KOTLIN_JAVASCRIPT_KIND);
return libraryKinds;
}
@Nullable
@@ -55,53 +56,51 @@ public class JSLibraryDescription extends CustomLibraryDescription {
CreateJavaScriptLibraryDialog dialog = new CreateJavaScriptLibraryDialog(null, "Create Kotlin JavaScript Library", contextDirectory);
dialog.show();
if (dialog.isOK()) {
KotlinPaths paths = PathUtil.getKotlinPathsForIdeaPlugin();
if (!dialog.isOK()) return null;
File libraryFile = paths.getJsLibJarPath();
if (!libraryFile.exists()) {
Messages.showErrorDialog(String.format("JavaScript standard library was not found in %s", paths.getLibPath()),
JAVA_SCRIPT_LIBRARY_CREATION);
KotlinPaths paths = PathUtil.getKotlinPathsForIdeaPlugin();
File libraryFile = paths.getJsLibJarPath();
if (!libraryFile.exists()) {
Messages.showErrorDialog(String.format("JavaScript standard library was not found in %s", paths.getLibPath()),
JAVA_SCRIPT_LIBRARY_CREATION);
return null;
}
Map<File, String> copyToPaths = new HashMap<File, String>();
if (dialog.isCopyLibraryFiles()) {
String copyIntoPath = dialog.getCopyLibraryIntoPath();
assert copyIntoPath != null;
copyToPaths.put(libraryFile, copyIntoPath);
}
if (dialog.isCopyJS()) {
String copyIntoPath = dialog.getCopyJsIntoPath();
assert copyIntoPath != null;
copyToPaths.put(paths.getJsLibJsPath(), copyIntoPath);
}
if (!copyToPaths.isEmpty()) {
Map<File,File> copiedFiles =
FileUIUtils.copyWithOverwriteDialog(parentComponent, JAVA_SCRIPT_LIBRARY_CREATION, copyToPaths);
if (copiedFiles == null) {
return null;
}
Map<File, String> copyToPaths = new HashMap<File, String>();
if (dialog.isCopyLibraryFiles()) {
String copyIntoPath = dialog.getCopyLibraryIntoPath();
assert copyIntoPath != null;
copyToPaths.put(libraryFile, copyIntoPath);
libraryFile = copiedFiles.get(libraryFile);
}
if (dialog.isCopyJS()) {
String copyIntoPath = dialog.getCopyJsIntoPath();
assert copyIntoPath != null;
copyToPaths.put(paths.getJsLibJsPath(), copyIntoPath);
}
if (!copyToPaths.isEmpty()) {
Map<File,File> copiedFiles =
FileUIUtils.copyWithOverwriteDialog(parentComponent, JAVA_SCRIPT_LIBRARY_CREATION, copyToPaths);
if (copiedFiles == null) {
return null;
}
if (dialog.isCopyLibraryFiles()) {
libraryFile = copiedFiles.get(libraryFile);
}
}
final String libraryFileUrl = VfsUtil.getUrlForLibraryRoot(libraryFile);
return new NewLibraryConfiguration(LIBRARY_NAME, getDownloadableLibraryType(), new LibraryVersionProperties()) {
@Override
public void addRoots(@NotNull LibraryEditor editor) {
editor.addRoot(libraryFileUrl, OrderRootType.CLASSES);
editor.addRoot(libraryFileUrl, OrderRootType.SOURCES);
}
};
}
return null;
final String libraryFileUrl = VfsUtil.getUrlForLibraryRoot(libraryFile);
return new NewLibraryConfiguration(LIBRARY_NAME, getDownloadableLibraryType(), new LibraryVersionProperties()) {
@Override
public void addRoots(@NotNull LibraryEditor editor) {
editor.addRoot(libraryFileUrl, OrderRootType.CLASSES);
editor.addRoot(libraryFileUrl, OrderRootType.SOURCES);
}
};
}
}
idea/src/org/jetbrains/jet/plugin/framework/JavaRuntimeLibraryDescription.java
+27 -29
View File
@@ -28,7 +28,6 @@ import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull;
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.FileUIUtils;
import org.jetbrains.jet.utils.KotlinPaths;
@@ -43,11 +42,12 @@ public class JavaRuntimeLibraryDescription extends CustomLibraryDescription {
public static final String LIBRARY_NAME = "KotlinJavaRuntime";
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
@Override
public Set<? extends LibraryKind> getSuitableLibraryKinds() {
return Sets.newHashSet(KOTLIN_JAVA_RUNTIME_KIND);
return libraryKinds;
}
@Nullable
@@ -56,36 +56,34 @@ public class JavaRuntimeLibraryDescription extends CustomLibraryDescription {
CreateJavaLibraryDialog dialog = new CreateJavaLibraryDialog(null, "Create Kotlin Java Runtime Library", contextDirectory);
dialog.show();
if (dialog.isOK()) {
KotlinPaths paths = PathUtil.getKotlinPathsForIdeaPlugin();
if (!dialog.isOK()) return null;
File libraryFile = paths.getRuntimePath();
if (!libraryFile.exists()) {
Messages.showErrorDialog(
parentComponent,
String.format("Java Runtime library was not found in '%s'." , paths.getLibPath()),
JAVA_RUNTIME_LIBRARY_CREATION);
return null;
}
KotlinPaths paths = PathUtil.getKotlinPathsForIdeaPlugin();
String copyIntoPath = dialog.getCopyIntoPath();
if (copyIntoPath != null) {
libraryFile = FileUIUtils.copyWithOverwriteDialog(parentComponent, JAVA_RUNTIME_LIBRARY_CREATION, copyIntoPath, libraryFile);
if (libraryFile == null) {
return null;
}
}
final String libraryFileUrl = VfsUtil.getUrlForLibraryRoot(libraryFile);
return new NewLibraryConfiguration(LIBRARY_NAME, getDownloadableLibraryType(), new LibraryVersionProperties()) {
@Override
public void addRoots(@NotNull LibraryEditor editor) {
editor.addRoot(libraryFileUrl, OrderRootType.CLASSES);
editor.addRoot(libraryFileUrl + "src", OrderRootType.SOURCES);
}
};
File libraryFile = paths.getRuntimePath();
if (!libraryFile.exists()) {
Messages.showErrorDialog(
parentComponent,
String.format("Java Runtime library was not found in '%s'." , paths.getLibPath()),
JAVA_RUNTIME_LIBRARY_CREATION);
return null;
}
return null;
String copyIntoPath = dialog.getCopyIntoPath();
if (copyIntoPath != null) {
libraryFile = FileUIUtils.copyWithOverwriteDialog(parentComponent, JAVA_RUNTIME_LIBRARY_CREATION, copyIntoPath, libraryFile);
if (libraryFile == null) {
return null;
}
}
final String libraryFileUrl = VfsUtil.getUrlForLibraryRoot(libraryFile);
return new NewLibraryConfiguration(LIBRARY_NAME, getDownloadableLibraryType(), new LibraryVersionProperties()) {
@Override
public void addRoots(@NotNull LibraryEditor editor) {
editor.addRoot(libraryFileUrl, OrderRootType.CLASSES);
editor.addRoot(libraryFileUrl + "src", OrderRootType.SOURCES);
}
};
}
}