Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 301243
Collapse All | Expand All

(-)src/org/eclipse/team/internal/ui/mapping/ModelSynchronizePage.java (-2 / +6 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2000, 2007 IBM Corporation and others.
2
 * Copyright (c) 2000, 2010 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
Lines 30-35 Link Here
30
 **/
30
 **/
31
public class ModelSynchronizePage extends AbstractSynchronizePage {
31
public class ModelSynchronizePage extends AbstractSynchronizePage {
32
32
33
	public static final String EXCLUDE_REFRESH_ACTION = TeamUIPlugin.ID + ".excludeRefreshAction"; //$NON-NLS-1$
34
33
	private ModelSynchronizeParticipant participant;
35
	private ModelSynchronizeParticipant participant;
34
36
35
	/**
37
	/**
Lines 42-48 Link Here
42
		configuration.setComparisonType(isThreeWay() 
44
		configuration.setComparisonType(isThreeWay() 
43
						? ISynchronizePageConfiguration.THREE_WAY 
45
						? ISynchronizePageConfiguration.THREE_WAY 
44
						: ISynchronizePageConfiguration.TWO_WAY);
46
						: ISynchronizePageConfiguration.TWO_WAY);
45
		configuration.addActionContribution(new RefreshActionContribution());
47
		Boolean excludeRefresh = (Boolean) configuration.getProperty(EXCLUDE_REFRESH_ACTION);
48
		if (excludeRefresh == null || (!excludeRefresh.booleanValue()))
49
			configuration.addActionContribution(new RefreshActionContribution());
46
	}
50
	}
47
51
48
	private boolean isThreeWay() {
52
	private boolean isThreeWay() {
(-)src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelSynchronizeParticipant.java (+3 lines)
Lines 17-22 Link Here
17
import org.eclipse.jface.action.IMenuManager;
17
import org.eclipse.jface.action.IMenuManager;
18
import org.eclipse.team.core.mapping.provider.SynchronizationContext;
18
import org.eclipse.team.core.mapping.provider.SynchronizationContext;
19
import org.eclipse.team.internal.ui.Utils;
19
import org.eclipse.team.internal.ui.Utils;
20
import org.eclipse.team.internal.ui.mapping.ModelSynchronizePage;
20
import org.eclipse.team.ui.TeamUI;
21
import org.eclipse.team.ui.TeamUI;
21
import org.eclipse.team.ui.mapping.ISynchronizationCompareAdapter;
22
import org.eclipse.team.ui.mapping.ISynchronizationCompareAdapter;
22
import org.eclipse.team.ui.mapping.SynchronizationActionProvider;
23
import org.eclipse.team.ui.mapping.SynchronizationActionProvider;
Lines 50-55 Link Here
50
				.setSupportedModes(ISynchronizePageConfiguration.INCOMING_MODE
51
				.setSupportedModes(ISynchronizePageConfiguration.INCOMING_MODE
51
						| ISynchronizePageConfiguration.CONFLICTING_MODE);
52
						| ISynchronizePageConfiguration.CONFLICTING_MODE);
52
		configuration.setMode(ISynchronizePageConfiguration.INCOMING_MODE);
53
		configuration.setMode(ISynchronizePageConfiguration.INCOMING_MODE);
54
		configuration.setProperty(ModelSynchronizePage.EXCLUDE_REFRESH_ACTION,
55
				new Boolean(true));
53
	}
56
	}
54
57
55
	protected ModelSynchronizeParticipantActionGroup createMergeActionGroup() {
58
	protected ModelSynchronizeParticipantActionGroup createMergeActionGroup() {

Return to bug 301243