Handle missing plug-ins in source-lookup and use List instead of arrays

Fixes #133

Author: HannesWell

ui/org.eclipse.pde.core/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %name
 Bundle-SymbolicName: org.eclipse.pde.core; singleton:=true
-Bundle-Version: 3.15.200.qualifier
+Bundle-Version: 3.15.300.qualifier
 Bundle-Activator: org.eclipse.pde.internal.core.PDECore
 Bundle-Vendor: %provider-name
 Bundle-Localization: plugin

ui/org.eclipse.pde.core/pom.xml

@@ -19,7 +19,7 @@
     <relativePath>../../</relativePath>
   </parent>
   <artifactId>org.eclipse.pde.core</artifactId>
-  <version>3.15.200-SNAPSHOT</version>
+  <version>3.15.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <properties>
     <defaultSigning-excludeInnerJars>true</defaultSigning-excludeInnerJars>

ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/sourcelookup/PDESourceLookupDirector.java

@@ -36,7 +36,7 @@ public class PDESourceLookupDirector extends AbstractSourceLookupDirector {
 	/**
 	 * Cache of source containers by location and id (String & String)
 	 */
-	private Map<String, ISourceContainer[]> fSourceContainerMap = new LinkedHashMap<>();
+	private Map<String, List<ISourceContainer>> fSourceContainerMap = new LinkedHashMap<>();
 
 	private ISourceContainer[] fJreSourceContainers;
 
@@ -84,15 +84,18 @@ public Object[] findSourceElements(Object object) throws CoreException {
 		return sourceElements;
 	}
 
-	ISourceContainer[] getSourceContainers(String location, String id) throws CoreException {
+	List<ISourceContainer> getSourceContainers(String location, String id) throws CoreException {
 
-		ISourceContainer[] containers = fSourceContainerMap.get(location);
+		List<ISourceContainer> containers = fSourceContainerMap.get(location);
 		if (containers != null) {
 			return containers;
 		}
 
-		ArrayList<IRuntimeClasspathEntry> result = new ArrayList<>();
+		List<IRuntimeClasspathEntry> result = new ArrayList<>();
 		ModelEntry entry = PluginRegistry.findEntry(id);
+		if (entry == null) {
+			return Collections.emptyList();
+		}
 
 		boolean match = false;
 
@@ -118,7 +121,7 @@ ISourceContainer[] getSourceContainers(String location, String id) throws CoreEx
 				// use source container that maps to the library in the linked project.
 				ISourceContainer container = getArchiveSourceContainer(location);
 				if (container != null) {
-					containers = new ISourceContainer[] {container};
+					containers = List.of(container);
 					fSourceContainerMap.put(location, containers);
 					return containers;
 				}
@@ -139,8 +142,8 @@ ISourceContainer[] getSourceContainers(String location, String id) throws CoreEx
 			}
 		}
 
-		IRuntimeClasspathEntry[] entries = result.toArray(new IRuntimeClasspathEntry[result.size()]);
-		containers = JavaRuntime.getSourceContainers(entries);
+		IRuntimeClasspathEntry[] entries = result.toArray(IRuntimeClasspathEntry[]::new);
+		containers = List.of(JavaRuntime.getSourceContainers(entries));
 		fSourceContainerMap.put(location, containers);
 		return containers;
 	}
@@ -199,7 +202,7 @@ private ISourceContainer getArchiveSourceContainer(String location) throws JavaM
 		return null;
 	}
 
