Index: lams_common/src/java/org/lamsfoundation/lams/tool/GroupedToolSession.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/GroupedToolSession.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/src/java/org/lamsfoundation/lams/tool/GroupedToolSession.java	1 Feb 2005 05:31:36 -0000	1.1
@@ -0,0 +1,28 @@
+/*
+ * Created on 1/02/2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.lamsfoundation.lams.tool;
+
+import org.lamsfoundation.lams.learningdesign.Group;
+
+/**
+ * @author daveg
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class GroupedToolSession extends ToolSession {
+
+    /** persistent field */
+    private Group group;
+
+	public Group getGroup() {
+		return group;
+	}
+	public void setGroup(Group group) {
+		this.group = group;
+	}
+}
Index: lams_common/src/java/org/lamsfoundation/lams/tool/NonGroupedToolSession.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/NonGroupedToolSession.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/src/java/org/lamsfoundation/lams/tool/NonGroupedToolSession.java	1 Feb 2005 05:31:36 -0000	1.1
@@ -0,0 +1,28 @@
+/*
+ * Created on 1/02/2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.lamsfoundation.lams.tool;
+
+import org.lamsfoundation.lams.usermanagement.User;
+
+/**
+ * @author daveg
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class NonGroupedToolSession extends ToolSession {
+
+    /** persistent field */
+    private User user;
+
+	public User getUser() {
+		return user;
+	}
+	public void setUser(User user) {
+		this.user = user;
+	}
+}
Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java,v
diff -u -r1.1 -r1.2
--- lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java	28 Jan 2005 04:20:45 -0000	1.1
+++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java	1 Feb 2005 05:31:36 -0000	1.2
@@ -14,7 +14,12 @@
  *         table="lams_tool_session"
  *     
 */
-public class ToolSession implements Serializable {
+public abstract class ToolSession implements Serializable {
+    
+    /** Tool session type id for grouped */
+    public static final int GROUPED_TYPE = 1;
+    /** Tool session type id for non-grouped */
+    public static final int NON_GROUPED_TYPE = 2;
 
     /** identifier field */
     private Long toolSessionId;
@@ -29,23 +34,17 @@
     private Date createDateTime;
 
     /** persistent field */
-    private Group group;
-
-    /** persistent field */
     private org.lamsfoundation.lams.tool.ToolSessionState toolSessionState;
+    
+    private int toolSessionTypeId;
 
-    /** persistent field */
-    private Set userToolSessions;
-
     /** full constructor */
     public ToolSession(Long toolSessionId, long activityId, long toolSessionKey, Date createDateTime, Group group, org.lamsfoundation.lams.tool.ToolSessionState toolSessionState, Set userToolSessions) {
         this.toolSessionId = toolSessionId;
         this.activityId = activityId;
         this.toolSessionKey = toolSessionKey;
         this.createDateTime = createDateTime;
-        this.group = group;
         this.toolSessionState = toolSessionState;
-        this.userToolSessions = userToolSessions;
     }
 
     /** default constructor */
@@ -115,20 +114,6 @@
     /** 
      *            @hibernate.many-to-one
      *             not-null="true"
-     *            @hibernate.column name="group_id"         
-     *         
-     */
-    public Group getGroup() {
-        return this.group;
-    }
-
-    public void setGroup(Group group) {
-        this.group = group;
-    }
-
-    /** 
-     *            @hibernate.many-to-one
-     *             not-null="true"
      *            @hibernate.column name="tool_session_state_id"         
      *         
      */
@@ -140,25 +125,6 @@
         this.toolSessionState = toolSessionState;
     }
 
-    /** 
-     *            @hibernate.set
-     *             lazy="true"
-     *             inverse="true"
-     *             cascade="none"
-     *            @hibernate.collection-key
-     *             column="tool_session_id"
-     *            @hibernate.collection-one-to-many
-     *             class="org.lamsfoundation.lams.lesson.UserToolSession"
-     *         
-     */
-    public Set getUserToolSessions() {
-        return this.userToolSessions;
-    }
-
-    public void setUserToolSessions(Set userToolSessions) {
-        this.userToolSessions = userToolSessions;
-    }
-
     public String toString() {
         return new ToStringBuilder(this)
             .append("toolSessionId", getToolSessionId())
@@ -180,4 +146,10 @@
             .toHashCode();
     }
 
+	public int getToolSessionTypeId() {
+		return toolSessionTypeId;
+	}
+	public void setToolSessionTypeId(int toolSessionTypeId) {
+		this.toolSessionTypeId = toolSessionTypeId;
+	}
 }