Remove warnings by generic'ising users of Collections classes
git-svn-id: http://webgoat.googlecode.com/svn/trunk@188 4033779f-a91e-0410-96ef-6bf7bf53c507
This commit is contained in:
@ -35,7 +35,7 @@ import java.util.Map;
|
||||
public class Authorization
|
||||
{
|
||||
|
||||
Map permissions = new Hashtable();
|
||||
Map<Integer, Integer> permissions = new Hashtable<Integer, Integer>();
|
||||
|
||||
|
||||
public Authorization()
|
||||
|
@ -535,7 +535,7 @@ public class ParameterParser
|
||||
*/
|
||||
public String[] getMissingParameters(String[] requestuired)
|
||||
{
|
||||
Vector missing = new Vector();
|
||||
Vector<String> missing = new Vector<String>();
|
||||
|
||||
for (int i = 0; i < requestuired.length; i++)
|
||||
{
|
||||
|
@ -50,7 +50,7 @@ public class UserTracker
|
||||
|
||||
// FIXME: persist this somehow!
|
||||
|
||||
private static HashMap storage = new HashMap();
|
||||
private static HashMap<String, HashMap<String, LessonTracker>> storage = new HashMap<String, HashMap<String, LessonTracker>>();
|
||||
|
||||
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<String, LessonTracker> 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<String, LessonTracker> getUserMap(String userName)
|
||||
{
|
||||
|
||||
HashMap usermap = (HashMap) storage.get(userName);
|
||||
HashMap<String, LessonTracker> usermap = storage.get(userName);
|
||||
|
||||
if (usermap == null)
|
||||
{
|
||||
|
||||
usermap = new HashMap();
|
||||
usermap = new HashMap<String, LessonTracker>();
|
||||
|
||||
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<String, LessonTracker> usermap = getUserMap(s.getUserName());
|
||||
usermap.put(screen.getTitle(), tracker);
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user