Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
===================================================================
diff -u -r7f203b0b0a2e56896f7eee5367b52d1ec4db483e -r95aa4590e8f18e8323cd6efc196b2c3a851b5e2e
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java	(.../Activity.java)	(revision 7f203b0b0a2e56896f7eee5367b52d1ec4db483e)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java	(.../Activity.java)	(revision 95aa4590e8f18e8323cd6efc196b2c3a851b5e2e)
@@ -5,11 +5,12 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
+import org.lamsfoundation.lams.util.Nullable;
 
 /**
  * @hibernate.class table="lams_learning_activity"
  */
-public abstract class Activity implements Serializable {
+public abstract class Activity implements Serializable,Nullable {
 
 	public static final int TOOL_ACTIVITY_TYPE = 1;
 
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java
===================================================================
diff -u -r7f203b0b0a2e56896f7eee5367b52d1ec4db483e -r95aa4590e8f18e8323cd6efc196b2c3a851b5e2e
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java	(.../GroupingActivity.java)	(revision 7f203b0b0a2e56896f7eee5367b52d1ec4db483e)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java	(.../GroupingActivity.java)	(revision 95aa4590e8f18e8323cd6efc196b2c3a851b5e2e)
@@ -132,4 +132,12 @@
 	public void setCreateGroupingUIID(Integer create_grouping_ui_id) {
 		this.createGroupingUIID = create_grouping_ui_id;
 	}
+
+    /**
+     * @see org.lamsfoundation.lams.util.Nullable#isNull()
+     */
+    public boolean isNull()
+    {
+        return false;
+    }
 }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/NullActivity.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/NullActivity.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/NullActivity.java	(revision 95aa4590e8f18e8323cd6efc196b2c3a851b5e2e)
@@ -0,0 +1,19 @@
+
+package org.lamsfoundation.lams.learningdesign;
+
+
+/**
+ * Null activity object. 
+ * @author dgarth
+ */
+public class NullActivity extends Activity {
+
+    /**
+     * @see org.lamsfoundation.lams.util.Nullable#isNull()
+     */
+    public boolean isNull()
+    {
+        return true;
+    }
+
+}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java
===================================================================
diff -u -rbc5100fd493b75e5b64ab91b24756d6aeae59e1e -r95aa4590e8f18e8323cd6efc196b2c3a851b5e2e
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java	(.../OptionsActivity.java)	(revision bc5100fd493b75e5b64ab91b24756d6aeae59e1e)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java	(.../OptionsActivity.java)	(revision 95aa4590e8f18e8323cd6efc196b2c3a851b5e2e)
@@ -159,4 +159,12 @@
 	public void setOptionsInstructions(String options_instructions) {
 		this.optionsInstructions = options_instructions;
 	}
+
+    /**
+     * @see org.lamsfoundation.lams.util.Nullable#isNull()
+     */
+    public boolean isNull()
+    {
+        return false;
+    }
 }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java
===================================================================
diff -u -rabb47d2c4be2715536640454a589db41e208fecc -r95aa4590e8f18e8323cd6efc196b2c3a851b5e2e
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java	(.../ParallelActivity.java)	(revision abb47d2c4be2715536640454a589db41e208fecc)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java	(.../ParallelActivity.java)	(revision 95aa4590e8f18e8323cd6efc196b2c3a851b5e2e)
@@ -115,4 +115,12 @@
             .toString();
     }
 
+    /**
+     * @see org.lamsfoundation.lams.util.Nullable#isNull()
+     */
+    public boolean isNull()
+    {
+        return false;
+    }
+
 }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java
===================================================================
diff -u -rd7ebd611fae09a4e8c3c7df6b85f8da3829434f6 -r95aa4590e8f18e8323cd6efc196b2c3a851b5e2e
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java	(.../PermissionGateActivity.java)	(revision d7ebd611fae09a4e8c3c7df6b85f8da3829434f6)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java	(.../PermissionGateActivity.java)	(revision 95aa4590e8f18e8323cd6efc196b2c3a851b5e2e)
@@ -121,5 +121,13 @@
         .append("activityId", getActivityId())
         .toString();
     }
+
+    /**
+     * @see org.lamsfoundation.lams.util.Nullable#isNull()
+     */
+    public boolean isNull()
+    {
+        return false;
+    }
     
 }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java
===================================================================
diff -u -rd7ebd611fae09a4e8c3c7df6b85f8da3829434f6 -r95aa4590e8f18e8323cd6efc196b2c3a851b5e2e
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java	(.../ScheduleGateActivity.java)	(revision d7ebd611fae09a4e8c3c7df6b85f8da3829434f6)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java	(.../ScheduleGateActivity.java)	(revision 95aa4590e8f18e8323cd6efc196b2c3a851b5e2e)
@@ -174,5 +174,12 @@
             .append("activityId", getActivityId())
             .toString();
     }
+    /**
+     * @see org.lamsfoundation.lams.util.Nullable#isNull()
+     */
+    public boolean isNull()
+    {
+        return false;
+    }
 
 }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
