inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.2 to HEAD

Browse Source 
17307: Merged DEV/BELARUS/V3.2-2009_10_19 to V3.2
       17121: ETHREEOH-2999: Accessing Recent snapshots fails in a web project that is created from an already existing project 
       17223: ETHREEEOH-2999: (post-review changes)
   17346: ETHREEOH-2824 - further perf improvement for multiple single submits (to active workflow sandboxes) from large modified list
   17375: Fix ETHREEOH-1643 - WCM revert file & version history, including a few unreported WCM / UI revert file issues
   17380: ETHREEOH-1643 - fix build/test fallout


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18110 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2010-01-19 10:26:45 +00:00
parent cd903c80df
commit 85e4c0dbf1
14 changed files with 191 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/java/org/alfresco/web/bean/wcm/CompareSnapshotDialog.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2008 Alfresco Software Limited.
* Copyright (C) 2005-2009 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -33,6 +33,7 @@ import javax.faces.context.FacesContext;
import org.alfresco.service.cmr.avm.AVMService;
import org.alfresco.service.cmr.avmsync.AVMSyncService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.wcm.sandbox.SandboxService;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.dialog.BaseDialogBean;
import org.alfresco.web.bean.repository.Repository;
@@ -43,7 +44,6 @@ import org.apache.commons.logging.LogFactory;
* Base class for AVMCompare dialogs
*
* @author Dmitry Lazurkin
*
*/
public abstract class CompareSnapshotDialog extends BaseDialogBean
{
@@ -53,6 +53,7 @@ public abstract class CompareSnapshotDialog extends BaseDialogBean
private final static String MSG_CLOSE = "close";
protected AVMBrowseBean avmBrowseBean;
transient private SandboxService sandboxService;
transient private AVMService avmService;
transient private AVMSyncService avmSyncService;
protected NodeRef websiteRef;
@@ -108,7 +109,7 @@ public abstract class CompareSnapshotDialog extends BaseDialogBean
@Override
public String getContainerDescription()
{
int prev = AVMCompareUtils.getPrevVersionID(getAvmService(), sandbox, version);
int prev = WCMCompareUtils.getPrevVersionID(getSandboxService(), sandbox, version);
return MessageFormat.format(Application.getMessage(FacesContext.getCurrentInstance(), getDescription()), version, prev);
}
@@ -159,6 +160,20 @@ public abstract class CompareSnapshotDialog extends BaseDialogBean
return avmService;
}
/**
* Getter for sandboxService service
*
* @return sandboxService
*/
public SandboxService getSandboxService()
{
if (sandboxService == null)
{
sandboxService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getSandboxService();
}
return sandboxService;
}
/**
* Getter for avmSyncService service
*