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 -r1.5 -r1.6
--- lams_common/src/java/org/lamsfoundation/lams/tool/NonGroupedToolSession.java	7 Jun 2005 05:43:23 -0000	1.5
+++ lams_common/src/java/org/lamsfoundation/lams/tool/NonGroupedToolSession.java	13 Jan 2006 04:22:59 -0000	1.6
@@ -29,6 +29,10 @@
 import org.lamsfoundation.lams.usermanagement.User;
 
 /**
+ * Not used at present - creates a separate ToolSession for each learner.
+ * When we have a user interface that allows the author to select the whole of the class
+ * vs an individual learner for the tool session, then it will be used.
+ * 
  * @author daveg
  */
 public class NonGroupedToolSession extends ToolSession {
@@ -44,7 +48,9 @@
     {
         super(null,toolActivity,createDateTime,toolSessionStateId,lesson);
         super.setUniqueKey(UNIQUE_KEY_PREFIX
+        				   +"_"
                            +toolActivity.getActivityId().toString()
+        				   +"_"
                            +user.getUserId().toString());
         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.9 -r1.10
--- lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java	23 Feb 2005 07:04:25 -0000	1.9
+++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java	13 Jan 2006 04:22:25 -0000	1.10
@@ -19,15 +19,15 @@
     
     /** Tool session type id for grouped */
     public static final int GROUPED_TYPE = 1;
-    /** Tool session type id for non-grouped */
+    /** Tool session type id for non-grouped - all learners in a separate session */
     public static final int NON_GROUPED_TYPE = 2;
     
     /** Tool session state id for started tool session */
     public static final int STARTED_STATE = 1;
     /** Tool session state id for completed tool session */
     public static final int ENDED_STATE = 2;
 
-    public static final String UNIQUE_KEY_PREFIX = "uq_";
+    public static final String UNIQUE_KEY_PREFIX = "uq";
     /** identifier field */
     private Long toolSessionId;
 
@@ -157,7 +157,7 @@
 	    else
 	        return GROUPED_TYPE;
 	}
-    public Lesson getLesson() {
+	public Lesson getLesson() {
         return lesson;
     }
     public void setLesson(Lesson lesson) {