Skip to content

Commit 2aea21c

Browse files
committed
Adjust API tools to internal API changes of JDT
This adapts API tools to the new TypeLocator added as part of the multirelease compilation support see eclipse-jdt/eclipse.jdt.core#3900 for details.
1 parent 6dc51e2 commit 2aea21c

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.pde.api.tools;singleton:=true
5-
Bundle-Version: 1.3.800.qualifier
5+
Bundle-Version: 1.3.900.qualifier
66
Bundle-Vendor: %providerName
77
Bundle-Localization: plugin
88
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
99
org.eclipse.pde.core;bundle-version="[3.17.200,4.0.0)",
10-
org.eclipse.jdt.core;bundle-version="[3.36.0,4.0.0)",
10+
org.eclipse.jdt.core;bundle-version="[3.43.0,4.0.0)",
1111
org.eclipse.jdt.launching;bundle-version="[3.21.0,4.0.0)",
1212
org.eclipse.core.resources;bundle-version="[3.21.0,4.0.0)",
1313
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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
import java.util.ArrayList;
1717
import java.util.HashSet;
18+
import java.util.Iterator;
1819
import java.util.List;
1920
import java.util.Map.Entry;
2021
import java.util.Set;
@@ -402,8 +403,9 @@ void buildContext(final IProject project, State state, List<Change> changes, Has
402403
addInnerTypes(change.resource, change.changeKind);
403404
} else {
404405
// look up the source file
405-
String path = state.typeLocators.get(change.typeName);
406-
if (path != null) {
406+
Iterator<String> iterator = state.typeLocators.getPathForName(change.typeName).iterator();
407+
while (iterator.hasNext()) {
408+
String path = iterator.next();
407409
IResource member = this.builder.getProject().findMember(path);
408410
if (member != null && member.getType() == IResource.FILE) {
409411
IFile source = (IFile) member;

0 commit comments

Comments
 (0)