AVM Compare functionality added to classic (JSF) client

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10300 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/messages/webclient.properties

@@ -612,6 +612,28 @@ invite_content_step1_desc=Select the users and roles they will play for this con
 remove_content_user_info=To remove an invited user from this content, click Yes.
 content_owner=User ''{0}'' is the current owner of this content.
 
+# AVM Compare 
+snapshot_compare_to_current=Compare To Current Snapshot
+snapshot_compare_to_current_description=View list of modifications between snapshot ''{0}'' and current snapshot
+snapshot_compare_to_previous=Compare to Previous Snapshot
+snapshot_compare_to_previous_description=View list of modifications between snapshot ''{0}'' and ''{1}''
+snapshot_compare_to_any=Compare to Any Snapshot
+snapshot_compare_to_any_description=View list of modifications between snapshot ''{0}'' and a user selected snapshot
+store_title=Store
+version_title=Version
+avm_compare_newer=Newer
+avm_compare_older=Older
+avm_compare_conflict=Conflict
+avm_compare_directory=Directory
+avm_compare_same=Same
+error_version_validate=Number of version is not valid
+snapshot_name=Name
+snapshot_path=Path
+snapshot_status=Status
+increment_button_hint=Next valid version
+decrement_button_hint=Previous valid version
+refresh_button_hint=Refresh
+
 # System Users messages
 create_user=Create User
 change_password=Change Password

config/alfresco/web-client-config-dialogs.xml

@@ -308,6 +308,43 @@
                  title-id="link_validaton_dialog_title" 
                  description-id="link_validaton_dialog_desc" />
                  
+         <!-- AVM Compare -->              
+         <dialog name="compareToCurrentSnapshot" page="/jsp/wcm/compare-to-current-snapshot.jsp"
+                 managed-bean="CompareToCurrentSnapshot" icon="/images/icons/comparetocurrent_large.png"
+                 show-ok-button="false" 
+                 title-id="snapshot_compare_to_current" description-id="snapshot_compare_to_current_description" />
+                 
+                 <!-- AVM Compare -->              
+         <dialog name="compareToPreviousSnapshot" page="/jsp/wcm/compare-to-current-snapshot.jsp"
+                 managed-bean="CompareToPreviousSnapshot" icon="/images/icons/comparetoprevious_large.png"
+                 show-ok-button="false" 
+                 title-id="snapshot_compare_to_previous" description-id="snapshot_compare_to_previous_description" />
+
+          <!-- CompareToAnySnapshot -->
+         <dialog name="compareToAnySnapshot" page="/jsp/wcm/compare-to-any-snapshot.jsp"
+          		  managed-bean="CompareToAnySnapshot" icon="/images/icons/comparetoany_large.png"
+          		  show-ok-button="false"
+          		  title-id="snapshot_compare_to_any" description-id="snapshot_compare_to_any_description" />
+                 
+          <!-- manage permissions -->              
+         <dialog name="setPermissions" page="/jsp/wcm/set-permissions.jsp" 
+                 managed-bean="SetPermissionsDialog" icon="/images/icons/users_large.gif"
+                 title-id="set_permissions_title" description-id="set_permissions_subtitle" />
+                 
+         <dialog name="removePermissions" page="/jsp/wcm/remove-permissions.jsp" 
+                 managed-bean="RemovePermissionsDialog" icon="/images/icons/delete_large.gif"
+                 title-id="remove_permissions_title" />
+                 
+         <dialog name="editPermissions" page="/jsp/wcm/edit-permissions.jsp" 
+                 managed-bean="EditPermissionsDialog" icon="/images/icons/edituser_large.gif"
+                 title-id="edit_permissions_title" description-id="edit_permissions_subtitle" />                
+
+         <dialog name="managePermissions" page="/jsp/wcm/manage-permissions.jsp" 
+                 managed-bean="ManagePermissionsDialog" icon="/images/icons/edituser.gif"
+				 actions-config-id="set_permission_menu"
+				 show-ok-button="false" 
+                 title-id="view_permissions_title" description-id="manage_permissions_subtitle" />
+                 
          <dialog name="editUserDetails" page="/jsp/users/edit-user-details.jsp" managed-bean="EditUserDetailsDialog"
                  icon="/images/icons/edituser_large.gif" title-id="edit_user_details" 
                  description-id="edit_user_details_description" />

