1 files changed, 61 insertions, 0 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/OverrideAndUpdateOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/OverrideAndUpdateOperation.java
new file mode 100644
index 000000000..0ca371e13
--- /dev/null
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/OverrideAndUpdateOperation.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.team.internal.ccvs.ui.operations;
+
+import java.util.*;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.mapping.ResourceMappingContext;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.team.core.mapping.provider.SynchronizationScopeManager;
+import org.eclipse.team.internal.ccvs.core.*;
+import org.eclipse.ui.IWorkbenchPart;
+
+/**
+ * A specialized Replace operation that will update managed resources and
+ * unmanaged resources that are conflicting additions (so that the remote is fetched)
+ */
+public class OverrideAndUpdateOperation extends ReplaceOperation {
+
+	private IResource[] conflictingAdditions;
+	private final IProject project;
+
+	public OverrideAndUpdateOperation(IWorkbenchPart part, IProject project, IResource[] allResources, IResource[] conflictingAdditions, CVSTag tag, boolean recurse) {
+		super(part, allResources, tag, recurse);
+		this.project = project;
+		this.conflictingAdditions = conflictingAdditions;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.team.internal.ccvs.ui.operations.ReplaceOperation#getResourcesToUpdate(org.eclipse.team.internal.ccvs.core.ICVSResource[])
+	 */
+	protected ICVSResource[] getResourcesToUpdate(ICVSResource[] resources, IProgressMonitor monitor) throws CVSException {
+		// Add the conflicting additions to the list of resources to update
+		Set update = new HashSet();
+		ICVSResource[] conflicts = getCVSArguments(conflictingAdditions);
+		update.addAll(Arrays.asList(conflicts));
+		update.addAll(Arrays.asList(super.getResourcesToUpdate(resources, monitor)));
+		return (ICVSResource[]) update.toArray(new ICVSResource[update.size()]);
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.team.internal.ccvs.ui.operations.UpdateOperation#getResourceMappingContext()
+	 */
+	protected ResourceMappingContext getResourceMappingContext() {
+		return new SingleProjectSubscriberContext(CVSProviderPlugin.getPlugin().getCVSWorkspaceSubscriber(), false, project);
+	}
+	
+	protected SynchronizationScopeManager createScopeManager(boolean consultModels) {
+		return new SingleProjectScopeManager(getJobName(), getSelectedMappings(), getResourceMappingContext(), consultModels, project);
+	}
+
+}