Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java,v diff -u -r1.16 -r1.17 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java 10 Oct 2005 11:52:09 -0000 1.16 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java 21 Nov 2005 05:19:58 -0000 1.17 @@ -68,6 +68,8 @@ /** nullable persistent field */ private Integer groupingUIID; + private Integer groupingTypeId; + /** persistent field */ private Set groups; @@ -137,13 +139,20 @@ */ public Integer getGroupingTypeId() { - if(this instanceof LessonClass) + /* if(this instanceof LessonClass) return CLASS_GROUPING_TYPE; else if(this instanceof ChosenGrouping) return CHOSEN_GROUPING_TYPE; else - return RANDOM_GROUPING_TYPE; + return RANDOM_GROUPING_TYPE; */ + return this.groupingTypeId; + } + + public void setGroupingTypeId(Integer groupingTypeID) + { + this.groupingTypeId = groupingTypeID; + } /** * @@ -337,4 +346,19 @@ else return new LessonClass(); } + + public boolean isRandomGrouping() + { + return getGroupingTypeId().intValue() == RANDOM_GROUPING_TYPE.intValue(); + } + + public boolean isChosenGrouping() + { + return getGroupingTypeId().intValue() == CHOSEN_GROUPING_TYPE.intValue(); + } + + public boolean isClassGrouping() + { + return getGroupingTypeId().intValue() == CLASS_GROUPING_TYPE.intValue(); + } }