Bug 491265 - Generify org.eclipse.ui.intro*

Move org.eclipse.ui.intro.universal to JavaSE-1.8
Fix leaked resources

Change-Id: I831a65808709853459129c20244c42a84dd6bf02

11 files changed, 77 insertions, 72 deletions

diff --git a/org.eclipse.ui.intro.universal/.classpath b/org.eclipse.ui.intro.universal/.classpath
index ce7393340..22f30643c 100644
--- a/org.eclipse.ui.intro.universal/.classpath
+++ b/org.eclipse.ui.intro.universal/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.ui.intro.universal/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ui.intro.universal/.settings/org.eclipse.jdt.core.prefs
index 2175b8e6b..940d8eeb5 100644
--- a/org.eclipse.ui.intro.universal/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.ui.intro.universal/.settings/org.eclipse.jdt.core.prefs
@@ -1,16 +1,21 @@
-#Mon May 01 16:05:28 EDT 2006
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
 org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
@@ -54,4 +59,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.eclipse.ui.intro.universal/META-INF/MANIFEST.MF b/org.eclipse.ui.intro.universal/META-INF/MANIFEST.MF
index 2253f02b4..44216f8dd 100644
--- a/org.eclipse.ui.intro.universal/META-INF/MANIFEST.MF
+++ b/org.eclipse.ui.intro.universal/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
 Eclipse-LazyStart: true; exceptions="org.eclipse.ui.internal.intro.universal.contentdetect"
 Bundle-Activator: org.eclipse.ui.internal.intro.universal.UniversalIntroPlugin
 Bundle-ClassPath: .
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: javax.xml.parsers,
  org.w3c.dom,
  org.xml.sax
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/CustomizationContentsArea.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/CustomizationContentsArea.java
index 5ef8a0722..277f89487 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/CustomizationContentsArea.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/CustomizationContentsArea.java
@@ -111,8 +111,8 @@ public class CustomizationContentsArea {
 	private TableViewer bottomLeft;
 	private TableViewer bottomRight;
 	private CheckboxTableViewer rootPages;
-	private ArrayList introRootPages = new ArrayList();
-	private ArrayList themeList = new ArrayList();
+	private ArrayList<String> introRootPages = new ArrayList<>();
+	private ArrayList<IntroTheme> themeList = new ArrayList<>();
 	private IntroTheme introTheme;
 	private String introThemeId;
 	private IntroData introData;
@@ -688,7 +688,7 @@ public class CustomizationContentsArea {
 		enableFontsButton();
 		// sync up the root page checklist
 		rootPages.setInput(ROOT_PAGE_TABLE);
-		ArrayList selected = new ArrayList();
+		ArrayList<RootPage> selected = new ArrayList<>();
 		for (int i = 0; i < ROOT_PAGE_TABLE.length; i++) {
 			String id = ROOT_PAGE_TABLE[i].id;
 			if (introRootPages.contains(id))
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/GroupData.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/GroupData.java
index df1571694..276bd84f3 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/GroupData.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/GroupData.java
@@ -23,7 +23,7 @@ import org.w3c.dom.NodeList;
 public class GroupData {
 	boolean fDefault=false;
 	private String path;
-	private ArrayList children = new ArrayList();
+	private ArrayList<BaseData> children = new ArrayList<>();
 	
 	public GroupData(String path, boolean defaultGroup) {
 		fDefault = defaultGroup;
@@ -60,9 +60,9 @@ public class GroupData {
 		return fDefault;
 	}
 
-	public void addAnchors(List result) {
+	public void addAnchors(List<IntroElement> result) {
 		for (int i = 0; i < children.size(); i++) {
-			BaseData edata = (BaseData) children.get(i);
+			BaseData edata = children.get(i);
 			String id = edata.getId();
 			IntroElement element = null;
 			String tagName="anchor"; //$NON-NLS-1$
@@ -107,13 +107,13 @@ public class GroupData {
 	}
 	
 	public BaseData[] getChildren() {
-		return (BaseData[])children.toArray(new BaseData[children.size()]);
+		return children.toArray(new BaseData[children.size()]);
 	}
 
 	public int getExtensionCount() {
 		int count=0;
 		for (int i=0; i<children.size(); i++) {
-			BaseData data = (BaseData)children.get(i);
+			BaseData data = children.get(i);
 			if (data instanceof ExtensionData)
 				count++;
 		}
@@ -141,7 +141,7 @@ public class GroupData {
 	
 	BaseData find(String extensionId) {
 		for (int i = 0; i < children.size(); i++) {
-			BaseData data = (BaseData) children.get(i);
+			BaseData data = children.get(i);
 			if (data.getId().equals(extensionId))
 				return data;
 		}
@@ -154,7 +154,7 @@ public class GroupData {
 	
 	public int getIndexOf(String baseId) {
 		for (int i = 0; i < children.size(); i++) {
-			BaseData bd = (BaseData) children.get(i);
+			BaseData bd = children.get(i);
 			if (bd.getId().equals(baseId))
 				return i;
 		}
@@ -173,14 +173,14 @@ public class GroupData {
 	
 	public void moveUp(BaseData ed) {
 		int index = children.indexOf(ed);
-		BaseData swapped = (BaseData)children.get(index-1);
+		BaseData swapped = children.get(index-1);
 		children.set(index, swapped);
 		children.set(index-1, ed);
 	}
 
 	public void moveDown(BaseData ed) {
 		int index = children.indexOf(ed);
-		BaseData swapped = (BaseData)children.get(index+1);
+		BaseData swapped = children.get(index+1);
 		children.set(index, swapped);
 		children.set(index+1, ed);		
 	}
@@ -210,7 +210,7 @@ public class GroupData {
 				writer.println(">"); //$NON-NLS-1$
 		}
 		for (int i=0; i<children.size(); i++) {
-			BaseData ed = (BaseData)children.get(i);
+			BaseData ed = children.get(i);
 			ed.write(writer, indent+"   "); //$NON-NLS-1$
 		}
 		writer.print(indent);
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/IntroData.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/IntroData.java
index c655c3682..1a90e3589 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/IntroData.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/IntroData.java
@@ -13,8 +13,8 @@ package org.eclipse.ui.internal.intro.universal;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringReader;
-import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -37,7 +37,7 @@ import org.xml.sax.SAXParseException;
 
 public class IntroData {
 	private String productId;
-	private Hashtable pages=new Hashtable();
+	private Map<String, PageData> pages = new HashMap<>();
 	private boolean active;
 	
 	public IntroData(String productId, String fileNameOrData, boolean active) {
@@ -192,9 +192,7 @@ public class IntroData {
 	public void write(PrintWriter writer) {
 		writer.println("<?xml version=\"1.0\" encoding=\"utf-8\" ?>"); //$NON-NLS-1$
 		writer.println("<extensions>"); //$NON-NLS-1$
-		for (Enumeration keys = pages.keys(); keys.hasMoreElements();) {
-			String id = (String)keys.nextElement();
-			PageData pd = (PageData)pages.get(id);
+		for (PageData pd : pages.values()) {
 			pd.write(writer, "   "); //$NON-NLS-1$
 		}
 		writer.println("</extensions>"); //$NON-NLS-1$
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/PageData.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/PageData.java
index ccc8e76b0..a27b628a2 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/PageData.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/PageData.java
@@ -14,13 +14,13 @@ import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.ui.intro.config.IntroElement;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
 public class PageData {
 	public static final String P_TOP_LEFT = "page-content/top-left"; //$NON-NLS-1$
 	public static final String P_TOP_RIGHT = "page-content/top-right"; //$NON-NLS-1$
@@ -28,7 +28,7 @@ public class PageData {
 	public static final String P_BOTTOM_RIGHT = "page-content/bottom-right"; //$NON-NLS-1$
 
 	private String id;
-	private ArrayList groups = new ArrayList();
+	private ArrayList<GroupData> groups = new ArrayList<>();
 	private GroupData hidden=null;
 	
 	public PageData(String id) {
@@ -59,7 +59,7 @@ public class PageData {
 			groups.add(gd);
 	}
 
-	public void addAnchors(List result, String groupId) {
+	public void addAnchors(List<IntroElement> result, String groupId) {
 		GroupData group = findGroup(groupId);
 		if (group==null) return;
 		group.addAnchors(result);
@@ -69,7 +69,7 @@ public class PageData {
 		if (isHidden(extensionId))
 			return null;
 		for (int i=0; i<groups.size(); i++) {
-			GroupData gdata = (GroupData)groups.get(i);
+			GroupData gdata = groups.get(i);
 			if (gdata.contains(extensionId)) {
 				IPath resolvedPath = new Path(id);
 				resolvedPath = resolvedPath.append(gdata.getPath());
@@ -82,7 +82,7 @@ public class PageData {
 
 	public String resolveDefaultPath() {
 		for (int i=0; i<groups.size(); i++) {
-			GroupData gdata = (GroupData)groups.get(i);
+			GroupData gdata = groups.get(i);
 			if (gdata.isDefault()) {
 				IPath resolvedPath = new Path(id).append(gdata.getPath());
 				resolvedPath = resolvedPath.append(IUniversalIntroConstants.DEFAULT_ANCHOR);
@@ -100,7 +100,7 @@ public class PageData {
 		if (groupId.equals(IUniversalIntroConstants.HIDDEN))
 			return hidden;
 		for (int i=0; i<groups.size(); i++) {
-			GroupData gdata = (GroupData)groups.get(i);
+			GroupData gdata = groups.get(i);
 			IPath path = new Path(gdata.getPath());
 			if (path.lastSegment().equals(groupId))
 				return gdata;
@@ -137,7 +137,7 @@ public class PageData {
 	private GroupData findDefaultGroup() {
 		GroupData defaultGroup = null;
 		for (int i=0; i<groups.size(); i++) {
-			GroupData gd = (GroupData)groups.get(i);
+			GroupData gd = groups.get(i);
 			if (gd.isDefault()) {
 				if (defaultGroup==null)
 					defaultGroup = gd;
@@ -155,7 +155,7 @@ public class PageData {
 	
 	public ExtensionData findExtension(String extensionId, boolean checkHidden) {
 		for (int i=0; i<groups.size(); i++) {
-			GroupData gdata = (GroupData)groups.get(i);
+			GroupData gdata = groups.get(i);
 			ExtensionData ed = find(gdata, extensionId);
 			if (ed!=null)
 				return ed;
@@ -176,7 +176,7 @@ public class PageData {
 	public String resolveExtension(String extensionId) {
 		// check the explicit groups
 		for (int i=0; i<groups.size(); i++) {
-			GroupData gdata = (GroupData)groups.get(i);
+			GroupData gdata = groups.get(i);
 			if (gdata.contains(extensionId)) {
 				return id+"/"+gdata.getPath()+"/"+extensionId;  //$NON-NLS-1$//$NON-NLS-2$
 			}
@@ -186,7 +186,7 @@ public class PageData {
 			return null;
 		// create the default: pick the last group
 		if (groups.size()==0) return null;
-		GroupData last = (GroupData)groups.get(groups.size()-1);
+		GroupData last = groups.get(groups.size()-1);
 		return id + "/" + last.getPath() + "/" + IUniversalIntroConstants.DEFAULT_ANCHOR;  //$NON-NLS-1$//$NON-NLS-2$
 	}
 	
@@ -195,7 +195,7 @@ public class PageData {
 		String indent2 = indent+"   "; //$NON-NLS-1$
 		writer.println("<page id=\""+id+"\">");  //$NON-NLS-1$//$NON-NLS-2$
 		for (int i=0; i<groups.size(); i++) {
-			GroupData gd = (GroupData)groups.get(i);
+			GroupData gd = groups.get(i);
 			gd.write(writer, indent2);
 		}
 		if (hidden!=null)
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/UniversalIntroConfigurer.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/UniversalIntroConfigurer.java
index 2e6f2a7a1..4e9b13506 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/UniversalIntroConfigurer.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/UniversalIntroConfigurer.java
@@ -48,7 +48,7 @@ public class UniversalIntroConfigurer extends IntroConfigurer implements
 	
 	private IntroData primaryIntroData;
 	private IntroData[] secondaryIntroData;
-	private SequenceResolver sequenceResolver;
+	private SequenceResolver<IntroElement> sequenceResolver;
 
 	public UniversalIntroConfigurer() {
 		loadData();
@@ -225,7 +225,7 @@ public class UniversalIntroConfigurer extends IntroConfigurer implements
 	}
 
 	public IntroElement[] getLaunchBarShortcuts() {
-		ArrayList links = new ArrayList();
+		ArrayList<IntroElement> links = new ArrayList<>();
 		String ids = getVariable(VAR_INTRO_ROOT_PAGES);
 		if (ids != null) {
 			StringTokenizer stok = new StringTokenizer(ids, ","); //$NON-NLS-1$
@@ -236,11 +236,11 @@ public class UniversalIntroConfigurer extends IntroConfigurer implements
 					links.add(page);
 			}
 		}
-		return (IntroElement[]) links.toArray(new IntroElement[links.size()]);
+		return links.toArray(new IntroElement[links.size()]);
 	}
 
 	private IntroElement[] getRootPageLinks(boolean standby) {
-		ArrayList links = new ArrayList();
+		ArrayList<IntroElement> links = new ArrayList<IntroElement>();
 		String ids = getVariable(VAR_INTRO_ROOT_PAGES);
 		if (ids != null) {
 			StringTokenizer stok = new StringTokenizer(ids, ","); //$NON-NLS-1$
@@ -258,7 +258,7 @@ public class UniversalIntroConfigurer extends IntroConfigurer implements
 			if (page !=null)
 				links.add(page);
 		}
-		return (IntroElement[]) links.toArray(new IntroElement[links.size()]);
+		return links.toArray(new IntroElement[links.size()]);
 	}
 
 	private IntroElement[] getRootPageActionLinks(boolean standby) {
@@ -274,7 +274,7 @@ public class UniversalIntroConfigurer extends IntroConfigurer implements
 	}
 
 	private IntroElement[] getNavLinks(String pageId) {
-		ArrayList links = new ArrayList();
+		ArrayList<IntroElement> links = new ArrayList<IntroElement>();
 		String ids = getVariable(VAR_INTRO_ROOT_PAGES);		
 		/*
 		 * In high contrast mode the workbench link must be generated in the nav links 
@@ -294,7 +294,7 @@ public class UniversalIntroConfigurer extends IntroConfigurer implements
 			}
 		}
 
-		return (IntroElement[]) links.toArray(new IntroElement[links.size()]);
+		return links.toArray(new IntroElement[links.size()]);
 	}
 
 	private IntroElement createRootPageLink(String id, boolean standby) {
@@ -500,7 +500,7 @@ public class UniversalIntroConfigurer extends IntroConfigurer implements
 			}
 		}
 		// load all other installed (but not running) products' intro data
-		List result = new ArrayList();
+		List<IntroData> result = new ArrayList<IntroData>();
 		Properties[] prefs = ProductPreferences.getProductPreferences(false);
 		for (int i=0;i<prefs.length;++i) {
 			String key = UniversalIntroPlugin.PLUGIN_ID + '/' + VAR_INTRO_DATA;
@@ -515,18 +515,18 @@ public class UniversalIntroConfigurer extends IntroConfigurer implements
 				}
 			}
 		}
-		secondaryIntroData = (IntroData[])result.toArray(new IntroData[result.size()]);
+		secondaryIntroData = result.toArray(new IntroData[result.size()]);
 	}
 
 	private IntroElement[] getContent(String pageId, String groupId) {
-		List result = new ArrayList();
+		List<IntroElement> result = new ArrayList<IntroElement>();
 		if (!ContentDetector.getNewContributors().isEmpty()) {
 			// Add a new content fallback anchor
 			IntroElement fallback = new IntroElement("anchor"); //$NON-NLS-1$
 			fallback.setAttribute("id", NEW_CONTENT_ANCHOR); //$NON-NLS-1$
 			result.add(fallback);
 		}
-		List anchors = getAnchors(pageId, groupId);
+		List<IntroElement> anchors = getAnchors(pageId, groupId);
 		if (anchors != null) {
 			result.addAll(anchors);
 		}
@@ -534,36 +534,38 @@ public class UniversalIntroConfigurer extends IntroConfigurer implements
 		IntroElement fallback = new IntroElement("anchor"); //$NON-NLS-1$
 		fallback.setAttribute("id", DEFAULT_ANCHOR); //$NON-NLS-1$
 		result.add(fallback);
-		return (IntroElement[]) result.toArray(new IntroElement[result.size()]);
+		return result.toArray(new IntroElement[result.size()]);
 	}
 
-	private List getAnchors(String pageId, String groupId) {
-		List primaryAnchors = null;
+	private List<IntroElement> getAnchors(String pageId, String groupId) {
+		List<IntroElement> primaryAnchors = null;
 		if (primaryIntroData != null) {
 			primaryAnchors = getAnchors(primaryIntroData, pageId, groupId);
 		}
 		if (primaryAnchors == null) {
-			primaryAnchors = Collections.EMPTY_LIST;
+			primaryAnchors = Collections.emptyList();
 		}
-		List secondaryAnchorsList = new ArrayList();
+		List<List<IntroElement>> secondaryAnchorsList = new ArrayList<>();
 		for (int i=0;i<secondaryIntroData.length;++i) {
 			IntroData idata = secondaryIntroData[i];
-			List anchors = getAnchors(idata, pageId, groupId);
+			List<IntroElement> anchors = getAnchors(idata, pageId, groupId);
 			if (anchors != null) {
 				secondaryAnchorsList.add(anchors);
 			}
 		}
-		List[] secondaryAnchors = (List[])secondaryAnchorsList.toArray(new List[secondaryAnchorsList.size()]);
+
+		@SuppressWarnings("unchecked")
+		List<IntroElement>[] secondaryAnchors = secondaryAnchorsList.toArray(new List[secondaryAnchorsList.size()]);
 		if (sequenceResolver == null) {
-			sequenceResolver = new SequenceResolver();
+			sequenceResolver = new SequenceResolver<IntroElement>();
 		}
 		return sequenceResolver.getSequence(primaryAnchors, secondaryAnchors);
 	}
 	
-	private List getAnchors(IntroData data, String pageId, String groupId) {
+	private List<IntroElement> getAnchors(IntroData data, String pageId, String groupId) {
 		PageData pdata = data.getPage(pageId);
 		if (pdata != null) {
-			List anchors = new ArrayList();
+			List<IntroElement> anchors = new ArrayList<IntroElement>();
 			pdata.addAnchors(anchors, groupId);
 			return anchors;
 		}
@@ -664,7 +666,7 @@ public class UniversalIntroConfigurer extends IntroConfigurer implements
 		return false;
 	}
 
-	public void init(IIntroSite site, Map themeProperties) {
+	public void init(IIntroSite site, Map<String, String> themeProperties) {
 		super.init(site, themeProperties);
 		Action customizeAction = new CustomizeAction(site);
 		customizeAction.setText(Messages.SharedIntroConfigurer_customize_label);
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/contentdetect/ContentDetectHelper.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/contentdetect/ContentDetectHelper.java
index 6749c32b2..d5fe11496 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/contentdetect/ContentDetectHelper.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/contentdetect/ContentDetectHelper.java
@@ -86,8 +86,8 @@ public class ContentDetectHelper {
 		saveMemento(writeMemento, EXTENSION_NAMES_XML);
 	}
 	
-	public Set getContributors() {	
-		Set contributors = new HashSet();
+	public Set<String> getContributors() {
+		Set<String> contributors = new HashSet<>();
 		XMLMemento readMemento = getReadMemento(EXTENSION_NAMES_XML);
 		if (readMemento == null) {
 			return contributors;
@@ -155,8 +155,8 @@ public class ContentDetectHelper {
 		return stateFile;
 	}
 	
-	public Set findNewContributors(Set contributors, Set previousContributors) {
-		Set result = new HashSet(contributors);
+	public Set<String> findNewContributors(Set<String> contributors, Set<String> previousContributors) {
+		Set<String> result = new HashSet<>(contributors);
 		for (Iterator iter = previousContributors.iterator(); iter.hasNext();) {
 			result.remove(iter.next());
 		}
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/contentdetect/ContentDetector.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/contentdetect/ContentDetector.java
index 78f4b226f..2cf157259 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/contentdetect/ContentDetector.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/contentdetect/ContentDetector.java
@@ -42,12 +42,12 @@ public class ContentDetector extends IntroContentDetector {
 			int previous = helper.getExtensionCount();
 			if (numIntroExtensions != previous) {
 				helper.saveExtensionCount(numIntroExtensions);
-				Set contributors = new HashSet();
+				Set<String> contributors = new HashSet<>();
 				for (int i = 0; i < extensions.length; i++) {
 					contributors.add(extensions[i].getContributor().getName());
 				}
 				if (numIntroExtensions > previous && previous != ContentDetectHelper.NO_STATE) {
-					Set previousContributors = helper.getContributors();
+					Set<String> previousContributors = helper.getContributors();
 					newContributors = helper.findNewContributors(contributors, previousContributors);
 					helper.saveContributors(contributors);
 					return true;
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/PreferenceArbiter.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/PreferenceArbiter.java
index c70b083f3..4173d89a3 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/PreferenceArbiter.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/PreferenceArbiter.java
@@ -20,15 +20,15 @@ import java.util.Map;
  */
 public class PreferenceArbiter {
 
-	private Map references;
+	private Map<Object, int[]> references;
 	private Object leader;
 	
 	public void consider(Object obj) {
 		if (obj != null) {
 			if (references == null) {
-				references = new HashMap();
+				references = new HashMap<>();
 			}
-			int[] count = (int[])references.get(obj);
+			int[] count = references.get(obj);
 			if (count == null) {
 				count = new int[] { 0 };
 				references.put(obj, count);
@@ -38,7 +38,7 @@ public class PreferenceArbiter {
 				if (leader == null) {
 					leader = obj;
 				}
-				else if (count[0] > ((int[])references.get(leader))[0]) {
+				else if (count[0] > (references.get(leader))[0]) {
 					leader = obj;
 				}
 			}