Bug 533490 - Find unused dependencies does not respect indirectly

referenced class files

Change-Id: I2fc1bb653d912d3d4be6caa4a3e0430c031cdd5f
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
Signed-off-by: Moritz Aleithe <moritz.aleithe@yahoo.de>

Author: Montimort

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

@@ -170,15 +170,8 @@ private boolean provideJavaClasses(IPluginModelBase[] models, IProgressMonitor m
 			for (IPackageFragment pkgFragment : packageFragments) {
 				SubMonitor iterationMonitor = subMonitor.split(2);
 				if (pkgFragment.hasChildren()) {
-					Requestor requestor = new Requestor();
-					engine.search(SearchPattern.createPattern(pkgFragment, IJavaSearchConstants.REFERENCES),
-							new SearchParticipant[] { SearchEngine.getDefaultSearchParticipant() }, searchScope,
-							requestor, iterationMonitor.split(1));
-					if (requestor.foundMatches()) {
-						if (provideJavaClasses(pkgFragment, engine, searchScope,
-								iterationMonitor.split(1))) {
-							return true;
-						}
+					if (provideJavaClasses(pkgFragment, engine, searchScope, iterationMonitor.split(1))) {
+						return true;
 					}
 				}
 			}
@@ -203,12 +196,15 @@ private boolean provideJavaClasses(IPackageFragment packageFragment, SearchEngin
 			if (types != null) {
 				SubMonitor iterationMonitor = subMonitor.split(1).setWorkRemaining(types.length);
 				for (IType type : types) {
-					requestor = new Requestor();
-					engine.search(SearchPattern.createPattern(type, IJavaSearchConstants.REFERENCES),
+					IType[] allTypes = type.newSupertypeHierarchy(iterationMonitor.split(1)).getAllTypes();
+					for (IType currType : allTypes) {
+						requestor = new Requestor();
+						engine.search(SearchPattern.createPattern(currType, IJavaSearchConstants.REFERENCES),
 							new SearchParticipant[] { SearchEngine.getDefaultSearchParticipant() }, searchScope,
 							requestor, iterationMonitor.split(1));
-					if (requestor.foundMatches()) {
-						return true;
+						if (requestor.foundMatches()) {
+							return true;
+						}
 					}
 				}
 			} else {