Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ListingLearningDesignProcessor.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ListingLearningDesignProcessor.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ListingLearningDesignProcessor.java (revision d410626d215698996ea23e539fc9f43a029c305c) @@ -0,0 +1,39 @@ +package org.lamsfoundation.lams.learningdesign; + +import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO; +import org.lamsfoundation.lams.learningdesign.exception.LearningDesignProcessorException; + +import java.util.ArrayList; + +public class ListingLearningDesignProcessor extends LearningDesignProcessor { + + ArrayList activityList; + + public ListingLearningDesignProcessor(LearningDesign design, IActivityDAO activityDAO) { + super(design, activityDAO); + activityList = new ArrayList<>(); + } + + @Override + public boolean startComplexActivity(ComplexActivity activity) throws LearningDesignProcessorException { + return true; + } + + @Override + public void endComplexActivity(ComplexActivity activity) throws LearningDesignProcessorException { + activityList.add(activity); + } + + @Override + public void startSimpleActivity(SimpleActivity activity) throws LearningDesignProcessorException { + } + + @Override + public void endSimpleActivity(SimpleActivity activity) throws LearningDesignProcessorException { + activityList.add(activity); + } + + public ArrayList getActivityList() { + return activityList; + } +} \ No newline at end of file Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java =================================================================== diff -u -rbe74862925361d836bef1df4c5959105c9695a87 -rd410626d215698996ea23e539fc9f43a029c305c --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java (.../RepopulateProgressMarksServlet.java) (revision be74862925361d836bef1df4c5959105c9695a87) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java (.../RepopulateProgressMarksServlet.java) (revision d410626d215698996ea23e539fc9f43a029c305c) @@ -23,27 +23,11 @@ package org.lamsfoundation.lams.learning.web.servlet; -import java.io.IOException; -import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.Set; - -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - import org.apache.log4j.Logger; import org.lamsfoundation.lams.learning.service.ILearnerFullService; import org.lamsfoundation.lams.learningdesign.Activity; -import org.lamsfoundation.lams.learningdesign.ComplexActivity; -import org.lamsfoundation.lams.learningdesign.LearningDesign; -import org.lamsfoundation.lams.learningdesign.LearningDesignProcessor; -import org.lamsfoundation.lams.learningdesign.SimpleActivity; +import org.lamsfoundation.lams.learningdesign.ListingLearningDesignProcessor; import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO; -import org.lamsfoundation.lams.learningdesign.exception.LearningDesignProcessorException; import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.lesson.service.ILessonService; @@ -54,10 +38,19 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.SpringBeanAutowiringSupport; -import org.springframework.web.context.support.WebApplicationContextUtils; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.Set; + @SuppressWarnings("serial") public class RepopulateProgressMarksServlet extends HttpServlet { @@ -113,7 +106,7 @@ .append(".\n----------------------------------------------------------------------------------\n\n") .toString(); - ActivitiesToCheckProcessor processor = new ActivitiesToCheckProcessor(lesson.getLearningDesign(), + ListingLearningDesignProcessor processor = new ListingLearningDesignProcessor(lesson.getLearningDesign(), activityDAO); processor.parseLearningDesign(); ArrayList activityList = processor.getActivityList(); @@ -185,37 +178,4 @@ throws ServletException, IOException { doGet(request, response); } - - class ActivitiesToCheckProcessor extends LearningDesignProcessor { - - ArrayList activityList; - - public ActivitiesToCheckProcessor(LearningDesign design, IActivityDAO activityDAO) { - super(design, activityDAO); - activityList = new ArrayList<>(); - } - - @Override - public boolean startComplexActivity(ComplexActivity activity) throws LearningDesignProcessorException { - return true; - } - - @Override - public void endComplexActivity(ComplexActivity activity) throws LearningDesignProcessorException { - activityList.add(activity); - } - - @Override - public void startSimpleActivity(SimpleActivity activity) throws LearningDesignProcessorException { - } - - @Override - public void endSimpleActivity(SimpleActivity activity) throws LearningDesignProcessorException { - activityList.add(activity); - } - - public ArrayList getActivityList() { - return activityList; - } - } } \ No newline at end of file