| /******************************************************************************* |
| * Copyright (c) 2000, 2003 IBM Corporation and others. |
| * All rights reserved. This program and the accompanying materials |
| * are made available under the terms of the Common Public License v1.0 |
| * which accompanies this distribution, and is available at |
| * http://www.eclipse.org/legal/cpl-v10.html |
| * |
| * Contributors: |
| * IBM Corporation - initial API and implementation |
| *******************************************************************************/ |
| package org.eclipse.team.internal.ccvs.ui.subscriber; |
| |
| import org.eclipse.team.core.subscribers.SyncInfo; |
| import org.eclipse.team.ui.sync.SyncInfoDirectionFilter; |
| import org.eclipse.team.ui.sync.SyncInfoFilter; |
| import org.eclipse.team.ui.sync.SyncInfoSet; |
| |
| public class OverrideAndCommitAction extends SubscriberCommitAction { |
| |
| /* (non-Javadoc) |
| * @see org.eclipse.team.ui.sync.SubscriberAction#getSyncInfoFilter() |
| */ |
| protected SyncInfoFilter getSyncInfoFilter() { |
| return new SyncInfoDirectionFilter(new int[] {SyncInfo.CONFLICTING, SyncInfo.INCOMING}); |
| } |
| |
| protected boolean promptForConflictHandling(SyncInfoSet syncSet) { |
| // If there is a conflict in the syncSet, we need to prompt the user before proceeding. |
| if (syncSet.hasConflicts() || syncSet.hasIncomingChanges()) { |
| switch (promptForConflicts(syncSet)) { |
| case 0: |
| // Yes, synchronize conflicts as well |
| break; |
| case 1: |
| // No, stop here |
| return false; |
| case 2: |
| default: |
| // Cancel |
| return false; |
| } |
| } |
| return true; |
| } |
| } |