Revert "Bug 534884 - [9] Transitive project dependencies are missing
when launching on a modular JVM"
This reverts commit 96369c32121f4eab99beb458982213461d26b0af.
Change-Id: I0e31d53f93fb3f9f53347628761c1ed5e6c9b163
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaProject.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaProject.java
index 5629858..7c38d53 100644
--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaProject.java
+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaProject.java
@@ -617,7 +617,7 @@
* In the latter case the corresponding module description of the
* location referenced by that classpath entry is returned.
*
- * @return the <code>IModuleDescription</code> this project represents.
+ * @return the <code>IModule</code> this project represents.
* @exception JavaModelException if this element does not exist or if an
* exception occurs while accessing its corresponding resource
* @since 3.14
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java
index 1c65f7c..a6f4aaa 100644
--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java
+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java
@@ -567,47 +567,6 @@
} else {
rootIDs.add(rootID);
}
- } else {
- if (entry.getEntryKind() == IClasspathEntry.CPE_PROJECT) {
- computeExpandedClasspathFromModularProject(rootIDs, accumulatedEntries, excludeTestCode, workspaceRoot);
- }
- }
- }
- }
-
- private void computeExpandedClasspathFromModularProject(HashSet rootIDs,
- ObjectVector accumulatedEntries, boolean excludeTestCode, IWorkspaceRoot workspaceRoot)
- throws JavaModelException {
- IModuleDescription referring = this.getModuleDescription();
- if (referring == null)
- return;
- IClasspathEntry[] resolvedClasspath = getResolvedClasspath();
- for (IClasspathEntry iEntry : resolvedClasspath) {
- ClasspathEntry entry = (ClasspathEntry) iEntry;
- if (iEntry.getEntryKind() == IClasspathEntry.CPE_PROJECT && entry.isModular()) {
- String rootID = entry.rootID();
- if (rootIDs.contains(rootID)) {
- continue;
- }
- rootIDs.add(rootID);
- IModuleDescription referred = null;
- IResource member = workspaceRoot.findMember(iEntry.getPath());
- JavaProject referredProject = null;
- if (member != null && member.getType() == IResource.PROJECT) {
- IProject projRsc = (IProject) member;
- referredProject = (JavaProject) JavaCore.create(projRsc);
- referred = referredProject.getModuleDescription();
- if (referred != null) {
- IModule module = NameLookup.getModuleDescriptionInfo(referring);
- IModuleReference[] requires = module.requires();
- for (IModuleReference req : requires) {
- if (CharOperation.equals(req.name(), referred.getElementName().toCharArray())) {
- accumulatedEntries.add(entry);
- }
- }
- }
- referredProject.computeExpandedClasspathFromModularProject(rootIDs, accumulatedEntries, excludeTestCode, workspaceRoot);
- }
}
}
}
