Skip to content

Do not remove reexported required bundles #1861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
laeubi merged 1 commit into from
Jul 9, 2025
Merged

Do not remove reexported required bundles #1861

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 30 additions & 16 deletions ...rc/org/eclipse/pde/internal/ui/search/dependencies/GatherUnusedDependenciesOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,28 +146,42 @@ public void run(IProgressMonitor monitor) throws InvocationTargetException, Inte

}
if (ClasspathUtilCore.hasBundleStructure(fModel)) {
IBundle bundle = ((IBundlePluginModelBase) fModel).getBundleModel().getBundle();
IManifestHeader header = bundle.getManifestHeader(EquinoxModuleDataNamespace.REGISTERED_BUDDY_HEADER);
if (header != null) {
String values = header.getValue();
String[] registerBud = values.split("\\s*,\\s*"); //$NON-NLS-1$
List<Object> found = new ArrayList<>();
for (String string : registerBud) {
for (Object obj : fList) {
if (obj instanceof PluginImport) {
String id = ((PluginImport) obj).getId();
if (string.equals(id)) {
found.add(obj);
}
removeBuddies();
removeReexported();
}
}

protected void removeBuddies() {
IBundle bundle = ((IBundlePluginModelBase) fModel).getBundleModel().getBundle();
IManifestHeader header = bundle.getManifestHeader(EquinoxModuleDataNamespace.REGISTERED_BUDDY_HEADER);
if (header != null) {
String values = header.getValue();
String[] registerBud = values.split("\\s*,\\s*"); //$NON-NLS-1$
List<Object> found = new ArrayList<>();
for (String string : registerBud) {
for (Object obj : fList) {
if (obj instanceof PluginImport) {
String id = ((PluginImport) obj).getId();
if (string.equals(id)) {
found.add(obj);
}
}
}
if (found.size() > 0) {
fList.removeAll(found);
}
}
fList.removeAll(found);
}
}

private void removeReexported() {
List<Object> found = new ArrayList<>();
for (Object obj : fList) {
if (obj instanceof PluginImport plugin) {
if (plugin.isReexported()) {
found.add(plugin);
}
}
}
fList.removeAll(found);
}

private void updateMonitor(IProgressMonitor monitor, int size) {
Expand Down
Loading