revert changes regarding PackageAdmin as there is no official docu

eclipse-jdt · Oct 10, 2024 · 41a997c · 41a997c
1 parent ae1a99e
commit 41a997c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 29 deletions.
diff --git a/...anipulation/common/org/eclipse/jdt/internal/core/manipulation/JavaManipulationPlugin.java b/...anipulation/common/org/eclipse/jdt/internal/core/manipulation/JavaManipulationPlugin.java
@@ -13,11 +13,10 @@
  *******************************************************************************/
 package org.eclipse.jdt.internal.core.manipulation;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.packageadmin.PackageAdmin;
 
 import org.eclipse.osgi.service.debug.DebugOptions;
 import org.eclipse.osgi.service.debug.DebugOptionsListener;
@@ -174,18 +173,12 @@ public Bundle[] getBundles(String bundleName, String version) {
  if (bundles != null)
  return bundles;
 
- bundles = fBundleContext.getBundles();
- List<Bundle> matchingBundles = new ArrayList<>();
- for (Bundle bundle : bundles) {
- if (bundle.getSymbolicName().equals(bundleName)) {
- if (version == null || bundle.getVersion().toString().equals(version)) {
- matchingBundles.add(bundle);
- }
- }
- }
- if (!matchingBundles.isEmpty()) {
- return (Bundle[]) matchingBundles.toArray();
- }
+ // Accessing unresolved bundle
+ ServiceReference<PackageAdmin> serviceRef= fBundleContext.getServiceReference(PackageAdmin.class);
+ PackageAdmin admin= fBundleContext.getService(serviceRef);
+ bundles= admin.getBundles(bundleName, version);
+ if (bundles != null && bundles.length > 0)
+ return bundles;
  return null;
  }
 

diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/JavaPlugin.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/JavaPlugin.java
@@ -14,21 +14,21 @@
 package org.eclipse.jdt.internal.ui;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
-import java.util.List;
 import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.stream.Collectors;
 
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.packageadmin.PackageAdmin;
 import org.osgi.service.prefs.BackingStoreException;
 
 import org.eclipse.osgi.service.debug.DebugOptions;
@@ -1136,18 +1136,12 @@ public Bundle[] getBundles(String bundleName, String version) {
  if (bundles != null)
  return bundles;
 
- bundles = fBundleContext.getBundles();
- List<Bundle> matchingBundles = new ArrayList<>();
- for (Bundle bundle : bundles) {
- if (bundle.getSymbolicName().equals(bundleName)) {
- if (version == null || bundle.getVersion().toString().equals(version)) {
- matchingBundles.add(bundle);
- }
- }
- }
- if (!matchingBundles.isEmpty()) {
- return (Bundle[]) matchingBundles.toArray();
- }
+ // Accessing unresolved bundle
+ ServiceReference<PackageAdmin> serviceRef= fBundleContext.getServiceReference(PackageAdmin.class);
+ PackageAdmin admin= fBundleContext.getService(serviceRef);
+ bundles= admin.getBundles(bundleName, version);
+ if (bundles != null && bundles.length > 0)
+ return bundles;
  return null;
  }