1 files changed, 0 insertions, 143 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMarkAsMergedHandler.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMarkAsMergedHandler.java
deleted file mode 100644
index 0569a9bb1..000000000
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMarkAsMergedHandler.java
+++ /dev/null
@@ -1,143 +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.ui.mapping;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.core.runtime.jobs.MultiRule;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.team.core.diff.*;
-import org.eclipse.team.core.mapping.IMergeContext;
-import org.eclipse.team.internal.ui.TeamUIMessages;
-import org.eclipse.team.ui.mapping.SynchronizationOperation;
-import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
-
-public class ResourceMarkAsMergedHandler extends ResourceMergeActionHandler {
-
-	private ResourceModelProviderOperation operation;
-
-
-	public ResourceMarkAsMergedHandler(ISynchronizePageConfiguration configuration) {
-		super(configuration);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.ui.mapping.MergeActionHandler#getOperation()
-	 */
-	protected synchronized SynchronizationOperation getOperation() {
-		if (operation == null) {
-			operation = new ResourceModelProviderOperation(getConfiguration(),
-						getStructuredSelection()) {
-				/* (non-Javadoc)
-				 * @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor)
-				 */
-				public void execute(IProgressMonitor monitor)
-						throws InvocationTargetException, InterruptedException {
-					try {
-						final IMergeContext context = (IMergeContext) getContext();
-						final IDiff[] deltas = getTargetDiffs();
-						ISchedulingRule rule = getMergeRule(context, deltas);
-						context.run(new IWorkspaceRunnable() {
-							public void run(IProgressMonitor monitor)
-									throws CoreException {
-								markAsMerged(deltas, context, monitor);
-							}
-	
-						}, rule, IResource.NONE, monitor);
-	
-					} catch (CoreException e) {
-						throw new InvocationTargetException(e);
-					}
-				}
-	
-				private ISchedulingRule getMergeRule(IMergeContext context,
-						IDiff[] deltas) {
-					ISchedulingRule result = null;
-					for (int i = 0; i < deltas.length; i++) {
-						IDiff node = deltas[i];
-						ISchedulingRule rule = context.getMergeRule(node);
-						if (result == null) {
-							result = rule;
-						} else {
-							result = MultiRule.combine(result, rule);
-						}
-					}
-					return result;
-				}
-	
-				private void markAsMerged(IDiff[] deltas,
-						final IMergeContext context, IProgressMonitor monitor)
-						throws CoreException {
-					context.markAsMerged(deltas, false, monitor);
-				}
-	
-				/* (non-Javadoc)
-				 * @see org.eclipse.team.internal.ui.mapping.ResourceModelProviderOperation#getDiffFilter()
-				 */
-				protected FastDiffFilter getDiffFilter() {
-					return new FastDiffFilter() {
-						public boolean select(IDiff node) {
-							if (node instanceof IThreeWayDiff) {
-								IThreeWayDiff twd = (IThreeWayDiff) node;
-								if (twd.getDirection() == IThreeWayDiff.CONFLICTING
-										|| twd.getDirection() == IThreeWayDiff.INCOMING) {
-									return true;
-								}
-							}
-							return false;
-						}
-					};
-				}
-				protected String getJobName() {
-					IDiff[] diffs = getTargetDiffs();
-					if (diffs.length == 1)
-						return TeamUIMessages.ResourceMarkAsMergedHandler_0;
-					return NLS.bind(TeamUIMessages.ResourceMarkAsMergedHandler_1, new Integer(diffs.length).toString());
-				}
-			};
-		}
-		return operation;
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.ui.mapping.MergeActionHandler#updateEnablement(org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public void updateEnablement(IStructuredSelection selection) {
-		synchronized (this) {
-			operation = null;
-		}
-		super.updateEnablement(selection);
-		int mode = getConfiguration().getMode();
-		if ((mode == ISynchronizePageConfiguration.OUTGOING_MODE 
-				&& getSynchronizationContext().getDiffTree().countFor(IThreeWayDiff.CONFLICTING, IThreeWayDiff.DIRECTION_MASK) == 0)
-				|| (getSynchronizationContext().getDiffTree().countFor(IThreeWayDiff.CONFLICTING, IThreeWayDiff.DIRECTION_MASK) == 0
-						&& getSynchronizationContext().getDiffTree().countFor(IThreeWayDiff.INCOMING, IThreeWayDiff.DIRECTION_MASK) == 0)) {
-			setEnabled(false);
-			return;
-		}
-	}
-	
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		if (saveDirtyEditors())
-			return super.execute(event);
-		return null;
-	}
-	
-}