Index: lams_common/src/java/org/lamsfoundation/lams/tool/GroupedToolSession.java =================================================================== diff -u -raf2133eea2be056c211a5c29d6f68a3d8595a513 -raa06aeaad8ea943460f0f92e661078d51a957bd3 --- lams_common/src/java/org/lamsfoundation/lams/tool/GroupedToolSession.java (.../GroupedToolSession.java) (revision af2133eea2be056c211a5c29d6f68a3d8595a513) +++ lams_common/src/java/org/lamsfoundation/lams/tool/GroupedToolSession.java (.../GroupedToolSession.java) (revision aa06aeaad8ea943460f0f92e661078d51a957bd3) @@ -18,7 +18,7 @@ public class GroupedToolSession extends ToolSession { /** persistent field */ - private Group group; + private Group sessionGroup; /**default constructor*/ public GroupedToolSession(){ } @@ -33,21 +33,23 @@ public GroupedToolSession(ToolActivity toolActivity, Date createDateTime, int toolSessionStateId, - Group group, + Group sessionGroup, Lesson lesson) { super(null,toolActivity,createDateTime,toolSessionStateId,lesson); super.setUniqueKey(UNIQUE_KEY_PREFIX + +"_" +toolActivity.getActivityId().toString() - +group.getGroupId().toString()); - this.group=group; + +"_" + +sessionGroup.getGroupId().toString()); + this.sessionGroup=sessionGroup; } - public Group getGroup() { - return group; + public Group getSessionGroup() { + return sessionGroup; } - public void setGroup(Group group) { - this.group = group; + public void setSessionGroup(Group sessionGroup) { + this.sessionGroup = sessionGroup; } }