source/java/org/alfresco/web/bean/wcm/AVMCompareUtils.java

@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2005-2008 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of
+ * the GPL, you may redistribute this Program in connection with Free/Libre
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's
+ * FLOSS exception.  You should have recieved a copy of the text describing
+ * the FLOSS exception, and it is also available here:
+ * http://www.alfresco.com/legal/licensing"
+ */
+package org.alfresco.web.bean.wcm;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+
+import org.alfresco.service.cmr.avm.AVMService;
+import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
+import org.alfresco.service.cmr.avm.VersionDescriptor;
+import org.alfresco.service.cmr.avmsync.AVMDifference;
+import org.alfresco.service.cmr.avmsync.AVMSyncService;
+import org.alfresco.util.NameMatcher;
+import org.alfresco.web.app.Application;
+
+/**
+ * AVMCompare Utils
+ * @author ValerySh
+ *
+ */
+public class AVMCompareUtils
+{
+
+    /**
+     * Get a difference map between two corresponding node trees.
+     * @param avmSyncService AVMSyncService
+     * @param srcVersion The version id for the source tree.
+     * @param srcPath The avm path to the source tree.
+     * @param dstVersion The version id for the destination tree.
+     * @param dstPath The avm path to the destination tree.
+     * @param excluder A NameMatcher used to exclude files from consideration.
+     * @return list of compared objects
+     */
+    public static List<Map<String, String>> getComparedNodes(AVMSyncService avmSyncService, int srcVersion, String srcPath, int dstVersion, String dstPath, NameMatcher excluder)
+    {
+        FacesContext context = FacesContext.getCurrentInstance();
+        List<AVMDifference> compare = avmSyncService.compare(srcVersion, srcPath, dstVersion, dstPath, excluder);
+        List<Map<String, String>> result = new ArrayList<Map<String, String>>();
+        for (AVMDifference diff : compare)
+        {
+            String path = diff.getSourcePath();
+            Map<String, String> node = new HashMap<String, String>();
+            String sandboxPath = AVMUtil.getSandboxPath(path);
+            node.put("path", path.replaceFirst(sandboxPath, ""));
+            node.put("name", path.substring(path.lastIndexOf("/") + 1));
+
+            String status;
+            switch (diff.getDifferenceCode())
+            {
+            case AVMDifference.OLDER:
+                status = Application.getMessage(context, "avm_compare_older");
+                break;
+            case AVMDifference.NEWER:
+                status = Application.getMessage(context, "avm_compare_newer");
+                break;
+            case AVMDifference.SAME:
+                status = Application.getMessage(context, "avm_compare_same");
+                break;
+            case AVMDifference.DIRECTORY:
+                status = Application.getMessage(context, "avm_compare_directory");
+                break;
+            case AVMDifference.CONFLICT:
+                status = Application.getMessage(context, "avm_compare_conflict");
+                break;
+            default:
+                status = "";
+            }
+            node.put("status", status);
+
+            result.add(node);
+        }
+        return result;
+    }
+
+    /**
+     * checks the version of the first is accessible for Store
+     * @param avmService AVMService
+     * @param name The name of the AVMStore
+     * @param version Version
+     * @return true if version is first
+     */
+    public static boolean isFirstVersion(AVMService avmService, String name, int version)
+    {
+        boolean result = false;
+        List<Integer> allVersions = getAllVersionID(avmService, name);
+
+        if (version == Collections.min(allVersions))
+            result = true;
+        return result;
+    }
+
+    /**
+     * checks the version of the last is accessible for Store
+     * @param avmService AVMService
+     * @param name The name of the AVMStore
+     * @param version Version
+     * @return true if version is latest
+     */
+    public static boolean isLatestVersion(AVMService avmService, String name, int version)
+    {
+        boolean result = false;
+        List<Integer> allVersions = getAllVersionID(avmService, name);
+        if (version == Collections.max(allVersions))
+            result = true;
+        return result;
+    }
+
+    /**
+     * Get the versions id in an AVMStore
+     * @param avmService AVMService
+     * @param name The name of the AVMStore
+     * @return List versions id
+     */
+    public static List<Integer> getAllVersionID(AVMService avmService, String name)
+    {
+        List<Integer> allVersions = new ArrayList<Integer>();
+        List<VersionDescriptor> listVersion = avmService.getStoreVersions(name);
+        for (VersionDescriptor vd : listVersion)
+        {
+            if ((vd.getTag() != null || AVMUtil.isUserStore(name)) && vd.getVersionID() > 2)
+            {
+                allVersions.add(vd.getVersionID());
+            }
+        }
+
+        return allVersions;
+    }
+
+    /** Get Previous Version Id
+     * @param avmService AVMService
+     * @param name The name of the AVMStore
+     * @param version Current version Id
+     * @return Previous Version Id
+     */
+    public static int getPrevVersionID(AVMService avmService, String name, int version)
+    {
+        List<Integer> allVersions = getAllVersionID(avmService, name);
+        Collections.sort(allVersions);
+        int index = allVersions.indexOf(version);
+        if (index == 0)
+            return 0;
+        return allVersions.get(index - 1);
+    }
+
+    /**
+     * Receive Stores List
+     * @param avmService AVMService
+     * @return List Stores name
+     */
+    public static List<String> receiveStoresList(AVMService avmService)
+    {
+        List<String> result = new ArrayList<String>();
+        List<AVMStoreDescriptor> storeDescs = avmService.getStores();
+        for (AVMStoreDescriptor storeDesc : storeDescs)
+        {
+            if (!storeDesc.getCreator().equalsIgnoreCase("system") && !AVMUtil.isPreviewStore(storeDesc.getName()))
+                result.add(storeDesc.getName());
+        }
+        return result;
+    }
+}

