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

This checkin does two things:

Browse Source 
1. Refines the semantics of ghost creation, so that they only appear when
warranted.
2. Implements a mechanism for filtering out files which should not appear in comparison
results or be pushed along by updates.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4525 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-12-05 22:26:02 +00:00
parent ae4d6a0fd2
commit f5f4a867f7
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java
View File

@@ -984,7 +984,8 @@ public class AVMBrowseBean implements IContextListener
tx.begin(); tx.begin();
// calcluate the list of differences between the user store and the staging area // calcluate the list of differences between the user store and the staging area
List<AVMDifference> diffs = this.avmSyncService.compare(-1, store + ":/", -1, getStagingStore() + ":/"); // TODO Need to pass the global exclude NameMatcher to the compare call.
List<AVMDifference> diffs = this.avmSyncService.compare(-1, store + ":/", -1, getStagingStore() + ":/", null);
List<Pair<Integer, String>> versionPaths = new ArrayList<Pair<Integer, String>>(); List<Pair<Integer, String>> versionPaths = new ArrayList<Pair<Integer, String>>();
for (AVMDifference diff : diffs) for (AVMDifference diff : diffs)
{ {

2
source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java
View File

@@ -222,7 +222,7 @@ public class CreateWebContentWizard extends BaseContentWizard
AVMConstants.STORE_MAIN), AVMConstants.STORE_MAIN),
AVMDifference.NEWER)); AVMDifference.NEWER));
} }
this.avmSyncService.update(diffList, true, true, true, true, null, null); this.avmSyncService.update(diffList, null, true, true, true, true, null, null);
if (this.startWorkflow) if (this.startWorkflow)
{ {

5
source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
View File

@@ -335,7 +335,8 @@ public class SubmitDialog extends BaseDialogBean
{ {
String userStore = this.avmBrowseBean.getSandbox() + ":/"; String userStore = this.avmBrowseBean.getSandbox() + ":/";
String stagingStore = this.avmBrowseBean.getStagingStore() + ":/"; String stagingStore = this.avmBrowseBean.getStagingStore() + ":/";
List<AVMDifference> diffs = avmSyncService.compare(-1, userStore, -1, stagingStore); // TODO Pass the globalPathExcluder NameMatcher instead of null.
List<AVMDifference> diffs = avmSyncService.compare(-1, userStore, -1, stagingStore, null);
selected = new ArrayList<AVMNodeDescriptor>(diffs.size()); selected = new ArrayList<AVMNodeDescriptor>(diffs.size());
for (AVMDifference diff : diffs) for (AVMDifference diff : diffs)
{ {
@@ -426,7 +427,7 @@ public class SubmitDialog extends BaseDialogBean
} }
// write changes to layer so files are marked as modified // write changes to layer so files are marked as modified
avmSyncService.update(diffs, true, true, false, false, null, null); avmSyncService.update(diffs, null, true, true, false, false, null, null);
// convert package to workflow package // convert package to workflow package
AVMNodeDescriptor packageDesc = avmService.lookup(-1, packagesPath); AVMNodeDescriptor packageDesc = avmService.lookup(-1, packagesPath);

3
source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
View File

@@ -490,7 +490,8 @@ public class UIUserSandboxes extends SelfRenderingComponent
String id = getClientId(fc); String id = getClientId(fc);
// use the sync service to get the list of diffs between the stores // use the sync service to get the list of diffs between the stores
List<AVMDifference> diffs = avmSyncService.compare(-1, userStore, -1, stagingStore); // TODO Need to pass the global exclude NameMatcher.
List<AVMDifference> diffs = avmSyncService.compare(-1, userStore, -1, stagingStore, null);
if (diffs.size() != 0) if (diffs.size() != 0)
{ {
// store lookup of username to list of modified nodes // store lookup of username to list of modified nodes