Bug 496890 - Update o.e.help.ui to Java 8

Enable raw types warning and fix them.

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

24 files changed, 96 insertions, 85 deletions

diff --git a/org.eclipse.help.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.help.ui/.settings/org.eclipse.jdt.core.prefs
index fce2be489..36762e1e7 100644
--- a/org.eclipse.help.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.help.ui/.settings/org.eclipse.jdt.core.prefs
@@ -64,7 +64,7 @@ org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariable
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
 org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
@@ -78,7 +78,7 @@ org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/IEngineDescriptor.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/IEngineDescriptor.java
index 67f80b18b..86ecf00f8 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/IEngineDescriptor.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/IEngineDescriptor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -81,7 +81,7 @@ public interface IEngineDescriptor {
 	 * 
 	 * @return the parameter dictionary
 	 */
-	Dictionary getParameters();
+	Dictionary<String, Object> getParameters();
 
 	/**
 	 * Tests whether this engine is provided as an extension point contribution
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/ISearchScopeFactory.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/ISearchScopeFactory.java
index 7c0c73a86..23ed7f773 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/ISearchScopeFactory.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/ISearchScopeFactory.java
@@ -47,5 +47,5 @@ public interface ISearchScopeFactory {
 	 * @return a new search scope object
 	 */
 	ISearchScope createSearchScope(IPreferenceStore store, String engineId,
-			Dictionary parameters);
+			Dictionary<String, Object> parameters);
 }
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/browser/LaunchURL.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/browser/LaunchURL.java
index 210f25402..e7728b443 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/browser/LaunchURL.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/browser/LaunchURL.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,14 +12,19 @@ package org.eclipse.help.ui.browser;
 
 import java.util.Hashtable;
 
-import org.eclipse.core.runtime.*;
-import org.eclipse.help.browser.*;
-import org.eclipse.help.internal.browser.*;
-import org.eclipse.help.ui.internal.*;
-import org.eclipse.help.ui.internal.util.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.ui.*;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExecutableExtension;
+import org.eclipse.help.browser.IBrowser;
+import org.eclipse.help.internal.browser.BrowserManager;
+import org.eclipse.help.ui.internal.HelpUIPlugin;
+import org.eclipse.help.ui.internal.Messages;
+import org.eclipse.help.ui.internal.util.ErrorUtil;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.ui.IActionDelegate;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
 
 /**
  * Action that launches a URL in a browser.
@@ -63,10 +68,11 @@ public class LaunchURL implements IWorkbenchWindowActionDelegate,
 	 * @see IExecutableExtension#setInitializationData(IConfigurationElement,
 	 *      String, Object)
 	 */