source/java/org/alfresco/web/bean/wcm/CompareSnapshotDialog.java

@@ -0,0 +1,192 @@
+/*
+ * Copyright (C) 2005-2008 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of
+ * the GPL, you may redistribute this Program in connection with Free/Libre
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's
+ * FLOSS exception.  You should have recieved a copy of the text describing
+ * the FLOSS exception, and it is also available here:
+ * http://www.alfresco.com/legal/licensing"
+ */
+package org.alfresco.web.bean.wcm;
+
+import java.text.MessageFormat;
+import java.util.List;
+import java.util.Map;
+
+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.web.app.Application;
+import org.alfresco.web.bean.dialog.BaseDialogBean;
+import org.alfresco.web.bean.repository.Repository;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Base class for AVMCompare dialogs
+ *
+ * @author Dmitry Lazurkin
+ *
+ */
+public abstract class CompareSnapshotDialog extends BaseDialogBean
+{
+    private static final Log logger = LogFactory.getLog(CompareSnapshotDialog.class);
+
+    private static final long serialVersionUID = 5483551383286687197L;
+
+    private final static String MSG_CLOSE = "close";
+    protected AVMBrowseBean avmBrowseBean;
+    transient private AVMService avmService;
+    transient private AVMSyncService avmSyncService;
+    protected NodeRef websiteRef;
+    protected String store;
+    protected NodeRef webProjectRef;
+    protected int version;
+    protected String sandbox;
+    protected String storeRoot;
+
+    protected boolean finished = false;
+
+    public abstract List<Map<String, String>> getComparedNodes();
+
+    @Override
+    public void init(Map<String, String> parameters)
+    {
+        super.init(parameters);
+
+        // setup context for dialog
+        this.sandbox = parameters.get("sandbox");
+
+        String ver = parameters.get("version");
+        if (ver != null && ver.length() > 0)
+        {
+            this.version = Integer.parseInt(ver);
+        }
+        else
+        {
+            this.version = -1;
+        }
+
+        // get the store
+        this.store = parameters.get("store");
+        this.storeRoot = AVMUtil.buildSandboxRootPath(this.sandbox);
+
+        // get the web project noderef
+        String webProject = parameters.get("webproject");
+        if (webProject == null)
+        {
+            this.webProjectRef = this.avmBrowseBean.getWebsite().getNodeRef();
+        }
+        else
+        {
+            this.webProjectRef = new NodeRef(webProject);
+        }
+
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Initialising dialog compare snapshot: " + this.websiteRef);
+        }
+    }
+
+    @Override
+    public String getContainerDescription()
+    {
+        int prev = AVMCompareUtils.getPrevVersionID(getAvmService(), sandbox, version);
+        return MessageFormat.format(Application.getMessage(FacesContext.getCurrentInstance(), getDescription()), version, prev);
+    }
+
+    @Override
+    public String getCancelButtonLabel()
+    {
+        return Application.getMessage(FacesContext.getCurrentInstance(), MSG_CLOSE);
+    }
+
+    @Override
+    protected String finishImpl(FacesContext context, String outcome) throws Exception
+    {
+        return outcome;
+    }
+
+    /**
+     * Getter for avmBrowseBean
+     *
+     * @return avmBrowseBean
+     */
+    public AVMBrowseBean getAvmBrowseBean()
+    {
+        return avmBrowseBean;
+    }
+
+    /**
+     * Setter for avmBrowseBean
+     *
+     * @param avmBrowseBean avm browse bean
+     */
+    public void setAvmBrowseBean(AVMBrowseBean avmBrowseBean)
+    {
+        this.avmBrowseBean = avmBrowseBean;
+    }
+
+    /**
+     * Getter for avmService service
+     *
+     * @return avmService
+     */
+    public AVMService getAvmService()
+    {
+        if (avmService == null)
+        {
+            avmService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getAVMService();
+        }
+
+        return avmService;
+    }
+
+    /**
+     * Getter for avmSyncService service
+     *
+     * @return avmSyncService
+     */
+    public AVMSyncService getAvmSyncService()
+    {
+        if (avmSyncService == null)
+        {
+            avmSyncService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getAVMSyncService();
+        }
+        return avmSyncService;
+    }
+
+    /**
+     * Returns description message id for AVMCompare dialog
+     *
+     * @return description message id for dialog
+     */
+    protected abstract String getDescription();
+
+    /**
+     * Returns sandbox name
+     *
+     * @return sandbox name
+     */
+    public String getSandbox()
+    {
+        return sandbox;
+    }
+}

