From f5f4a867f7ce15c8026613e63a39c106c9d7a218 Mon Sep 17 00:00:00 2001 From: Britt Park Date: Tue, 5 Dec 2006 22:26:02 +0000 Subject: [PATCH] This checkin does two things: 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 --- source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java | 3 ++- .../org/alfresco/web/bean/wcm/CreateWebContentWizard.java | 2 +- source/java/org/alfresco/web/bean/wcm/SubmitDialog.java | 5 +++-- .../org/alfresco/web/ui/wcm/component/UIUserSandboxes.java | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java b/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java index d955a5cc2f..ad15b9311d 100644 --- a/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java +++ b/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java @@ -984,7 +984,8 @@ public class AVMBrowseBean implements IContextListener tx.begin(); // calcluate the list of differences between the user store and the staging area - List diffs = this.avmSyncService.compare(-1, store + ":/", -1, getStagingStore() + ":/"); + // TODO Need to pass the global exclude NameMatcher to the compare call. + List diffs = this.avmSyncService.compare(-1, store + ":/", -1, getStagingStore() + ":/", null); List> versionPaths = new ArrayList>(); for (AVMDifference diff : diffs) { diff --git a/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java b/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java index d61648e7b7..46a9a0aaea 100644 --- a/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java +++ b/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java @@ -222,7 +222,7 @@ public class CreateWebContentWizard extends BaseContentWizard AVMConstants.STORE_MAIN), 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) { diff --git a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java index 308fc55a43..85e3a15389 100644 --- a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java +++ b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java @@ -335,7 +335,8 @@ public class SubmitDialog extends BaseDialogBean { String userStore = this.avmBrowseBean.getSandbox() + ":/"; String stagingStore = this.avmBrowseBean.getStagingStore() + ":/"; - List diffs = avmSyncService.compare(-1, userStore, -1, stagingStore); + // TODO Pass the globalPathExcluder NameMatcher instead of null. + List diffs = avmSyncService.compare(-1, userStore, -1, stagingStore, null); selected = new ArrayList(diffs.size()); for (AVMDifference diff : diffs) { @@ -426,7 +427,7 @@ public class SubmitDialog extends BaseDialogBean } // 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 AVMNodeDescriptor packageDesc = avmService.lookup(-1, packagesPath); diff --git a/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java b/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java index 04447848e3..80b7daa667 100644 --- a/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java +++ b/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java @@ -490,7 +490,8 @@ public class UIUserSandboxes extends SelfRenderingComponent String id = getClientId(fc); // use the sync service to get the list of diffs between the stores - List diffs = avmSyncService.compare(-1, userStore, -1, stagingStore); + // TODO Need to pass the global exclude NameMatcher. + List diffs = avmSyncService.compare(-1, userStore, -1, stagingStore, null); if (diffs.size() != 0) { // store lookup of username to list of modified nodes