From 52f23a20f407b01e02a71d34743e9824cca81f91 Mon Sep 17 00:00:00 2001
From: "rogan.dawes" <rogan.dawes@4033779f-a91e-0410-96ef-6bf7bf53c507>
Date: Tue, 10 Jul 2007 11:48:20 +0000
Subject: [PATCH] Move maintanance of lesson categories from AbstractLesson
 into Category class

git-svn-id: http://webgoat.googlecode.com/svn/trunk@130 4033779f-a91e-0410-96ef-6bf7bf53c507
---
 .../owasp/webgoat/lessons/AbstractLesson.java | 43 +------------------
 .../org/owasp/webgoat/lessons/Category.java   | 40 ++++++++++++++++-
 2 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/AbstractLesson.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/AbstractLesson.java
index 739242beb..4fa6ef925 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/AbstractLesson.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/AbstractLesson.java	
@@ -100,8 +100,6 @@ public abstract class AbstractLesson extends Screen implements Comparable
     final static IMG previousGrey = new IMG("images/left14.gif").setAlt(
 	    "Previous").setBorder(0).setHspace(0).setVspace(0);
 
-    private static Vector<Category> categories = new Vector<Category>();
-
     private Integer ranking;
 
     private Category category;
@@ -117,22 +115,6 @@ public abstract class AbstractLesson extends Screen implements Comparable
      */
     public AbstractLesson()
     {
-		categories.add(Category.A1);
-		categories.add(Category.A2);
-		categories.add(Category.A3);
-		categories.add(Category.A4);
-		categories.add(Category.A5);
-		categories.add(Category.A6);
-		categories.add(Category.A7);
-		categories.add(Category.A8);
-		categories.add(Category.A9);
-		categories.add(Category.A10);
-		categories.add(Category.WEB_SERVICES);
-		categories.add(Category.AJAX_SECURITY);
-		categories.add(Category.ADMIN_FUNCTIONS);
-		categories.add(Category.GENERAL);
-		categories.add(Category.CODE_QUALITY);
-		categories.add(Category.CHALLENGE);
     	id = new Integer(++count);
     }
 
@@ -155,27 +137,6 @@ public abstract class AbstractLesson extends Screen implements Comparable
 	this.hidden = hidden;
     }
 
-
-    public static Category getCategory(String myCategoryName)
-    {
-	Category myCategory = null;
-
-	Iterator i = categories.iterator();
-	boolean done = false;
-	while (i.hasNext() && !done)
-	{
-	    Category category = (Category) i.next();
-	    if (category.getName().equalsIgnoreCase(myCategoryName))
-	    {
-		myCategory = category;
-		done = true;
-	    }
-	}
-
-	return myCategory;
-    }
-
-
     public void update(WebgoatProperties properties)
     {
 	String className = getClass().getName();
@@ -185,7 +146,7 @@ public abstract class AbstractLesson extends Screen implements Comparable
 	String categoryRankingKey = "category."
 		+ getDefaultCategory().getName() + ".ranking";
 	// System.out.println("Category ranking key: " + categoryRankingKey);
-	Category tempCategory = AbstractLesson.getCategory(getDefaultCategory()
+	Category tempCategory = Category.getCategory(getDefaultCategory()
 		.getName());
 	tempCategory.setRanking(new Integer(properties.getIntProperty(
 		categoryRankingKey, getDefaultCategory().getRanking()
@@ -263,7 +224,7 @@ public abstract class AbstractLesson extends Screen implements Comparable
     {
 	if (categoryName != null)
 	{
-	    category = getCategory(categoryName);
+	    category = Category.getCategory(categoryName);
 	}
 	else
 	{
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Category.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Category.java
index 3d8e9b8a0..1a0d6d525 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Category.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Category.java	
@@ -1,5 +1,9 @@
 package org.owasp.webgoat.lessons;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
 /*******************************************************************************
  * 
  * 
@@ -83,11 +87,45 @@ public class Category implements Comparable
     public final static Category CHALLENGE = new Category("Challenge",
 	    new Integer(2000));
 
+    private static final List<Category> categories = new ArrayList<Category>();
+    
     private String category;
 
     private Integer ranking;
 
-
+    static {
+		categories.add(A1);
+		categories.add(A2);
+		categories.add(A3);
+		categories.add(A4);
+		categories.add(A5);
+		categories.add(A6);
+		categories.add(A7);
+		categories.add(A8);
+		categories.add(A9);
+		categories.add(A10);
+		categories.add(WEB_SERVICES);
+		categories.add(AJAX_SECURITY);
+		categories.add(ADMIN_FUNCTIONS);
+		categories.add(GENERAL);
+		categories.add(CODE_QUALITY);
+		categories.add(CHALLENGE);
+    }
+    
+    public static synchronized void addCategory(Category c) {
+    	categories.add(c);
+    }
+    
+    public static synchronized Category getCategory(String name) {
+    	Iterator<Category> it = categories.iterator();
+    	while (it.hasNext()) {
+    		Category c = it.next();
+    		if (c.getName().equals(name))
+    			return c;
+    	}
+    	return null;
+    }
+    
     public Category(String category, Integer ranking)
     {
 	this.category = category;