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

eclipse: use var in library source root if var is used in class root

Browse Source
This commit is contained in:
anna
2010-06-17 18:38:02 +04:00
parent 8e3757caaf
commit a9a08eab16
3 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseModuleManager.java
-8
View File
@@ -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);
}
}
plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseClasspathReader.java
-1
View File
@@ -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);
plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseClasspathWriter.java
+1 -1
View File
@@ -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);
}
}