From 1e3854d1c493266f98ebc796094e8ac7e85ba9fc Mon Sep 17 00:00:00 2001 From: anna Date: Fri, 12 Feb 2010 22:00:02 +0300 Subject: [PATCH] eclipse: project name should be found in .project (IDEA-52070 ) --- .../jetbrains/idea/eclipse/conversion/EclipseClasspathReader.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 e8c892af55..815624003b 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseClasspathReader.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseClasspathReader.java @@ -45,11 +45,15 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.eclipse.EclipseXml; import org.jetbrains.idea.eclipse.IdeaXml; import org.jetbrains.idea.eclipse.config.EclipseModuleManager; +import org.jetbrains.idea.eclipse.importWizard.EclipseProjectFinder; import org.jetbrains.idea.eclipse.util.ErrorLog; import java.io.File; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Set; public class EclipseClasspathReader { private final String myRootPath; @@ -413,7 +417,7 @@ public class EclipseClasspathReader { final @NotNull String rootPath, final @Nullable String relativeToRootPath) { for (String currentRoot : currentRoots) { - if (currentRoot.endsWith(rootPath)) { //rootPath = content_root <=> applicable root: abs_path/content_root + if (currentRoot.endsWith(rootPath) || Comparing.strEqual(rootPath, EclipseProjectFinder.findProjectName(currentRoot))) { //rootPath = content_root <=> applicable root: abs_path/content_root if (relativeToRootPath == null) { return VfsUtil.pathToUrl(currentRoot); } -- 2.11.4.GIT