From 9e352396d3e64ff947aaae20914db244f82b5141 Mon Sep 17 00:00:00 2001 From: "rogan.dawes" Date: Wed, 18 Jul 2007 13:32:59 +0000 Subject: [PATCH] Remove warnings by generic'ising users of Collections classes git-svn-id: http://webgoat.googlecode.com/svn/trunk@188 4033779f-a91e-0410-96ef-6bf7bf53c507 --- .../org/owasp/webgoat/lessons/XMLInjection.java | 4 ++-- .../org/owasp/webgoat/session/Authorization.java | 2 +- .../org/owasp/webgoat/session/ParameterParser.java | 2 +- .../org/owasp/webgoat/session/UserTracker.java | 12 ++++++------ .../org/owasp/webgoat/util/HtmlEncoder.java | 12 ++++++------ 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/XMLInjection.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/XMLInjection.java index b5feeec3c..76229d9d4 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/XMLInjection.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/XMLInjection.java @@ -58,12 +58,12 @@ public class XMLInjection extends LessonAdapter private final static String ACCOUNTID = "accountID"; - public static HashMap rewardsMap = new HashMap(); + public static HashMap rewardsMap = new HashMap(); private final static IMG MAC_LOGO = new IMG("images/logos/macadamian.gif").setAlt( "Macadamian Technologies").setBorder(0).setHspace(0).setVspace(0); - protected static HashMap init() + protected static HashMap init() { Reward r = new Reward(); diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/Authorization.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/Authorization.java index e1b3cde99..e01428c25 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/Authorization.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/Authorization.java @@ -35,7 +35,7 @@ import java.util.Map; public class Authorization { - Map permissions = new Hashtable(); + Map permissions = new Hashtable(); public Authorization() diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/ParameterParser.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/ParameterParser.java index 1558528ed..25321089e 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/ParameterParser.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/ParameterParser.java @@ -535,7 +535,7 @@ public class ParameterParser */ public String[] getMissingParameters(String[] requestuired) { - Vector missing = new Vector(); + Vector missing = new Vector(); for (int i = 0; i < requestuired.length; i++) { diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/UserTracker.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/UserTracker.java index 225498db2..91808d020 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/UserTracker.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/UserTracker.java @@ -50,7 +50,7 @@ public class UserTracker // FIXME: persist this somehow! - private static HashMap storage = new HashMap(); + private static HashMap> storage = new HashMap>(); private static MemoryUserDatabase usersDB = new MemoryUserDatabase(); @@ -180,7 +180,7 @@ public class UserTracker public LessonTracker getLessonTracker(WebSession s, String user, Screen screen) { - HashMap usermap = getUserMap(user); + HashMap usermap = getUserMap(user); LessonTracker tracker = (LessonTracker) usermap.get(screen.getTitle()); if (tracker == null) { @@ -214,15 +214,15 @@ public class UserTracker * @param userName Description of the Parameter * @return The userMap value */ - private HashMap getUserMap(String userName) + private HashMap getUserMap(String userName) { - HashMap usermap = (HashMap) storage.get(userName); + HashMap usermap = storage.get(userName); if (usermap == null) { - usermap = new HashMap(); + usermap = new HashMap(); storage.put(userName, usermap); @@ -265,7 +265,7 @@ public class UserTracker //System.out.println( "User [" + s.getUserName() + "] TRACKER: updating " + screen + " LTH " + tracker.hashCode() ); tracker.store(s, screen); - HashMap usermap = getUserMap(s.getUserName()); + HashMap usermap = getUserMap(s.getUserName()); usermap.put(screen.getTitle(), tracker); } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/util/HtmlEncoder.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/util/HtmlEncoder.java index b1d0d8b3a..2c613c890 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/util/HtmlEncoder.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/util/HtmlEncoder.java @@ -35,9 +35,9 @@ import java.util.Map; public class HtmlEncoder { - static Map e2i = new HashMap(); + static Map e2i = new HashMap(); - static Map i2e = new HashMap(); + static Map i2e = new HashMap(); // html entity list private static Object[][] entities = { { "quot", new Integer(34) }, // " - double-quote @@ -120,9 +120,9 @@ public class HtmlEncoder public HtmlEncoder() { for (int i = 0; i < entities.length; i++) - e2i.put(entities[i][0], entities[i][1]); + e2i.put((String)entities[i][0], (Integer)entities[i][1]); for (int i = 0; i < entities.length; i++) - i2e.put(entities[i][1], entities[i][0]); + i2e.put((Integer)entities[i][1], (String)entities[i][0]); } @@ -146,7 +146,7 @@ public class HtmlEncoder { char ch = s1.charAt(i); - String entity = (String) i2e.get(new Integer((int) ch)); + String entity = i2e.get(new Integer((int) ch)); if (entity == null) { @@ -202,7 +202,7 @@ public class HtmlEncoder } else { - iso = (Integer) e2i.get(entity); + iso = e2i.get(entity); } if (iso == null) {