Merge pull request #85 from mayhew64/master

Added a lesson restart for lesson specific restart actions

webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java

@@ -676,6 +676,12 @@ public abstract class AbstractLesson extends Screen implements Comparable<Object
      */
     public abstract String getCurrentAction(WebSession s);
 
+   /**
+    * Initiates lesson restart functionality
+    */
+   public abstract void restartLesson();
+
+    
     /**
      * <p>setCurrentAction.</p>
      *

webgoat-container/src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java

@@ -111,6 +111,14 @@ public abstract class LessonAdapter extends AbstractLesson {
         return false;
     }
 
+    /**
+     * Initiates lesson restart functionality. Lessons should override this for 
+     * lesson specific actions 
+     */
+    public void restartLesson() {
+        // Do Nothing - called when restart lesson is pressed. Each lesson can do something
+    }
+        
     private final static Integer DEFAULT_RANKING = new Integer(1000);
 
     /**

webgoat-container/src/main/java/org/owasp/webgoat/session/WebSession.java

@@ -1126,6 +1126,7 @@ public class WebSession {
     public void restartLesson(int lessonId) {
         AbstractLesson al = getLesson(lessonId);
         System.out.println("Restarting lesson: " + al);
+        al.restartLesson();
         al.getLessonTracker(this).setCompleted(false);
         if (al instanceof SequentialLessonAdapter) {
             SequentialLessonAdapter sla = (SequentialLessonAdapter) al;