Additional generification in o.e.dltk.validators.ui.

Change-Id: If83386e7f3c381672ee8862bd3a9790f2c3c4037
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

3 files changed, 9 insertions, 10 deletions

diff --git a/core/plugins/org.eclipse.dltk.validators.ui/src/org/eclipse/dltk/validators/internal/ui/AddValidatorDialog.java b/core/plugins/org.eclipse.dltk.validators.ui/src/org/eclipse/dltk/validators/internal/ui/AddValidatorDialog.java
index 0b1f2927f..d856e69d7 100644
--- a/core/plugins/org.eclipse.dltk.validators.ui/src/org/eclipse/dltk/validators/internal/ui/AddValidatorDialog.java
+++ b/core/plugins/org.eclipse.dltk.validators.ui/src/org/eclipse/dltk/validators/internal/ui/AddValidatorDialog.java
@@ -50,7 +50,7 @@ public class AddValidatorDialog extends StatusDialog implements IStatusHandler {
 	private IStatus[] fStati;
 	private int fPrevIndex = -1;
 
-	private Map createValidatorMap = new HashMap();
+	private Map<IValidatorType, IValidator> createValidatorMap = new HashMap<>();
 
 	private ValidatorConfigurationPage fConfigurationPage = null;
 
@@ -192,8 +192,7 @@ public class AddValidatorDialog extends StatusDialog implements IStatusHandler {
 			return this.fEditedValidator;
 		}
 		if (this.createValidatorMap.containsKey(fSelectedValidatorType)) {
-			return (IValidator) this.createValidatorMap
-					.get(fSelectedValidatorType);
+			return this.createValidatorMap.get(fSelectedValidatorType);
 		} else {
 			IValidator validator = fSelectedValidatorType
 					.createValidator(createUniqueId(fSelectedValidatorType));
@@ -329,12 +328,12 @@ public class AddValidatorDialog extends StatusDialog implements IStatusHandler {
 	}
 
 	public void removeValidators(boolean removeAll) {
-		Iterator iterator = this.createValidatorMap.keySet().iterator();
+		Iterator<IValidatorType> iterator = this.createValidatorMap.keySet()
+				.iterator();
 		while (iterator.hasNext()) {
-			Object next = iterator.next();
-			IValidatorType type = (IValidatorType) next;
+			IValidatorType type = iterator.next();
 			if (removeAll || !type.equals(fSelectedValidatorType)) {
-				IValidator v = (IValidator) createValidatorMap.get(type);
+				IValidator v = createValidatorMap.get(type);
 				type.disposeValidator(v.getID());
 			}
 		}
diff --git a/core/plugins/org.eclipse.dltk.validators.ui/src/org/eclipse/dltk/validators/internal/ui/ValidatorConfigurationPageManager.java b/core/plugins/org.eclipse.dltk.validators.ui/src/org/eclipse/dltk/validators/internal/ui/ValidatorConfigurationPageManager.java
index 84825e3f6..b218e759b 100644
--- a/core/plugins/org.eclipse.dltk.validators.ui/src/org/eclipse/dltk/validators/internal/ui/ValidatorConfigurationPageManager.java
+++ b/core/plugins/org.eclipse.dltk.validators.ui/src/org/eclipse/dltk/validators/internal/ui/ValidatorConfigurationPageManager.java
@@ -24,14 +24,14 @@ public class ValidatorConfigurationPageManager {
 
 	private final static String ID_ATTR = "id"; //$NON-NLS-1$
 
-	private static Map toolkits;
+	private static Map<String, Object> toolkits;
 
 	private static void initialize() {
 		if (toolkits != null) {
 			return;
 		}
 
-		toolkits = new HashMap(5);
+		toolkits = new HashMap<>(5);
 		IConfigurationElement[] cfg = Platform.getExtensionRegistry()
 				.getConfigurationElementsFor(LANGUAGE_EXTPOINT);
 
diff --git a/core/plugins/org.eclipse.dltk.validators.ui/src/org/eclipse/dltk/validators/internal/ui/ValidatorsConsolePageParticipant.java b/core/plugins/org.eclipse.dltk.validators.ui/src/org/eclipse/dltk/validators/internal/ui/ValidatorsConsolePageParticipant.java
index 25c3ce929..63f36151b 100644
--- a/core/plugins/org.eclipse.dltk.validators.ui/src/org/eclipse/dltk/validators/internal/ui/ValidatorsConsolePageParticipant.java
+++ b/core/plugins/org.eclipse.dltk.validators.ui/src/org/eclipse/dltk/validators/internal/ui/ValidatorsConsolePageParticipant.java
@@ -46,7 +46,7 @@ public class ValidatorsConsolePageParticipant
 	}
 
 	@Override
-	public Object getAdapter(Class adapter) {
+	public <T> T getAdapter(Class<T> adapter) {
 		return null;
 	}
 }