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

Drop JVMConfigurationKeys.ANNOTATIONS_PATH_KEY and external annotations in CLI

Browse Source 
CoreExternalAnnotationsManager is moved to the only usage left, which is in the
test
This commit is contained in:
Alexander Udalov
2015-04-25 00:31:28 +03:00
committed by Dmitry Jemerov
parent b0a4e812e5
commit c41aefe2cb
9 changed files with 15 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.java
-19
View File
@@ -18,9 +18,6 @@ package org.jetbrains.kotlin.utils;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileManager;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jps.model.java.impl.JavaSdkUtil;
@@ -144,22 +141,6 @@ public class PathUtil {
return new File(resourceRoot).getAbsoluteFile();
}
@NotNull
public static VirtualFile jarFileOrDirectoryToVirtualFile(@NotNull File file) {
if (file.exists()) {
if (file.isDirectory()) {
return VirtualFileManager.getInstance()
.findFileByUrl("file://" + FileUtil.toSystemIndependentName(file.getAbsolutePath()));
}
else {
return VirtualFileManager.getInstance().findFileByUrl("jar://" + FileUtil.toSystemIndependentName(file.getAbsolutePath()) + "!/");
}
}
else {
throw new IllegalStateException("Path " + file + " does not exist.");
}
}
@NotNull
public static List<File> getJdkClassesRoots() {
return JavaSdkUtil.getJdkClassesRoots(new File(System.getProperty("java.home")), true);