MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

reuse code from PluginPathManager

Browse Source
This commit is contained in:
Dmitry Jemerov
2013-05-07 21:52:59 +02:00
parent cbd8b5bbc2
commit 47dc81bb20
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/server/impl/CompileServerClasspathManager.java
+2 -11
View File
@@ -19,7 +19,7 @@ import com.intellij.compiler.server.CompileServerPathProvider;
import com.intellij.compiler.server.CompileServerPlugin;
import com.intellij.ide.plugins.IdeaPluginDescriptor;
import com.intellij.ide.plugins.PluginManager;
import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.application.PluginPathManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.extensions.PluginId;
import com.intellij.openapi.project.Project;
@@ -30,7 +30,6 @@ import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.util.Arrays;
import java.util.List;
/**
@@ -128,15 +127,7 @@ public class CompileServerClasspathManager {
return extraDirFile;
}
}
List<String> roots = Arrays.asList(new File(PathManager.getHomePath(), "plugins").getPath(),
new File(PathManager.getHomePath(), "community/plugins").getPath());
for (String root : roots) {
File pluginDir = new File(root, pluginDirName);
if (pluginDir.isDirectory()) {
return pluginDir;
}
}
return null;
return PluginPathManager.getPluginHome(pluginDirName);
}
private static List<String> getDynamicClasspath(Project project) {
platform/platform-impl/src/com/intellij/openapi/application/PluginPathManager.java
+7 -3
View File
@@ -24,13 +24,17 @@ public class PluginPathManager {
private PluginPathManager() {
}
public static String getPluginHomePath(String pluginName) {
public static File getPluginHome(String pluginName) {
String homePath = PathManager.getHomePath();
File candidate = new File(homePath, "community/plugins/" + pluginName);
if (candidate.isDirectory()) {
return candidate.getPath();
return candidate;
}
return new File(homePath, "plugins/" + pluginName).getPath();
return new File(homePath, "plugins/" + pluginName);
}
public static String getPluginHomePath(String pluginName) {
return getPluginHome(pluginName).getPath();
}
public static String getPluginHomePathRelative(String pluginName) {