From 47dc81bb20f76ef7fabe95d38dbe1bd131d1df47 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 7 May 2013 21:42:08 +0200
Subject: [PATCH] reuse code from PluginPathManager

---
 .../server/impl/CompileServerClasspathManager.java  | 13 ++-----------
 .../openapi/application/PluginPathManager.java      | 10 +++++++---
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/java/compiler/impl/src/com/intellij/compiler/server/impl/CompileServerClasspathManager.java b/java/compiler/impl/src/com/intellij/compiler/server/impl/CompileServerClasspathManager.java
index e1474b9f770f..508227014753 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/impl/CompileServerClasspathManager.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/impl/CompileServerClasspathManager.java
@@ -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) {
diff --git a/platform/platform-impl/src/com/intellij/openapi/application/PluginPathManager.java b/platform/platform-impl/src/com/intellij/openapi/application/PluginPathManager.java
index 5e1869bb87a6..faf9ab64a1ab 100644
--- a/platform/platform-impl/src/com/intellij/openapi/application/PluginPathManager.java
+++ b/platform/platform-impl/src/com/intellij/openapi/application/PluginPathManager.java
@@ -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) {