Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java =================================================================== diff -u -re5099e3af56df14b516a320ce044987097aa5d40 -rebd021b90e8100f21a316744a9187cb2812a9fd0 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (.../AuthoringActivityDTO.java) (revision e5099e3af56df14b516a320ce044987097aa5d40) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (.../AuthoringActivityDTO.java) (revision ebd021b90e8100f21a316744a9187cb2812a9fd0) @@ -155,7 +155,11 @@ private Integer createGroupingUIID; - private GroupingDTO groupingDTO; + /* Server will send Grouping objects as an array (in the Groupings array) + * rather than being part of the GroupingActivity. For the groupings array + * see LearningDesignDTO. + */ + //private GroupingDTO groupingDTO; /** Single Library can have one or more activities @@ -219,7 +223,7 @@ this.applyGrouping = applyGrouping; this.groupingSupportType = groupingSupportType; this.groupingType = groupingType; - this.groupingDTO = groupingDTO; + //this.groupingDTO = groupingDTO; } public AuthoringActivityDTO(Activity activity){ processActivityType(activity); @@ -284,10 +288,10 @@ private void addGroupingActivityAttributes(GroupingActivity groupingActivity){ Grouping grouping = groupingActivity.getCreateGrouping(); - this.groupingDTO = grouping.getGroupingDTO(); + //this.groupingDTO = grouping.getGroupingDTO(); this.createGroupingID = grouping.getGroupingId(); this.createGroupingUIID = grouping.getGroupingUIID(); - this.groupingType = grouping.getGroupingTypeId(); + //this.groupingType = grouping.getGroupingTypeId(); } private void addOptionsActivityAttributes(OptionsActivity optionsActivity){ this.maxOptions = optionsActivity.getMaxNumberOfOptions(); @@ -811,15 +815,13 @@ this.groupingType = groupingType; } /** - * @return Returns the groupingDTO. - */ + * GroupingDTO removed and is now part of the "groupings" array located in LearningDesignDTO + * public GroupingDTO getGroupingDTO() { return groupingDTO; } - /** - * @param groupingDTO The groupingDTO to set. - */ + public void setGroupingDTO(GroupingDTO groupingDTO) { this.groupingDTO = groupingDTO; - } + } */ }