Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java =================================================================== diff -u -r79c858a92c17ab3ca404cab4a0cf6094254e68d5 -r0db78e5162fc29c3a27023bf9e38e790ef9e609a --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (.../Activity.java) (revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (.../Activity.java) (revision 0db78e5162fc29c3a27023bf9e38e790ef9e609a) @@ -256,24 +256,37 @@ public static Activity getActivityInstance(int activityType) { + // the default constructors don't set up the activity type + // so we need to do that manually + Activity activity = null; switch(activityType){ case TOOL_ACTIVITY_TYPE: - return new ToolActivity(); + activity = new ToolActivity(); + break; case OPTIONS_ACTIVITY_TYPE: - return new OptionsActivity(); + activity = new OptionsActivity(); + break; case PARALLEL_ACTIVITY_TYPE: - return new ParallelActivity(); + activity = new ParallelActivity(); + break; case SEQUENCE_ACTIVITY_TYPE: - return new SequenceActivity(); + activity = new SequenceActivity(); + break; case SYNCH_GATE_ACTIVITY_TYPE: - return new SynchGateActivity(); + activity = new SynchGateActivity(); + break; case SCHEDULE_GATE_ACTIVITY_TYPE: - return new ScheduleGateActivity(); + activity = new ScheduleGateActivity(); + break; case PERMISSION_GATE_ACTIVITY_TYPE: - return new PermissionGateActivity(); + activity = new PermissionGateActivity(); + break; default: - return new GroupingActivity(); + activity = new GroupingActivity(); + break; } + activity.setActivityTypeId(new Integer(activityType)); + return activity; } //---------------------------------------------------------------------