Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml,v
diff -u -r1.15 -r1.16
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml 2 Mar 2005 03:25:58 -0000 1.15
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml 4 Mar 2005 03:59:40 -0000 1.16
@@ -134,7 +134,7 @@
@hibernate.class
public abstract
-
+
@hibernate.class
@@ -155,7 +155,7 @@
-
+
@hibernate.class
@@ -168,13 +168,13 @@
-
+
@hibernate.class
-
+
@hibernate.class
@@ -198,10 +198,10 @@
-
+
@hibernate.class
-
+
@hibernate.class
@@ -221,7 +221,7 @@
-
+
@hibernate.class
@@ -239,10 +239,10 @@
-
+
@hibernate.class
-
+
@hibernate.class
Index: lams_common/db/sql/insert_test_data.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/Attic/insert_test_data.sql,v
diff -u -r1.28 -r1.29
--- lams_common/db/sql/insert_test_data.sql 28 Feb 2005 23:12:20 -0000 1.28
+++ lams_common/db/sql/insert_test_data.sql 4 Mar 2005 03:57:10 -0000 1.29
@@ -155,7 +155,7 @@
insert into lams_user_group values(2, 90);
insert into lams_user_group values(3, 89);
-insert into lams_lesson values (1, 1, 1, '2005-02-23 17:37:25', 1, 3, NULL, NULL, 101);
+insert into lams_lesson values (1, 1, 1, 'Test Lesson','Description','2005-02-23 17:37:25', 1, 3, 1, NULL, 101,null,null);
-- Populates the lams_learning_activity table with default activity templates that would be avaialbe to the
-- author in the left panel and a default dummy learning_design defination
@@ -167,7 +167,7 @@
gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image)
values
(1,1,'Notebook Template','Notebook',10,20,null,'Help Text for Activity',
-1,null,null,0,
+1,null,0,0,
null,1,'20050101','Offline Instructions ',0,
null,null,1,1,
null,null,null,'NotebookImage');
@@ -179,7 +179,7 @@
gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image)
values
(2,2,'NoticeBoard Template','NoticeBoard',10,20,null,'Help Text for Activity',
-1,null,null,0,
+1,null,0,0,
null,2,'20050101','Offline Instructions ',0,
null,null,2,2,
null,null,null,'NoticeBoardImage');
@@ -191,7 +191,7 @@
gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image)
values
(3,3,'Multiple Choice Template','Multiple Choice',10,20,null,'Help Text for Activity',
-1,null,null,0,
+1,null,0,0,
null,3,'20050101','Offline Instructions ',0,
null,null,3,3,
null,null,null,'MultipleChoiceImage');
@@ -203,7 +203,7 @@
gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image)
values
(4,4,'Question and Answer Template','Question and Answer',10,20,null,'Help Text for Activity',
-1,null,null,0,
+1,null,0,0,
null,4,'20050101','Offline Instructions ',0,
null,null,4,4,
null,null,null,'QAImage');
@@ -215,7 +215,7 @@
gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image)
values
(5,5,'MessageBoard Template','MessageBoard',10,20,null,'Help Text for Activity',
-1,null,null,0,
+1,null,0,0,
null,5,'20050101','Offline Instructions ',0,
null,null,5,5,
null,null,null,'MBImage');
@@ -227,7 +227,7 @@
gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image)
values
(6,6,'Survey Template','Survey',10,20,null,'Help Text for Activity',
-1,null,null,0,
+1,null,0,0,
null,6,'20050101','Offline Instructions ',0,
null,null,6,6,
null,null,null,'SurveyImage');
@@ -239,7 +239,7 @@
gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image)
values
(7,7,'Chat Template','Chat',10,20,null,'Help Text for Activity',
-1,null,null,0,
+1,null,0,0,
null,7,'20050101','Offline Instructions ',0,
null,null,7,7,
null,null,null,'ChatImage');
@@ -251,7 +251,7 @@
gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image)
values
(8,8,'Shared Resources Template','Shared Resources',10,20,null,'Help Text for Activity',
-1,null,null,0,
+1,null,0,0,
null,8,'20050101','Offline Instructions ',0,
null,null,8,8,
null,null,null,'SRImage');
@@ -263,7 +263,7 @@
gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image)
values
(9,9,'Voting Template','Voting',10,20,null,'Help Text for Activity',
-1,null,null,0,
+1,null,0,0,
null,9,'20050101','Offline Instructions ',0,
null,null,9,9,
null,null,null,'VotingImage');
@@ -275,7 +275,7 @@
gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image)
values
(10,10,'Submit Files Template','Submit Files',10,20,null,'Help Text for Activity',
-1,null,null,0,
+1,null,0,0,
null,10,'20050101','Offline Instructions ',0,
null,null,10,10,
null,null,null,'SubmitFilesImage');
@@ -287,7 +287,7 @@
gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image)
values
(11,11,'Instant Messaging Template','Instant Messaging',10,20,null,'Help Text for Activity',
-1,null,null,0,
+1,null,0,0,
null,11,'20050101','Offline Instructions ',0,
null,null,11,11,
null,null,null,'IMImage');
@@ -478,7 +478,7 @@
'Random Grouping Activity Description','RandomGroupingActivity Title','Help Text for RandomGroupingActivity',
10,20,
null,null,2,
-null,null,null,0,
+null,null,0,0,
1,null,'20050101',
0,null,
null,null,null,
@@ -511,7 +511,7 @@
'QNA Activity Description','QNA Activity Title','Help Text for QNA Activity',
10,20,
null,null,1,
-99,99,null,0,
+99,99,0,0,
1,4,'20050101',
1,'QNA Activity Offline Instructions ',
null,null,null,
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java,v
diff -u -r1.9 -r1.10
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java 4 Mar 2005 00:28:30 -0000 1.9
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java 4 Mar 2005 04:00:12 -0000 1.10
@@ -5,9 +5,9 @@
import java.io.Serializable;
import java.util.Date;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import java.util.TreeSet;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
@@ -346,19 +346,19 @@
public int hashCode() {
return new HashCodeBuilder().append(getReadOnly()).toHashCode();
}
- public TreeSet getParentActivities(){
- TreeSet parentActivities = new TreeSet(new ActivityOrderComparator());
+ public HashSet getParentActivities(){
+ HashSet parentActivities = new HashSet();
Iterator iterator = this.getActivities().iterator();
while(iterator.hasNext()){
Activity activity = (Activity)iterator.next();
- if(activity.getParentActivity()==null)
+ if(activity.getParentActivity()==null)
parentActivities.add(activity);
}
return parentActivities;
}
public Activity calculateFirstActivity(){
Activity firstActivity = null;
- TreeSet parentActivities = this.getParentActivities();
+ HashSet parentActivities = this.getParentActivities();
Iterator parentIterator = parentActivities.iterator();
while(parentIterator.hasNext()){
Activity activity = (Activity)parentIterator.next();