Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/DesignDetailDTO.java =================================================================== diff -u -r8e98619391a7b227ca6d7f16b884e219149e4a23 -r86a0f186099637fc974445894c5462d60420f10d --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/DesignDetailDTO.java (.../DesignDetailDTO.java) (revision 8e98619391a7b227ca6d7f16b884e219149e4a23) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/DesignDetailDTO.java (.../DesignDetailDTO.java) (revision 86a0f186099637fc974445894c5462d60420f10d) @@ -78,7 +78,7 @@ this.title = learningDesign.getTitle(); this.firstActivityID = learningDesign.getFirstActivity()!=null? learningDesign.getFirstActivity().getActivityId(): - WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + null; this.validDesign = learningDesign.getValidDesign(); this.readOnly = learningDesign.getReadOnly(); this.dateReadOnly = learningDesign.getDateReadOnly(); @@ -88,91 +88,91 @@ this.version = learningDesign.getVersion(); this.parentLearningDesignID = learningDesign.getParentLearningDesign()!=null? learningDesign.getParentLearningDesign().getLearningDesignId(): - WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + null; this.workspaceFolderID = learningDesign.getWorkspaceFolder().getWorkspaceFolderId(); } /** * @return Returns the copyTypeID. */ public Integer getCopyTypeID() { - return copyTypeID!=null?copyTypeID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + return copyTypeID; } /** * @return Returns the dateReadOnly. */ public Date getDateReadOnly() { - return dateReadOnly!=null?dateReadOnly:WDDXTAGS.DATE_NULL_VALUE; + return dateReadOnly; } /** * @return Returns the description. */ public String getDescription() { - return description!=null?description:WDDXTAGS.STRING_NULL_VALUE; + return description; } /** * @return Returns the firstActivityID. */ public Long getFirstActivityID() { - return firstActivityID!=null?firstActivityID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + return firstActivityID; } /** * @return Returns the helpText. */ public String getHelpText() { - return helpText!=null?helpText:WDDXTAGS.STRING_NULL_VALUE; + return helpText; } /** * @return Returns the learningDesignID. */ public Long getLearningDesignID() { - return learningDesignID!=null?learningDesignID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + return learningDesignID; } /** * @return Returns the learningDesignUIID. */ public Integer getLearningDesignUIID() { - return learningDesignUIID!=null?learningDesignUIID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + return learningDesignUIID; } /** * @return Returns the parentLearningDesignID. */ public Long getParentLearningDesignID() { - return parentLearningDesignID!=null?parentLearningDesignID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + return parentLearningDesignID; } /** * @return Returns the readOnly. */ public Boolean getReadOnly() { - return readOnly!=null?readOnly:WDDXTAGS.BOOLEAN_NULL_VALUE; + return readOnly; } /** * @return Returns the title. */ public String getTitle() { - return title!=null?title:WDDXTAGS.STRING_NULL_VALUE; + return title; } /** * @return Returns the userID. */ public Integer getUserID() { - return userID!=null?userID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + return userID; } /** * @return Returns the validDesign. */ public Boolean getValidDesign() { - return validDesign!=null?validDesign:WDDXTAGS.BOOLEAN_NULL_VALUE; + return validDesign; } /** * @return Returns the version. */ public String getVersion() { - return version!=null?version:WDDXTAGS.STRING_NULL_VALUE; + return version; } /** * @return Returns the workspaceFolderID. */ public Integer getWorkspaceFolderID() { - return workspaceFolderID!=null?workspaceFolderID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + return workspaceFolderID; } } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GroupingDTO.java =================================================================== diff -u -rb3dbc137e110d79b6aae154a808b7ca6e7de403d -r86a0f186099637fc974445894c5462d60420f10d --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GroupingDTO.java (.../GroupingDTO.java) (revision b3dbc137e110d79b6aae154a808b7ca6e7de403d) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GroupingDTO.java (.../GroupingDTO.java) (revision 86a0f186099637fc974445894c5462d60420f10d) @@ -85,7 +85,7 @@ * @return Returns the groupingID. */ public Long getGroupingID() { - return groupingID!=null?groupingID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + return groupingID; } /** * @param groupingID The groupingID to set. @@ -98,7 +98,7 @@ * @return Returns the groupingType. */ public Integer getGroupingType() { - return groupingType!=null?groupingType:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + return groupingType; } /** * @param groupingType The groupingType to set. @@ -111,7 +111,7 @@ * @return Returns the groupingUIID. */ public Integer getGroupingUIID() { - return groupingUIID!=null?groupingUIID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + return groupingUIID; } /** * @param groupingUIID The groupingUIID to set. @@ -124,7 +124,7 @@ * @return Returns the learnersPerGroup. */ public Integer getLearnersPerGroup() { - return learnersPerGroup!=null?learnersPerGroup:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + return learnersPerGroup; } /** * @param learnersPerGroup The learnersPerGroup to set. @@ -137,7 +137,7 @@ * @return Returns the maxNumberOfGroups. */ public Integer getMaxNumberOfGroups() { - return maxNumberOfGroups!=null?maxNumberOfGroups:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + return maxNumberOfGroups; } /** * @param maxNumberOfGroups The maxNumberOfGroups to set. @@ -150,7 +150,7 @@ * @return Returns the numberOfGroups. */ public Integer getNumberOfGroups() { - return numberOfGroups!=null?numberOfGroups:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + return numberOfGroups; } /** * @param numberOfGroups The numberOfGroups to set. @@ -163,7 +163,7 @@ * @return Returns the staffGroupID. */ public Long getStaffGroupID() { - return staffGroupID!=null?staffGroupID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + return staffGroupID; } /** * @param staffGroupID The staffGroupID to set. Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java =================================================================== diff -u -r79c858a92c17ab3ca404cab4a0cf6094254e68d5 -r86a0f186099637fc974445894c5462d60420f10d --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java (.../LearningDesignDTO.java) (revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java (.../LearningDesignDTO.java) (revision 86a0f186099637fc974445894c5462d60420f10d) @@ -139,10 +139,10 @@ this.title = learningDesign.getTitle(); this.firstActivityID = learningDesign.getFirstActivity()!=null? learningDesign.getFirstActivity().getActivityId(): - WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + null; this.firstActivityUIID = learningDesign.getFirstActivity()!=null? learningDesign.getFirstActivity().getActivityUIID(): - WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + null; this.maxID = learningDesign.getMaxID(); this.validDesign = learningDesign.getValidDesign(); this.readOnly = learningDesign.getReadOnly(); @@ -153,7 +153,7 @@ this.userID = learningDesign.getUser()!=null? learningDesign.getUser().getUserId(): - WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + null; this.helpText = learningDesign.getHelpText(); this.copyTypeID = learningDesign.getCopyTypeID(); @@ -162,18 +162,18 @@ this.parentLearningDesignID = learningDesign.getParentLearningDesign()!=null? learningDesign.getParentLearningDesign().getLearningDesignId(): - WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + null; this.workspaceFolderID = learningDesign.getWorkspaceFolder()!=null? learningDesign.getWorkspaceFolder().getWorkspaceFolderId(): - WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + null; this.duration = learningDesign.getDuration(); this.licenseText = learningDesign.getLicenseText(); this.licenseID = learningDesign.getLicense()!=null? learningDesign.getLicense().getLicenseID(): - WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + null; this.lessonOrgID = learningDesign.getLessonOrgID(); @@ -190,151 +190,176 @@ * @return Returns the copyTypeID. */ public Integer getCopyTypeID() { - return copyTypeID!=null?copyTypeID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + //return copyTypeID!=null?copyTypeID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + return copyTypeID; } /** * @return Returns the createDateTime. */ public Date getCreateDateTime() { - return createDateTime!=null?createDateTime:WDDXTAGS.DATE_NULL_VALUE; + //return createDateTime!=null?createDateTime:WDDXTAGS.DATE_NULL_VALUE; + return createDateTime; } /** * @return Returns the dateReadOnly. */ public Date getDateReadOnly() { - return dateReadOnly!=null?dateReadOnly:WDDXTAGS.DATE_NULL_VALUE; + //return dateReadOnly!=null?dateReadOnly:WDDXTAGS.DATE_NULL_VALUE; + return dateReadOnly; } /** * @return Returns the description. */ public String getDescription() { - return description!=null?description:WDDXTAGS.STRING_NULL_VALUE; + //return description!=null?description:WDDXTAGS.STRING_NULL_VALUE; + return description; } /** * @return Returns the duration. */ public Long getDuration() { - return duration!=null?duration:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + //return duration!=null?duration:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + return duration; } /** * @return Returns the firstActivityID. */ public Long getFirstActivityID() { - return firstActivityID!=null?firstActivityID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + //return firstActivityID!=null?firstActivityID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + return firstActivityID; } /** * @return Returns the helpText. */ public String getHelpText() { - return helpText!=null?helpText:WDDXTAGS.STRING_NULL_VALUE; + //return helpText!=null?helpText:WDDXTAGS.STRING_NULL_VALUE; + return helpText; } /** * @return Returns the lastModifiedDateTime. */ public Date getLastModifiedDateTime() { - return lastModifiedDateTime!=null?lastModifiedDateTime:WDDXTAGS.DATE_NULL_VALUE; + //return lastModifiedDateTime!=null?lastModifiedDateTime:WDDXTAGS.DATE_NULL_VALUE; + return lastModifiedDateTime; } /** * @return Returns the learningDesignID. */ public Long getLearningDesignID() { - return learningDesignID!=null?learningDesignID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + //return learningDesignID!=null?learningDesignID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + return learningDesignID; } /** * @return Returns the learningDesignUIID. */ public Integer getLearningDesignUIID() { - return learningDesignUIID!=null?learningDesignUIID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + //return learningDesignUIID!=null?learningDesignUIID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + return learningDesignUIID; } /** * @return Returns the lessonID. */ public Long getLessonID() { - return lessonID!=null?lessonID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + //return lessonID!=null?lessonID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + return lessonID; } /** * @return Returns the lessonName. */ public String getLessonName() { - return lessonName!=null?lessonName:WDDXTAGS.STRING_NULL_VALUE; + //return lessonName!=null?lessonName:WDDXTAGS.STRING_NULL_VALUE; + return lessonName; } /** * @return Returns the lessonOrgID. */ public Long getLessonOrgID() { - return lessonOrgID!=null?lessonOrgID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + //return lessonOrgID!=null?lessonOrgID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + return lessonOrgID; } /** * @return Returns the lessonOrgName. */ public String getLessonOrgName() { - return lessonOrgName!=null?lessonOrgName:WDDXTAGS.STRING_NULL_VALUE; + //return lessonOrgName!=null?lessonOrgName:WDDXTAGS.STRING_NULL_VALUE; + return lessonOrgName; } /** * @return Returns the lessonStartDateTime. */ public Date getLessonStartDateTime() { - return lessonStartDateTime!=null?lessonStartDateTime:WDDXTAGS.DATE_NULL_VALUE; + //return lessonStartDateTime!=null?lessonStartDateTime:WDDXTAGS.DATE_NULL_VALUE; + return lessonStartDateTime; } /** * @return Returns the licenseID. */ public Long getLicenseID() { - return licenseID!=null?licenseID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + //return licenseID!=null?licenseID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + return licenseID; } /** * @return Returns the licenseText. */ public String getLicenseText() { - return licenseText!=null?licenseText:WDDXTAGS.STRING_NULL_VALUE; + //return licenseText!=null?licenseText:WDDXTAGS.STRING_NULL_VALUE; + return licenseText; } /** * @return Returns the maxID. */ public Integer getMaxID() { - return maxID!=null?maxID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + //return maxID!=null?maxID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + return maxID; } /** * @return Returns the parentLearningDesignID. */ public Long getParentLearningDesignID() { - return parentLearningDesignID!=null?parentLearningDesignID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + //return parentLearningDesignID!=null?parentLearningDesignID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + return parentLearningDesignID; } /** * @return Returns the readOnly. */ public Boolean getReadOnly() { - return readOnly!=null?readOnly:WDDXTAGS.BOOLEAN_NULL_VALUE; + //return readOnly!=null?readOnly:WDDXTAGS.BOOLEAN_NULL_VALUE; + return readOnly; } /** * @return Returns the title. */ public String getTitle() { - return title!=null?title:WDDXTAGS.STRING_NULL_VALUE; + //return title!=null?title:WDDXTAGS.STRING_NULL_VALUE; + return title; } /** * @return Returns the userID. */ public Integer getUserID() { - return userID!=null?userID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + //return userID!=null?userID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + return userID; } /** * @return Returns the validDesign. */ public Boolean getValidDesign() { - return validDesign!=null?validDesign:WDDXTAGS.BOOLEAN_NULL_VALUE; + //return validDesign!=null?validDesign:WDDXTAGS.BOOLEAN_NULL_VALUE; + return validDesign; } /** * @return Returns the version. */ public String getVersion() { - return version!=null?version:WDDXTAGS.STRING_NULL_VALUE; + //return version!=null?version:WDDXTAGS.STRING_NULL_VALUE; + return version; } /** * @return Returns the workspaceFolderID. */ public Integer getWorkspaceFolderID() { - return workspaceFolderID!=null?workspaceFolderID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + //return workspaceFolderID!=null?workspaceFolderID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + return workspaceFolderID; } public ArrayList getActivities(){ return activities; @@ -581,7 +606,7 @@ * @return Returns the onlineInstructions. */ public String getOnlineInstructions() { - return onlineInstructions!=null?onlineInstructions:WDDXTAGS.STRING_NULL_VALUE; + return onlineInstructions; } /** * @param onlineInstructions The onlineInstructions to set. @@ -601,7 +626,7 @@ * @return Returns the offlineInstructions. */ public String getOfflineInstructions() { - return offlineInstructions!=null?offlineInstructions:WDDXTAGS.STRING_NULL_VALUE; + return offlineInstructions; } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningLibraryDTO.java =================================================================== diff -u -r20790f49a06eb6d311bddc9940fe35408a5dd5c4 -r86a0f186099637fc974445894c5462d60420f10d --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningLibraryDTO.java (.../LearningLibraryDTO.java) (revision 20790f49a06eb6d311bddc9940fe35408a5dd5c4) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningLibraryDTO.java (.../LearningLibraryDTO.java) (revision 86a0f186099637fc974445894c5462d60420f10d) @@ -83,25 +83,25 @@ * @return Returns the description. */ public String getDescription() { - return description!=null?description:WDDXTAGS.STRING_NULL_VALUE; + return description; } /** * @return Returns the learningLibraryID. */ public Long getLearningLibraryID() { - return learningLibraryID!=null?learningLibraryID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + return learningLibraryID; } /** * @return Returns the title. */ public String getTitle() { - return title!=null?title:WDDXTAGS.STRING_NULL_VALUE; + return title; } /** * @return Returns the validFlag. */ public Boolean getValidFlag() { - return validFlag!=null?validFlag:WDDXTAGS.BOOLEAN_NULL_VALUE; + return validFlag; } /** Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/MonitoringActivityDTO.java =================================================================== diff -u -r79c858a92c17ab3ca404cab4a0cf6094254e68d5 -r86a0f186099637fc974445894c5462d60420f10d --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/MonitoringActivityDTO.java (.../MonitoringActivityDTO.java) (revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/MonitoringActivityDTO.java (.../MonitoringActivityDTO.java) (revision 86a0f186099637fc974445894c5462d60420f10d) @@ -64,42 +64,43 @@ * @return Returns the activityID. */ public Long getActivityID() { - return activityID!=null?activityID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + return activityID; } /** * @return Returns the activityTypeID. */ public Integer getActivityTypeID() { - return activityTypeID!=null?activityTypeID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + return activityTypeID; } /** * @return Returns the description. */ public String getDescription() { - return description!=null?description:WDDXTAGS.STRING_NULL_VALUE; + return description; } /** * @return Returns the orderID. */ public Integer getOrderID() { - return orderID!=null?orderID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + return orderID; } /** * @return Returns the title. */ public String getTitle() { - return title!=null?title:WDDXTAGS.STRING_NULL_VALUE; + return title; + } /** * @return Returns the contributionType. */ public Integer getContributionType() { - return contributionType!=null?contributionType:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + return contributionType; } /** * @return Returns the isRequired. */ public Boolean getIsRequired() { - return isRequired!=null?isRequired:new Boolean(false); + return isRequired; } } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/TransitionDTO.java =================================================================== diff -u -rb3dbc137e110d79b6aae154a808b7ca6e7de403d -r86a0f186099637fc974445894c5462d60420f10d --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/TransitionDTO.java (.../TransitionDTO.java) (revision b3dbc137e110d79b6aae154a808b7ca6e7de403d) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/TransitionDTO.java (.../TransitionDTO.java) (revision 86a0f186099637fc974445894c5462d60420f10d) @@ -79,61 +79,61 @@ * @return Returns the createDateTime. */ public Date getCreateDateTime() { - return createDateTime!=null?createDateTime:WDDXTAGS.DATE_NULL_VALUE; + return createDateTime; } /** * @return Returns the description. */ public String getDescription() { - return description!=null?description:WDDXTAGS.STRING_NULL_VALUE; + return description; } /** * @return Returns the fromActivityID. */ public Long getFromActivityID() { - return fromActivityID!=null?fromActivityID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + return fromActivityID; } /** * @return Returns the fromUIID. */ public Integer getFromUIID() { - return fromUIID!=null?fromUIID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + return fromUIID; } /** * @return Returns the learningDesignID. */ public Long getLearningDesignID() { - return learningDesignID!=null?learningDesignID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + return learningDesignID; } /** * @return Returns the title. */ public String getTitle() { - return title!=null?title:WDDXTAGS.STRING_NULL_VALUE; + return title; } /** * @return Returns the toActivityID. */ public Long getToActivityID() { - return toActivityID!=null?toActivityID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + return toActivityID; } /** * @return Returns the toUIID. */ public Integer getToUIID() { - return toUIID!=null?toUIID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + return toUIID; } /** * @return Returns the transitionID. */ public Long getTransitionID() { - return transitionID!=null?transitionID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + return transitionID; } /** * @return Returns the transitionUIID. */ public Integer getTransitionUIID() { - return transitionUIID!=null?transitionUIID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + return transitionUIID; } /** * @param createDateTime The createDateTime to set.