Fisheye: Tag 0ac951a5cbd9d468de8081247c169a6f92123126 refers to a dead (removed) revision in file `lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0ac951a5cbd9d468de8081247c169a6f92123126 refers to a dead (removed) revision in file `lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/MindmapNode.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0ac951a5cbd9d468de8081247c169a6f92123126 refers to a dead (removed) revision in file `lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/MindmapRequest.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0ac951a5cbd9d468de8081247c169a6f92123126 refers to a dead (removed) revision in file `lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/MindmapSession.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0ac951a5cbd9d468de8081247c169a6f92123126 refers to a dead (removed) revision in file `lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/MindmapUser.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/MindmapConstants.java =================================================================== diff -u --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/MindmapConstants.java (revision 0) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/MindmapConstants.java (revision 0ac951a5cbd9d468de8081247c169a6f92123126) @@ -0,0 +1,65 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + + +package org.lamsfoundation.lams.tool.mindmap; + +public interface MindmapConstants { + public static final String TOOL_SIGNATURE = "lamind10"; + + // Mindmap session status + public static final Integer SESSION_NOT_STARTED = new Integer(0); + public static final Integer SESSION_IN_PROGRESS = new Integer(1); + public static final Integer SESSION_COMPLETED = new Integer(2); + + public static final String AUTHORING_DEFAULT_TAB = "1"; + public static final String AUTH_SESSION_ID_COUNTER = "authoringSessionIdCounter"; + public static final String AUTH_SESSION_ID = "authoringSessionId"; + + public static final int MONITORING_SUMMARY_MAX_MESSAGES = 5; + + // Attribute names + public static final String ATTR_MESSAGE = "message"; + public static final String ATTR_SESSION_MAP = "sessionMap"; + + // Parameter names + public static final String PARAM_PARENT_PAGE = "parentPage"; + + static final String FILTER_REPLACE_TEXT = "***"; + + public static final String ATTR_SESSION_MAP_ID = "sessionMapID"; + //public static final String ATTR_CONDITION_SET = "conditionList"; + + public static final String PARAM_ORDER_ID = "orderId"; + //public static final String ATTR_DELETED_CONDITION_LIST = "deletedConditionList"; + //public static final String TEXT_SEARCH_DEFINITION_NAME = "text.search.output.definition.mindmap"; + //public static final String TEXT_SEARCH_DEFAULT_CONDITION_DISPLAY_NAME_KEY = "text.search.output.definition.mindmap.default.condition"; + public static final String SUCCESS = "success"; + //public static final String ERROR_MSG_CONDITION = "error.condition"; + //public static final String ERROR_MSG_NAME_BLANK = "error.condition.name.blank"; + //public static final String ERROR_MSG_NAME_DUPLICATED = "error.condition.duplicated.name"; + + public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline"; + public static final String ATTR_SUBMISSION_DEADLINE_DATESTRING = "submissionDateString"; + public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed"; +} Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/IMindmapDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0ac951a5cbd9d468de8081247c169a6f92123126 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/IMindmapDAO.java (.../IMindmapDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/IMindmapDAO.java (.../IMindmapDAO.java) (revision 0ac951a5cbd9d468de8081247c169a6f92123126) @@ -38,6 +38,4 @@ public Mindmap getMindmapByUid(Long Uid); void saveOrUpdate(Mindmap toContent); - - void releaseFromCache(Object o); } Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0ac951a5cbd9d468de8081247c169a6f92123126 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapDAO.java (.../MindmapDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapDAO.java (.../MindmapDAO.java) (revision 0ac951a5cbd9d468de8081247c169a6f92123126) @@ -67,9 +67,4 @@ getSession().flush(); } - @Override - public void releaseFromCache(Object o) { - getSessionFactory().getCurrentSession().evict(o); - - } } Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapNodeDAO.java =================================================================== diff -u -rceb74e3b4097cf6461280448f904fa21a176aaa4 -r0ac951a5cbd9d468de8081247c169a6f92123126 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapNodeDAO.java (.../MindmapNodeDAO.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dao/hibernate/MindmapNodeDAO.java (.../MindmapNodeDAO.java) (revision 0ac951a5cbd9d468de8081247c169a6f92123126) @@ -82,6 +82,8 @@ private static final String SQL_QUERY_FIND_NODES_BY_SESSION_ID_AND_USER_ID = "from " + MindmapNode.class.getName() + " mn where mn.session.sessionId = ? and mn.user.userId = ?"; + private static final String DELETE_NODE_MULTIUSER_MODE = "delete from " + MindmapNode.class.getName() + " where unique_id = :unique_id and mindmap_id = :mindmap_id and user_id = :user_id and session_id = :session_id"; + /* Functions Implementations */ // deleting Mindmap nodes in singleuser mode @@ -97,9 +99,11 @@ @Override public void deleteNodeByUniqueMindmapUser(Long uniqueId, Long mindmapId, Long userId, Long sessionId) { Session session = getSessionFactory().getCurrentSession(); - String hql = "delete from " + MindmapNode.class.getName() + " where unique_id = " + uniqueId - + " and mindmap_id = " + mindmapId + " and user_id = " + userId + " and session_id = " + sessionId; - Query query = session.createQuery(hql); + Query query = session.createQuery(DELETE_NODE_MULTIUSER_MODE) + .setParameter("unique_id", uniqueId) + .setParameter("mindmap_id", mindmapId) + .setParameter("user_id", userId) + .setParameter("session_id", sessionId); query.executeUpdate(); } Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0ac951a5cbd9d468de8081247c169a6f92123126 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.java (.../Mindmap.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.java (.../Mindmap.java) (revision 0ac951a5cbd9d468de8081247c169a6f92123126) @@ -28,37 +28,79 @@ import java.util.HashSet; import java.util.Set; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.OneToMany; +import javax.persistence.Table; + import org.apache.log4j.Logger; import org.lamsfoundation.lams.tool.mindmap.service.MindmapService; //import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator; /** * */ +@Entity +@Table(name = "tl_lamind10_mindmap") public class Mindmap implements java.io.Serializable, Cloneable { private static final long serialVersionUID = 579733009969321015L; static Logger log = Logger.getLogger(MindmapService.class.getName()); // Fields + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + + @Column(name = "create_date") private Date createDate; + + @Column(name = "update_date") private Date updateDate; + + @Column(name = "submission_deadline") private Date submissionDeadline; + + @Column(name = "create_by") private Long createBy; + + @Column private String title; + + @Column private String instructions; + + @Column(name = "lock_on_finished") private boolean lockOnFinished; + + @Column(name = "multiuser_mode") private boolean multiUserMode; + + @Column(name = "content_in_use") private boolean contentInUse; + + @Column(name = "define_later") private boolean defineLater; + + @Column(name = "tool_content_id") private Long toolContentId; + + @Column(name = "export_content") private String mindmapExportContent; - private Set mindmapSessions; + @Column(name = "reflect_on_activity") private boolean reflectOnActivity; + + @Column(name = "reflect_instructions") private String reflectInstructions; + @OneToMany(mappedBy = "mindmap") + private Set mindmapSessions; + // Constructors /** default constructor */ @@ -68,7 +110,7 @@ /** full constructor */ public Mindmap(Date createDate, Date updateDate, Long createBy, String title, String instructions, boolean lockOnFinished, boolean filteringEnabled, String filterKeywords, boolean contentInUse, - boolean defineLater, Long toolContentId, Set mindmapSessions) { + boolean defineLater, Long toolContentId, Set mindmapSessions) { this.createDate = createDate; this.updateDate = updateDate; this.createBy = createBy; @@ -271,11 +313,11 @@ * * */ - public Set getMindmapSessions() { + public Set getMindmapSessions() { return mindmapSessions; } - public void setMindmapSessions(Set mindmapSessions) { + public void setMindmapSessions(Set mindmapSessions) { this.mindmapSessions = mindmapSessions; } @@ -338,7 +380,7 @@ mindmap.setUid(null); // create an empty set for the mindmapSession - mindmap.mindmapSessions = new HashSet(); + mindmap.mindmapSessions = new HashSet(); } catch (CloneNotSupportedException cnse) { Mindmap.log.error("Error cloning " + Mindmap.class); Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapNode.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0ac951a5cbd9d468de8081247c169a6f92123126 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapNode.java (.../MindmapNode.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapNode.java (.../MindmapNode.java) (revision 0ac951a5cbd9d468de8081247c169a6f92123126) @@ -24,25 +24,53 @@ package org.lamsfoundation.lams.tool.mindmap.model; -import org.apache.log4j.Logger; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; /** * @author Ruslan Kazakov * */ +@Entity +@Table(name = "tl_lamind10_node") public class MindmapNode implements Cloneable { - private static Logger log = Logger.getLogger(MindmapNode.class); - + @Id + @Column(name = "node_id") + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long nodeId; + + @Column(name = "unique_id") private Long uniqueId; + + @ManyToOne + @JoinColumn(name = "parent_id") private MindmapNode parent; + + @Column(name = "node_text") private String text; + + @Column(name = "node_color") private String color; - private MindmapSession session; - private MindmapUser user; - private Mindmap mindmap; + @ManyToOne + @JoinColumn(name = "session_id") + private MindmapSession session; + + @ManyToOne + @JoinColumn(name = "user_id") + private MindmapUser user; + + @ManyToOne + @JoinColumn(name = "mindmap_id") + private Mindmap mindmap; + /** default constructor */ public MindmapNode() { } Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapRequest.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0ac951a5cbd9d468de8081247c169a6f92123126 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapRequest.java (.../MindmapRequest.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapRequest.java (.../MindmapRequest.java) (revision 0ac951a5cbd9d468de8081247c169a6f92123126) @@ -24,21 +24,51 @@ package org.lamsfoundation.lams.tool.mindmap.model; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; + /** * @author Ruslan Kazakov * * * */ +@Entity +@Table(name = "tl_lamind10_request") public class MindmapRequest implements Cloneable { + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + + @Column(name = "unique_id") private Long uniqueId; + + @Column(name = "global_id") private Long globalId; + + @Column(name = "request_type") private int type; + + @Column(name = "node_id") private Long nodeId; + + @Column(name = "node_child_id") private Long nodeChildId; + + @ManyToOne() + @JoinColumn(name = "user_id") private MindmapUser user; + + @ManyToOne() + @JoinColumn(name = "mindmap_id") private Mindmap mindmap; /** default constructor */ @@ -55,13 +85,6 @@ this.mindmap = mindmap; } - // ********************************************************** - // get/set methods - // ********************************************************** - - /** - * - */ public Long getUid() { return uid; } @@ -70,74 +93,38 @@ this.uid = uid; } - /** - * @return Returns the subject of the Message. - * - */ public Long getUniqueId() { return uniqueId; } - /** - * @param subject - * The subject of the Message to be set. - */ public void setUniqueId(Long uniqueId) { this.uniqueId = uniqueId; } - /** - * @return Returns the subject of the Message. - * - */ public Long getGlobalId() { return globalId; } - /** - * @param globalId - * the globalId to set - */ public void setGlobalId(Long globalId) { this.globalId = globalId; } - /** - * @return Returns the subject of the Message. - * - */ public int getType() { return type; } - /** - * @param subject - * The subject of the Message to be set. - */ public void setType(int type) { this.type = type; } - /** - * @return Returns the userid of the user who created the Mindmap. - * - */ public Long getNodeId() { return nodeId; } - /** - * @param createdBy - * The userid of the user who created this Mindmap. - */ public void setNodeId(Long nodeId) { this.nodeId = nodeId; } - /** - * @return Returns the userid of the user who created the Mindmap. - * - */ public Long getNodeChildId() { return nodeChildId; } @@ -146,26 +133,14 @@ this.nodeChildId = nodeChildId; } - /** - * @return Returns the userid of the user who created the Mindmap. - * - */ public MindmapUser getUser() { return user; } - /** - * @param createdBy - * The userid of the user who created this Mindmap. - */ public void setUser(MindmapUser user) { this.user = user; } - /** - * @return Returns the userid of the user who created the Mindmap. - * - */ public Mindmap getMindmap() { return mindmap; } Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapSession.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0ac951a5cbd9d468de8081247c169a6f92123126 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapSession.java (.../MindmapSession.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapSession.java (.../MindmapSession.java) (revision 0ac951a5cbd9d468de8081247c169a6f92123126) @@ -28,34 +28,56 @@ import java.util.HashSet; import java.util.Set; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.Table; + import org.apache.log4j.Logger; /** * Represents the tool session. * * */ +@Entity +@Table(name = "tl_lamind10_session") public class MindmapSession implements java.io.Serializable { private static Logger log = Logger.getLogger(MindmapSession.class); private static final long serialVersionUID = 4407078136514639026L; - // Fields + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + @Column(name = "session_end_date") private Date sessionEndDate; + @Column(name = "session_start_date") private Date sessionStartDate; + @Column private Integer status; + @Column(name = "session_id") private Long sessionId; + @Column(name = "session_name") private String sessionName; + @ManyToOne + @JoinColumn(name = "mindmap_uid") private Mindmap mindmap; - private Set mindmapUsers; + @OneToMany(mappedBy = "mindmapSession") + private Set mindmapUsers; // Constructors @@ -65,7 +87,7 @@ /** full constructor */ public MindmapSession(Date sessionEndDate, Date sessionStartDate, Integer status, Long sessionId, - String sessionName, Mindmap mindmap, Set mindmapUsers) { + String sessionName, Mindmap mindmap, Set mindmapUsers) { this.sessionEndDate = sessionEndDate; this.sessionStartDate = sessionStartDate; this.status = status; @@ -76,11 +98,6 @@ } // Property accessors - /** - * - * - */ - public Long getUid() { return this.uid; } @@ -89,11 +106,6 @@ this.uid = uid; } - /** - * - * - */ - public Date getSessionEndDate() { return this.sessionEndDate; } @@ -102,11 +114,6 @@ this.sessionEndDate = sessionEndDate; } - /** - * - * - */ - public Date getSessionStartDate() { return this.sessionStartDate; } @@ -115,11 +122,6 @@ this.sessionStartDate = sessionStartDate; } - /** - * - * - */ - public Integer getStatus() { return this.status; } @@ -128,11 +130,6 @@ this.status = status; } - /** - * - * - */ - public Long getSessionId() { return this.sessionId; } @@ -141,11 +138,6 @@ this.sessionId = sessionId; } - /** - * - * - */ - public String getSessionName() { return this.sessionName; } @@ -154,12 +146,6 @@ this.sessionName = sessionName; } - /** - * - * - * - */ - public Mindmap getMindmap() { return this.mindmap; } @@ -168,26 +154,14 @@ this.mindmap = mindmap; } - /** - * - * - * - * - */ - - public Set getMindmapUsers() { + public Set getMindmapUsers() { return this.mindmapUsers; } - public void setMindmapUsers(Set mindmapUsers) { + public void setMindmapUsers(Set mindmapUsers) { this.mindmapUsers = mindmapUsers; } - /** - * toString - * - * @return String - */ @Override public String toString() { StringBuffer buffer = new StringBuffer(); @@ -233,7 +207,7 @@ MindmapSession session = null; try { session = (MindmapSession) super.clone(); - session.mindmapUsers = new HashSet(); + session.mindmapUsers = new HashSet(); } catch (CloneNotSupportedException e) { log.error("When clone " + MindmapSession.class + " failed"); } Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapUser.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0ac951a5cbd9d468de8081247c169a6f92123126 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapUser.java (.../MindmapUser.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/MindmapUser.java (.../MindmapUser.java) (revision 0ac951a5cbd9d468de8081247c169a6f92123126) @@ -24,6 +24,15 @@ package org.lamsfoundation.lams.tool.mindmap.model; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; + import org.lamsfoundation.lams.usermanagement.dto.UserDTO; /** @@ -32,18 +41,37 @@ * * */ +@Entity +@Table(name = "tl_lamind10_user") public class MindmapUser implements java.io.Serializable { private static final long serialVersionUID = -3701664859818409197L; - // Fields + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + + @Column(name = "user_id") private Long userId; + + @Column(name = "last_name") private String lastName; + + @Column(name = "first_name") private String firstName; + + @Column(name = "login_name") private String loginName; + + @ManyToOne + @JoinColumn(name = "mindmap_session_uid") private MindmapSession mindmapSession; + + @Column(name = "finishedActivity") private boolean finishedActivity; + + @Column(name = "entry_uid") private Long entryUID; // Constructors @@ -53,7 +81,7 @@ } public MindmapUser(UserDTO user, MindmapSession mindmapSession) { - this.userId = new Long(user.getUserID().intValue()); + this.userId = Long.valueOf(user.getUserID().intValue()); this.firstName = user.getFirstName(); this.lastName = user.getLastName(); this.loginName = user.getLogin(); @@ -70,9 +98,6 @@ } // Property accessors - /** - * - */ public Long getUid() { return this.uid; } @@ -81,10 +106,6 @@ this.uid = uid; } - /** - * - * - */ public Long getUserId() { return this.userId; } @@ -93,10 +114,6 @@ this.userId = userId; } - /** - * - * - */ public String getLastName() { return this.lastName; } @@ -105,10 +122,6 @@ this.lastName = lastName; } - /** - * - * - */ public String getLoginName() { return loginName; } @@ -117,10 +130,6 @@ this.loginName = loginName; } - /** - * - * - */ public String getFirstName() { return this.firstName; } @@ -129,9 +138,6 @@ this.firstName = firstName; } - /** - * - */ public boolean isFinishedActivity() { return finishedActivity; } @@ -140,11 +146,6 @@ this.finishedActivity = finishedActivity; } - /** - * - * - * - */ public MindmapSession getMindmapSession() { return this.mindmapSession; } @@ -153,9 +154,6 @@ this.mindmapSession = mindmapSession; } - /** - * - */ public Long getEntryUID() { return entryUID; } @@ -164,11 +162,6 @@ this.entryUID = entryUID; } - /** - * toString - * - * @return String - */ @Override public String toString() { StringBuffer buffer = new StringBuffer(); Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r0ac951a5cbd9d468de8081247c169a6f92123126 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java (.../MindmapService.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java (.../MindmapService.java) (revision 0ac951a5cbd9d468de8081247c169a6f92123126) @@ -52,6 +52,7 @@ import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.SessionDataExistsException; import org.lamsfoundation.lams.tool.exception.ToolException; +import org.lamsfoundation.lams.tool.mindmap.MindmapConstants; import org.lamsfoundation.lams.tool.mindmap.dao.IMindmapDAO; import org.lamsfoundation.lams.tool.mindmap.dao.IMindmapNodeDAO; import org.lamsfoundation.lams.tool.mindmap.dao.IMindmapRequestDAO; @@ -62,7 +63,6 @@ import org.lamsfoundation.lams.tool.mindmap.model.MindmapRequest; import org.lamsfoundation.lams.tool.mindmap.model.MindmapSession; import org.lamsfoundation.lams.tool.mindmap.model.MindmapUser; -import org.lamsfoundation.lams.tool.mindmap.util.MindmapConstants; import org.lamsfoundation.lams.tool.mindmap.util.MindmapException; import org.lamsfoundation.lams.tool.mindmap.util.xmlmodel.NodeConceptModel; import org.lamsfoundation.lams.tool.mindmap.util.xmlmodel.NodeModel; Fisheye: Tag 0ac951a5cbd9d468de8081247c169a6f92123126 refers to a dead (removed) revision in file `lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/util/MindmapConstants.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/AuthoringController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r0ac951a5cbd9d468de8081247c169a6f92123126 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/AuthoringController.java (.../AuthoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 0ac951a5cbd9d468de8081247c169a6f92123126) @@ -32,12 +32,12 @@ import org.apache.log4j.Logger; import org.lamsfoundation.lams.tool.ToolAccessMode; +import org.lamsfoundation.lams.tool.mindmap.MindmapConstants; import org.lamsfoundation.lams.tool.mindmap.dto.RootJSON; import org.lamsfoundation.lams.tool.mindmap.model.Mindmap; import org.lamsfoundation.lams.tool.mindmap.model.MindmapNode; import org.lamsfoundation.lams.tool.mindmap.model.MindmapUser; import org.lamsfoundation.lams.tool.mindmap.service.IMindmapService; -import org.lamsfoundation.lams.tool.mindmap.util.MindmapConstants; import org.lamsfoundation.lams.tool.mindmap.util.xmlmodel.NodeConceptModel; import org.lamsfoundation.lams.tool.mindmap.util.xmlmodel.NodeModel; import org.lamsfoundation.lams.tool.mindmap.web.forms.AuthoringForm; Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r0ac951a5cbd9d468de8081247c169a6f92123126 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningController.java (.../LearningController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningController.java (.../LearningController.java) (revision 0ac951a5cbd9d468de8081247c169a6f92123126) @@ -41,6 +41,7 @@ import org.lamsfoundation.lams.tool.ToolSessionManager; import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.ToolException; +import org.lamsfoundation.lams.tool.mindmap.MindmapConstants; import org.lamsfoundation.lams.tool.mindmap.dto.IdeaJSON; import org.lamsfoundation.lams.tool.mindmap.dto.MindmapDTO; import org.lamsfoundation.lams.tool.mindmap.dto.NotifyResponseJSON; @@ -51,7 +52,6 @@ import org.lamsfoundation.lams.tool.mindmap.model.MindmapSession; import org.lamsfoundation.lams.tool.mindmap.model.MindmapUser; import org.lamsfoundation.lams.tool.mindmap.service.IMindmapService; -import org.lamsfoundation.lams.tool.mindmap.util.MindmapConstants; import org.lamsfoundation.lams.tool.mindmap.util.MindmapException; import org.lamsfoundation.lams.tool.mindmap.util.xmlmodel.NodeConceptModel; import org.lamsfoundation.lams.tool.mindmap.util.xmlmodel.NodeModel; Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/MonitoringController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r0ac951a5cbd9d468de8081247c169a6f92123126 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/MonitoringController.java (.../MonitoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 0ac951a5cbd9d468de8081247c169a6f92123126) @@ -34,12 +34,12 @@ import org.apache.log4j.Logger; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.tool.ToolAccessMode; +import org.lamsfoundation.lams.tool.mindmap.MindmapConstants; import org.lamsfoundation.lams.tool.mindmap.dto.MindmapDTO; import org.lamsfoundation.lams.tool.mindmap.dto.MindmapUserDTO; import org.lamsfoundation.lams.tool.mindmap.model.Mindmap; import org.lamsfoundation.lams.tool.mindmap.model.MindmapUser; import org.lamsfoundation.lams.tool.mindmap.service.IMindmapService; -import org.lamsfoundation.lams.tool.mindmap.util.MindmapConstants; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.DateUtil; import org.lamsfoundation.lams.util.WebUtil;