blob: e820c5471367753e00baaa94aa0a7de0c2713d04 (
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
|
/*******************************************************************************
* 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.examples.filesystem.ui;
import org.eclipse.team.core.mapping.ISynchronizationScopeManager;
import org.eclipse.team.core.mapping.provider.SynchronizationContext;
import org.eclipse.team.examples.filesystem.subscriber.FileSystemMergeContext;
import org.eclipse.team.ui.synchronize.ModelParticipantMergeOperation;
import org.eclipse.ui.IWorkbenchPart;
/**
* This merge operation will attempt a headless merge and then prompt
* the user with a dialog if conflicts exist.
*/
public class SyncDialogModelMergeOperation extends
ModelParticipantMergeOperation {
public SyncDialogModelMergeOperation(IWorkbenchPart part, ISynchronizationScopeManager manager) {
super(part, manager);
}
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ModelParticipantMergeOperation#createMergeContext()
*/
protected SynchronizationContext createMergeContext() {
return new FileSystemMergeContext(getScopeManager());
}
}
|
