From 6e8d8562d6d158523f49967fedf5c7f6eb4ba9aa Mon Sep 17 00:00:00 2001 From: mayhew64 <mayhew64@yahoo.com> Date: Sun, 3 May 2015 16:31:52 -0400 Subject: [PATCH] WEB-203 deprecated getCredits - credits moved to the about page --- src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java | 1 + src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java | 2 ++ src/main/java/org/owasp/webgoat/lessons/WelcomeScreen.java | 5 ----- src/main/java/org/owasp/webgoat/session/ErrorScreen.java | 5 ----- src/main/java/org/owasp/webgoat/session/Screen.java | 6 ------ src/main/webapp/main.jsp | 3 --- 6 files changed, 3 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java b/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java index 524f3123b..36aab1e60 100644 --- a/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java +++ b/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java @@ -161,6 +161,7 @@ public abstract class AbstractLesson extends Screen implements Comparable<Object /** * Gets the credits attribute of the AbstractLesson object * + * @deprecated - Credits have moved to the about page * @return The credits value */ public abstract Element getCredits(); diff --git a/src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java b/src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java index c905cc0ee..f85a11b93 100644 --- a/src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java +++ b/src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java @@ -140,6 +140,8 @@ public abstract class LessonAdapter extends AbstractLesson { /** * Gets the credits attribute of the AbstractLesson object * + * @deprecated Credits are in the about page. This method s no + * longer called from WebGoat * @return The credits value */ public Element getCredits() { diff --git a/src/main/java/org/owasp/webgoat/lessons/WelcomeScreen.java b/src/main/java/org/owasp/webgoat/lessons/WelcomeScreen.java index db8e37114..0342dd462 100644 --- a/src/main/java/org/owasp/webgoat/lessons/WelcomeScreen.java +++ b/src/main/java/org/owasp/webgoat/lessons/WelcomeScreen.java @@ -112,11 +112,6 @@ public class WelcomeScreen extends Screen return (ec); } - public Element getCredits() - { - return new ElementContainer(); - } - /** * Gets the instructions attribute of the WelcomeScreen object * diff --git a/src/main/java/org/owasp/webgoat/session/ErrorScreen.java b/src/main/java/org/owasp/webgoat/session/ErrorScreen.java index 07fe1e4fd..687e72b6b 100644 --- a/src/main/java/org/owasp/webgoat/session/ErrorScreen.java +++ b/src/main/java/org/owasp/webgoat/session/ErrorScreen.java @@ -209,11 +209,6 @@ public class ErrorScreen extends Screen return (new Small().addElement(list)); } - public Element getCredits() - { - return new ElementContainer(); - } - /** * Description of the Method * diff --git a/src/main/java/org/owasp/webgoat/session/Screen.java b/src/main/java/org/owasp/webgoat/session/Screen.java index 0a85cd496..d19c46d01 100644 --- a/src/main/java/org/owasp/webgoat/session/Screen.java +++ b/src/main/java/org/owasp/webgoat/session/Screen.java @@ -79,12 +79,6 @@ public abstract class Screen { */ protected abstract Element createContent(WebSession s); - /** - * Gets the credits attribute of the Screen object - * - * @return The credits value - */ - public abstract Element getCredits(); /** * Creates a new lessonTracker object. diff --git a/src/main/webapp/main.jsp b/src/main/webapp/main.jsp index 7e704027d..eeb9c9e06 100644 --- a/src/main/webapp/main.jsp +++ b/src/main/webapp/main.jsp @@ -278,9 +278,6 @@ <% } %> - <div id="credits"> - <% out.println(currentLesson.getCredits());%> - </div> </div> </div>