Bug 484653 - Generify org.eclipse.help.internal.criteria packageI20160112-1800I20160112-0800I20160105-1000

Add types to the collections wherever needed.

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

6 files changed, 51 insertions, 51 deletions

diff --git a/org.eclipse.help/src/org/eclipse/help/internal/criteria/CriteriaDefinitionAssembler.java b/org.eclipse.help/src/org/eclipse/help/internal/criteria/CriteriaDefinitionAssembler.java
index e9c730399..6b5a38d1c 100644
--- a/org.eclipse.help/src/org/eclipse/help/internal/criteria/CriteriaDefinitionAssembler.java
+++ b/org.eclipse.help/src/org/eclipse/help/internal/criteria/CriteriaDefinitionAssembler.java
@@ -30,18 +30,18 @@ public class CriteriaDefinitionAssembler {
 	 * Assembles the given criteria definition contributions into a complete criteria definition.
 	 * The originals are not modified.
 	 */
-	public CriteriaDefinition assemble(List contributions) {
+	public CriteriaDefinition assemble(List<CriteriaDefinitionContribution> contributions) {
 		return merge(contributions);
 	}
 
 	/*
 	 * Merge all criteria definition contributions into one.
 	 */
-	private CriteriaDefinition merge(List contributions) {
+	private CriteriaDefinition merge(List<CriteriaDefinitionContribution> contributions) {
 		CriteriaDefinition criteriaDefinition = new CriteriaDefinition();
-		Iterator iter = contributions.iterator();
+		Iterator<CriteriaDefinitionContribution> iter = contributions.iterator();
 		while (iter.hasNext()) {
-			CriteriaDefinitionContribution contribution = (CriteriaDefinitionContribution)iter.next();
+			CriteriaDefinitionContribution contribution = iter.next();
 			mergeChildren(criteriaDefinition, (CriteriaDefinition)contribution.getCriteriaDefinition());
 			contribution.setCriteriaDefinition(null);
 		}
@@ -57,8 +57,8 @@ public class CriteriaDefinitionAssembler {
 	 * Insure criterion has its id at least, and criterion value has both its id and name.
 	 */
 	private void mergeChildren(UAElement a, UAElement b) {
-		Map criterionById = new HashMap();
-		Set criterionValueIds = new HashSet();
+		Map<String, UAElement> criterionById = new HashMap<>();
+		Set<String> criterionValueIds = new HashSet<>();
 
 		IUAElement[] childrenA = a.getChildren();
 		for(int i = 0; i < childrenA.length; ++i){
@@ -85,7 +85,7 @@ public class CriteriaDefinitionAssembler {
 				if(null != idB && idB.trim().length() > 0){
 					if (criterionById.containsKey(idB)) {
 						// duplicate id; merge children
-						mergeChildren((CriterionDefinition)criterionById.get(idB), childB);
+						mergeChildren(criterionById.get(idB), childB);
 					} else {
 						// wasn't a duplicate
 						a.appendChild(childB);
diff --git a/org.eclipse.help/src/org/eclipse/help/internal/criteria/CriteriaDefinitionFileProvider.java b/org.eclipse.help/src/org/eclipse/help/internal/criteria/CriteriaDefinitionFileProvider.java
index f0576dcf0..cbe1dee25 100644
--- a/org.eclipse.help/src/org/eclipse/help/internal/criteria/CriteriaDefinitionFileProvider.java
+++ b/org.eclipse.help/src/org/eclipse/help/internal/criteria/CriteriaDefinitionFileProvider.java
@@ -37,7 +37,7 @@ public class CriteriaDefinitionFileProvider extends AbstractCriteriaDefinitionPr
 	 */
 	@Override
 	public ICriteriaDefinitionContribution[] getCriteriaDefinitionContributions(String locale) {
-		List contributions = new ArrayList();
+		List<ICriteriaDefinitionContribution> contributions = new ArrayList<>();
 		CriteriaDefinitionFile[] criteriaDefinitionFiles = getCriteriaDefinitionFiles(locale);
 		CriteriaDefinitionFileParser parser = new CriteriaDefinitionFileParser();
 		for (int i = 0; i < criteriaDefinitionFiles.length; ++i) {
@@ -65,7 +65,7 @@ public class CriteriaDefinitionFileProvider extends AbstractCriteriaDefinitionPr
 				HelpPlugin.logError(msg, t);
 			}
 		}
-		return (ICriteriaDefinitionContribution[])contributions.toArray(new ICriteriaDefinitionContribution[contributions.size()]);
+		return contributions.toArray(new ICriteriaDefinitionContribution[contributions.size()]);
 	}
 
 	private String getCriteriaDefinitionFilePath(CriteriaDefinitionFile criteriaDefinitionFile) {
@@ -78,7 +78,7 @@ public class CriteriaDefinitionFileProvider extends AbstractCriteriaDefinitionPr
 	 * Returns all available CriteriaDefinitionFiles for the given locale.
 	 */
 	private CriteriaDefinitionFile[] getCriteriaDefinitionFiles(String locale) {
-		List criteriaDefinitionFiles = new ArrayList();
+		List<CriteriaDefinitionFile> criteriaDefinitionFiles = new ArrayList<>();
 		IExtensionRegistry registry = Platform.getExtensionRegistry();
 		IConfigurationElement[] elements = registry.getConfigurationElementsFor(EXTENSION_POINT_ID_CRITERIA_DEFINITION);
 		for (int i=0;i<elements.length;++i) {
@@ -90,6 +90,6 @@ public class CriteriaDefinitionFileProvider extends AbstractCriteriaDefinitionPr
 				criteriaDefinitionFiles.add(criteriaDefinitionFile);
 			}
 		}
-		return (CriteriaDefinitionFile[])criteriaDefinitionFiles.toArray(new CriteriaDefinitionFile[criteriaDefinitionFiles.size()]);
+		return criteriaDefinitionFiles.toArray(new CriteriaDefinitionFile[criteriaDefinitionFiles.size()]);
 	}
 }
diff --git a/org.eclipse.help/src/org/eclipse/help/internal/criteria/CriteriaDefinitionManager.java b/org.eclipse.help/src/org/eclipse/help/internal/criteria/CriteriaDefinitionManager.java
index 99410c631..e9925f7f0 100644
--- a/org.eclipse.help/src/org/eclipse/help/internal/criteria/CriteriaDefinitionManager.java
+++ b/org.eclipse.help/src/org/eclipse/help/internal/criteria/CriteriaDefinitionManager.java
@@ -34,19 +34,20 @@ public class CriteriaDefinitionManager {
 	private static final String ELEMENT_NAME_CRITERIA_DEFINITION_PROVIDER = "criteriaDefinitionProvider"; //$NON-NLS-1$
 	private static final String ATTRIBUTE_NAME_CLASS = "class"; //$NON-NLS-1$
 
-	private Map criteriaDefinitionContributionsByLocale = new HashMap();
-	private Map criteriaDefinitionsByLocale = new HashMap();
+	private Map<String, CriteriaDefinitionContribution[]> criteriaDefinitionContributionsByLocale = new HashMap<>();
+	private Map<String, CriteriaDefinition> criteriaDefinitionsByLocale = new HashMap<>();
 	private AbstractCriteriaDefinitionProvider[] criteriaDefinitionProviders;
 
 	public synchronized ICriteriaDefinition getCriteriaDefinition(String locale) {
-		CriteriaDefinition criteriaDefinition = (CriteriaDefinition)criteriaDefinitionsByLocale.get(locale);
+		CriteriaDefinition criteriaDefinition = criteriaDefinitionsByLocale.get(locale);
 		if (null == criteriaDefinition) {
 			HelpPlugin.getTocManager().getTocs(locale);
 			long start = System.currentTimeMillis();
 			if (HelpPlugin.DEBUG_CRITERIA) {
 			    System.out.println("Start to update criteria definition for locale " + locale); //$NON-NLS-1$
 			}
-			List contributions = new ArrayList(Arrays.asList(readCriteriaDefinitionContributions(locale)));
+			List<CriteriaDefinitionContribution> contributions = new ArrayList<>(
+					Arrays.asList(readCriteriaDefinitionContributions(locale)));
 			CriteriaDefinitionAssembler assembler = new CriteriaDefinitionAssembler();
 			criteriaDefinition = assembler.assemble(contributions);
 			criteriaDefinitionsByLocale.put(locale, criteriaDefinition);
@@ -62,7 +63,7 @@ public class CriteriaDefinitionManager {
 	 * Returns all criteria definition contributions for the given locale, from all providers.
 	 */
 	public synchronized CriteriaDefinitionContribution[] getCriteriaDefinitionContributions(String locale) {
-		CriteriaDefinitionContribution[] contributions = (CriteriaDefinitionContribution[])criteriaDefinitionContributionsByLocale.get(locale);
+		CriteriaDefinitionContribution[] contributions = criteriaDefinitionContributionsByLocale.get(locale);
 		if (contributions == null) {
 			contributions = readCriteriaDefinitionContributions(locale);
 			criteriaDefinitionContributionsByLocale.put(locale, contributions);
@@ -72,7 +73,7 @@ public class CriteriaDefinitionManager {
 
 	private CriteriaDefinitionContribution[] readCriteriaDefinitionContributions(String locale) {
 		CriteriaDefinitionContribution[] cached;
-		List contributions = new ArrayList();
+		List<CriteriaDefinitionContribution> contributions = new ArrayList<>();
 		AbstractCriteriaDefinitionProvider[] providers = getCriteriaDefinitionProviders();
 		for (int i=0;i<providers.length;++i) {
 			ICriteriaDefinitionContribution[] contrib;
@@ -106,7 +107,7 @@ public class CriteriaDefinitionManager {
 				}
 			}
 		}
-		cached = (CriteriaDefinitionContribution[])contributions.toArray(new CriteriaDefinitionContribution[contributions.size()]);
+		cached = contributions.toArray(new CriteriaDefinitionContribution[contributions.size()]);
 		return cached;
 	}
 
@@ -124,7 +125,7 @@ public class CriteriaDefinitionManager {
 	 */
 	public AbstractCriteriaDefinitionProvider[] getCriteriaDefinitionProviders() {
 		if (null == criteriaDefinitionProviders) {
-			List providers = new ArrayList();
+			List<AbstractCriteriaDefinitionProvider> providers = new ArrayList<>();
 			IExtensionRegistry registry = Platform.getExtensionRegistry();
 			IConfigurationElement[] elements = registry.getConfigurationElementsFor(EXTENSION_POINT_ID_CRITERIA_DEFINITION);
 			for (int i=0;i<elements.length;++i) {
@@ -141,7 +142,7 @@ public class CriteriaDefinitionManager {
 					}
 				}
 			}
-			criteriaDefinitionProviders = (AbstractCriteriaDefinitionProvider[])providers.toArray(new AbstractCriteriaDefinitionProvider[providers.size()]);
+			criteriaDefinitionProviders = providers.toArray(new AbstractCriteriaDefinitionProvider[providers.size()]);
 		}
 		return criteriaDefinitionProviders;
 	}
diff --git a/org.eclipse.help/src/org/eclipse/help/internal/criteria/CriteriaManager.java b/org.eclipse.help/src/org/eclipse/help/internal/criteria/CriteriaManager.java
index 0aa092ca3..2e63e0985 100644
--- a/org.eclipse.help/src/org/eclipse/help/internal/criteria/CriteriaManager.java
+++ b/org.eclipse.help/src/org/eclipse/help/internal/criteria/CriteriaManager.java
@@ -33,22 +33,22 @@ public class CriteriaManager {
 	private final static String SUPPORTED_CRITERIA = "supportedCriteria"; //$NON-NLS-1$
 	private final static String ENABLE_CRITERIA = "enableCriteria"; //$NON-NLS-1$
 
-	private List supportedCriteria;
+	private List<String> supportedCriteria;
 	private boolean criteriaEnabled;
-	private Map allCriteriaValues;
+	private Map<String, Map<String, Set<String>>> allCriteriaValues;
 
 	private CriteriaDefinitionManager criteriaDefinitionManager;
 
 	public CriteriaManager() {
 		criteriaEnabled = Platform.getPreferencesService().getBoolean(HelpPlugin.PLUGIN_ID, ENABLE_CRITERIA, false, null);
 
-		supportedCriteria = new ArrayList();
+		supportedCriteria = new ArrayList<>();
 		StringTokenizer criteria = new StringTokenizer(Platform.getPreferencesService().getString(HelpPlugin.PLUGIN_ID, SUPPORTED_CRITERIA, "", null), ",;"); //$NON-NLS-1$ //$NON-NLS-2$
 		while (criteria.hasMoreTokens()) {
 			supportedCriteria.add(criteria.nextToken().toLowerCase().trim());
 		}
 
-		allCriteriaValues = new HashMap();
+		allCriteriaValues = new HashMap<>();
 
 		if (criteriaDefinitionManager == null){
 			criteriaDefinitionManager = new CriteriaDefinitionManager();
@@ -67,29 +67,29 @@ public class CriteriaManager {
 	}
 
 	public void addCriteriaValues(ICriteria[] criteria, String locale){
-		Map criteriaInLocale = (HashMap)allCriteriaValues.get(locale);
+		Map<String, Set<String>> criteriaInLocale = allCriteriaValues.get(locale);
 		if(null == criteriaInLocale) {
-			criteriaInLocale = new HashMap();
+			criteriaInLocale = new HashMap<>();
 		}
 		CriterionResource[] resources = CriterionResource.toCriterionResource(criteria);
 		for(int i = 0; i < resources.length; ++ i){
 			CriterionResource criterion = resources[i];
 			String criterionName = criterion.getCriterionName();
-			List criterionValues = criterion.getCriterionValues();
+			List<String> criterionValues = criterion.getCriterionValues();
 
-			Set existedValues = (Set)criteriaInLocale.get(criterionName);
+			Set<String> existedValues = criteriaInLocale.get(criterionName);
 			if (null == existedValues)
-				existedValues = new HashSet();
+				existedValues = new HashSet<>();
 			existedValues.addAll(criterionValues);
 			criteriaInLocale.put(criterionName, existedValues);
 		}
 		allCriteriaValues.put(locale, criteriaInLocale);
 	}
 
-	public Map getAllCriteriaValues(String locale){
-		Map criteria = (Map) allCriteriaValues.get(locale);
+	public Map<String, Set<String>> getAllCriteriaValues(String locale) {
+		Map<String, Set<String>> criteria = allCriteriaValues.get(locale);
 		if(null == criteria) {
-			criteria = new HashMap();
+			criteria = new HashMap<>();
 		}
 		return criteria;
 	}
diff --git a/org.eclipse.help/src/org/eclipse/help/internal/criteria/CriteriaProviderRegistry.java b/org.eclipse.help/src/org/eclipse/help/internal/criteria/CriteriaProviderRegistry.java
index 3b450c0a5..9c1a434f5 100644
--- a/org.eclipse.help/src/org/eclipse/help/internal/criteria/CriteriaProviderRegistry.java
+++ b/org.eclipse.help/src/org/eclipse/help/internal/criteria/CriteriaProviderRegistry.java
@@ -31,7 +31,7 @@ public class CriteriaProviderRegistry {
 
 	public static final String PROVIDER_XP_NAME = "org.eclipse.help.criteriaProvider"; //$NON-NLS-1$
 
-	private static List providers = null;
+	private static List<AbstractCriteriaProvider> providers = null;
 
 	private static CriteriaProviderRegistry instance;
 
@@ -51,7 +51,7 @@ public class CriteriaProviderRegistry {
 		if (initialized ) {
 			return;
 		}
-		providers = new ArrayList();
+		providers = new ArrayList<>();
 		IExtensionRegistry registry = Platform.getExtensionRegistry();
 		IConfigurationElement[] elements = registry
 				.getConfigurationElementsFor(PROVIDER_XP_NAME);
@@ -65,7 +65,7 @@ public class CriteriaProviderRegistry {
 						+ PROVIDER_XP_NAME + "].", e); //$NON-NLS-1$
 			}
 			if (obj instanceof AbstractCriteriaProvider) {
-				providers.add(obj);
+				providers.add((AbstractCriteriaProvider) obj);
 			}
 		}
 		initialized = true;
@@ -73,7 +73,7 @@ public class CriteriaProviderRegistry {
 
 	public AbstractCriteriaProvider[] getScopes() {
 		readProviders();
-		return (AbstractCriteriaProvider[]) providers.toArray(new AbstractCriteriaProvider[providers.size()]);
+		return providers.toArray(new AbstractCriteriaProvider[providers.size()]);
 	}
 
 	public ICriteria[] getAllCriteria(ITopic topic) {
@@ -84,8 +84,8 @@ public class CriteriaProviderRegistry {
 		} else {
 			criteria = new ICriteria[0];
 		}
-		for (Iterator iter = providers.iterator(); iter.hasNext();) {
-			AbstractCriteriaProvider provider = (AbstractCriteriaProvider) iter.next();
+		for (Iterator<AbstractCriteriaProvider> iter = providers.iterator(); iter.hasNext();) {
+			AbstractCriteriaProvider provider = iter.next();
 			ICriteria[] newCriteria = provider.getCriteria(topic);
 			if (newCriteria.length > 0) {
 				if (criteria.length == 0) {
@@ -109,8 +109,8 @@ public class CriteriaProviderRegistry {
 		} else {
 			criteria = new ICriteria[0];
 		}
-		for (Iterator iter = providers.iterator(); iter.hasNext();) {
-			AbstractCriteriaProvider provider = (AbstractCriteriaProvider) iter.next();
+		for (Iterator<AbstractCriteriaProvider> iter = providers.iterator(); iter.hasNext();) {
+			AbstractCriteriaProvider provider = iter.next();
 			ICriteria[] newCriteria = provider.getCriteria(toc);
 			if (newCriteria.length > 0) {
 				if (criteria.length == 0) {
diff --git a/org.eclipse.help/src/org/eclipse/help/internal/criteria/CriterionResource.java b/org.eclipse.help/src/org/eclipse/help/internal/criteria/CriterionResource.java
index 34411d274..ba8de123f 100644
--- a/org.eclipse.help/src/org/eclipse/help/internal/criteria/CriterionResource.java
+++ b/org.eclipse.help/src/org/eclipse/help/internal/criteria/CriterionResource.java
@@ -17,7 +17,6 @@ import java.util.List;
 import java.util.StringTokenizer;
 
 import org.eclipse.help.ICriteria;
-
 import org.eclipse.help.internal.HelpPlugin;
 
 /**
@@ -28,15 +27,15 @@ import org.eclipse.help.internal.HelpPlugin;
 public class CriterionResource {
 
 	private String criterionName;
-	private List criterionValues;
+	private List<String> criterionValues;
 
 	public CriterionResource(String criterionName){
 		this(criterionName, null);
 	}
 
-	public CriterionResource (String criterionName, List criterionValues){
+	public CriterionResource(String criterionName, List<String> criterionValues) {
 		this.criterionName = criterionName;
-		this.criterionValues = new ArrayList();
+		this.criterionValues = new ArrayList<>();
 		if(null != criterionValues) {
 			this.addCriterionValues(criterionValues);
 		}
@@ -46,7 +45,7 @@ public class CriterionResource {
 		return this.criterionName;
 	}
 
-	public List getCriterionValues(){
+	public List<String> getCriterionValues() {
 		return this.criterionValues;
 	}
 
@@ -56,15 +55,15 @@ public class CriterionResource {
 		}
 	}
 
-	public void addCriterionValues(List criterionValues){
-		for(Iterator iterator = criterionValues.iterator(); iterator.hasNext();){
-			String criterionValue = (String) iterator.next();
+	public void addCriterionValues(List<String> criterionValues) {
+		for (Iterator<String> iterator = criterionValues.iterator(); iterator.hasNext();) {
+			String criterionValue = iterator.next();
 			this.addCriterionValue(criterionValue);
 		}
 	}
 
 	public static CriterionResource[] toCriterionResource(ICriteria[] criteriaElements) {
-		List criteriaList = new ArrayList();
+		List<CriterionResource> criteriaList = new ArrayList<>();
 		outer: for (int i = 0; i < criteriaElements.length; ++i) {
 			String elementName = criteriaElements[i].getName();
 			String elementValue = criteriaElements[i].getValue();
@@ -73,12 +72,12 @@ public class CriterionResource {
 				if (HelpPlugin.getCriteriaManager().isSupportedCriterion(elementName)) {
 					elementName = elementName.toLowerCase();
 					StringTokenizer tokenizer = new StringTokenizer(elementValue, ","); //$NON-NLS-1$
-					List values = new ArrayList();
+					List<String> values = new ArrayList<>();
 					while (tokenizer.hasMoreTokens()) {
 						values.add(tokenizer.nextToken().trim());
 					}
 					for(int j = 0; j < criteriaList.size(); ++j){
-						CriterionResource criterion = (CriterionResource) criteriaList.get(j);
+						CriterionResource criterion = criteriaList.get(j);
 						if(elementName.equals(criterion.getCriterionName())){
 							criterion.addCriterionValues(values);
 							continue outer;