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 109f7c13c..737e02d03 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/AbstractLesson.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/AbstractLesson.java @@ -142,9 +142,6 @@ public abstract class AbstractLesson extends Screen implements Comparable public final static Category AJAX_SECURITY = new Category("AJAX Security", new Integer(1150)); - public final static Category NEW_LESSON = new Category("New Lessons", - new Integer(1210)); - public final static Category ADMIN_FUNCTIONS = new Category( "Admin Functions", new Integer(10)); @@ -196,34 +193,28 @@ public abstract class AbstractLesson extends Screen implements Comparable private String lessonPlanFileName; - 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(NEW_LESSON); - categories.add(ADMIN_FUNCTIONS); - categories.add(GENERAL); - categories.add(CODE_QUALITY); - categories.add(CHALLENGE); - } - - /** * Constructor for the Lesson object */ public AbstractLesson() { - id = new Integer(++count); + 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); + id = new Integer(++count); } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/NewLesson.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/NewLesson.java index ec2758c2e..9c91e8cc1 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/NewLesson.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/NewLesson.java @@ -61,15 +61,15 @@ public class NewLesson extends LessonAdapter */ protected Category getDefaultCategory() { - return AbstractLesson.NEW_LESSON; + return GENERAL; } - private final static Integer DEFAULT_RANKING = new Integer(10); + private final static Integer DEFAULT_RANKING = new Integer(5); protected Integer getDefaultRanking() { - return DEFAULT_RANKING; + return DEFAULT_RANKING; }