From a9a08eab16035983c6ff79ea2e1a1e143679d291 Mon Sep 17 00:00:00 2001 From: anna Date: Wed, 16 Jun 2010 14:12:37 +0400 Subject: [PATCH] eclipse: use var in library source root if var is used in class root --- .../idea/eclipse/config/EclipseModuleManager.java | 8 -------- .../idea/eclipse/conversion/EclipseClasspathReader.java | 1 - .../idea/eclipse/conversion/EclipseClasspathWriter.java | 2 +- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseModuleManager.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseModuleManager.java index 84b8c066a1e2..fe24aa50098d 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseModuleManager.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseModuleManager.java @@ -91,15 +91,7 @@ public class EclipseModuleManager { myEclipseUrls.add(url); } - public void registerEclipseLibSrcUrl(String srcUrl) { - myEclipseUrls.add(SRC_PREFIX + srcUrl); - } - public boolean isEclipseLibUrl(String url) { return myEclipseUrls.contains(url); } - - public boolean isEclipseLibSrcUrl(String url) { - return myEclipseUrls.contains(SRC_PREFIX + url); - } } diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseClasspathReader.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseClasspathReader.java index 491a2d195164..a68584d028d9 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseClasspathReader.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseClasspathReader.java @@ -182,7 +182,6 @@ public class EclipseClasspathReader { if (sourcePath != null) { final String srcUrl = expandEclipsePath2Url(sourcePath, rootModel, myCurrentRoots); modifiableModel.addRoot(srcUrl, OrderRootType.SOURCES); - eclipseModuleManager.registerEclipseLibSrcUrl(srcUrl); } EJavadocUtil.appendJavadocRoots(element, rootModel, myCurrentRoots, modifiableModel); diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseClasspathWriter.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseClasspathWriter.java index fcb882036b99..c7e22d068b76 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseClasspathWriter.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseClasspathWriter.java @@ -137,7 +137,7 @@ public class EclipseClasspathWriter { srcRelativePath = EPathUtil.collapse2EclipsePath(srcFile, myModel); if (eclipseVariablePath != null) { eclipseSrcVariablePath = eclipseModuleManager.getEclipseSrcVariablePath(srcFile); - if (eclipseSrcVariablePath == null && !eclipseModuleManager.isEclipseLibSrcUrl(srcFile)) { + if (eclipseSrcVariablePath == null) { eclipseSrcVariablePath = "/" + EPathUtil.collapse2EclipseVariabledPath(libraryOrderEntry); } }