-	private void addProjectSourceContainers(IProject project, ArrayList<IRuntimeClasspathEntry> result) throws CoreException {
+	private void addProjectSourceContainers(IProject project, List<IRuntimeClasspathEntry> result) throws CoreException {
 		if (project == null || !project.hasNature(JavaCore.NATURE_ID))
 			return;
 
@@ -224,13 +227,7 @@ private void addProjectSourceContainers(IProject project, ArrayList<IRuntimeClas
 
 	@Override
 	public synchronized void dispose() {
-		Iterator<ISourceContainer[]> iterator = fSourceContainerMap.values().iterator();
-		while (iterator.hasNext()) {
-			ISourceContainer[] containers = iterator.next();
-			for (ISourceContainer container : containers) {
-				container.dispose();
-			}
-		}
+		fSourceContainerMap.values().stream().flatMap(List::stream).forEach(ISourceContainer::dispose);
 		fSourceContainerMap.clear();
 		super.dispose();
 	}

ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/sourcelookup/PDESourceLookupQuery.java

@@ -16,6 +16,8 @@
 
 import com.sun.jdi.VMDisconnectedException;
 import java.io.File;
+import java.util.Arrays;
+import java.util.List;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.ISafeRunnable;
 import org.eclipse.debug.core.DebugException;
@@ -304,11 +306,11 @@ private Object getSourceElement(String location, String id, String typeName, boo
 	}
 
 	private Object findJreSourceElement(String sourcePath) throws CoreException {
-		ISourceContainer[] jreSourceContainers = fDirector.getJreSourceContainers();
+		List<ISourceContainer> jreSourceContainers = Arrays.asList(fDirector.getJreSourceContainers());
 		return findSourceElement(jreSourceContainers, sourcePath);
 	}
 
-	private Object findSourceElement(ISourceContainer[] containers, String typeName) throws CoreException {
+	private Object findSourceElement(List<ISourceContainer> containers, String typeName) throws CoreException {
 		for (ISourceContainer container : containers) {
 			Object[] result = container.findSourceElements(typeName);
 			if (result.length > 0)
@@ -317,7 +319,7 @@ private Object findSourceElement(ISourceContainer[] containers, String typeName)
 		return null;
 	}
 
-	protected ISourceContainer[] getSourceContainers(String location, String id) throws CoreException {
+	protected List<ISourceContainer> getSourceContainers(String location, String id) throws CoreException {
 		return fDirector.getSourceContainers(location, id);
 	}
 

ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: PDE JUnit Tests
 Bundle-SymbolicName: org.eclipse.pde.ui.tests; singleton:=true
-Bundle-Version: 3.11.800.qualifier
+Bundle-Version: 3.11.900.qualifier
 Bundle-ClassPath: tests.jar
 Bundle-Activator: org.eclipse.pde.ui.tests.PDETestsPlugin
 Bundle-Vendor: Eclipse.org

ui/org.eclipse.pde.ui.tests/pom.xml

@@ -18,7 +18,7 @@
     <relativePath>../../</relativePath>
   </parent>
   <artifactId>org.eclipse.pde.ui.tests</artifactId>
-  <version>3.11.800-SNAPSHOT</version>
+  <version>3.11.900-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <properties>

ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/classpathresolver/ClasspathResolverTest.java

@@ -104,7 +104,7 @@ public _PDESourceLookupQuery(PDESourceLookupDirector director, Object object) {
 		}
 
 		@Override // Make super.getSourceContainers() visible
-		public ISourceContainer[] getSourceContainers(String location, String id) throws CoreException {
+		public List<ISourceContainer> getSourceContainers(String location, String id) throws CoreException {
 			return super.getSourceContainers(location, id);
 		}
 	}
@@ -137,12 +137,12 @@ public void testSourceLookupPath() throws Exception {
 		PDESourceLookupDirector d = new PDESourceLookupDirector();
 		_PDESourceLookupQuery q = new _PDESourceLookupQuery(d, project);
 
-		ISourceContainer[] containers = q.getSourceContainers(project.getLocation().toOSString(), bundleName);
+		List<ISourceContainer> containers = q.getSourceContainers(project.getLocation().toOSString(), bundleName);
 
-		assertEquals(2, containers.length);
-		assertEquals(JavaCore.create(project), ((JavaProjectSourceContainer) containers[0]).getJavaProject());
+		assertEquals(2, containers.size());
+		assertEquals(JavaCore.create(project), ((JavaProjectSourceContainer) containers.get(0)).getJavaProject());
 		assertEquals(project.getFolder("cpe").getLocation().toFile(),
-				((DirectorySourceContainer) containers[1]).getDirectory());
+				((DirectorySourceContainer) containers.get(1)).getDirectory());
 	}
 
 	@Test