Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -rd2c7363ac0242caa259b49112d85ffa9671c30e6 -r5a52a4c104c66462546e17c4d04424b4222d6304 Binary files differ Index: lams_common/src/java/org/lamsfoundation/lams/tool/BasicToolVO.java =================================================================== diff -u -rd07ab22c47381f20a9773e08503dacab3040f111 -r5a52a4c104c66462546e17c4d04424b4222d6304 --- lams_common/src/java/org/lamsfoundation/lams/tool/BasicToolVO.java (.../BasicToolVO.java) (revision d07ab22c47381f20a9773e08503dacab3040f111) +++ lams_common/src/java/org/lamsfoundation/lams/tool/BasicToolVO.java (.../BasicToolVO.java) (revision 5a52a4c104c66462546e17c4d04424b4222d6304) @@ -31,42 +31,55 @@ /** - * - * @hibernate.class table="lams_tool" + * DTO which is passed to tools that want to know about their entry in the lams_tool database. + * This allows us to change the main Tool object (Tool) without changing the object + * used by the tools. */ -public class BasicToolVO implements Serializable { +public class BasicToolVO implements Serializable, IToolVO { /** identifier field */ private Long toolId; /** persistent field */ + private boolean supportsGrouping; + + /** persistent field */ private String learnerUrl; /** persistent field */ - private boolean supportsGrouping; + private String learnerPreviewUrl; + /** persistent field */ + private String learnerProgressUrl; + /** nullable persistent field */ private String authorUrl; + /** nullable persistent field */ + private String defineLaterUrl; + /** persistent field */ - private boolean supportsDefineLater; + private String exportPortfolioLearnerUrl; /** persistent field */ - private boolean supportsModeration; + private String exportPortfolioClassUrl; + + /** persistent field */ + private String monitorUrl; /** persistent field */ - private boolean supportsRunOffline; + private String contributeUrl; /** persistent field */ - private boolean supportsContribute; + private String moderationUrl; /** persistent field */ + private boolean supportsRunOffline; + + /** persistent field */ private boolean valid; /** nullable persistent field */ - private String defineLaterUrl; - - /** nullable persistent field */ private long defaultToolContentId; /** persistent field */ @@ -84,63 +97,66 @@ /** persistent field */ private Date createDateTime; - /** persistent field */ - private String exportPortfolioUrl; - - /** persistent field */ - private String monitorUrl; - - /** persistent field */ - private String contributeUrl; - - /** persistent field */ - private String moderationUrl; - /** persistent field */ private Integer groupingSupportTypeId; + /** persistent field */ + private String toolIdentifier; + + /** persistent field */ + private String toolVersion; + + /** Name of the file (including the package) that contains the text strings for + * this activity. e.g. org.lamsfoundation.lams.tool.sbmt.SbmtResources.properties. */ + private String languageFile; + /** full constructor */ public BasicToolVO(Long toolId, - String learnerUrl, boolean supportsGrouping, + String learnerUrl, + String learnerPreviewUrl, + String learnerProgressUrl, String authorUrl, - boolean supportsDefineLater, - boolean supportsModeration, - boolean supportsRunOffline, - boolean supportsContribute, String defineLaterUrl, + String exportPortfolioLearnerUrl, + String exportPortfolioClassUrl, + String monitorUrl, + String contributeUrl, + String moderationUrl, + boolean supportsRunOffline, long defaultToolContentId, String toolSignature, String toolDisplayName, String description, - String className, - String exportPortfolioUrl, - Integer groupingSupportTypeId, + String serviceName, Date createDateTime, - String monitorUrl, - String contributeUrl, - String moderationUrl) + Integer groupingSupportTypeId, + String toolIdentifier, + String toolVersion, + String languageFile) { - this.toolId = toolId; - this.learnerUrl = learnerUrl; - this.supportsGrouping = supportsGrouping; - this.authorUrl = authorUrl; - this.supportsDefineLater = supportsDefineLater; - this.supportsModeration = supportsModeration; - this.supportsContribute = supportsContribute; - this.supportsRunOffline = supportsRunOffline; - this.defineLaterUrl = defineLaterUrl; - this.defaultToolContentId = defaultToolContentId; - this.toolSignature = toolSignature; - this.toolDisplayName = toolDisplayName; - this.description = description; - this.serviceName = className; - this.exportPortfolioUrl = exportPortfolioUrl; - this.groupingSupportTypeId = groupingSupportTypeId; - this.createDateTime = createDateTime; - this.monitorUrl = monitorUrl; - this.contributeUrl = contributeUrl; - this.moderationUrl = moderationUrl; + this.supportsGrouping=supportsGrouping; + this.learnerUrl=learnerUrl; + this.learnerPreviewUrl=learnerPreviewUrl; + this.learnerProgressUrl=learnerProgressUrl; + this.authorUrl=authorUrl; + this.defineLaterUrl=defineLaterUrl; + this.exportPortfolioLearnerUrl=exportPortfolioLearnerUrl; + this.exportPortfolioClassUrl=exportPortfolioClassUrl; + this.monitorUrl=monitorUrl; + this.contributeUrl=contributeUrl; + this.moderationUrl=moderationUrl; + this.supportsRunOffline=supportsRunOffline; + this.defaultToolContentId=defaultToolContentId; + this.toolSignature=toolSignature; + this.toolDisplayName=toolDisplayName; + this.description=description; + this.serviceName=serviceName; + this.createDateTime=createDateTime; + this.groupingSupportTypeId=groupingSupportTypeId; + this.toolIdentifier=toolIdentifier; + this.toolVersion=toolVersion; + this.languageFile=languageFile; } /** default constructor */ @@ -149,316 +165,316 @@ /** minimal constructor */ public BasicToolVO(Long toolId, - String learnerUrl, boolean supportsGrouping, - boolean supportsDefineLater, - boolean supportsModeration, - boolean supportsContribute, + String learnerUrl, + String authorUrl, boolean supportsRunOffline, - long defaultToolContentId, String toolSignature, String toolDisplayName, - String className, - String exportPortfolioUrl, - Integer groupingSupportTypeId, + String serviceName, Date createDateTime, - String monitorUrl) + Integer groupingSupportTypeId, + String toolIdentifier, + String toolVersion) { - this.toolId = toolId; - this.learnerUrl = learnerUrl; - this.supportsGrouping = supportsGrouping; - this.supportsDefineLater = supportsDefineLater; - this.supportsModeration = supportsModeration; - this.supportsContribute = supportsContribute; - this.supportsRunOffline = supportsRunOffline; - this.defaultToolContentId = defaultToolContentId; - this.toolSignature = toolSignature; - this.toolDisplayName = toolDisplayName; - this.serviceName = className; - this.exportPortfolioUrl = exportPortfolioUrl; - this.groupingSupportTypeId = groupingSupportTypeId; - this.createDateTime = createDateTime; - this.monitorUrl = monitorUrl; - } + this.supportsGrouping=supportsGrouping; + this.learnerUrl=learnerUrl; + this.authorUrl=authorUrl; + this.supportsRunOffline=supportsRunOffline; + this.toolSignature=toolSignature; + this.toolDisplayName=toolDisplayName; + this.serviceName=serviceName; + this.createDateTime=createDateTime; + this.groupingSupportTypeId=groupingSupportTypeId; + this.toolIdentifier=toolIdentifier; + this.toolVersion=toolVersion; + } - /** - * @hibernate.id generator-class="identity" type="java.lang.Long" - * column="tool_id" - */ - public Long getToolId() { - return this.toolId; - } - public void setToolId(Long toolId) { - this.toolId = toolId; - } - /** - * @hibernate.property column="learner_url"length="65535" - * not-null="true" - */ - public String getLearnerUrl() { - return this.learnerUrl; - } + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#getAuthorUrl() + */ + public String getAuthorUrl() { + return authorUrl; + } - public void setLearnerUrl(String learnerUrl) { - this.learnerUrl = learnerUrl; - } + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#setAuthorUrl(java.lang.String) + */ + public void setAuthorUrl(String authorUrl) { + this.authorUrl = authorUrl; + } - /** - * @hibernate.property column="supports_contribute_flag" length="1" - * not-null="true" - * @return Returns the supportsContribute. - */ - public boolean getSupportsContribute() - { - return supportsContribute; - } - /** - * @param supportsContribute The supportsContribute to set. - */ - public void setSupportsContribute(boolean supportsContribute) - { - this.supportsContribute = supportsContribute; - } - - /** - * @hibernate.property column="author_url" length="65535" - */ - public String getAuthorUrl() { - return this.authorUrl; - } + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#getContributeUrl() + */ + public String getContributeUrl() { + return contributeUrl; + } - public void setAuthorUrl(String authorUrl) { - this.authorUrl = authorUrl; - } + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#setContributeUrl(java.lang.String) + */ + public void setContributeUrl(String contributeUrl) { + this.contributeUrl = contributeUrl; + } - /** - * @hibernate.property column="supports_define_later_flag" length="1" - * not-null="true" - */ - public boolean getSupportsDefineLater() { - return this.supportsDefineLater; - } + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#getCreateDateTime() + */ + public Date getCreateDateTime() { + return createDateTime; + } - public void setSupportsDefineLater(boolean supportsDefineLater) { - this.supportsDefineLater = supportsDefineLater; - } + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#setCreateDateTime(java.util.Date) + */ + public void setCreateDateTime(Date createDateTime) { + this.createDateTime = createDateTime; + } - /** - * @hibernate.property column="supports_moderation_flag" length="1" - * not-null="true" - * @return Returns the supportsModeration. - */ - public boolean getSupportsModeration() - { - return supportsModeration; - } - /** - * @param supportsModeration The supportsModeration to set. - */ - public void setSupportsModeration(boolean supportsModeration) - { - this.supportsModeration = supportsModeration; - } - - /** - * @hibernate.property column="supports_run_offline_flag" length="1" - * not-null="true" - * @return Returns the supportsRunOffline. - */ - public boolean getSupportsRunOffline() - { - return supportsRunOffline; - } - - /** - * @param supportsRunOffline The supportsRunOffline to set. - */ - public void setSupportsRunOffline(boolean supportsRunOffline) - { - this.supportsRunOffline = supportsRunOffline; - } - - /** - * @hibernate.property column="define_later_url" length="65535" - */ - public String getDefineLaterUrl() { - return this.defineLaterUrl; - } + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#getDefaultToolContentId() + */ + public long getDefaultToolContentId() { + return defaultToolContentId; + } - public void setDefineLaterUrl(String defineLaterUrl) { - this.defineLaterUrl = defineLaterUrl; - } + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#setDefaultToolContentId(long) + */ + public void setDefaultToolContentId(long defaultToolContentId) { + this.defaultToolContentId = defaultToolContentId; + } - /** - * @hibernate.property column="default_tool_content_id" length="20" - * not-null="false" - */ - public long getDefaultToolContentId() { - return this.defaultToolContentId; - } + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#getDefineLaterUrl() + */ + public String getDefineLaterUrl() { + return defineLaterUrl; + } - public void setDefaultToolContentId(long defaultToolContentId) { - this.defaultToolContentId = defaultToolContentId; - } + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#setDefineLaterUrl(java.lang.String) + */ + public void setDefineLaterUrl(String defineLaterUrl) { + this.defineLaterUrl = defineLaterUrl; + } - /** - * @hibernate.property column="tool_signature" length="64" - * not-null="true" - */ - public String getToolSignature() { - return this.toolSignature; - } + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#getDescription() + */ + public String getDescription() { + return description; + } - public void setToolSignature(String toolSignature) { - this.toolSignature = toolSignature; - } + public void setDescription(String description) { + this.description = description; + } - /** - * @hibernate.property column="tool_display_name" length="255" - * not-null="true" - */ - public String getToolDisplayName() { - return this.toolDisplayName; - } + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#getExportPortfolioClassUrl() + */ + public String getExportPortfolioClassUrl() { + return exportPortfolioClassUrl; + } - public void setToolDisplayName(String toolDisplayName) { - this.toolDisplayName = toolDisplayName; - } + public void setExportPortfolioClassUrl(String exportPortfolioClassUrl) { + this.exportPortfolioClassUrl = exportPortfolioClassUrl; + } - /** - * @hibernate.property column="description" length="65535" - */ - public String getDescription() { - return this.description; - } + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#getExportPortfolioLearnerUrl() + */ + public String getExportPortfolioLearnerUrl() { + return exportPortfolioLearnerUrl; + } - public void setDescription(String description) { - this.description = description; - } + public void setExportPortfolioLearnerUrl(String exportPortfolioLearnerUrl) { + this.exportPortfolioLearnerUrl = exportPortfolioLearnerUrl; + } - /** - * @hibernate.property column="service_name" length="65535" - * not-null="true" - */ - public String getServiceName() { - return this.serviceName; - } + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#getGroupingSupportTypeId() + */ + public Integer getGroupingSupportTypeId() { + return groupingSupportTypeId; + } - public void setServiceName(String serviceName) { - this.serviceName = serviceName; - } + public void setGroupingSupportTypeId(Integer groupingSupportTypeId) { + this.groupingSupportTypeId = groupingSupportTypeId; + } - /** - * @hibernate.property column="export_portfolio_url" length="65535" - * not-null="true" - */ - public String getExportPortfolioUrl() { - return this.exportPortfolioUrl; - } + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#getLanguageFile() + */ + public String getLanguageFile() { + return languageFile; + } - public void setExportPortfolioUrl(String exportPortfolioUrl) { - this.exportPortfolioUrl = exportPortfolioUrl; - } + public void setLanguageFile(String languageFile) { + this.languageFile = languageFile; + } - /** - * @hibernate.property column="valid_flag" length="1" - * not-null="true" - * @return Returns the valid. - */ - public boolean isValid() - { - return valid; - } - /** - * @param valid The valid to set. - */ - public void setValid(boolean valid) - { - this.valid = valid; - } - /** - * @return Returns the groupingSupportTypeId. - */ - public Integer getGroupingSupportTypeId() - { - return groupingSupportTypeId; - } - /** - * @param groupingSupportTypeId The groupingSupportTypeId to set. - */ - public void setGroupingSupportTypeId(Integer groupingSupportTypeId) - { - this.groupingSupportTypeId = groupingSupportTypeId; - } - - /** - * @hibernate.property column="create_date_time" - length="19" not-null="true" - * @return Returns the createDateTime. - */ - public Date getCreateDateTime() - { - return createDateTime; - } - /** - * @param createDateTime The createDateTime to set. - */ - public void setCreateDateTime(Date createDateTime) - { - this.createDateTime = createDateTime; - } - + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#getLearnerPreviewUrl() + */ + public String getLearnerPreviewUrl() { + return learnerPreviewUrl; + } - /** - * @hibernate.property column="contribute_url" length="65535" - * @return Returns the contributeUrl. - */ - public String getContributeUrl() - { - return contributeUrl; - } - /** - * @param contributeUrl The contributUrl to set. - */ - public void setContributeUrl(String contributeUrl) - { - this.contributeUrl = contributeUrl; - } - /** - * @hibernate.property column="moderation_url" length="65535" - * @return Returns the moderationUrl. - */ - public String getModerationUrl() - { - return moderationUrl; - } - /** - * @param moderationUrl The moderationUrl to set. - */ - public void setModerationUrl(String moderationUrl) - { - this.moderationUrl = moderationUrl; - } - /** - * @hibernate.property column="monitor_url" length="65535" - * @return Returns the monitorUrl. - */ - public String getMonitorUrl() - { - return monitorUrl; - } - /** - * @param monitorUrl The monitorUrl to set. - */ - public void setMonitorUrl(String monitorUrl) - { - this.monitorUrl = monitorUrl; - } + public void setLearnerPreviewUrl(String learnerPreviewUrl) { + this.learnerPreviewUrl = learnerPreviewUrl; + } + + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#getLearnerProgressUrl() + */ + public String getLearnerProgressUrl() { + return learnerProgressUrl; + } + + public void setLearnerProgressUrl(String learnerProgressUrl) { + this.learnerProgressUrl = learnerProgressUrl; + } + + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#getLearnerUrl() + */ + public String getLearnerUrl() { + return learnerUrl; + } + + public void setLearnerUrl(String learnerUrl) { + this.learnerUrl = learnerUrl; + } + + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#getModerationUrl() + */ + public String getModerationUrl() { + return moderationUrl; + } + + public void setModerationUrl(String moderationUrl) { + this.moderationUrl = moderationUrl; + } + + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#getMonitorUrl() + */ + public String getMonitorUrl() { + return monitorUrl; + } + + public void setMonitorUrl(String monitorUrl) { + this.monitorUrl = monitorUrl; + } + + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#getServiceName() + */ + public String getServiceName() { + return serviceName; + } + + public void setServiceName(String serviceName) { + this.serviceName = serviceName; + } + + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#isSupportsGrouping() + */ + public boolean isSupportsGrouping() { + return supportsGrouping; + } + + public void setSupportsGrouping(boolean supportsGrouping) { + this.supportsGrouping = supportsGrouping; + } + + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#isSupportsRunOffline() + */ + public boolean isSupportsRunOffline() { + return supportsRunOffline; + } + + public void setSupportsRunOffline(boolean supportsRunOffline) { + this.supportsRunOffline = supportsRunOffline; + } + + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#getToolDisplayName() + */ + public String getToolDisplayName() { + return toolDisplayName; + } + + public void setToolDisplayName(String toolDisplayName) { + this.toolDisplayName = toolDisplayName; + } + + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#getToolId() + */ + public Long getToolId() { + return toolId; + } + + public void setToolId(Long toolId) { + this.toolId = toolId; + } + + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#getToolIdentifier() + */ + public String getToolIdentifier() { + return toolIdentifier; + } + + public void setToolIdentifier(String toolIdentifier) { + this.toolIdentifier = toolIdentifier; + } + + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#getToolSignature() + */ + public String getToolSignature() { + return toolSignature; + } + + public void setToolSignature(String toolSignature) { + this.toolSignature = toolSignature; + } + + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#getToolVersion() + */ + public String getToolVersion() { + return toolVersion; + } + + public void setToolVersion(String toolVersion) { + this.toolVersion = toolVersion; + } + + /* (non-Javadoc) + * @see org.lamsfoundation.lams.tool.IToolVO#isValid() + */ + public boolean isValid() { + return valid; + } + + public void setValid(boolean valid) { + this.valid = valid; + } + public String toString() { return new ToStringBuilder(this) .append("toolId", getToolId()) + .append("toolSignature", getToolSignature()) .toString(); } @@ -476,5 +492,6 @@ .append(getToolId()) .toHashCode(); } - + + } Index: lams_common/src/java/org/lamsfoundation/lams/tool/IToolVO.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/tool/IToolVO.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/tool/IToolVO.java (revision 5a52a4c104c66462546e17c4d04424b4222d6304) @@ -0,0 +1,65 @@ +package org.lamsfoundation.lams.tool; + +import java.util.Date; + +public interface IToolVO { + + public abstract String getAuthorUrl(); + + public abstract void setAuthorUrl(String authorUrl); + + public abstract String getContributeUrl(); + + public abstract void setContributeUrl(String contributeUrl); + + public abstract Date getCreateDateTime(); + + public abstract void setCreateDateTime(Date createDateTime); + + public abstract long getDefaultToolContentId(); + + public abstract void setDefaultToolContentId(long defaultToolContentId); + + public abstract String getDefineLaterUrl(); + + public abstract void setDefineLaterUrl(String defineLaterUrl); + + public abstract String getDescription(); + + public abstract String getExportPortfolioClassUrl(); + + public abstract String getExportPortfolioLearnerUrl(); + + public abstract Integer getGroupingSupportTypeId(); + + public abstract String getLanguageFile(); + + public abstract String getLearnerPreviewUrl(); + + public abstract String getLearnerProgressUrl(); + + public abstract String getLearnerUrl(); + + public abstract String getModerationUrl(); + + public abstract String getMonitorUrl(); + + public abstract String getServiceName(); + + public abstract boolean isSupportsGrouping(); + + public abstract boolean isSupportsRunOffline(); + + public abstract String getToolDisplayName(); + + public abstract Long getToolId(); + + public abstract String getToolIdentifier(); + + public abstract String getToolSignature(); + + public abstract String getToolVersion(); + + public abstract boolean isValid(); + +} \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java =================================================================== diff -u -r57fbfc34b82cddfb18fc2022aa1cedaf09fa8759 -r5a52a4c104c66462546e17c4d04424b4222d6304 --- lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java (.../Tool.java) (revision 57fbfc34b82cddfb18fc2022aa1cedaf09fa8759) +++ lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java (.../Tool.java) (revision 5a52a4c104c66462546e17c4d04424b4222d6304) @@ -569,9 +569,31 @@ return new AuthoringToolDTO(this); } - public BasicToolVO createBasicToolVO() { - BasicToolVO vo = new BasicToolVO(); - vo.setAuthorUrl(this.getAuthorUrl()); + public IToolVO createBasicToolVO() { + IToolVO vo = new BasicToolVO( + this.toolId, + this.supportsGrouping, + this.learnerUrl, + this.learnerPreviewUrl, + this.learnerProgressUrl, + this.authorUrl, + this.defineLaterUrl, + this.exportPortfolioLearnerUrl, + this.exportPortfolioClassUrl, + this.monitorUrl, + this.contributeUrl, + this.moderationUrl, + this.supportsRunOffline, + this.defaultToolContentId, + this.toolSignature, + this.toolDisplayName, + this.description, + this.serviceName, + this.createDateTime, + this.groupingSupportTypeId, + this.toolIdentifier, + this.toolVersion, + this.languageFile); return vo; } Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java =================================================================== diff -u -r2b831e534444ad040546c3762a267a2f73e4199d -r5a52a4c104c66462546e17c4d04424b4222d6304 --- lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java (.../ILamsToolService.java) (revision 2b831e534444ad040546c3762a267a2f73e4199d) +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java (.../ILamsToolService.java) (revision 5a52a4c104c66462546e17c4d04424b4222d6304) @@ -24,7 +24,7 @@ import java.util.List; -import org.lamsfoundation.lams.tool.BasicToolVO; +import org.lamsfoundation.lams.tool.IToolVO; import org.lamsfoundation.lams.tool.exception.LamsToolServiceException; @@ -51,7 +51,7 @@ */ public List getAllPotentialLearners(long toolContentID) throws LamsToolServiceException; - public BasicToolVO getToolBySignature(final String toolSignature); + public IToolVO getToolBySignature(final String toolSignature); public long getToolDefaultContentIdBySignature(final String toolSignature); } Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java =================================================================== diff -u -r2b831e534444ad040546c3762a267a2f73e4199d -r5a52a4c104c66462546e17c4d04424b4222d6304 --- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java (.../LamsToolService.java) (revision 2b831e534444ad040546c3762a267a2f73e4199d) +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java (.../LamsToolService.java) (revision 5a52a4c104c66462546e17c4d04424b4222d6304) @@ -24,7 +24,7 @@ import java.util.List; -import org.lamsfoundation.lams.tool.BasicToolVO; +import org.lamsfoundation.lams.tool.IToolVO; import org.lamsfoundation.lams.tool.Tool; import org.lamsfoundation.lams.tool.dao.IToolDAO; import org.lamsfoundation.lams.tool.exception.LamsToolServiceException; @@ -51,7 +51,7 @@ return null; } - public BasicToolVO getToolBySignature(final String toolSignature) + public IToolVO getToolBySignature(final String toolSignature) { Tool tool = toolDAO.getToolBySignature(toolSignature); return tool.createBasicToolVO(); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java =================================================================== diff -u -r61a2088821a0175b973f9d8354f7432f5fcdc566 -r5a52a4c104c66462546e17c4d04424b4222d6304 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java (.../IMcService.java) (revision 61a2088821a0175b973f9d8354f7432f5fcdc566) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java (.../IMcService.java) (revision 5a52a4c104c66462546e17c4d04424b4222d6304) @@ -26,11 +26,10 @@ import java.util.List; import org.lamsfoundation.lams.contentrepository.ITicket; -import org.lamsfoundation.lams.contentrepository.ItemNotFoundException; import org.lamsfoundation.lams.contentrepository.NodeKey; import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; import org.lamsfoundation.lams.lesson.Lesson; -import org.lamsfoundation.lams.tool.BasicToolVO; +import org.lamsfoundation.lams.tool.IToolVO; import org.lamsfoundation.lams.tool.ToolSessionExportOutputData; import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.SessionDataExistsException; @@ -186,7 +185,7 @@ public ToolSessionExportOutputData exportToolSession(List toolSessionIds) throws DataMissingException, ToolException; - public BasicToolVO getToolBySignature(String toolSignature) throws McApplicationException; + public IToolVO getToolBySignature(String toolSignature) throws McApplicationException; public long getToolDefaultContentIdBySignature(String toolSignature) throws McApplicationException; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java =================================================================== diff -u -r6aae05a339038bca1bc67564026097be3cf9cfd5 -r5a52a4c104c66462546e17c4d04424b4222d6304 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision 6aae05a339038bca1bc67564026097be3cf9cfd5) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision 5a52a4c104c66462546e17c4d04424b4222d6304) @@ -45,7 +45,7 @@ import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials; import org.lamsfoundation.lams.learning.service.ILearnerService; import org.lamsfoundation.lams.lesson.Lesson; -import org.lamsfoundation.lams.tool.BasicToolVO; +import org.lamsfoundation.lams.tool.IToolVO; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolSessionExportOutputData; import org.lamsfoundation.lams.tool.ToolSessionManager; @@ -1737,10 +1737,10 @@ } - public BasicToolVO getToolBySignature(String toolSignature) throws McApplicationException + public IToolVO getToolBySignature(String toolSignature) throws McApplicationException { logger.debug("attempt retrieving tool with signature : " + toolSignature); - BasicToolVO tool=toolService.getToolBySignature(toolSignature); + IToolVO tool=toolService.getToolBySignature(toolSignature); logger.debug("retrieved tool: " + tool); return tool; }