Fix Unresolved type to sometimes ignore a guessed Object type binding (#2966)

* Fix Unresolved type to ignore a guessed type binding to Object

- add check in UnresolvedElementsBaseSubProcessor.addSimilarTypeProposal
  method to ignore a guessed binding of Object for unresolved type when there
  are possible types to look at
- fix relevance when importing and adding to module so it will be
  offered sooner
- for eclipse-jdt/eclipse.jdt.core#5039

Author: jjohnstn

org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/text/correction/UnresolvedElementsBaseSubProcessor.java

@@ -957,7 +957,8 @@ private void addSimilarTypeProposals(int kind, ICompilationUnit cu, Name node, i
 		String resolvedTypeName= null;
 		ITypeBinding binding= ASTResolving.guessBindingForTypeReference(node);
 		ITypeBinding simpleBinding= null;
-		if (binding != null) {
+		if (binding != null &&
+				(!binding.getQualifiedName().equals("java.lang.Object") || elements.length == 0)) { //$NON-NLS-1$
 			simpleBinding= binding;
 			if (simpleBinding.isArray()) {
 				simpleBinding= simpleBinding.getElementType();
@@ -1045,7 +1046,7 @@ private void addSimilarTypeProposals(int kind, ICompilationUnit cu, Name node, i
 			}
 		}
 		if (elements.length == 0) {
-			collectRequiresModuleProposals(cu, node, IProposalRelevance.IMPORT_NOT_FOUND_ADD_REQUIRES_MODULE, proposals, true);
+			collectRequiresModuleProposals(cu, node, IProposalRelevance.IMPORT_NOT_FOUND_ADD_REQUIRES_MODULE + 100, proposals, true);
 		}
 	}
 
@@ -1094,7 +1095,7 @@ private T getCompositeChangeProposal(ChangeCorrectionProposalCore proposal) thro
 					String moduleRequiresChangeName= change.getName();
 					moduleRequiresChangeName= moduleRequiresChangeName.substring(0, 1).toLowerCase() + moduleRequiresChangeName.substring(1);
 					String changeName= Messages.format(CorrectionMessages.UnresolvedElementsSubProcessor_combine_two_proposals_info, new String[] { importChangeName, moduleRequiresChangeName });
-					compositeProposal= new ChangeCorrectionProposalCore(changeName, null, IProposalRelevance.IMPORT_NOT_FOUND_ADD_REQUIRES_MODULE) {
+					compositeProposal= new ChangeCorrectionProposalCore(changeName, null, aicpc.getRelevance()) {
 						@Override
 						protected Change createChange() throws CoreException {
 							return new CompositeChange(changeName, new Change[] { change, importChange });