Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dto/VoteGeneralMonitoringDTO.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rb13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dto/VoteGeneralMonitoringDTO.java (.../VoteGeneralMonitoringDTO.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dto/VoteGeneralMonitoringDTO.java (.../VoteGeneralMonitoringDTO.java) (revision b13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8) @@ -23,14 +23,14 @@ package org.lamsfoundation.lams.tool.vote.dto; import java.util.List; -import java.util.Map; +//import java.util.Map; /** * DTO that holds monitoring flow properties * * @author Ozgur Demirtas */ -public class VoteGeneralMonitoringDTO implements Comparable { +public class VoteGeneralMonitoringDTO implements Comparable { protected String requestLearningReport; protected String userExceptionNoToolSessions; protected String userExceptionContentInUse; @@ -48,16 +48,16 @@ // protected List listMonitoredAnswersContainerDto; protected List sessionDTOs; - protected Map mapStandardNominationsContent; - protected Map mapStandardNominationsHTMLedContent; - protected Map mapStandardRatesContent; - protected Map mapStandardUserCount; - protected Map mapStandardQuestionUid; - protected Map mapStandardToolSessionUid; + // protected Map mapStandardNominationsContent; + // protected Map mapStandardNominationsHTMLedContent; + // protected Map mapStandardRatesContent; + // protected Map mapStandardUserCount; + // protected Map mapStandardQuestionUid; + // protected Map mapStandardToolSessionUid; protected String sessionUserCount; protected String completedSessionUserCount; - protected List mapStudentsVoted; + // protected List mapStudentsVoted; protected String contentFolderID; @@ -226,112 +226,112 @@ this.sessionDTOs = sessionDTOs; } - /** - * @return Returns the mapStandardNominationsContent. - */ - public Map getMapStandardNominationsContent() { - return mapStandardNominationsContent; - } +// /** +// * @return Returns the mapStandardNominationsContent. +// */ +// public Map getMapStandardNominationsContent() { +// return mapStandardNominationsContent; +// } +// +// /** +// * @param mapStandardNominationsContent +// * The mapStandardNominationsContent to set. +// */ +// public void setMapStandardNominationsContent(Map mapStandardNominationsContent) { +// this.mapStandardNominationsContent = mapStandardNominationsContent; +// } - /** - * @param mapStandardNominationsContent - * The mapStandardNominationsContent to set. - */ - public void setMapStandardNominationsContent(Map mapStandardNominationsContent) { - this.mapStandardNominationsContent = mapStandardNominationsContent; - } +// /** +// * @return Returns the mapStandardNominationsHTMLedContent. +// */ +// public Map getMapStandardNominationsHTMLedContent() { +// return mapStandardNominationsHTMLedContent; +// } +// +// /** +// * @param mapStandardNominationsHTMLedContent +// * The mapStandardNominationsHTMLedContent to set. +// */ +// public void setMapStandardNominationsHTMLedContent(Map mapStandardNominationsHTMLedContent) { +// this.mapStandardNominationsHTMLedContent = mapStandardNominationsHTMLedContent; +// } - /** - * @return Returns the mapStandardNominationsHTMLedContent. - */ - public Map getMapStandardNominationsHTMLedContent() { - return mapStandardNominationsHTMLedContent; - } +// /** +// * @return Returns the mapStandardQuestionUid. +// */ +// public Map getMapStandardQuestionUid() { +// return mapStandardQuestionUid; +// } +// +// /** +// * @param mapStandardQuestionUid +// * The mapStandardQuestionUid to set. +// */ +// public void setMapStandardQuestionUid(Map mapStandardQuestionUid) { +// this.mapStandardQuestionUid = mapStandardQuestionUid; +// } - /** - * @param mapStandardNominationsHTMLedContent - * The mapStandardNominationsHTMLedContent to set. - */ - public void setMapStandardNominationsHTMLedContent(Map mapStandardNominationsHTMLedContent) { - this.mapStandardNominationsHTMLedContent = mapStandardNominationsHTMLedContent; - } +// /** +// * @return Returns the mapStandardRatesContent. +// */ +// public Map getMapStandardRatesContent() { +// return mapStandardRatesContent; +// } +// +// /** +// * @param mapStandardRatesContent +// * The mapStandardRatesContent to set. +// */ +// public void setMapStandardRatesContent(Map mapStandardRatesContent) { +// this.mapStandardRatesContent = mapStandardRatesContent; +// } - /** - * @return Returns the mapStandardQuestionUid. - */ - public Map getMapStandardQuestionUid() { - return mapStandardQuestionUid; - } +// /** +// * @return Returns the mapStandardToolSessionUid. +// */ +// public Map getMapStandardToolSessionUid() { +// return mapStandardToolSessionUid; +// } +// +// /** +// * @param mapStandardToolSessionUid +// * The mapStandardToolSessionUid to set. +// */ +// public void setMapStandardToolSessionUid(Map mapStandardToolSessionUid) { +// this.mapStandardToolSessionUid = mapStandardToolSessionUid; +// } - /** - * @param mapStandardQuestionUid - * The mapStandardQuestionUid to set. - */ - public void setMapStandardQuestionUid(Map mapStandardQuestionUid) { - this.mapStandardQuestionUid = mapStandardQuestionUid; - } +// /** +// * @return Returns the mapStandardUserCount. +// */ +// public Map getMapStandardUserCount() { +// return mapStandardUserCount; +// } +// +// /** +// * @param mapStandardUserCount +// * The mapStandardUserCount to set. +// */ +// public void setMapStandardUserCount(Map mapStandardUserCount) { +// this.mapStandardUserCount = mapStandardUserCount; +// } - /** - * @return Returns the mapStandardRatesContent. - */ - public Map getMapStandardRatesContent() { - return mapStandardRatesContent; - } +// /** +// * @param mapStudentsVoted +// * The mapStudentsVoted to set. +// */ +// public void setMapStudentsVoted(List mapStudentsVoted) { +// this.mapStudentsVoted = mapStudentsVoted; +// } +// +// /** +// * @return Returns the mapStudentsVoted. +// */ +// public List getMapStudentsVoted() { +// return mapStudentsVoted; +// } /** - * @param mapStandardRatesContent - * The mapStandardRatesContent to set. - */ - public void setMapStandardRatesContent(Map mapStandardRatesContent) { - this.mapStandardRatesContent = mapStandardRatesContent; - } - - /** - * @return Returns the mapStandardToolSessionUid. - */ - public Map getMapStandardToolSessionUid() { - return mapStandardToolSessionUid; - } - - /** - * @param mapStandardToolSessionUid - * The mapStandardToolSessionUid to set. - */ - public void setMapStandardToolSessionUid(Map mapStandardToolSessionUid) { - this.mapStandardToolSessionUid = mapStandardToolSessionUid; - } - - /** - * @return Returns the mapStandardUserCount. - */ - public Map getMapStandardUserCount() { - return mapStandardUserCount; - } - - /** - * @param mapStandardUserCount - * The mapStandardUserCount to set. - */ - public void setMapStandardUserCount(Map mapStandardUserCount) { - this.mapStandardUserCount = mapStandardUserCount; - } - - /** - * @param mapStudentsVoted - * The mapStudentsVoted to set. - */ - public void setMapStudentsVoted(List mapStudentsVoted) { - this.mapStudentsVoted = mapStudentsVoted; - } - - /** - * @return Returns the mapStudentsVoted. - */ - public List getMapStudentsVoted() { - return mapStudentsVoted; - } - - /** * @return Returns the responseId. */ public String getResponseId() { Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dto/VoteMonitoredAnswersDTO.java =================================================================== diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -rb13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dto/VoteMonitoredAnswersDTO.java (.../VoteMonitoredAnswersDTO.java) (revision 5773f84ed608838de3521ecde87c52f3c72d478c) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dto/VoteMonitoredAnswersDTO.java (.../VoteMonitoredAnswersDTO.java) (revision b13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8) @@ -22,7 +22,7 @@ package org.lamsfoundation.lams.tool.vote.dto; -import java.util.List; +//import java.util.List; import java.util.Map; import org.apache.commons.lang.builder.ToStringBuilder; @@ -34,15 +34,16 @@ * * @author Ozgur Demirtas */ -public class VoteMonitoredAnswersDTO implements Comparable { +public class VoteMonitoredAnswersDTO implements Comparable { protected String questionUid; private String question; private String attemptUid; - private List candidateAnswers; + // private List candidateAnswers; + @SuppressWarnings("rawtypes") private Map questionAttempts; private String sessionId; @@ -79,22 +80,22 @@ this.sessionName = sessionName; } - /** - * @return Returns the candidateAnswers. - */ - public List getCandidateAnswers() { - return candidateAnswers; - } +// /** +// * @return Returns the candidateAnswers. +// */ +// public List getCandidateAnswers() { +// return candidateAnswers; +// } +// +// /** +// * @param candidateAnswers +// * The candidateAnswers to set. +// */ +// public void setCandidateAnswers(List candidateAnswers) { +// this.candidateAnswers = candidateAnswers; +// } /** - * @param candidateAnswers - * The candidateAnswers to set. - */ - public void setCandidateAnswers(List candidateAnswers) { - this.candidateAnswers = candidateAnswers; - } - - /** * @return Returns the question. */ public String getQuestion() { @@ -127,6 +128,7 @@ /** * @return Returns the questionAttempts. */ + @SuppressWarnings("rawtypes") public Map getQuestionAttempts() { return questionAttempts; } @@ -135,6 +137,7 @@ * @param questionAttempts * The questionAttempts to set. */ + @SuppressWarnings("rawtypes") public void setQuestionAttempts(Map questionAttempts) { this.questionAttempts = questionAttempts; } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dto/VoteMonitoredUserDTO.java =================================================================== diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -rb13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dto/VoteMonitoredUserDTO.java (.../VoteMonitoredUserDTO.java) (revision 5773f84ed608838de3521ecde87c52f3c72d478c) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dto/VoteMonitoredUserDTO.java (.../VoteMonitoredUserDTO.java) (revision b13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8) @@ -22,7 +22,7 @@ package org.lamsfoundation.lams.tool.vote.dto; import java.util.Date; -import java.util.Map; +//import java.util.Map; import org.apache.commons.lang.builder.ToStringBuilder; @@ -33,7 +33,7 @@ * * @author Ozgur Demirtas */ -public class VoteMonitoredUserDTO implements Comparable { +public class VoteMonitoredUserDTO implements Comparable { private String queUsrId; private String uid; @@ -58,7 +58,7 @@ private String questionUid; - private Map usersAttempts; + // private Map usersAttempts; private String responsePresentable; @@ -83,21 +83,21 @@ .toString(); } - /** - * @return Returns the usersAttempts. - */ - public Map getUsersAttempts() { - return usersAttempts; - } +// /** +// * @return Returns the usersAttempts. +// */ +// public Map getUsersAttempts() { +// return usersAttempts; +// } +// +// /** +// * @param usersAttempts +// * The usersAttempts to set. +// */ +// public void setUsersAttempts(Map usersAttempts) { +// this.usersAttempts = usersAttempts; +// } - /** - * @param usersAttempts - * The usersAttempts to set. - */ - public void setUsersAttempts(Map usersAttempts) { - this.usersAttempts = usersAttempts; - } - @Override public int compareTo(Object o) { VoteMonitoredUserDTO VoteMonitoredUserDTO = (VoteMonitoredUserDTO) o; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dto/VoteQuestionDTO.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rb13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dto/VoteQuestionDTO.java (.../VoteQuestionDTO.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dto/VoteQuestionDTO.java (.../VoteQuestionDTO.java) (revision b13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8) @@ -28,7 +28,7 @@ * * @author Ozgur Demirtas */ -public class VoteQuestionDTO implements Comparable { +public class VoteQuestionDTO implements Comparable { private Long uid; private String question; private String displayOrder; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dto/VoteStatsDTO.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rb13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dto/VoteStatsDTO.java (.../VoteStatsDTO.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dto/VoteStatsDTO.java (.../VoteStatsDTO.java) (revision b13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.vote.dto; import org.apache.commons.lang.builder.ToStringBuilder; @@ -33,7 +32,7 @@ * * @author Ozgur Demirtas */ -public class VoteStatsDTO implements Comparable { +public class VoteStatsDTO implements Comparable { private String sessionName; private Long sessionUid; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java =================================================================== diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -rb13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java (.../VoteContent.java) (revision 5773f84ed608838de3521ecde87c52f3c72d478c) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java (.../VoteContent.java) (revision b13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8) @@ -40,6 +40,11 @@ */ public class VoteContent implements Serializable { + /** + * + */ + private static final long serialVersionUID = 1986729606785509746L; + /** identifier field */ private Long uid; @@ -82,10 +87,10 @@ private boolean showResults; /** persistent field */ - private Set voteQueContents; + private Set voteQueContents; /** persistent field */ - private Set voteSessions; + private Set voteSessions; private Date submissionDeadline; @@ -105,7 +110,7 @@ Date updateDate, boolean allowText, boolean useSelectLeaderToolOuput, boolean reflect, String reflectionSubject, String maxNominationCount, String minNominationCount, long createdBy, boolean lockOnFinish, boolean showResults, Short maxExternalInputs, Short externalInputsAdded, - Set voteQueContents, Set voteSessions) { + Set voteQueContents, Set voteSessions) { this.voteContentId = voteContentId; this.title = title; this.instructions = instructions; @@ -132,7 +137,7 @@ } /** minimal constructor */ - public VoteContent(Long voteContentId, Set voteQueContents, Set voteSessions) { + public VoteContent(Long voteContentId, Set voteQueContents, Set voteSessions) { this.voteContentId = voteContentId; this.voteQueContents = voteQueContents; this.voteSessions = voteSessions; @@ -155,8 +160,8 @@ vote.isDefineLater(), vote.getCreationDate(), vote.getUpdateDate(), vote.isAllowText(), vote.isUseSelectLeaderToolOuput(), vote.isReflect(), vote.getReflectionSubject(), vote.getMaxNominationCount(), vote.getMinNominationCount(), vote.getCreatedBy(), vote.isLockOnFinish(), - vote.isShowResults(), vote.getMaxExternalInputs(), vote.getExternalInputsAdded(), new TreeSet(), - new TreeSet()); + vote.isShowResults(), vote.getMaxExternalInputs(), vote.getExternalInputsAdded(), + new TreeSet(), new TreeSet()); newContent.setVoteQueContents(vote.deepCopyMcQueContent(newContent)); newContent.setAssignedDataFlowObject(vote.getAssignedDataFlowObject()); @@ -169,11 +174,11 @@ * @param newQaContent * @return Set */ - public Set deepCopyMcQueContent(VoteContent newMcContent) { + public Set deepCopyMcQueContent(VoteContent newMcContent) { - Set newMcQueContent = new TreeSet(); - for (Iterator i = this.getVoteQueContents().iterator(); i.hasNext();) { - VoteQueContent queContent = (VoteQueContent) i.next(); + Set newMcQueContent = new TreeSet<>(); + for (Iterator i = this.getVoteQueContents().iterator(); i.hasNext();) { + VoteQueContent queContent = i.next(); if (queContent.getMcContent() != null) { int displayOrder = queContent.getDisplayOrder(); VoteQueContent mcQueContent = VoteQueContent.newInstance(queContent, displayOrder, newMcContent); @@ -234,9 +239,9 @@ /** * @return Returns the voteQueContents. */ - public Set getVoteQueContents() { + public Set getVoteQueContents() { if (voteQueContents == null) { - setVoteQueContents(new HashSet()); + setVoteQueContents(new HashSet()); } return voteQueContents; @@ -246,16 +251,16 @@ * @param voteQueContents * The voteQueContents to set. */ - public void setVoteQueContents(Set voteQueContents) { + public void setVoteQueContents(Set voteQueContents) { this.voteQueContents = voteQueContents; } /** * @return Returns the voteSessions. */ - public Set getVoteSessions() { + public Set getVoteSessions() { if (voteSessions == null) { - setVoteSessions(new HashSet()); + setVoteSessions(new HashSet()); } return voteSessions; } @@ -264,7 +269,7 @@ * @param voteSessions * The voteSessions to set. */ - public void setVoteSessions(Set voteSessions) { + public void setVoteSessions(Set voteSessions) { this.voteSessions = voteSessions; } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteQueContent.java =================================================================== diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -rb13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteQueContent.java (.../VoteQueContent.java) (revision 5773f84ed608838de3521ecde87c52f3c72d478c) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteQueContent.java (.../VoteQueContent.java) (revision b13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8) @@ -34,6 +34,11 @@ */ public class VoteQueContent implements Serializable, Comparable { + /** + * + */ + private static final long serialVersionUID = 1598466582549757720L; + /** identifier field */ private Long uid; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteQueUsr.java =================================================================== diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -rb13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteQueUsr.java (.../VoteQueUsr.java) (revision 5773f84ed608838de3521ecde87c52f3c72d478c) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteQueUsr.java (.../VoteQueUsr.java) (revision b13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8) @@ -63,10 +63,11 @@ private VoteSession voteSession; /** persistent field */ - private Set voteUsrAttempts; + private Set voteUsrAttempts; /** full constructor */ - public VoteQueUsr(Long queUsrId, String username, String fullname, VoteSession voteSession, Set voteUsrAttempts) { + public VoteQueUsr(Long queUsrId, String username, String fullname, VoteSession voteSession, + Set voteUsrAttempts) { this.queUsrId = queUsrId; this.username = username; this.fullname = fullname; @@ -80,7 +81,7 @@ } /** minimal constructor */ - public VoteQueUsr(Long queUsrId, Set voteUsrAttempts) { + public VoteQueUsr(Long queUsrId, Set voteUsrAttempts) { this.queUsrId = queUsrId; this.voteUsrAttempts = voteUsrAttempts; } @@ -117,14 +118,14 @@ this.fullname = fullname; } - public Set getVoteUsrAttempts() { + public Set getVoteUsrAttempts() { if (this.voteUsrAttempts == null) { - setVoteUsrAttempts(new HashSet()); + setVoteUsrAttempts(new HashSet()); } return this.voteUsrAttempts; } - public void setMcUsrAttempts(Set voteUsrAttempts) { + public void setMcUsrAttempts(Set voteUsrAttempts) { this.voteUsrAttempts = voteUsrAttempts; } @@ -171,7 +172,7 @@ * @param voteUsrAttempts * The voteUsrAttempts to set. */ - public void setVoteUsrAttempts(Set voteUsrAttempts) { + public void setVoteUsrAttempts(Set voteUsrAttempts) { this.voteUsrAttempts = voteUsrAttempts; } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteSession.java =================================================================== diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -rb13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteSession.java (.../VoteSession.java) (revision 5773f84ed608838de3521ecde87c52f3c72d478c) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteSession.java (.../VoteSession.java) (revision b13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8) @@ -38,6 +38,11 @@ */ public class VoteSession implements Serializable, Comparable { + /** + * + */ + private static final long serialVersionUID = 5053800653198292982L; + public final static String INCOMPLETE = "INCOMPLETE"; public static final String COMPLETED = "COMPLETED"; @@ -66,13 +71,13 @@ private VoteContent voteContent; /** persistent field */ - private Set voteQueUsers; + private Set voteQueUsers; /** persistent field */ private VoteQueUsr groupLeader; public VoteSession(Long voteSessionId, Date sessionStartDate, String sessionStatus, String session_name, - VoteContent voteContent, Set voteQueUsers) { + VoteContent voteContent, Set voteQueUsers) { this.voteSessionId = voteSessionId; this.sessionStartDate = sessionStartDate; this.sessionStatus = sessionStatus; @@ -206,15 +211,15 @@ /** * @return Returns the voteQueUsers. */ - public Set getVoteQueUsers() { + public Set getVoteQueUsers() { return voteQueUsers; } /** * @param voteQueUsers * The voteQueUsers to set. */ - public void setVoteQueUsers(Set voteQueUsers) { + public void setVoteQueUsers(Set voteQueUsers) { this.voteQueUsers = voteQueUsers; } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteUsrAttempt.java =================================================================== diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -rb13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteUsrAttempt.java (.../VoteUsrAttempt.java) (revision 5773f84ed608838de3521ecde87c52f3c72d478c) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteUsrAttempt.java (.../VoteUsrAttempt.java) (revision b13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8) @@ -37,6 +37,11 @@ */ public class VoteUsrAttempt implements Serializable, Comparable { + /** + * + */ + private static final long serialVersionUID = 6756874212158405114L; + /** identifier field */ private Long uid; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteApplicationException.java =================================================================== diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -rb13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteApplicationException.java (.../VoteApplicationException.java) (revision 5773f84ed608838de3521ecde87c52f3c72d478c) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteApplicationException.java (.../VoteApplicationException.java) (revision b13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8) @@ -28,12 +28,18 @@ * not suppose to be try and catched in any level. The struts should be taking * care of handling this exception. *

- * + * * @author Ozgur Demirtas * */ public class VoteApplicationException extends RuntimeException { + /** + * + */ + private static final long serialVersionUID = 6708356432970104502L; + + /** * Default Constructor */ public VoteApplicationException() { @@ -42,7 +48,7 @@ /** * Constructor for customized error message - * + * * @param message */ public VoteApplicationException(String message) { @@ -51,7 +57,7 @@ /** * Constructor for wrapping the throwable object - * + * * @param cause */ public VoteApplicationException(Throwable cause) { @@ -61,7 +67,7 @@ /** * Constructor for wrapping both the customized error message and * throwable exception object. - * + * * @param message * @param cause */ Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/util/VoteComparator.java =================================================================== diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -rb13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/util/VoteComparator.java (.../VoteComparator.java) (revision 5773f84ed608838de3521ecde87c52f3c72d478c) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/util/VoteComparator.java (.../VoteComparator.java) (revision b13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8) @@ -30,8 +30,13 @@ * the web layer makes use of it. * */ -public class VoteComparator implements Comparator, Serializable { +public class VoteComparator implements Comparator, Serializable { + /** + * + */ + private static final long serialVersionUID = 1411627466727527798L; + @Override public int compare(Object o1, Object o2) { Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/util/VoteStringComparator.java =================================================================== diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -rb13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/util/VoteStringComparator.java (.../VoteStringComparator.java) (revision 5773f84ed608838de3521ecde87c52f3c72d478c) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/util/VoteStringComparator.java (.../VoteStringComparator.java) (revision b13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8) @@ -31,8 +31,13 @@ * The TreeMap in the web layer makes use of it. * */ -public class VoteStringComparator implements Comparator, Serializable { +public class VoteStringComparator implements Comparator, Serializable { + /** + * + */ + private static final long serialVersionUID = 2698324740289653704L; + @Override public int compare(Object o1, Object o2) { String s1 = (String) o1; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteChartGeneratorAction.java =================================================================== diff -u -r9433ee2ac442fe5c8c1e125f94e9320fceb25fff -rb13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteChartGeneratorAction.java (.../VoteChartGeneratorAction.java) (revision 9433ee2ac442fe5c8c1e125f94e9320fceb25fff) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteChartGeneratorAction.java (.../VoteChartGeneratorAction.java) (revision b13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8) @@ -58,7 +58,6 @@ private static IVoteService voteService; @Override - @SuppressWarnings("unchecked") public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws JSONException, IOException { String currentSessionId = request.getParameter("currentSessionId"); @@ -87,7 +86,7 @@ //sessionId should not be blank } else if (!StringUtils.isBlank(currentSessionId)) { - VoteChartGeneratorAction.logger.warn("Session Id should not be blank"); + logger.warn("Session Id should not be blank"); VoteSession voteSession = getVoteService().getSessionBySessionId(new Long(currentSessionId)); VoteContent voteContent = voteSession.getVoteContent(); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VoteAuthoringForm.java =================================================================== diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -rb13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VoteAuthoringForm.java (.../VoteAuthoringForm.java) (revision 5773f84ed608838de3521ecde87c52f3c72d478c) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VoteAuthoringForm.java (.../VoteAuthoringForm.java) (revision b13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8) @@ -34,6 +34,10 @@ * */ public class VoteAuthoringForm extends VoteLearningForm implements VoteAppConstants { + /** + * + */ + private static final long serialVersionUID = 6118856765992233606L; /* form controllers */ protected String addOptionContent; protected String currentTab; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VotePedagogicalPlannerForm.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rb13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VotePedagogicalPlannerForm.java (.../VotePedagogicalPlannerForm.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VotePedagogicalPlannerForm.java (.../VotePedagogicalPlannerForm.java) (revision b13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8) @@ -20,7 +20,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.vote.web.form; import java.util.ArrayList; @@ -35,6 +34,10 @@ import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm; public class VotePedagogicalPlannerForm extends PedagogicalPlannerActivityForm { + /** + * + */ + private static final long serialVersionUID = 4035785085162811572L; private List nomination; private String contentFolderID; private String instructions; @@ -84,11 +87,11 @@ setToolContentID(voteContent.getVoteContentId()); setInstructions(voteContent.getInstructions()); - nomination = new ArrayList(); - Set questions = voteContent.getVoteQueContents(); + nomination = new ArrayList<>(); + Set questions = voteContent.getVoteQueContents(); if (questions != null) { int topicIndex = 0; - for (VoteQueContent message : (Set) questions) { + for (VoteQueContent message : questions) { setNomination(topicIndex++, message.getQuestion()); } } @@ -97,7 +100,7 @@ public void setNomination(int number, String nomination) { if (this.nomination == null) { - this.nomination = new ArrayList(); + this.nomination = new ArrayList<>(); } while (number >= this.nomination.size()) { this.nomination.add(null);