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

15
source/java/org/alfresco/web/bean/wcm/CompareToAnySnapshotDialog.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
@@ -65,10 +65,11 @@ public class CompareToAnySnapshotDialog extends CompareSnapshotDialog
/**
* Builds list of available version numbers
*/
private void buildAvailibleVersionNumbers()
private void buildAvailableVersionNumbers()
{
this.curAvailableVersionNumber = -1;
this.availableVersionNumbers = AVMCompareUtils.getAllVersionID(getAvmService(), userSpecifiedStore);
this.availableVersionNumbers = WCMCompareUtils.getAllVersionID(getSandboxService(), userSpecifiedStore);
Collections.sort(availableVersionNumbers);
}
@Override
@@ -78,7 +79,7 @@ public class CompareToAnySnapshotDialog extends CompareSnapshotDialog
userSpecifiedStore = sandbox;
userSpecifiedRoot = storeRoot;
userSpecifiedVersion = -1;
buildAvailibleVersionNumbers();
buildAvailableVersionNumbers();
this.compare = true;
this.storeChanged = false;
}
@@ -102,7 +103,7 @@ public class CompareToAnySnapshotDialog extends CompareSnapshotDialog
if (isCorrectVersion(userSpecifiedVersion))
{
nodes = AVMCompareUtils.getComparedNodes(getAvmSyncService(), version, storeRoot, userSpecifiedVersion, userSpecifiedRoot, null);
nodes = WCMCompareUtils.getComparedNodes(getAvmSyncService(), version, storeRoot, userSpecifiedVersion, userSpecifiedRoot, null);
}
return nodes;
@@ -118,7 +119,7 @@ public class CompareToAnySnapshotDialog extends CompareSnapshotDialog
*/
public List<SelectItem> getStoresList()
{
List<String> stores = AVMCompareUtils.receiveStoresList(getAvmService());
List<String> stores = WCMCompareUtils.receiveStoresList(getAvmService());
List<SelectItem> result = new ArrayList<SelectItem>();
@@ -211,7 +212,7 @@ public class CompareToAnySnapshotDialog extends CompareSnapshotDialog
this.userSpecifiedStore = userSpecifiedSnapshot;
this.userSpecifiedRoot = AVMUtil.buildSandboxRootPath(this.userSpecifiedStore);
this.userSpecifiedVersion = -1;
buildAvailibleVersionNumbers();
buildAvailableVersionNumbers();
}
}