===================================================================
diff -u -rabb47d2c4be2715536640454a589db41e208fecc -r95aa4590e8f18e8323cd6efc196b2c3a851b5e2e
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java	(.../SequenceActivity.java)	(revision abb47d2c4be2715536640454a589db41e208fecc)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java	(.../SequenceActivity.java)	(revision 95aa4590e8f18e8323cd6efc196b2c3a851b5e2e)
@@ -117,4 +117,13 @@
             .toString();
     }
 
+
+    /**
+     * @see org.lamsfoundation.lams.util.Nullable#isNull()
+     */
+    public boolean isNull()
+    {
+        return false;
+    }
+
 }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java
===================================================================
diff -u -r75ee1ef1061f8c0809261ab26afba40ec40bc211 -r95aa4590e8f18e8323cd6efc196b2c3a851b5e2e
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java	(.../SynchGateActivity.java)	(revision 75ee1ef1061f8c0809261ab26afba40ec40bc211)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java	(.../SynchGateActivity.java)	(revision 95aa4590e8f18e8323cd6efc196b2c3a851b5e2e)
@@ -118,4 +118,12 @@
             .toString();
     }
 
+    /**
+     * @see org.lamsfoundation.lams.util.Nullable#isNull()
+     */
+    public boolean isNull()
+    {
+        return false;
+    }
+
 }
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java
===================================================================
diff -u -r4ac10999b646e5147e00b64c11969ec0b1d081ab -r95aa4590e8f18e8323cd6efc196b2c3a851b5e2e
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java	(.../ToolActivity.java)	(revision 4ac10999b646e5147e00b64c11969ec0b1d081ab)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java	(.../ToolActivity.java)	(revision 95aa4590e8f18e8323cd6efc196b2c3a851b5e2e)
@@ -192,5 +192,13 @@
 	 */
 	public void setToolSessions(Set toolSessions) {
 		this.toolSessions = toolSessions;
-	}	
+	}
+
+    /**
+     * @see org.lamsfoundation.lams.util.Nullable#isNull()
+     */
+    public boolean isNull()
+    {
+        return false;
+    }	
 }
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/LessonCompleteActivity.java
===================================================================
diff -u -rf6b57f7fc79528760e004b09322b56f0b0ef3ddd -r95aa4590e8f18e8323cd6efc196b2c3a851b5e2e
--- lams_common/src/java/org/lamsfoundation/lams/lesson/LessonCompleteActivity.java	(.../LessonCompleteActivity.java)	(revision f6b57f7fc79528760e004b09322b56f0b0ef3ddd)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/LessonCompleteActivity.java	(.../LessonCompleteActivity.java)	(revision 95aa4590e8f18e8323cd6efc196b2c3a851b5e2e)
@@ -6,6 +6,8 @@
  */
 package org.lamsfoundation.lams.lesson;
 
+import org.lamsfoundation.lams.learningdesign.NullActivity;
+
 /**
  * @author dgarth
  *
Fisheye: Tag 95aa4590e8f18e8323cd6efc196b2c3a851b5e2e refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/lesson/NullActivity.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/ParallelWaitActivity.java
===================================================================
diff -u -rf6b57f7fc79528760e004b09322b56f0b0ef3ddd -r95aa4590e8f18e8323cd6efc196b2c3a851b5e2e
--- lams_common/src/java/org/lamsfoundation/lams/lesson/ParallelWaitActivity.java	(.../ParallelWaitActivity.java)	(revision f6b57f7fc79528760e004b09322b56f0b0ef3ddd)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/ParallelWaitActivity.java	(.../ParallelWaitActivity.java)	(revision 95aa4590e8f18e8323cd6efc196b2c3a851b5e2e)
@@ -6,6 +6,8 @@
  */
 package org.lamsfoundation.lams.lesson;
 
+import org.lamsfoundation.lams.learningdesign.NullActivity;
+
 /**
  * @author dgarth
  *
Index: lams_common/src/java/org/lamsfoundation/lams/util/Nullable.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/util/Nullable.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/util/Nullable.java	(revision 95aa4590e8f18e8323cd6efc196b2c3a851b5e2e)
@@ -0,0 +1,28 @@
+/* ********************************************************************************
+ *  Copyright Notice
+ *  =================
+ * This file contains propriety information of LAMS Foundation. 
+ * Copying or reproduction with prior written permission is prohibited.
+ * Copyright (c) 2004 
+ * Created on 2004-12-3
+ ******************************************************************************** */
+
+package org.lamsfoundation.lams.util;
+
+
+/**
+ * Null Object pattern. This interface is defined to avoid the use of NULL. 
+ * The domain object that allows NULL as return value should implement this
+ * interface.
+ * 
+ * @author Jacky Fang 2004-12-3
+ * 
+ */
+public interface Nullable
+{
+    /**
+     * contract to indicate whether current object is null.
+     * @return
+     */
+    public boolean isNull();
+}