Index: lams_central/web/lams_authoring.swf =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/lams_authoring.swf,v diff -u -r1.497 -r1.497.2.1 Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/lams_authoring_library.swf,v diff -u -r1.397 -r1.397.2.1 Binary files differ Index: lams_common/src/java/org/lamsfoundation/lams/workspace/dto/FolderContentDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/workspace/dto/FolderContentDTO.java,v diff -u -r1.11 -r1.11.2.1 --- lams_common/src/java/org/lamsfoundation/lams/workspace/dto/FolderContentDTO.java 11 Jan 2008 01:56:26 -0000 1.11 +++ lams_common/src/java/org/lamsfoundation/lams/workspace/dto/FolderContentDTO.java 2 Feb 2009 03:16:43 -0000 1.11.2.1 @@ -26,6 +26,7 @@ import java.util.SortedSet; import java.util.Vector; +import org.apache.commons.lang.time.DateUtils; import org.lamsfoundation.lams.learningdesign.LearningDesign; import org.lamsfoundation.lams.usermanagement.WorkspaceFolder; import org.lamsfoundation.lams.util.wddx.WDDXTAGS; @@ -45,6 +46,7 @@ public String description; public Date creationDateTime; public Date lastModifiedDateTime; + public String formattedLastModifiedDateTime; public String resourceType; public Long resourceID; public Integer permissionCode; @@ -78,6 +80,7 @@ this.description = design.getDescription(); this.creationDateTime = design.getCreateDateTime(); this.lastModifiedDateTime = design.getLastModifiedDateTime(); + this.formattedLastModifiedDateTime = formatLastModifiedDateTime(); this.resourceType = DESIGN; this.resourceID = design.getLearningDesignId(); this.permissionCode = permissionCode; @@ -91,6 +94,7 @@ this.description = "Folder"; this.creationDateTime = workspaceFolder.getCreationDate(); this.lastModifiedDateTime = workspaceFolder.getLastModifiedDate(); + this.formattedLastModifiedDateTime = formatLastModifiedDateTime(); this.resourceType = FOLDER; this.resourceID = new Long(workspaceFolder.getWorkspaceFolderId().intValue()); this.permissionCode = permissionCode; @@ -103,6 +107,7 @@ this.description = workspaceFolderContent.getDescription(); this.creationDateTime = workspaceFolderContent.getCreateDate(); this.lastModifiedDateTime = workspaceFolderContent.getLastModified(); + this.formattedLastModifiedDateTime = formatLastModifiedDateTime(); this.resourceID = workspaceFolderContent.getFolderContentID(); this.permissionCode = permissionCode; if(workspaceFolderContent.getContentTypeID().equals(WorkspaceFolderContent.CONTENT_TYPE_FILE)) @@ -134,6 +139,12 @@ return lastModifiedDateTime!=null?lastModifiedDateTime:WDDXTAGS.DATE_NULL_VALUE; } /** + * @return Returns the lastModifiedDateTime. + */ + public String getFormattedLastModifiedDateTime() { + return formattedLastModifiedDateTime!=null?formattedLastModifiedDateTime:WDDXTAGS.STRING_NULL_VALUE; + } + /** * @return Returns the name. */ public String getName() { @@ -189,4 +200,13 @@ public void setReadOnly(Boolean readOnly) { this.readOnly = readOnly; } + + private String formatLastModifiedDateTime() { + if(this.lastModifiedDateTime != null) { + java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("dd-MMM-yyyy HH:mm:ss"); + return sdf.format(lastModifiedDateTime); + } else { + return null; + } + } } Index: lams_monitoring/web/lams_wizard.swf =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/lams_wizard.swf,v diff -u -r1.71 -r1.71.2.1 Binary files differ Index: lams_monitoring/web/lams_wizard_library.swf =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/lams_wizard_library.swf,v diff -u -r1.49 -r1.49.2.1 Binary files differ