Add generic type arguments to map

Author: fedejeanne

org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/HierarchyBuilder.java

@@ -22,6 +22,7 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IOrdinaryClassFile;
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jdt.core.JavaModelException;
@@ -45,7 +46,6 @@
 import org.eclipse.jdt.internal.core.util.ResourceCompilationUnit;
 import org.eclipse.jdt.internal.core.util.Util;
 
-@SuppressWarnings({"rawtypes", "unchecked"})
 public abstract class HierarchyBuilder {
 	/**
 	 * The hierarchy being built.
@@ -66,7 +66,7 @@ public abstract class HierarchyBuilder {
 	 * for the types in the region (in other words, it contains
 	 * no supertypes outside the region).
 	 */
-	protected Map infoToHandle;
+	protected Map<IGenericType, IJavaElement> infoToHandle;
 	/*
 	 * The dot-separated fully qualified name of the focus type, or null of none.
 	 */
@@ -103,7 +103,7 @@ public HierarchyBuilder(TypeHierarchy hierarchy) throws JavaModelException {
 					this,
 					new DefaultProblemFactory());
 		}
-		this.infoToHandle = new HashMap(5);
+		this.infoToHandle = new HashMap<>(5);
 		this.focusQualifiedName = focusType == null ? null : focusType.getFullyQualifiedName();
 	}