Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java =================================================================== diff -u -r4645bbdc7f6283d2fc8e0293773b786da53976f7 -r8e98619391a7b227ca6d7f16b884e219149e4a23 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (.../AuthoringActivityDTO.java) (revision 4645bbdc7f6283d2fc8e0293773b786da53976f7) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (.../AuthoringActivityDTO.java) (revision 8e98619391a7b227ca6d7f16b884e219149e4a23) @@ -47,7 +47,7 @@ *****************************************************************************/ /** identifier field */ - private Long activityId; + private Long activityID; /** FLASH generated value. Unique per LearningDesign. * Required by flash only.*/ @@ -173,7 +173,7 @@ /***************************************************************************** * Constructors *****************************************************************************/ - public AuthoringActivityDTO(Long activityId, Integer activityUIID, + public AuthoringActivityDTO(Long activityID, Integer activityUIID, String description, String title, String helpText, Integer xcoord, Integer ycoord, Long parentActivityID, Integer parentUIID, Integer activityTypeId, Long groupingID, Integer groupingUIID, @@ -190,7 +190,7 @@ Boolean applyGrouping,Integer groupingSupportType, Integer groupingType,GroupingDTO groupingDTO) { super(); - this.activityId = activityId; + this.activityID = activityID; this.activityUIID = activityUIID; this.description = description; this.title = title; @@ -234,7 +234,7 @@ public AuthoringActivityDTO(Object object){ processActivityType(object); Activity activity = (Activity)object; - this.activityId = activity.getActivityId(); + this.activityID = activity.getActivityId(); this.activityUIID = activity.getActivityUIID(); this.description = activity.getDescription(); this.title = activity.getTitle(); @@ -434,10 +434,10 @@ return activityCategoryID!=null?activityCategoryID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; } /** - * @return Returns the activityId. + * @return Returns the activityID. */ - public Long getActivityId() { - return activityId!=null?activityId:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + public Long getActivityID() { + return activityID!=null?activityID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; } /** * @return Returns the activityTypeId. @@ -648,11 +648,11 @@ this.activityCategoryID = activityCategoryID; } /** - * @param activityId The activityId to set. + * @param activityID The activityID to set. */ - public void setActivityId(Long activityId) { + public void setActivityID(Long activityId) { if(!activityId.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG)) - this.activityId = activityId; + this.activityID = activityId; } /** * @param activityTypeId The activityTypeId to set. Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/DesignDetailDTO.java =================================================================== diff -u -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad -r8e98619391a7b227ca6d7f16b884e219149e4a23 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/DesignDetailDTO.java (.../DesignDetailDTO.java) (revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/DesignDetailDTO.java (.../DesignDetailDTO.java) (revision 8e98619391a7b227ca6d7f16b884e219149e4a23) @@ -1,8 +1,24 @@ -/* - * Created on Apr 11, 2005 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** */ package org.lamsfoundation.lams.learningdesign.dto; @@ -12,14 +28,11 @@ import org.lamsfoundation.lams.util.wddx.WDDXTAGS; /** - * @author Minhas - * - * TODO To change the template for this generated type comment go to - * Window - Preferences - Java - Code Style - Code Templates + * @author Manpreet Minhas */ public class DesignDetailDTO extends BaseDTO { - private Long learningDesignId; + private Long learningDesignID; private Integer learningDesignUIID; private String description; private String title; @@ -37,13 +50,13 @@ public DesignDetailDTO(){ } - public DesignDetailDTO(Long learningDesignId, Integer learningDesignUIID, + public DesignDetailDTO(Long learningDesignID, Integer learningDesignUIID, String description, String title, Long firstActivityID, Boolean validDesign, Boolean readOnly, Date dateReadOnly, Integer userID, String helpText, Integer copyTypeID, String version, Long parentLearningDesignID, Integer workspaceFolderID) { - this.learningDesignId = learningDesignId; + this.learningDesignID = learningDesignID; this.learningDesignUIID = learningDesignUIID; this.description = description; this.title = title; @@ -59,7 +72,7 @@ this.workspaceFolderID = workspaceFolderID; } public DesignDetailDTO(LearningDesign learningDesign){ - this.learningDesignId = learningDesign.getLearningDesignId(); + this.learningDesignID = learningDesign.getLearningDesignId(); this.learningDesignUIID = learningDesign.getLearningDesignUIID(); this.description = learningDesign.getDescription(); this.title = learningDesign.getTitle(); @@ -109,10 +122,10 @@ return helpText!=null?helpText:WDDXTAGS.STRING_NULL_VALUE; } /** - * @return Returns the learningDesignId. + * @return Returns the learningDesignID. */ - public Long getLearningDesignId() { - return learningDesignId!=null?learningDesignId:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + public Long getLearningDesignID() { + return learningDesignID!=null?learningDesignID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; } /** * @return Returns the learningDesignUIID. Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GroupingDTO.java =================================================================== diff -u -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad -r8e98619391a7b227ca6d7f16b884e219149e4a23 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GroupingDTO.java (.../GroupingDTO.java) (revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GroupingDTO.java (.../GroupingDTO.java) (revision 8e98619391a7b227ca6d7f16b884e219149e4a23) @@ -1,8 +1,24 @@ -/* - * Created on Apr 7, 2005 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** */ package org.lamsfoundation.lams.learningdesign.dto; @@ -15,10 +31,7 @@ import org.lamsfoundation.lams.util.wddx.WDDXTAGS; /** - * @author Minhas - * - * TODO To change the template for this generated type comment go to - * Window - Preferences - Java - Code Style - Code Templates + * @author Manpreet Minhas */ public class GroupingDTO extends BaseDTO{ Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java =================================================================== diff -u -r16942d8cd083c45c02a28ea715617dd419d8d2bc -r8e98619391a7b227ca6d7f16b884e219149e4a23 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java (.../LearningDesignDTO.java) (revision 16942d8cd083c45c02a28ea715617dd419d8d2bc) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java (.../LearningDesignDTO.java) (revision 8e98619391a7b227ca6d7f16b884e219149e4a23) @@ -40,7 +40,7 @@ */ public class LearningDesignDTO extends BaseDTO{ - private Long learningDesignId; + private Long learningDesignID; private Integer learningDesignUIID; private String description; private String title; @@ -99,7 +99,7 @@ Date lessonStartDateTime, Date lastModifiedDateTime) { super(); - this.learningDesignId = learningDesignId; + this.learningDesignID = learningDesignId; this.learningDesignUIID = learningDesignUIID; this.description = description; this.title = title; @@ -129,7 +129,7 @@ this.transitions = new ArrayList(); } public LearningDesignDTO(LearningDesign learningDesign){ - this.learningDesignId = learningDesign.getLearningDesignId(); + this.learningDesignID = learningDesign.getLearningDesignId(); this.learningDesignUIID = learningDesign.getLearningDesignUIID(); this.description = learningDesign.getDescription(); this.title = learningDesign.getTitle(); @@ -258,10 +258,10 @@ return lastModifiedDateTime!=null?lastModifiedDateTime:WDDXTAGS.DATE_NULL_VALUE; } /** - * @return Returns the learningDesignId. + * @return Returns the learningDesignID. */ - public Long getLearningDesignId() { - return learningDesignId!=null?learningDesignId:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + public Long getLearningDesignID() { + return learningDesignID!=null?learningDesignID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; } /** * @return Returns the learningDesignUIID. @@ -466,11 +466,11 @@ this.lastModifiedDateTime = lastModifiedDateTime; } /** - * @param learningDesignId The learningDesignId to set. + * @param learningDesignID The learningDesignID to set. */ - public void setLearningDesignId(Long learningDesignId) { + public void setLearningDesignID(Long learningDesignId) { if(!learningDesignId.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG)) - this.learningDesignId = learningDesignId; + this.learningDesignID = learningDesignId; } /** * @param learningDesignUIID The learningDesignUIID to set. Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java =================================================================== diff -u -r4b9b6266170988163d84ea035e5e59415eb54663 -r8e98619391a7b227ca6d7f16b884e219149e4a23 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java (.../LibraryActivityDTO.java) (revision 4b9b6266170988163d84ea035e5e59415eb54663) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java (.../LibraryActivityDTO.java) (revision 8e98619391a7b227ca6d7f16b884e219149e4a23) @@ -49,7 +49,7 @@ *****************************************************************************/ /** identifier field */ - private Long activityId; + private Long activityID; /** FLASH generated value. Unique per LearningDesign. * Required by flash only.*/ @@ -86,7 +86,7 @@ String description, String title, String helpText, Integer xcoord, Integer ycoord,String libraryActivityUiImage,AuthoringToolDTO tool) { super(); - this.activityId = activityId; + this.activityID = activityId; this.activityUIID = activityUIID; this.description = description; this.title = title; @@ -97,7 +97,7 @@ this.tool = tool; } public LibraryActivityDTO(ToolActivity activity){ - this.activityId = activity.getActivityId(); + this.activityID = activity.getActivityId(); this.activityUIID = activity.getActivityUIID(); this.description = activity.getDescription(); this.title = activity.getTitle(); @@ -114,10 +114,10 @@ /** - * @return Returns the activityId. + * @return Returns the activityID. */ - public Long getActivityId() { - return activityId!=null?activityId:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + public Long getActivityID() { + return activityID!=null?activityID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; } /** * @return Returns the activityUIID. Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/MonitoringActivityDTO.java =================================================================== diff -u -rcd32e8611c801a0169b9a2296cacdd33da4567d7 -r8e98619391a7b227ca6d7f16b884e219149e4a23 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/MonitoringActivityDTO.java (.../MonitoringActivityDTO.java) (revision cd32e8611c801a0169b9a2296cacdd33da4567d7) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/MonitoringActivityDTO.java (.../MonitoringActivityDTO.java) (revision 8e98619391a7b227ca6d7f16b884e219149e4a23) @@ -1,8 +1,24 @@ -/* - * Created on Mar 15, 2005 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** */ package org.lamsfoundation.lams.learningdesign.dto; @@ -11,10 +27,7 @@ import org.lamsfoundation.lams.util.wddx.WDDXTAGS; /** - * @author Minhas - * - * TODO To change the template for this generated type comment go to - * Window - Preferences - Java - Code Style - Code Templates + * @author Manpreet Minhas */ public class MonitoringActivityDTO { Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/ProgressActivityDTO.java =================================================================== diff -u -r8bbaae4777d25bac513a7adc0b42b2d8480e05cc -r8e98619391a7b227ca6d7f16b884e219149e4a23 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/ProgressActivityDTO.java (.../ProgressActivityDTO.java) (revision 8bbaae4777d25bac513a7adc0b42b2d8480e05cc) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/ProgressActivityDTO.java (.../ProgressActivityDTO.java) (revision 8e98619391a7b227ca6d7f16b884e219149e4a23) @@ -37,7 +37,7 @@ //--------------------------------------------------------------------- // attributes //--------------------------------------------------------------------- - private Long activityId; + private Long activityID; private String activityURL; @@ -57,16 +57,16 @@ */ public ProgressActivityDTO(Long activityId,String activityURL) { - this.activityId = activityId; + this.activityID = activityId; this.activityURL = activityURL; } /** - * @return Returns the activityId. + * @return Returns the activityID. */ - public Long getActivityId() + public Long getActivityID() { - return activityId; + return activityID; } /** * @return Returns the activityURL. Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/TransitionDTO.java =================================================================== diff -u -rfc77ed7c05214a99c9d9148a55e160d2d4a455ad -r8e98619391a7b227ca6d7f16b884e219149e4a23 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/TransitionDTO.java (.../TransitionDTO.java) (revision fc77ed7c05214a99c9d9148a55e160d2d4a455ad) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/TransitionDTO.java (.../TransitionDTO.java) (revision 8e98619391a7b227ca6d7f16b884e219149e4a23) @@ -1,8 +1,24 @@ -/* - * Created on Mar 30, 2005 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** */ package org.lamsfoundation.lams.learningdesign.dto; @@ -14,14 +30,11 @@ /** - * @author Minhas - * - * TODO To change the template for this generated type comment go to - * Window - Preferences - Java - Code Style - Code Templates + * @author Manpreet Minhas */ public class TransitionDTO extends BaseDTO{ - private Long transitionId; + private Long transitionID; private Integer transitionUIID; private Integer toUIID; private Integer fromUIID; @@ -40,7 +53,7 @@ Date createDateTime, Long toActivityID, Long fromActivityID, Long learningDesignID) { super(); - this.transitionId = transitionId; + this.transitionID = transitionId; this.transitionUIID = transitionUIID; this.toUIID = toUIID; this.fromUIID = fromUIID; @@ -52,7 +65,7 @@ this.learningDesignID = learningDesignID; } public TransitionDTO(Transition transition){ - this.transitionId = transition.getTransitionId(); + this.transitionID = transition.getTransitionId(); this.transitionUIID = transition.getTransitionUIID(); this.toUIID = transition.getToUIID(); this.fromUIID = transition.getFromUIID(); @@ -64,8 +77,8 @@ this.learningDesignID = transition.getLearningDesign().getLearningDesignId(); } public TransitionDTO(Hashtable transitionDetails){ - if(transitionDetails.containsKey("transitionId")) - transitionId= convertToLong(transitionDetails.get("transitionId")); + if(transitionDetails.containsKey("transitionID")) + transitionID= convertToLong(transitionDetails.get("transitionID")); if(transitionDetails.containsKey("transitionUIID")) transitionUIID=convertToInteger(transitionDetails.get("transitionUIID")); if(transitionDetails.containsKey("toUIID")) @@ -134,10 +147,10 @@ return toUIID!=null?toUIID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; } /** - * @return Returns the transitionId. + * @return Returns the transitionID. */ - public Long getTransitionId() { - return transitionId!=null?transitionId:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + public Long getTransitionID() { + return transitionID!=null?transitionID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; } /** * @return Returns the transitionUIID. @@ -202,11 +215,11 @@ this.toUIID = toUIID; } /** - * @param transitionId The transitionId to set. + * @param transitionID The transitionID to set. */ - public void setTransitionId(Long transitionId) { + public void setTransitionID(Long transitionId) { if(!transitionId.equals(WDDXTAGS.NUMERIC_NULL_VALUE_LONG)) - this.transitionId = transitionId; + this.transitionID = transitionId; } /** * @param transitionUIID The transitionUIID to set.