Fisheye: Tag 1.1.2.3 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/security/SecurityException.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java,v diff -u -r1.195.2.8 -r1.195.2.9 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 29 Oct 2014 12:44:54 -0000 1.195.2.8 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 31 Oct 2014 16:32:23 -0000 1.195.2.9 @@ -26,8 +26,6 @@ import java.io.IOException; import java.sql.Timestamp; -import java.text.DateFormat; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.Collection; @@ -38,7 +36,6 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.SortedSet; @@ -47,7 +44,6 @@ import java.util.TreeSet; import java.util.Vector; -import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.apache.commons.collections.CollectionUtils; @@ -74,29 +70,24 @@ import org.lamsfoundation.lams.learningdesign.dao.IGroupUserDAO; import org.lamsfoundation.lams.learningdesign.dao.IGroupingDAO; import org.lamsfoundation.lams.learningdesign.dao.ILearningDesignDAO; -import org.lamsfoundation.lams.learningdesign.dao.ITransitionDAO; import org.lamsfoundation.lams.lesson.CompletedActivityProgress; import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.lesson.LessonClass; import org.lamsfoundation.lams.lesson.dao.ILearnerProgressDAO; import org.lamsfoundation.lams.lesson.dao.ILessonClassDAO; import org.lamsfoundation.lams.lesson.dao.ILessonDAO; -import org.lamsfoundation.lams.lesson.dto.LessonDetailsDTO; import org.lamsfoundation.lams.lesson.service.ILessonService; import org.lamsfoundation.lams.lesson.service.LessonServiceException; import org.lamsfoundation.lams.logevent.LogEvent; import org.lamsfoundation.lams.logevent.service.ILogEventService; import org.lamsfoundation.lams.monitoring.MonitoringConstants; import org.lamsfoundation.lams.monitoring.dto.ContributeActivityDTO; import org.lamsfoundation.lams.security.ISecurityService; -import org.lamsfoundation.lams.security.SecurityException; import org.lamsfoundation.lams.tool.ToolSession; import org.lamsfoundation.lams.tool.exception.LamsToolServiceException; -import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.service.ILamsCoreToolService; import org.lamsfoundation.lams.usermanagement.Organisation; -import org.lamsfoundation.lams.usermanagement.OrganisationType; import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.Workspace; @@ -105,8 +96,6 @@ import org.lamsfoundation.lams.usermanagement.exception.UserAccessDeniedException; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.usermanagement.util.LastNameAlphabeticComparator; -import org.lamsfoundation.lams.util.Configuration; -import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.DateUtil; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.audit.AuditService; @@ -371,7 +360,7 @@ Boolean learnerRestart, Integer scheduledNumberDaysToLessonFinish, Long precedingLessonId) { securityService.isGroupMonitor(organisationId, userID, "intializeLesson", true); - + LearningDesign originalLearningDesign = authoringService.getLearningDesign(new Long(learningDesignId)); if (originalLearningDesign == null) { throw new MonitoringServiceException("Learning design for id=" + learningDesignId @@ -573,7 +562,7 @@ @Override public void startLessonOnSchedule(long lessonId, Date startDate, Integer userId) { securityService.isLessonMonitor(lessonId, userId, "start lesson on schedule", true); - + // we get the lesson just created Lesson requestedLesson = lessonDAO.getLesson(new Long(lessonId)); if (requestedLesson.isLessonStarted()) { @@ -626,7 +615,7 @@ @Override public void finishLessonOnSchedule(long lessonId, int scheduledNumberDaysToLessonFinish, Integer userId) { securityService.isLessonMonitor(lessonId, userId, "finish lesson on schedule", true); - + // we get the lesson want to finish Lesson requestedLesson = lessonDAO.getLesson(new Long(lessonId)); String triggerName = "finishLessonOnScheduleTrigger:" + lessonId; @@ -947,7 +936,7 @@ @Override public Boolean setLearnerPortfolioAvailable(long lessonId, Integer userId, Boolean isLearnerExportAvailable) { securityService.isLessonMonitor(lessonId, userId, "set learner portfolio available", true); - + isLearnerExportAvailable = (isLearnerExportAvailable != null) ? isLearnerExportAvailable : Boolean.FALSE; Lesson lesson = lessonDAO.getLesson(new Long(lessonId)); lesson.setLearnerExportAvailable(isLearnerExportAvailable); @@ -1236,7 +1225,7 @@ // be set. if (stopReason == null) { LearnerProgress learnerProgress = learnerService.getProgress(learner.getUserId(), lessonId); - if (stopActivity != null && learnerProgress.getCompletedActivities().containsKey(stopActivity)) { + if ((stopActivity != null) && learnerProgress.getCompletedActivities().containsKey(stopActivity)) { // we have reached the stop activity. It may have been the // activity we just processed // or it may have been a parent activity (e.g. an optional @@ -1256,7 +1245,7 @@ // now where? if ((nextActivity == null) - || (activity != null && nextActivity.getActivityId().equals(activity.getActivityId()))) { + || ((activity != null) && nextActivity.getActivityId().equals(activity.getActivityId()))) { // looks like we have reached the end of the sequence? stopReason = messageService .getMessage(MonitoringService.FORCE_COMPLETE_STOP_MESSAGE_COMPLETED_TO_END); Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ComplexLearnerProgressAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ComplexLearnerProgressAction.java,v diff -u -r1.6.2.1 -r1.6.2.2 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ComplexLearnerProgressAction.java 29 Oct 2014 12:03:34 -0000 1.6.2.1 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ComplexLearnerProgressAction.java 31 Oct 2014 16:32:23 -0000 1.6.2.2 @@ -49,7 +49,6 @@ import org.lamsfoundation.lams.monitoring.dto.ContributeActivityDTO; import org.lamsfoundation.lams.monitoring.service.IMonitoringService; import org.lamsfoundation.lams.monitoring.service.MonitoringServiceProxy; -import org.lamsfoundation.lams.security.SecurityException; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.session.SessionManager; Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java,v diff -u -r1.118.2.7 -r1.118.2.8 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 29 Oct 2014 12:03:34 -0000 1.118.2.7 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 31 Oct 2014 16:32:23 -0000 1.118.2.8 @@ -75,7 +75,6 @@ import org.lamsfoundation.lams.monitoring.service.IMonitoringService; import org.lamsfoundation.lams.monitoring.service.MonitoringServiceProxy; import org.lamsfoundation.lams.security.ISecurityService; -import org.lamsfoundation.lams.security.SecurityException; import org.lamsfoundation.lams.timezone.service.ITimezoneService; import org.lamsfoundation.lams.tool.exception.LamsToolServiceException; import org.lamsfoundation.lams.usermanagement.Organisation;