Attachment 160492 Details for Bug 301243 – Patch_v01

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch_v01

301243_v01.txt (text/plain), 3.21 KB, created by Pawel Pogorzelski

on 2010-03-01 11:05:30 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Pawel Pogorzelski

Created: 2010-03-01 11:05:30 EST

Size: 3.21 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.team.ui
>Index: src/org/eclipse/team/internal/ui/mapping/ModelSynchronizePage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelSynchronizePage.java,v
>retrieving revision 1.21
>diff -u -r1.21 ModelSynchronizePage.java
>--- src/org/eclipse/team/internal/ui/mapping/ModelSynchronizePage.java	16 Mar 2007 21:03:34 -0000	1.21
>+++ src/org/eclipse/team/internal/ui/mapping/ModelSynchronizePage.java	1 Mar 2010 15:57:49 -0000
>@@ -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 @@
>  **/
> 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 @@
> 		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() {
>Index: src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelSynchronizeParticipant.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelSynchronizeParticipant.java,v
>retrieving revision 1.3
>diff -u -r1.3 ApplyPatchModelSynchronizeParticipant.java
>--- src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelSynchronizeParticipant.java	24 Feb 2010 14:40:52 -0000	1.3
>+++ src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelSynchronizeParticipant.java	1 Mar 2010 15:57:49 -0000
>@@ -17,6 +17,7 @@
> 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 @@
> 				.setSupportedModes(ISynchronizePageConfiguration.INCOMING_MODE
> 						| ISynchronizePageConfiguration.CONFLICTING_MODE);
> 		configuration.setMode(ISynchronizePageConfiguration.INCOMING_MODE);
>+		configuration.setProperty(ModelSynchronizePage.EXCLUDE_REFRESH_ACTION,
>+				new Boolean(true));
> 	}
> 
> 	protected ModelSynchronizeParticipantActionGroup createMergeActionGroup() {

Actions: View | Diff

Attachments on bug 301243: 160492