From 3c19a96849aaf92ad525e5cd1f0f47212e823255 Mon Sep 17 00:00:00 2001 From: nik Date: Wed, 11 Oct 2017 11:43:44 +0300 Subject: [PATCH] xslt plugin: locate location of trove library via its classes So this code won't break when the library is converted to a repository library. --- .../plugins/xsltDebugger/XsltDebuggerExtension.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltDebuggerExtension.java b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltDebuggerExtension.java index 752482ed527a..7c821b342c61 100644 --- a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltDebuggerExtension.java +++ b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltDebuggerExtension.java @@ -28,7 +28,6 @@ import com.intellij.icons.AllIcons; import com.intellij.ide.plugins.IdeaPluginDescriptor; import com.intellij.ide.plugins.PluginManager; import com.intellij.ide.plugins.PluginManagerCore; -import com.intellij.openapi.application.PathManager; import com.intellij.openapi.application.ex.ApplicationManagerEx; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.extensions.PluginId; @@ -39,8 +38,10 @@ import com.intellij.openapi.util.UserDataHolder; import com.intellij.openapi.vfs.JarFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiManager; +import com.intellij.util.PathUtil; import com.intellij.util.PlatformIcons; import com.intellij.util.net.NetUtils; +import gnu.trove.THashMap; import org.intellij.lang.xpath.xslt.XsltSupport; import org.intellij.lang.xpath.xslt.impl.XsltChecker; import org.intellij.lang.xpath.xslt.run.XsltRunConfiguration; @@ -172,11 +173,7 @@ public class XsltDebuggerExtension extends XsltRunnerExtension { parameters.getClassPath().addTail(rmiStubs.getAbsolutePath()); } - File trove4j = new File(PathManager.getLibPath() + c + "trove4j.jar"); - if (!trove4j.exists()) { - trove4j = new File(PathManager.getHomePath() + c + "community" + c + "lib" + c + "trove4j.jar"); - assert trove4j.exists() : trove4j.getAbsolutePath(); - } + File trove4j = new File(PathUtil.getJarPathForClass(THashMap.class)); parameters.getClassPath().addTail(trove4j.getAbsolutePath()); final String type = parameters.getVMParametersList().getPropertyValue("xslt.transformer.type");