Part 2 of fix for Bug 359761 - [Help] Warnings for Generics showing in

org.eclipse.help.base after switch to J2SE-1.5

1 files changed, 4 insertions, 4 deletions

diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/criteria/ParseTocWithCriteria.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/criteria/ParseTocWithCriteria.java
index f980bfd0e..fa3d5b2fe 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/criteria/ParseTocWithCriteria.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/criteria/ParseTocWithCriteria.java
@@ -62,7 +62,7 @@ public class ParseTocWithCriteria extends TestCase {
 
 	public void testTocWithCriteria() throws Exception {
 		IToc2 toc = parseToc("data/help/criteria/c1.xml");
-		Map<String, Set> criteria = new HashMap<String, Set>();
+		Map<String, Set<String>> criteria = new HashMap<String, Set<String>>();
 		CriteriaUtilities.addCriteriaToMap(criteria, toc.getCriteria());
 	    assertEquals(2, criteria.size());
 	    Object  versions = criteria.get("version");
@@ -83,7 +83,7 @@ public class ParseTocWithCriteria extends TestCase {
 	public void testCopyTocWithCriteria() throws Exception {
 		IToc toc0 = parseToc("data/help/criteria/c1.xml");
 		Toc toc = new Toc(toc0);
-		Map<String, Set> criteria = new HashMap<String, Set>();
+		Map<String, Set<String>> criteria = new HashMap<String, Set<String>>();
 		CriteriaUtilities.addCriteriaToMap(criteria, toc.getCriteria());
 	    assertEquals(2, criteria.size());
 	    Object  versions = criteria.get("version");
@@ -106,7 +106,7 @@ public class ParseTocWithCriteria extends TestCase {
 		ITopic[] topics = (ITopic[]) toc.getTopics();
 		assertEquals(topics.length, 2);
 		// First topic
-		Map<String, Set> criteria = new HashMap<String, Set>();
+		Map<String, Set<String>> criteria = new HashMap<String, Set<String>>();
 		assertTrue(topics[0] instanceof ITopic2);
 		CriteriaUtilities.addCriteriaToMap(criteria, ((ITopic2)topics[0]).getCriteria());
 	    assertEquals(2, criteria.size());
@@ -119,7 +119,7 @@ public class ParseTocWithCriteria extends TestCase {
 
 		// Second topic
 
-		criteria = new HashMap<String, Set>();
+		criteria = new HashMap<String, Set<String>>();
 		assertTrue(topics[1] instanceof ITopic2);
 		CriteriaUtilities.addCriteriaToMap(criteria, ((ITopic2)topics[1]).getCriteria());	   
 	    versions = criteria.get("version");