Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java,v
diff -u -r1.20 -r1.21
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java	21 Oct 2008 03:06:25 -0000	1.20
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java	6 Jan 2009 03:00:59 -0000	1.21
@@ -67,4 +67,6 @@
     public Tool getPersistToolBySignature(final String toolSignature);
     
     public ToolSession getToolSession(Long toolSessionId);
+    
+    public Boolean isGroupedActivity(long toolContentID);
 }
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java,v
diff -u -r1.22 -r1.23
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java	21 Oct 2008 03:06:25 -0000	1.22
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java	6 Jan 2009 03:00:59 -0000	1.23
@@ -25,12 +25,15 @@
 
 import java.io.IOException;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.tool.IToolVO;
 import org.lamsfoundation.lams.tool.Tool;
 import org.lamsfoundation.lams.tool.ToolSession;
+import org.lamsfoundation.lams.tool.dao.IToolContentDAO;
 import org.lamsfoundation.lams.tool.dao.IToolDAO;
 import org.lamsfoundation.lams.tool.dao.IToolSessionDAO;
 import org.lamsfoundation.lams.tool.exception.LamsToolServiceException;
@@ -52,6 +55,7 @@
 
     public IToolDAO toolDAO;
     public IToolSessionDAO toolSessionDAO;
+    public IToolContentDAO toolContentDAO;
 
     /**
      * @see org.lamsfoundation.lams.tool.service.ILamsCoreToolService#getAllPotentialLearners(long)
@@ -103,6 +107,22 @@
 	this.toolSessionDAO = toolSessionDAO;
     }
 
+    /**
+     * 
+     * @return
+     */
+    public IToolContentDAO getToolContentDAO() {
+        return toolContentDAO;
+    }
+
+    /**
+     * 
+     * @param toolContentDAO
+     */
+    public void setToolContentDAO(IToolContentDAO toolContentDAO) {
+        this.toolContentDAO = toolContentDAO;
+    }
+    
     public String generateUniqueContentFolder() throws FileUtilException, IOException {
 
 	return FileUtil.generateUniqueContentFolderID();
@@ -122,4 +142,16 @@
     {
 	return toolSessionDAO.getToolSession(toolSessionId);
     }
+
+    @Override
+    public Boolean isGroupedActivity(long toolContentID) {
+	List<Activity> activities = toolContentDAO.findByProperty(Activity.class, "toolContentId", toolContentID);
+	if (activities.size() == 1) {
+	    Activity activity = activities.get(0);
+	    return activity.getApplyGrouping();
+	} else {
+	    log.debug("ToolContent contains multiple activities, can't test whether grouping applies.");
+	    return null;
+	}
+    }
 }
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java,v
diff -u -r1.6 -r1.7
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java	31 Oct 2008 01:41:51 -0000	1.6
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java	6 Jan 2009 03:02:19 -0000	1.7
@@ -174,4 +174,6 @@
     void releaseConditionsFromCache(Notebook notebook);
 
     void deleteCondition(NotebookCondition condition);
+    
+    boolean isGroupedActivity(long toolContentID);
 }
\ No newline at end of file
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java,v
diff -u -r1.18 -r1.19
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	31 Oct 2008 05:57:26 -0000	1.18
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	6 Jan 2009 03:02:19 -0000	1.19
@@ -653,4 +653,11 @@
 	    notebookDAO.delete(condition);
 	}
     }
+    
+    public boolean isGroupedActivity(long toolContentID) {
+	
+	getNotebookByContentId(1L);
+	
+	return toolService.isGroupedActivity(toolContentID);
+    }
 }
\ No newline at end of file