Adjust API tools to internal API changes of JDT

Author: laeubi

apitools/org.eclipse.pde.api.tools/META-INF/MANIFEST.MF

@@ -7,7 +7,7 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
  org.eclipse.pde.core;bundle-version="[3.17.200,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.36.0,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.42.100,4.0.0)",
  org.eclipse.jdt.launching;bundle-version="[3.21.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.21.0,4.0.0)",
  org.eclipse.text;bundle-version="[3.13.100,4.0.0)",

apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/IncrementalApiBuilder.java

@@ -16,6 +16,7 @@
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
@@ -402,13 +403,15 @@ void buildContext(final IProject project, State state, List<Change> changes, Has
 					addInnerTypes(change.resource, change.changeKind);
 				} else {
 					// look up the source file
-					String path = state.typeLocators.get(change.typeName);
-					if (path != null) {
-						IResource member = this.builder.getProject().findMember(path);
-						if (member != null && member.getType() == IResource.FILE) {
-							IFile source = (IFile) member;
-							this.builder.cleanupMarkers(source);
-							addInnerTypes(source, change.changeKind);
+					Map<Integer, String> pathMap = state.typeLocators.get(change.typeName);
+					if (pathMap != null) {
+						for (String path : pathMap.values()) {
+							IResource member = this.builder.getProject().findMember(path);
+							if (member != null && member.getType() == IResource.FILE) {
+								IFile source = (IFile) member;
+								this.builder.cleanupMarkers(source);
+								addInnerTypes(source, change.changeKind);
+							}
 						}
 					}
 				}