Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java =================================================================== diff -u -r79c858a92c17ab3ca404cab4a0cf6094254e68d5 -r1a6a7bef4eab459755e11f4376e56c0dd0790ab8 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (.../AuthoringActivityDTO.java) (revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (.../AuthoringActivityDTO.java) (revision 1a6a7bef4eab459755e11f4376e56c0dd0790ab8) @@ -63,11 +63,11 @@ /** UI specific attribute indicating the * position of the activity*/ - private Integer xcoord; + private Integer xCoord; /** UI specific attribute indicating the * position of the activity*/ - private Integer ycoord; + private Integer yCoord; /** The activity that acts as a container/parent for * this activity. Normally would be one of the @@ -187,8 +187,8 @@ this.description = description; this.title = title; this.helpText = helpText; - this.xcoord = xcoord; - this.ycoord = ycoord; + this.xCoord = xcoord; + this.yCoord = ycoord; this.parentActivityID = parentActivityID; this.parentUIID = parentUIID; this.activityTypeID = activityTypeId; @@ -228,8 +228,8 @@ this.description = activity.getDescription(); this.title = activity.getTitle(); this.helpText = activity.getHelpText(); - this.xcoord = activity.getXcoord(); - this.ycoord = activity.getYcoord(); + this.xCoord = activity.getXcoord(); + this.yCoord = activity.getYcoord(); this.parentActivityID = activity.getParentActivity()!=null? activity.getParentActivity().getActivityId(): WDDXTAGS.NUMERIC_NULL_VALUE_LONG; @@ -525,14 +525,14 @@ /** * @return Returns the xcoord. */ - public Integer getXcoord() { - return xcoord!=null?xcoord:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + public Integer getxCoord() { + return xCoord!=null?xCoord:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; } /** * @return Returns the ycoord. */ - public Integer getYcoord() { - return ycoord!=null?ycoord:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + public Integer getyCoord() { + return yCoord!=null?yCoord:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; } /************************************************* * Setters @@ -761,16 +761,16 @@ /** * @param xcoord The xcoord to set. */ - public void setXcoord(Integer xcoord) { + public void setxCoord(Integer xcoord) { if(!xcoord.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) - this.xcoord = xcoord; + this.xCoord = xcoord; } /** * @param ycoord The ycoord to set. */ - public void setYcoord(Integer ycoord) { - if(!xcoord.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) - this.ycoord = ycoord; + public void setyCoord(Integer ycoord) { + if(!xCoord.equals(WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)) + this.yCoord = ycoord; } /** * @return Returns the applyGrouping. Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java =================================================================== diff -u -rd777b8b26eed8fd9378ef936a1836ed8a7798379 -r1a6a7bef4eab459755e11f4376e56c0dd0790ab8 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java (.../LibraryActivityDTO.java) (revision d777b8b26eed8fd9378ef936a1836ed8a7798379) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java (.../LibraryActivityDTO.java) (revision 1a6a7bef4eab459755e11f4376e56c0dd0790ab8) @@ -66,11 +66,11 @@ /** UI specific attribute indicating the * position of the activity*/ - private Integer xcoord; + private Integer xCoord; /** UI specific attribute indicating the * position of the activity*/ - private Integer ycoord; + private Integer yCoord; /** The image that represents the icon of this * activity in the UI*/ @@ -97,8 +97,8 @@ this.description = description; this.title = title; this.helpText = helpText; - this.xcoord = xcoord; - this.ycoord = ycoord; + this.xCoord = xcoord; + this.yCoord = ycoord; this.libraryActivityUiImage = libraryActivityUiImage; this.tool = tool; } @@ -108,8 +108,8 @@ this.description = activity.getDescription(); this.title = activity.getTitle(); this.helpText = activity.getHelpText(); - this.xcoord = activity.getXcoord(); - this.ycoord = activity.getYcoord(); + this.xCoord = activity.getXcoord(); + this.yCoord = activity.getYcoord(); this.libraryActivityUiImage = activity.getLibraryActivityUiImage(); this.activityTypeID = activity.getActivityTypeId(); this.activityCategoryID = activity.getActivityCategoryID(); @@ -160,14 +160,14 @@ /** * @return Returns the xcoord. */ - public Integer getXcoord() { - return xcoord!=null?xcoord:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + public Integer getxCoord() { + return xCoord!=null?xCoord:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; } /** * @return Returns the ycoord. */ - public Integer getYcoord() { - return ycoord!=null?ycoord:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + public Integer getyCoord() { + return yCoord!=null?yCoord:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; } /** * @return Returns the tool.