cleanup, add suggestions from PR

Author: chrisrueger

ui/org.eclipse.pde.bnd.ui/src/org/eclipse/pde/bnd/ui/tasks/AnalyseBundleResolutionJob.java

@@ -29,8 +29,7 @@
 import java.util.Set;
 import java.util.function.Predicate;
 
-import org.bndtools.api.ILogger;
-import org.bndtools.api.Logger;
+import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -41,12 +40,9 @@
 
 import aQute.bnd.build.model.EE;
 import aQute.bnd.osgi.resource.ResourceUtils;
-import aQute.lib.io.IO;
 
 public class AnalyseBundleResolutionJob extends Job {
 
-	private static final ILogger					logger	= Logger.getLogger(AnalyseBundleResolutionJob.class);
-
 	private final Set<? extends CapReqLoader>		loaders;
 
 	private Map<String, List<RequirementWrapper>>	requirements;
@@ -86,17 +82,15 @@ protected IStatus run(IProgressMonitor monitor) {
 			Map<String, List<Capability>> allCaps = new HashMap<>();
 			Map<String, List<RequirementWrapper>> allReqs = new HashMap<>();
 			for (CapReqLoader loader : loaders) {
-				try {
+				try (loader){
 					Map<String, List<Capability>> caps = loader.loadCapabilities();
 					mergeMaps(caps, allCaps);
 
 					Map<String, List<RequirementWrapper>> reqs = loader.loadRequirements();
 					mergeMaps(reqs, allReqs);
 				} catch (Exception e) {
-					logger.logError("Error in Bnd resolution analysis.", e);
-				} finally {
-					IO.close(loader);
-				}
+					ILog.get().error("Error in Bnd resolution analysis.", e);
+				} 
 			}
 
 			// Check for resolved requirements
@@ -139,6 +133,8 @@ protected IStatus run(IProgressMonitor monitor) {
 
 			// showResults(resultFileArray, importResults, exportResults);
 			return Status.OK_STATUS;
+		} catch (RuntimeException e) {
+		     throw e;
 		} catch (Exception e) {
 			throw new RuntimeException(e);
 		}