blob: c479ab049a7fe861a2dffbcc0559d4f853341d90 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
/*******************************************************************************
* 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.compare.structuremergeviewer.IDiffElement;
import org.eclipse.team.core.synchronize.FastSyncInfoFilter;
import org.eclipse.team.core.synchronize.SyncInfo;
import org.eclipse.team.core.synchronize.FastSyncInfoFilter.SyncInfoDirectionFilter;
import org.eclipse.team.internal.ui.actions.SubscriberAction;
import org.eclipse.team.internal.ui.actions.SubscriberOperation;
import org.eclipse.ui.IWorkbenchPart;
/**
* Runs an update command that will prompt the user for overwritting local
* changes to files that have non-mergeable conflicts. All the prompting logic
* is in the super class.
*/
public class OverrideAndUpdateAction extends SubscriberAction {
/* (non-Javadoc)
* @see org.eclipse.team.ui.sync.SubscriberAction#getSyncInfoFilter()
*/
protected FastSyncInfoFilter getSyncInfoFilter() {
return new SyncInfoDirectionFilter(new int[] {SyncInfo.CONFLICTING, SyncInfo.OUTGOING});
}
protected SubscriberOperation getSubscriberOperation(IWorkbenchPart part, IDiffElement[] elements) {
return new OverrideAndUpdateSubscriberOperation(part, elements);
}
}
|