+	@SuppressWarnings("unchecked")
 	public void setInitializationData(IConfigurationElement config,
 			String propertyName, Object data) throws CoreException {
 		if (data != null && data instanceof Hashtable) {
-			url = (String) ((Hashtable) data).get("url"); //$NON-NLS-1$
+			url = ((Hashtable<String, String>) data).get("url"); //$NON-NLS-1$
 		}
 		if (url == null || url.length() == 0)
 			url = config.getAttribute("url"); //$NON-NLS-1$
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HelpActivitySupport.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HelpActivitySupport.java
index 28b662d9e..7e114f4c7 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HelpActivitySupport.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HelpActivitySupport.java
@@ -14,23 +14,20 @@ package org.eclipse.help.ui.internal;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.osgi.service.prefs.BackingStoreException;
-
-import org.eclipse.help.internal.HelpPlugin;
-import org.eclipse.help.internal.base.HelpBasePlugin;
-import org.eclipse.help.internal.base.IHelpActivitySupport;
-import org.eclipse.help.internal.toc.Toc;
-
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IProduct;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.InstanceScope;
-
+import org.eclipse.help.internal.HelpPlugin;
+import org.eclipse.help.internal.base.HelpBasePlugin;
+import org.eclipse.help.internal.base.IHelpActivitySupport;
+import org.eclipse.help.internal.toc.Toc;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.activities.IIdentifier;
 import org.eclipse.ui.activities.IWorkbenchActivitySupport;
+import org.osgi.service.prefs.BackingStoreException;
 
 /**
  * Wrapper for eclipse ui activity support
@@ -268,7 +265,7 @@ public class HelpActivitySupport implements IHelpActivitySupport {
 			return;
 		}
 
-		Set<String> enabledIds = new HashSet(activitySupport.getActivityManager()
+		Set<String> enabledIds = new HashSet<>(activitySupport.getActivityManager()
 				.getEnabledActivityIds());
 		enabledIds.addAll(activitityIds);
 		activitySupport.setEnabledActivityIds(enabledIds);
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HyperlinkHandler.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HyperlinkHandler.java
index fff44fdde..a0e2163c5 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HyperlinkHandler.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HyperlinkHandler.java
@@ -200,9 +200,9 @@ public class HyperlinkHandler
 	}
 
 	private void removeDisposedLinks() {
-		for (Enumeration keys = hyperlinkListeners.keys(); keys
+		for (Enumeration<Control> keys = hyperlinkListeners.keys(); keys
 				.hasMoreElements();) {
-			Control control = (Control) keys.nextElement();
+			Control control = keys.nextElement();
 			if (control.isDisposed()) {
 				hyperlinkListeners.remove(control);
 			}
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/StyledLineWrapper.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/StyledLineWrapper.java
index 21e6dac24..98ce70465 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/StyledLineWrapper.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/StyledLineWrapper.java
@@ -77,8 +77,8 @@ public class StyledLineWrapper implements StyledTextContent {
 		if (charCount != -1)
 			return charCount;
 		charCount = 0;
-		for (Iterator i = lines.iterator(); i.hasNext();)
-			charCount += ((String) i.next()).length();
+		for (Iterator<String> i = lines.iterator(); i.hasNext();)
+			charCount += i.next().length();
 		return charCount;
 	}
 
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowser.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowser.java
index 750a22c28..7158cfa28 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowser.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowser.java
@@ -492,8 +492,8 @@ public class EmbeddedBrowser {
 		shell.setSize(w, h);
 	}
 	private void notifyCloseListners() {
-		for (Iterator it = closeListeners.iterator(); it.hasNext();) {
-			IBrowserCloseListener listener = (IBrowserCloseListener) it.next();
+		for (Iterator<IBrowserCloseListener> it = closeListeners.iterator(); it.hasNext();) {
+			IBrowserCloseListener listener = it.next();
 			listener.browserClosed();
 		}
 	}
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/HelpContentPreferencePage.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/HelpContentPreferencePage.java
index ffe50d0cf..eddc30fe5 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/HelpContentPreferencePage.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/HelpContentPreferencePage.java
@@ -104,7 +104,7 @@ public class HelpContentPreferencePage extends PreferencePage implements
 	protected void performDefaults() {
 		super.performDefaults();
 
-		List ics = ICPreferences.getDefaultICs();
+		List<IC> ics = ICPreferences.getDefaultICs();
 		table.setICs(ics);
 		
 		// Restore Defaults functionality here		
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/HelpPreferencePage.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/HelpPreferencePage.java
index 6a7dc3b2d..97bc15249 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/HelpPreferencePage.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/HelpPreferencePage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -202,10 +202,10 @@ public class HelpPreferencePage extends PreferencePage implements
 	}
 	
 	private IPreferenceNode getPreferenceNode(String pageId) {
-		Iterator iterator = PlatformUI.getWorkbench().getPreferenceManager()
+		Iterator<IPreferenceNode> iterator = PlatformUI.getWorkbench().getPreferenceManager()
 				.getElements(PreferenceManager.PRE_ORDER).iterator();
 		while (iterator.hasNext()) {
-			IPreferenceNode next = (IPreferenceNode) iterator.next();
+			IPreferenceNode next = iterator.next();
 			if (next.getId().equals(pageId))
 				return next;
 		}
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/ICButtons.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/ICButtons.java
index 19d9a027e..931fbdf15 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/ICButtons.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/ICButtons.java
@@ -139,7 +139,7 @@ public class ICButtons implements SelectionListener{
 	public void removeIC()

 	{

 		IStructuredSelection selection = (IStructuredSelection)page.getTable().getSelection();

-		List ics = selection.toList();

+		List<IC> ics = selection.toList();

 		String remove = ""; //$NON-NLS-1$

 		

 		for (int i=0;i<ics.size();i++)

@@ -156,7 +156,7 @@ public class ICButtons implements SelectionListener{
 		if (shouldRemove)

 		{

 			for (int i=0;i<ics.size();i++)

-				page.getTable().removeIC((IC)ics.get(i));

+				page.getTable().removeIC(ics.get(i));

 			updateButtonStates();

 		}

 	}

@@ -188,13 +188,13 @@ public class ICButtons implements SelectionListener{
 	{

 		int indexes[] = page.getTable().getTable().getSelectionIndices();

 		IStructuredSelection selection = (IStructuredSelection)page.getTable().getSelection();

-		List ics = selection.toList();

+		List<IC> ics = selection.toList();

 		

 		boolean enable = enableIC.getText().equals(Messages.HelpContentBlock_4);

 		

 		for (int i=0;i<ics.size();i++)

 		{

-			((IC)ics.get(i)).setEnabled(enable);

+			ics.get(i).setEnabled(enable);

 			page.getTable().getTableViewer().replace(ics.get(i), indexes[i]);

 		}

 		page.getTable().refresh();

diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/ICTable.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/ICTable.java
index 7fcdabe44..3f2ebecdf 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/ICTable.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/ICTable.java
@@ -181,7 +181,7 @@ public class ICTable {
 	/**

 	 * @param rics the ordered remote InfoCenters

 	 */

-	public void update(List ics) {

+	public void update(List<IC> ics) {

 		viewer.getContentProvider().inputChanged(viewer, null, ics);

 		refresh();

 	}

@@ -198,7 +198,7 @@ public class ICTable {
 	 * 

 	 * @return List containing column names

 	 */

-	public List getColumnNames() {

+	public List<String> getColumnNames() {

 		return Arrays.asList(columnNames);

 	}

 

@@ -221,14 +221,14 @@ public class ICTable {
 		return content;

 	}

 

-	public void setICs(List ics)

+	public void setICs(List<IC> ics)

 	{

-		List oldICs = getICs();

+		List<IC> oldICs = getICs();

 		for (int o=0;o<oldICs.size();o++)

-			removeIC((IC)oldICs.get(o));

+			removeIC(oldICs.get(o));

 			

 		for (int i=0;i<ics.size();i++)

-			addIC((IC)ics.get(i));

+			addIC(ics.get(i));

 	}

 	

 	public TableViewer getTableViewer()

@@ -268,7 +268,7 @@ public class ICTable {
 	

 	public void removeIC(IC ic)

 	{

-		List content = getICs();

+		List<IC> content = getICs();

 		content.remove(ic);

 		getTableViewer().getContentProvider().inputChanged(getTableViewer(), null, content);

 		getTableViewer().remove(ic);

@@ -277,9 +277,9 @@ public class ICTable {
 	

 	private void loadPreferences()

 	{

-		List ics = ICPreferences.getICs();

+		List<IC> ics = ICPreferences.getICs();

 		for (int i=0;i<ics.size();i++)

-			addIC((IC)ics.get(i));

+			addIC(ics.get(i));

 	}

 

 }

diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/InfoCenterPage.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/InfoCenterPage.java
index 196701b32..fe0f1c907 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/InfoCenterPage.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/InfoCenterPage.java
@@ -429,7 +429,7 @@ public class InfoCenterPage extends RootScopePage {
 		}
 	}
 
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	private void findCheckedElements(java.util.List checkedResources,
 			Object parent) {
 		Object[] children = treeContentProvider.getChildren(parent);
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/InfoCenterSearchScopeFactory.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/InfoCenterSearchScopeFactory.java
index e99917c34..87d9f1fa7 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/InfoCenterSearchScopeFactory.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/InfoCenterSearchScopeFactory.java
@@ -31,7 +31,8 @@ public class InfoCenterSearchScopeFactory implements ISearchScopeFactory {
     /* (non-Javadoc)
      * @see org.eclipse.help.ui.ISearchScopeFactory#createSearchScope(org.eclipse.jface.preference.IPreferenceStore)
      */
-    public ISearchScope createSearchScope(IPreferenceStore store, String engineId, Dictionary parameters) {
+	public ISearchScope createSearchScope(IPreferenceStore store, String engineId,
+			Dictionary<String, Object> parameters) {
         String url = getProperty(P_URL, store, engineId, parameters);
         String ssvalue = getProperty(P_SEARCH_SELECTED, store, engineId, parameters);
         boolean searchSelected = ssvalue!=null && ssvalue.equalsIgnoreCase("true"); //$NON-NLS-1$
@@ -52,11 +53,12 @@ public class InfoCenterSearchScopeFactory implements ISearchScopeFactory {
         return new InfoCenter.Scope(url, searchSelected, tocs);
     }
     
-    private String getProperty(String key, IPreferenceStore store, String engineId, Dictionary parameters) {
+	private String getProperty(String key, IPreferenceStore store, String engineId,
+			Dictionary<String, Object> parameters) {
     	// try the store first
     	String value = store.getString(engineId+"."+key); //$NON-NLS-1$
     	if (value!=null && value.length()>0) return value;
     	// try the parameters
-    	return (String)parameters.get(key);
+		return (String) parameters.get(key);
     }
 }
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/LocalHelpPage.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/LocalHelpPage.java
index dea6fe6ba..b217b10c8 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/LocalHelpPage.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/LocalHelpPage.java
@@ -315,7 +315,7 @@ public class LocalHelpPage extends RootScopePage {
 		}
 	}
 
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	private void findCheckedElements(java.util.List checkedResources, Object parent,  
             CheckboxTreeViewer tree, ITreeContentProvider contentProvider) {
 		Object[] children = contentProvider.getChildren(parent);
@@ -433,9 +433,9 @@ public class LocalHelpPage extends RootScopePage {
 		for (int i = 0; i < criteria.length; i++) {
 			CriterionResource element = criteria[i];
 			CriterionName name = new CriterionName(element.getCriterionName(), null);
-			List values = element.getCriterionValues();
-			for (Iterator iter = values.iterator(); iter.hasNext();) {
-				String valueString = (String) iter.next();
+			List<String> values = element.getCriterionValues();
+			for (Iterator<String> iter = values.iterator(); iter.hasNext();) {
+				String valueString = iter.next();
 				CriterionValue value = new CriterionValue(valueString, name);
 			    criteriaTree.setChecked(value, true);
 				updateParentState(value, true, criteriaTree, criteriaTreeContentProvider);
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/LocalSearchScopeFactory.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/LocalSearchScopeFactory.java
index 2b2614589..cb504bf7e 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/LocalSearchScopeFactory.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/LocalSearchScopeFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -29,7 +29,8 @@ public class LocalSearchScopeFactory implements ISearchScopeFactory {
     /* (non-Javadoc)
      * @see org.eclipse.help.ui.ISearchScopeFactory#createSearchScope(org.eclipse.jface.preference.IPreferenceStore)
      */
-    public ISearchScope createSearchScope(IPreferenceStore store, String engineId, Dictionary parameters) {
+	public ISearchScope createSearchScope(IPreferenceStore store, String engineId,
+			Dictionary<String, Object> parameters) {
         String name = store.getString(engineId+"."+P_WORKING_SET); //$NON-NLS-1$
         WorkingSet workingSet = null;
         if (name != null)
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/WebSearchScopeFactory.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/WebSearchScopeFactory.java
index 27995aeb5..fdb29f904 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/WebSearchScopeFactory.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/search/WebSearchScopeFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,7 +13,7 @@ package org.eclipse.help.ui.internal.search;
 import java.util.Dictionary;
 
 import org.eclipse.help.internal.search.WebSearch;
-import org.eclipse.help.search.*;
+import org.eclipse.help.search.ISearchScope;
 import org.eclipse.help.ui.ISearchScopeFactory;
 import org.eclipse.jface.preference.IPreferenceStore;
 
@@ -26,12 +26,14 @@ public class WebSearchScopeFactory implements ISearchScopeFactory {
     /* (non-Javadoc)
      * @see org.eclipse.help.ui.ISearchScopeFactory#createSearchScope(org.eclipse.jface.preference.IPreferenceStore)
      */
-    public ISearchScope createSearchScope(IPreferenceStore store, String engineId, Dictionary parameters) {
+	public ISearchScope createSearchScope(IPreferenceStore store, String engineId,
+			Dictionary<String, Object> parameters) {
         String urlTemplate = getProperty(store, engineId, parameters);
         return new WebSearch.Scope(urlTemplate);
     }
     
-    private String getProperty(IPreferenceStore store, String engineId, Dictionary parameters) {
+	private String getProperty(IPreferenceStore store, String engineId,
+			Dictionary<String, Object> parameters) {
     	// try the store first
     	String value = store.getString(engineId+"."+P_URL); //$NON-NLS-1$
     	if (value!=null && value.length()>0) return value;
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/EngineDescriptor.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/EngineDescriptor.java
index 8547ddae0..a2f0a95e9 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/EngineDescriptor.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/EngineDescriptor.java
@@ -14,8 +14,10 @@ import java.util.Dictionary;
 import java.util.Hashtable;
 
 import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.help.search.*;
-import org.eclipse.help.ui.*;
+import org.eclipse.help.search.ISearchEngine;
+import org.eclipse.help.search.ISearchScope;
+import org.eclipse.help.ui.IEngineDescriptor;
+import org.eclipse.help.ui.RootScopePage;
 import org.eclipse.help.ui.internal.IHelpUIConstants;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.resource.ImageDescriptor;
@@ -140,7 +142,7 @@ public class EngineDescriptor implements IEngineDescriptor {
 		return page;
 	}
 
-	public Dictionary getParameters() {
+	public Dictionary<String, Object> getParameters() {
 		if (parameters != null)
 			return parameters;
 		parameters = new Hashtable<>();
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/EngineDescriptorManager.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/EngineDescriptorManager.java
index 191f0c298..aa7d207db 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/EngineDescriptorManager.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/EngineDescriptorManager.java
@@ -158,15 +158,14 @@ public class EngineDescriptorManager extends Observable implements IHelpUIConsta
 	private void loadFromExtensionRegistry() {
 		IConfigurationElement[] elements = Platform.getExtensionRegistry()
 				.getConfigurationElementsFor(ENGINE_EXP_ID);
-		Hashtable engineTypes = loadEngineTypes(elements);
+		Hashtable<String, EngineTypeDescriptor> engineTypes = loadEngineTypes(elements);
 		for (int i = 0; i < elements.length; i++) {
 			IConfigurationElement element = elements[i];
 			if (element.getName().equals(TAG_ENGINE)) { 
 				EngineDescriptor desc = new EngineDescriptor(element);
 				String engineId = desc.getEngineTypeId();
 				if (engineId != null) {
-					EngineTypeDescriptor etdesc = (EngineTypeDescriptor) engineTypes
-							.get(engineId);
+					EngineTypeDescriptor etdesc = engineTypes.get(engineId);
 					if (etdesc != null) {
 						desc.setEngineType(etdesc);
 						descriptors.add(desc);
@@ -176,7 +175,7 @@ public class EngineDescriptorManager extends Observable implements IHelpUIConsta
 		}
 	}
 
-	private Hashtable loadEngineTypes(IConfigurationElement[] elements) {
+	private Hashtable<String, EngineTypeDescriptor> loadEngineTypes(IConfigurationElement[] elements) {
 		Hashtable<String, EngineTypeDescriptor> result = new Hashtable<>();
 		ArrayList<EngineTypeDescriptor> list = new ArrayList<>();
 		for (int i = 0; i < elements.length; i++) {
@@ -280,9 +279,9 @@ public class EngineDescriptorManager extends Observable implements IHelpUIConsta
 		return typeId;
 	}
 	
-	private boolean isUsed(int value, ArrayList used) {
+	private boolean isUsed(int value, ArrayList<Integer> used) {
 		for (int i=0; i<used.size(); i++) {
-			Integer iv = (Integer)used.get(i);
+			Integer iv = used.get(i);
 			if (iv.intValue()==value)
 				return true;
 		}
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/EngineTypeDescriptor.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/EngineTypeDescriptor.java
index 3a0781c47..61d8f7b41 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/EngineTypeDescriptor.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/EngineTypeDescriptor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -111,7 +111,8 @@ public class EngineTypeDescriptor {
 		return null;
 	}
 	
-	public ISearchScope createSearchScope(IPreferenceStore store, String engineId, Dictionary parameters) {
+	public ISearchScope createSearchScope(IPreferenceStore store, String engineId,
+			Dictionary<String, Object> parameters) {
 		if (factory==null) {
 			String fclass = config.getAttribute(IHelpUIConstants.ATT_SCOPE_FACTORY);
 			if (fclass!=null) {
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ReusableHelpPart.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ReusableHelpPart.java
index b48eed4be..4a0f5df9d 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ReusableHelpPart.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ReusableHelpPart.java
@@ -492,13 +492,12 @@ public class ReusableHelpPart implements IHelpUIConstants,
 			if (actionBars != null) {
 				actionBars.clearGlobalActionHandlers();
 				if (visible) {
-					Map handlers = bars.getGlobalActionHandlers();
+					Map<String, IAction> handlers = bars.getGlobalActionHandlers();
 					if (handlers != null) {
-						Set keys = handlers.keySet();
-						for (Iterator iter = keys.iterator(); iter.hasNext();) {
-							String key = (String) iter.next();
-							actionBars.setGlobalActionHandler(key,
-									(IAction) handlers.get(key));
+						Set<String> keys = handlers.keySet();
+						for (Iterator<String> iter = keys.iterator(); iter.hasNext();) {
+							String key = iter.next();
+							actionBars.setGlobalActionHandler(key, handlers.get(key));
 						}
 					}
 				}
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ScopeSetDialog.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ScopeSetDialog.java
index 42605d1cc..9b6eab692 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ScopeSetDialog.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ScopeSetDialog.java
@@ -488,7 +488,7 @@ public class ScopeSetDialog extends TrayDialog  {
 		renameButton.setEnabled(editableSet);
 	}
 	
-	private PendingOperation findOperation(ScopeSet set, Class type) {
+	private PendingOperation findOperation(ScopeSet set, Class<?> type) {
 		if (operations!=null) {
 			for (int i=0; i<operations.size(); i++) {
 				PendingOperation op = operations.get(i);
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/SearchPart.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/SearchPart.java
index 971e305b0..109d22a53 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/SearchPart.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/SearchPart.java
@@ -83,6 +83,7 @@ public class SearchPart extends AbstractFormPart implements IHelpPart, IHelpUICo
 
 	private ReusableHelpPart parent;
 
+	@SuppressWarnings("rawtypes")
 	protected static java.util.List previousSearchQueryData = new java.util.ArrayList(20);
 
 	private static final String HREF_SEARCH_HELP = "/org.eclipse.platform.doc.user/tasks/help_search.htm"; //$NON-NLS-1$
@@ -597,13 +598,14 @@ public class SearchPart extends AbstractFormPart implements IHelpPart, IHelpUICo
 										alternateQuerySection.dispose();
 										alternateQuerySection = null;
 									}
-									List alts = ((LocalHelp)ed.getEngine()).getAlternates();
+											List<String> alts = ((LocalHelp) ed.getEngine()).getAlternates();
 									if (!alts.isEmpty())
 									{
 										createAlternateQueriesSection(toolkit);
 										for (int b=0;b<alts.size();b++)
 										{
-											Hyperlink link = toolkit.createHyperlink(alternateQueryComposite, (String)alts.get(b), SWT.NONE);
+													Hyperlink link = toolkit.createHyperlink(
+															alternateQueryComposite, alts.get(b), SWT.NONE);
 											link.addHyperlinkListener(new HyperlinkAdapter(){
 												public void linkActivated(HyperlinkEvent e) {
 
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/SearchResultsPart.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/SearchResultsPart.java
index ccb5b1e91..2246f5299 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/SearchResultsPart.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/SearchResultsPart.java
@@ -237,7 +237,7 @@ public class SearchResultsPart extends AbstractFormPart implements IHelpPart {
 		results.clear();
 	}
 
-	void startNewSearch(String phrase, ArrayList eds) {
+	void startNewSearch(String phrase, ArrayList<EngineDescriptor> eds) {
 		//this.phrase = phrase;
 		//separator.setVisible(true);
 		// locate local help engine and add it first
@@ -246,7 +246,7 @@ public class SearchResultsPart extends AbstractFormPart implements IHelpPart {
 			add(localHelp);
 		// add engines other than local help
 		for (int i = 0; i < eds.size(); i++) {
-			EngineDescriptor ed = (EngineDescriptor) eds.get(i);
+			EngineDescriptor ed = eds.get(i);
 			if (ed==localHelp)
 				continue;
 			add(ed);
@@ -254,9 +254,9 @@ public class SearchResultsPart extends AbstractFormPart implements IHelpPart {
 		reflow();
 	}
 	
-	private EngineDescriptor findLocalHelp(ArrayList eds) {
+	private EngineDescriptor findLocalHelp(ArrayList<EngineDescriptor> eds) {
 		for (int i=0; i<eds.size(); i++) {
-			EngineDescriptor ed = (EngineDescriptor)eds.get(i);
+			EngineDescriptor ed = eds.get(i);
 			if (ed.getEngineTypeId().equals(IHelpUIConstants.INTERNAL_HELP_ID))
 				return ed;
 		}