1 files changed, 0 insertions, 76 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelMergeOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelMergeOperation.java
deleted file mode 100644
index 43d8a8664..000000000
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelMergeOperation.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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.mappings;
-
-import org.eclipse.core.resources.mapping.ResourceMapping;
-import org.eclipse.team.core.mapping.provider.SynchronizationContext;
-import org.eclipse.team.core.subscribers.Subscriber;
-import org.eclipse.team.core.subscribers.SubscriberScopeManager;
-import org.eclipse.team.internal.ccvs.core.CVSMergeSubscriber;
-import org.eclipse.team.internal.ccvs.ui.CVSUIMessages;
-import org.eclipse.team.ui.synchronize.ModelSynchronizeParticipant;
-import org.eclipse.ui.IWorkbenchPart;
-
-public class ModelMergeOperation extends AbstractModelMergeOperation {
-
-	private final Subscriber subscriber;
-	private final boolean attempAutomerge;
-	
-	/**
-	 * Create a merge operation for the given subscriber. The merge operation will cancel the subscriber
-	 * when it is no longer needed.
-	 * @param part the part
-	 * @param mappings the mappings
-	 * @param subscriber the subscriber
-	 * @param attempAutomerge 
-	 */
-	public ModelMergeOperation(IWorkbenchPart part, ResourceMapping[] mappings, final CVSMergeSubscriber subscriber, boolean attempAutomerge) {
-		super(part, new SubscriberScopeManager(subscriber.getName(), mappings, subscriber, true){
-			public void dispose() {
-				subscriber.cancel();
-				super.dispose();
-			}
-		}, true);
-		this.subscriber = subscriber;
-		this.attempAutomerge = attempAutomerge;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.ui.operations.ModelParticipantMergeOperation#createMergeContext()
-	 */
-	protected SynchronizationContext createMergeContext() {
-		return MergeSubscriberContext.createContext(getScopeManager(), subscriber);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.ui.TeamOperation#getJobName()
-	 */
-	protected String getJobName() {
-		return CVSUIMessages.MergeUpdateAction_jobName;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.ui.mappings.AbstractModelMergeOperation#createParticipant()
-	 */
-	protected ModelSynchronizeParticipant createParticipant() {
-		setOwnsManager(false);
-		return new ModelMergeParticipant((MergeSubscriberContext)createMergeContext());
-	}
-	
-	protected boolean isPreviewInDialog() {
-		return false;
-	}
-	
-	public boolean isPreviewRequested() {
-		return !attempAutomerge;
-	}
-
-}