diff options
| author | Pawel Pogorzelski | 2010-03-01 16:05:00 +0000 |
|---|---|---|
| committer | Pawel Pogorzelski | 2010-03-01 16:05:00 +0000 |
| commit | e685e48b488cf273e2d78377a9a65873d5db93fe (patch) | |
| tree | 800596a66d9a881eada59295478001b0ffc4b004 /bundles/org.eclipse.team.ui/src | |
| parent | de40bf1afdfaca6544e2a3e9387402c17a0a84fe (diff) | |
| download | eclipse.platform.team-e685e48b488cf273e2d78377a9a65873d5db93fe.tar.gz eclipse.platform.team-e685e48b488cf273e2d78377a9a65873d5db93fe.tar.xz eclipse.platform.team-e685e48b488cf273e2d78377a9a65873d5db93fe.zip | |
Bug 301243 - [Sync View][Apply Patch] Remove 'Schedule' action for patch synchronizations
Diffstat (limited to 'bundles/org.eclipse.team.ui/src')
2 files changed, 9 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelSynchronizePage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelSynchronizePage.java index c225f2d42..e805455f7 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelSynchronizePage.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelSynchronizePage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2010 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 @@ -30,6 +30,8 @@ import org.eclipse.team.ui.synchronize.*; **/ public class ModelSynchronizePage extends AbstractSynchronizePage { + public static final String EXCLUDE_REFRESH_ACTION = TeamUIPlugin.ID + ".excludeRefreshAction"; //$NON-NLS-1$ + private ModelSynchronizeParticipant participant; /** @@ -42,7 +44,9 @@ public class ModelSynchronizePage extends AbstractSynchronizePage { configuration.setComparisonType(isThreeWay() ? ISynchronizePageConfiguration.THREE_WAY : ISynchronizePageConfiguration.TWO_WAY); - configuration.addActionContribution(new RefreshActionContribution()); + Boolean excludeRefresh = (Boolean) configuration.getProperty(EXCLUDE_REFRESH_ACTION); + if (excludeRefresh == null || (!excludeRefresh.booleanValue())) + configuration.addActionContribution(new RefreshActionContribution()); } private boolean isThreeWay() { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelSynchronizeParticipant.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelSynchronizeParticipant.java index f03eb1d0d..463034332 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelSynchronizeParticipant.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelSynchronizeParticipant.java @@ -17,6 +17,7 @@ import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IMenuManager; import org.eclipse.team.core.mapping.provider.SynchronizationContext; import org.eclipse.team.internal.ui.Utils; +import org.eclipse.team.internal.ui.mapping.ModelSynchronizePage; import org.eclipse.team.ui.TeamUI; import org.eclipse.team.ui.mapping.ISynchronizationCompareAdapter; import org.eclipse.team.ui.mapping.SynchronizationActionProvider; @@ -50,6 +51,8 @@ public class ApplyPatchModelSynchronizeParticipant extends .setSupportedModes(ISynchronizePageConfiguration.INCOMING_MODE | ISynchronizePageConfiguration.CONFLICTING_MODE); configuration.setMode(ISynchronizePageConfiguration.INCOMING_MODE); + configuration.setProperty(ModelSynchronizePage.EXCLUDE_REFRESH_ACTION, + new Boolean(true)); } protected ModelSynchronizeParticipantActionGroup createMergeActionGroup() { |