Ensure consistent order of calculated use-clause

Currently the implementation for calculating uses uses a HashSet to
collect all used packages. This leads to unstable behavior if the same
cleanup is applied multiple times.

This now uses a TreeSet instead to ensure lexicographic order is used.

Author: laeubi

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/CalculateUsesAction.java

@@ -14,8 +14,8 @@
 package org.eclipse.pde.internal.ui.search.dependencies;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.WorkspaceJob;
@@ -70,7 +70,7 @@ protected CalculateUsesOperation getOperation() {
 		return new CalculateUsesOperation(fProject, fModel) {
 
 			@Override
-			protected void handleSetUsesDirectives(final Map<String, HashSet<String>> pkgsAndUses) {
+			protected void handleSetUsesDirectives(final Map<String, Set<String>> pkgsAndUses) {
 				Display.getDefault().asyncExec(() -> {
 					if (pkgsAndUses.isEmpty()) {
 						return;

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/CalculateUsesOperation.java

@@ -19,10 +19,10 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeSet;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
@@ -66,7 +66,7 @@ protected void execute(IProgressMonitor monitor) throws CoreException, Invocatio
 			if (packages.isEmpty()) {
 				return;
 			}
-			Map<String, HashSet<String>> pkgsAndUses = findPackageReferences(packages, monitor);
+			Map<String, Set<String>> pkgsAndUses = findPackageReferences(packages, monitor);
 			if (monitor.isCanceled()) {
 				return;
 			}
@@ -94,9 +94,9 @@ protected Collection<String> getPublicExportedPackages() {
 		return list;
 	}
 
-	protected Map<String, HashSet<String>> findPackageReferences(Collection<String> packages, IProgressMonitor monitor) {
+	protected Map<String, Set<String>> findPackageReferences(Collection<String> packages, IProgressMonitor monitor) {
 		IJavaProject jp = JavaCore.create(fProject);
-		HashMap<String, HashSet<String>> pkgsAndUses = new HashMap<>();
+		Map<String, Set<String>> pkgsAndUses = new HashMap<>();
 		IPackageFragment[] frags = PDEJavaHelper.getPackageFragments(jp, Collections.emptySet(), false);
 		SubMonitor subMonitor = SubMonitor.convert(monitor, frags.length * 2);
 		for (IPackageFragment fragment : frags) {
@@ -107,11 +107,11 @@ protected Map<String, HashSet<String>> findPackageReferences(Collection<String>
 			iterationMonitor.subTask(
 					NLS.bind(PDEUIMessages.CalculateUsesOperation_calculatingDirective, fragment.getElementName()));
 			if (packages.contains(fragment.getElementName())) {
-				HashSet<String> pkgs = new HashSet<>();
+				Set<String> pkgs = new TreeSet<>();
 				pkgsAndUses.put(fragment.getElementName(), pkgs);
 				try {
 					findReferences(fragment.getCompilationUnits(), pkgs, iterationMonitor.split(1), false);
-					findReferences(fragment.getClassFiles(), pkgs, iterationMonitor.split(1), true);
+					findReferences(fragment.getOrdinaryClassFiles(), pkgs, iterationMonitor.split(1), true);
 				} catch (JavaModelException e) {
 				}
 			}
@@ -205,14 +205,14 @@ protected final void addPackages(String[] typeSignatures, Set<String> pkgs, ITyp
 		}
 	}
 
-	protected void handleSetUsesDirectives(Map<String, HashSet<String>> pkgsAndUses) {
+	protected void handleSetUsesDirectives(Map<String, Set<String>> pkgsAndUses) {
 		if (pkgsAndUses.isEmpty()) {
 			return;
 		}
 		setUsesDirectives(pkgsAndUses);
 	}
 
-	protected void setUsesDirectives(Map<String, HashSet<String>> pkgsAndUses) {
+	protected void setUsesDirectives(Map<String, Set<String>> pkgsAndUses) {
 		IBundle bundle = fModel.getBundleModel().getBundle();
 		IManifestHeader header = bundle.getManifestHeader(Constants.EXPORT_PACKAGE);
 		// header will not equal null b/c we would not get this far (ie. no exported packages so we would have returned earlier
@@ -226,7 +226,7 @@ protected void setUsesDirectives(Map<String, HashSet<String>> pkgsAndUses) {
 		}
 	}
 
-	protected String getDirectiveValue(String pkgName, Map<String, HashSet<String>> pkgsAndUses) {
+	protected String getDirectiveValue(String pkgName, Map<String, Set<String>> pkgsAndUses) {
 		Set<String> usesPkgs = pkgsAndUses.get(pkgName);
 		usesPkgs.remove(pkgName);
 		StringBuilder buffer = null;