From 9de155b6a48aebda83d9278aacb1ff989cef357f Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Thu, 8 Jan 2009 17:38:45 +0000 Subject: [PATCH] WCM SandboxService - add SandboxVersion (wraps AVM VersionDescriptor) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12640 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../web/ui/wcm/component/UISandboxSnapshots.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/source/java/org/alfresco/web/ui/wcm/component/UISandboxSnapshots.java b/source/java/org/alfresco/web/ui/wcm/component/UISandboxSnapshots.java index 1d1a9ea780..caebc7d51e 100644 --- a/source/java/org/alfresco/web/ui/wcm/component/UISandboxSnapshots.java +++ b/source/java/org/alfresco/web/ui/wcm/component/UISandboxSnapshots.java @@ -43,13 +43,13 @@ import javax.transaction.UserTransaction; import org.alfresco.model.WCMAppModel; import org.alfresco.repo.domain.PropertyValue; import org.alfresco.service.cmr.avm.AVMService; -import org.alfresco.service.cmr.avm.VersionDescriptor; import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.namespace.RegexQNamePattern; import org.alfresco.wcm.sandbox.SandboxConstants; import org.alfresco.wcm.sandbox.SandboxService; +import org.alfresco.wcm.sandbox.SandboxVersion; import org.alfresco.wcm.util.WCMUtil; import org.alfresco.web.app.Application; import org.alfresco.web.bean.repository.Repository; @@ -199,7 +199,7 @@ public class UISandboxSnapshots extends SelfRenderingComponent out.write(""); // get the list of snapshots we can potentially display - List versions; + List versions; String dateFilter = getDateFilter(); if (dateFilter == null || dateFilter.equals(FILTER_DATE_ALL)) { @@ -249,19 +249,19 @@ public class UISandboxSnapshots extends SelfRenderingComponent Map requestMap = context.getExternalContext().getRequestMap(); for (int i = versions.size() - 1; i >= 0; i--) // reverse order { - VersionDescriptor item = versions.get(i); + SandboxVersion item = versions.get(i); // only display snapshots with a valid tag - others are system generated snapshots - if (item.getTag() != null && item.getVersionID() != 0) + if (item.getTag() != null && item.getVersion() != 0) { - int version = item.getVersionID(); + int version = item.getVersion(); out.write(""); out.write(Utils.encode(item.getTag())); out.write(""); out.write(item.getDescription() != null ? Utils.encode(item.getDescription()) : ""); out.write(""); - out.write(df.format(new Date(item.getCreateDate()))); + out.write(df.format(item.getCreatedDate())); out.write(""); out.write(Utils.encode(item.getCreator())); out.write(""); @@ -289,7 +289,7 @@ public class UISandboxSnapshots extends SelfRenderingComponent action = createAction(context, sandbox, ACT_SNAPSHOT_REVERT, "/images/icons/revert.gif", "#{AVMBrowseBean.revertSnapshot}", null, null, params); } - requestMap.put(REQUEST_SNAPVERSION, Integer.toString(item.getVersionID())); + requestMap.put(REQUEST_SNAPVERSION, Integer.toString(item.getVersion())); Utils.encodeRecursive(context, action); // deploy action (if there are deployto servers specified)