source/java/org/alfresco/web/bean/wcm/CompareToAnySnapshotDialog.java

@@ -0,0 +1,268 @@
+/*
+ * Copyright (C) 2005-2008 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of
+ * the GPL, you may redistribute this Program in connection with Free/Libre
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's
+ * FLOSS exception.  You should have recieved a copy of the text describing
+ * the FLOSS exception, and it is also available here:
+ * http://www.alfresco.com/legal/licensing"
+ */
+package org.alfresco.web.bean.wcm;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+import javax.faces.model.SelectItem;
+
+import org.alfresco.web.app.Application;
+import org.alfresco.web.ui.common.Utils;
+
+/**
+ * Class for compareToAnySnapshot dialog
+ *
+ * @author Dmitry Velichkevich
+ * @author Dmitry Lazurkin
+ */
+public class CompareToAnySnapshotDialog extends CompareSnapshotDialog
+{
+    private static final long serialVersionUID = 5483432383286687197L;
+
+    private static final String COMPARE_TO_ANY_SNAPSHOT_DESCRIPTION_MESSAGE_TEXT_ID = "snapshot_compare_to_any_description";
+
+    public static final String MSG_ERROR_VERSION_NOT_VALID = "error_version_validate";
+
+    private int userSpecifiedVersion;
+
+    private boolean storeChanged;
+    private String userSpecifiedStore;
+
+    private String userSpecifiedRoot;
+
+    private List<Integer> availableVersionNumbers;
+    private int curAvailableVersionNumber;
+
+    private boolean compare;
+
+    /**
+     * Builds list of available version numbers
+     */
+    private void buildAvailibleVersionNumbers()
+    {
+        this.curAvailableVersionNumber = -1;
+        this.availableVersionNumbers = AVMCompareUtils.getAllVersionID(getAvmService(), userSpecifiedStore);
+    }
+
+    @Override
+    public void init(Map<String, String> parameters)
+    {
+        super.init(parameters);
+        userSpecifiedStore = sandbox;
+        userSpecifiedRoot = storeRoot;
+        userSpecifiedVersion = -1;
+        buildAvailibleVersionNumbers();
+        this.compare = true;
+        this.storeChanged = false;
+    }
+
+    /**
+     * @return true if snapshot's version is correct
+     */
+    private boolean isCorrectVersion(int userSpecVersion)
+    {
+        return userSpecVersion == -1 || availableVersionNumbers.contains(userSpecVersion);
+    }
+
+    @Override
+    public List<Map<String, String>> getComparedNodes()
+    {
+        if (compare)
+        {
+            this.compare = false;
+
+            List<Map<String, String>> nodes = null;
+
+            if (isCorrectVersion(userSpecifiedVersion))
+            {
+                nodes = AVMCompareUtils.getComparedNodes(getAvmSyncService(), version, storeRoot, userSpecifiedVersion, userSpecifiedRoot, null);
+            }
+
+            return nodes;
+        }
+        else
+        {
+            return Collections.emptyList();
+        }
+    }
+
+    /**
+     * @return list of stores select items
+     */
+    public List<SelectItem> getStoresList()
+    {
+        List<String> stores = AVMCompareUtils.receiveStoresList(getAvmService());
+
+        List<SelectItem> result = new ArrayList<SelectItem>();
+
+        for (String itemValue : stores)
+        {
+            result.add(new SelectItem(itemValue, itemValue, itemValue, false));
+        }
+
+        return result;
+    }
+
+    /**
+     * Action listener method that sets flag for starting compare
+     *
+     * @param event action event
+     */
+    public void refreshComparePanel(ActionEvent event)
+    {
+        this.compare = true;
+    }
+
+    /**
+     * Getter for user specified version
+     *
+     * @return userSpecifiedVersion
+     */
+    public int getUserSpecifiedVersion()
+    {
+        return userSpecifiedVersion;
+    }
+
+    /**
+     * Setter for user specified version
+     *
+     * @param userSpecifiedVersion user specified version
+     */
+    public void setUserSpecifiedVersion(int userSpecifiedVersion)
+    {
+        if (this.storeChanged == false)
+        {
+            if (this.userSpecifiedVersion != userSpecifiedVersion)
+            {
+                if (userSpecifiedVersion != -1)
+                {
+                    int index = availableVersionNumbers.indexOf(userSpecifiedVersion);
+                    if (index != -1)
+                    {
+                        this.curAvailableVersionNumber = index;
+                        this.userSpecifiedVersion = userSpecifiedVersion;
+                    }
+                    else
+                    {
+                        Utils.addErrorMessage(Application.getMessage(FacesContext.getCurrentInstance(), MSG_ERROR_VERSION_NOT_VALID));
+                        FacesContext.getCurrentInstance().renderResponse();
+                    }
+                }
+                else
+                {
+                    this.curAvailableVersionNumber = -1;
+                    this.userSpecifiedVersion = -1;
+                }
+            }
+        }
+        else
+        {
+            this.storeChanged = false;
+        }
+    }
+
+    /**
+     * Getter for user specified Store
+     *
+     * @return userSpecifiedStore user specified store
+     */
+    public String getUserSpecifiedSnapshot()
+    {
+        return userSpecifiedStore;
+    }
+
+    /**
+     * Setter for user specified snapshot
+     *
+     * @param setUserSpecifiedSnapshot user specified snapshot
+     */
+    public void setUserSpecifiedSnapshot(String userSpecifiedSnapshot)
+    {
+        if (userSpecifiedSnapshot.equals(userSpecifiedStore) == false)
+        {
+            this.storeChanged = true;
+            this.userSpecifiedStore = userSpecifiedSnapshot;
+            this.userSpecifiedRoot = AVMUtil.buildSandboxRootPath(this.userSpecifiedStore);
+            this.userSpecifiedVersion = -1;
+            buildAvailibleVersionNumbers();
+        }
+    }
+
+    @Override
+    public String getSandbox()
+    {
+        return this.userSpecifiedStore;
+    }
+
+    @Override
+    protected String getDescription()
+    {
+        return COMPARE_TO_ANY_SNAPSHOT_DESCRIPTION_MESSAGE_TEXT_ID;
+    }
+
+    /**
+     * @return true if increment button for version is disabled
+     */
+    public boolean isIncrementVersionButtonDisabled()
+    {
+        return (this.curAvailableVersionNumber + 1) == this.availableVersionNumbers.size();
+    }
+
+    /**
+     * @return true if decrement button for version is disabled
+     */
+    public boolean isDecrementVersionButtonDisabled()
+    {
+        return this.curAvailableVersionNumber == -1;
+    }
+
+    /**
+     * Increments version number
+     *
+     * @param event action event
+     */
+    public void incrementVersion(ActionEvent event)
+    {
+        this.curAvailableVersionNumber++;
+        this.userSpecifiedVersion = this.availableVersionNumbers.get(this.curAvailableVersionNumber);
+    }
+
+    /**
+     * Decrements version number
+     *
+     * @param event action event
+     */
+    public void decrementVersion(ActionEvent event)
+    {
+        this.curAvailableVersionNumber--;
+        this.userSpecifiedVersion = (this.curAvailableVersionNumber != -1) ? (this.availableVersionNumbers.get(this.curAvailableVersionNumber)) : (-1);
+    }
+
+}

source/java/org/alfresco/web/bean/wcm/CompareToCurrentSnapshotDialog.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2005-2008 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of
+ * the GPL, you may redistribute this Program in connection with Free/Libre
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's
+ * FLOSS exception.  You should have recieved a copy of the text describing
+ * the FLOSS exception, and it is also available here:
+ * http://www.alfresco.com/legal/licensing"
+ */
+package org.alfresco.web.bean.wcm;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Class for compareToCurrentSnapshot dialog
+ * @author ValerySh
+ *
+ */
+public class CompareToCurrentSnapshotDialog extends CompareSnapshotDialog
+{
+
+    private static final long serialVersionUID = 5483551383286687197L;
+    /** description for dialog */
+    private static final String MSG_COMPARE_TO_CURRENT_DESCRIPTION = "snapshot_compare_to_current_description";
+
+    @SuppressWarnings("unused")
+    private static final Log logger = LogFactory.getLog(CompareToPreviousSnapshotDialog.class);
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.alfresco.web.bean.wcm.CompareSnapshot#getComparedNodes()
+     */
+    public List<Map<String, String>> getComparedNodes()
+    {
+        if (finished)
+        {
+            finished = false;
+            return null;
+        }
+        finished = true;
+        return AVMCompareUtils.getComparedNodes(getAvmSyncService(), version, storeRoot, -1, storeRoot, null);
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.alfresco.web.bean.wcm.CompareSnapshot#getDescription()
+     */
+    protected String getDescription()
+    {
+        return MSG_COMPARE_TO_CURRENT_DESCRIPTION;
+    }
+
+}

source/java/org/alfresco/web/bean/wcm/CompareToPreviousSnapshotDialog.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2005-2008 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of
+ * the GPL, you may redistribute this Program in connection with Free/Libre
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's
+ * FLOSS exception.  You should have recieved a copy of the text describing
+ * the FLOSS exception, and it is also available here:
+ * http://www.alfresco.com/legal/licensing"
+ */
+package org.alfresco.web.bean.wcm;
+
+import java.util.List;
+import java.util.Map;
+
+/** 
+ * Class for compareToPreviousSnapshot dialog
+ * 
+ * @author ValerySh
+ *
+ */
+public class CompareToPreviousSnapshotDialog extends CompareSnapshotDialog
+{
+    private static final long serialVersionUID = 5483551384486687197L;
+
+    /** description for dialog */
+    private static final String MSG_COMPARE_TO_PREVIOUS_DESCRIPTION = "snapshot_compare_to_previous_description";
+
+    public List<Map<String, String>> getComparedNodes()
+    {
+        int prevVersion = AVMCompareUtils.getPrevVersionID(getAvmService(), sandbox, version);
+        return AVMCompareUtils.getComparedNodes(getAvmSyncService(), version, storeRoot, prevVersion, storeRoot, null);
+    }
+
+    protected String getDescription()
+    {
+        return MSG_COMPARE_TO_PREVIOUS_DESCRIPTION;
+    }
+
+}

source/web/WEB-INF/faces-config-beans.xml

@@ -4188,6 +4188,48 @@
       </managed-property>
    </managed-bean>
 
+   <!-- compare to currrent -->
+   <managed-bean>
+      <description>
+         The bean that AVM Compure to current snapshot
+      </description>
+      <managed-bean-name>CompareToCurrentSnapshot</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wcm.CompareToCurrentSnapshotDialog</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>avmBrowseBean</property-name>
+         <value>#{AVMBrowseBean}</value>
+      </managed-property>
+   </managed-bean>
+   <!-- end compare to currrent -->
+   
+   <!-- compare to previous -->
+   <managed-bean>
+      <description>
+         The bean that AVM Compure to prev snapshot
+      </description>
+      <managed-bean-name>CompareToPreviousSnapshot</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wcm.CompareToPreviousSnapshotDialog</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>avmBrowseBean</property-name>
+         <value>#{AVMBrowseBean}</value>
+      </managed-property>
+   </managed-bean>
+   <!-- end compare to previous -->
+   
+   <!-- CompareToAny -->
+	<managed-bean>
+		<managed-bean-name>CompareToAnySnapshot</managed-bean-name>
+		<managed-bean-class>org.alfresco.web.bean.wcm.CompareToAnySnapshotDialog</managed-bean-class>
+		<managed-bean-scope>session</managed-bean-scope>
+		<managed-property>
+        	<property-name>avmBrowseBean</property-name>
+        	<value>#{AVMBrowseBean}</value>
+      	</managed-property>
+	</managed-bean>
+<!-- End CompareToAny -->
+
    <managed-bean>
       <description>
          The bean that backs up the Change Expiration Date Dialog

source/web/jsp/wcm/compare-to-any-snapshot.jsp

@@ -0,0 +1,84 @@
+<%--
+ * Copyright (C) 2005-2008 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of
+ * the GPL, you may redistribute this Program in connection with Free/Libre
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's
+ * FLOSS exception.  You should have recieved a copy of the text describing
+ * the FLOSS exception, and it is also available here:
+ * http://www.alfresco.com/legal/licensing"
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a"%>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r"%>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8"%>
+
+<h:panelGrid columns="7">
+   <h:outputText id="sandbox-selection-description" value="#{msg.store_title}:" />
+
+   <h:selectOneMenu value="#{DialogManager.bean.userSpecifiedSnapshot}" onchange="document.forms['dialog'].submit(); return true;">
+      <f:selectItems value="#{DialogManager.bean.storesList}" />
+   </h:selectOneMenu>
+
+   <h:outputText id="version-selection-description" value="#{msg.version_title}:" />
+
+   <h:inputText id="version-value" size="5" value="#{DialogManager.bean.userSpecifiedVersion}" required="true">
+      <f:converter converterId="javax.faces.Integer" />
+   </h:inputText>
+
+   <h:commandButton id="increment-version-value-button" image="/images/icons/arrow_up.gif" title="#{msg.increment_button_hint}"
+      actionListener="#{DialogManager.bean.incrementVersion}" rendered="#{!DialogManager.bean.incrementVersionButtonDisabled}" />
+
+   <h:commandButton image="/images/icons/arrow_up_disabled.gif" title="#{msg.increment_button_hint}" rendered="#{DialogManager.bean.incrementVersionButtonDisabled}" disabled="true" />
+
+   <h:commandButton id="decrement-version-value-button" image="/images/icons/arrow_down.gif" title="#{msg.decrement_button_hint}"
+      actionListener="#{DialogManager.bean.decrementVersion}" rendered="#{!DialogManager.bean.decrementVersionButtonDisabled}" />
+
+   <h:commandButton image="/images/icons/arrow_down_disabled.gif" title="#{msg.decrement_button_hint}" rendered="#{DialogManager.bean.decrementVersionButtonDisabled}" disabled="true" />
+
+   <h:commandButton id="refresh-compare-panel" image="/images/icons/reset.gif" title="#{msg.refresh_button_hint}" actionListener="#{DialogManager.bean.refreshComparePanel}" />
+
+   <br />
+   <br />
+</h:panelGrid>
+
+<h:dataTable value="#{DialogManager.bean.comparedNodes}" var="row" width="100%" styleClass="selectedItems" headerClass="selectedItemsHeader" cellspacing="0"
+   cellpadding="4" style="margin-top: 4px; margin-bottom: 4px;">
+   <h:column>
+      <f:facet name="header">
+         <h:outputText value="#{msg.snapshot_name}" />
+      </f:facet>
+      <h:outputText value="#{row.name}" />
+   </h:column>
+
+   <h:column>
+      <f:facet name="header">
+         <h:outputText value="#{msg.snapshot_path}" />
+      </f:facet>
+      <h:outputText value="#{row.path}" />
+   </h:column>
+
+   <h:column>
+      <f:facet name="header">
+         <h:outputText value="#{msg.snapshot_status}" />
+      </f:facet>
+      <h:outputText value="#{row.status}" />
+   </h:column>
+</h:dataTable>

source/web/jsp/wcm/compare-to-current-snapshot.jsp

@@ -0,0 +1,55 @@
+<%--
+ * Copyright (C) 2005-2008 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of
+ * the GPL, you may redistribute this Program in connection with Free/Libre
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's
+ * FLOSS exception.  You should have recieved a copy of the text describing
+ * the FLOSS exception, and it is also available here:
+ * http://www.alfresco.com/legal/licensing"
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a"%>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r"%>
+
+<%@ page buffer="32kb" contentType="text/html;charset=UTF-8"%>
+
+<h:dataTable value="#{DialogManager.bean.comparedNodes}" var="row" width="100%" styleClass="selectedItems" headerClass="selectedItemsHeader" cellspacing="0"
+   cellpadding="4" style="margin-bottom: 4px;">
+   <h:column>
+      <f:facet name="header">
+         <h:outputText value="#{msg.snapshot_name}" />
+      </f:facet>
+      <h:outputText value="#{row.name}" />
+   </h:column>
+
+   <h:column>
+      <f:facet name="header">
+         <h:outputText value="#{msg.snapshot_path}" />
+      </f:facet>
+      <h:outputText value="#{row.path}" />
+   </h:column>
+
+   <h:column>
+      <f:facet name="header">
+         <h:outputText value="#{msg.snapshot_status}" />
+      </f:facet>
+      <h:outputText value="#{row.status}" />
+   </h:column>
+</h:dataTable>