Attachment 183568 Details for Bug 330797 – Fix

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

[patch] Fix

patch.txt (text/plain), 5.58 KB, created by Dani Megert

on 2010-11-22 08:37:32 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Dani Megert

Created: 2010-11-22 08:37:32 EST

Size: 5.58 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.team.ui
>Index: src/org/eclipse/team/internal/ui/TeamUIPlugin.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java,v
>retrieving revision 1.84
>diff -u -r1.84 TeamUIPlugin.java
>--- src/org/eclipse/team/internal/ui/TeamUIPlugin.java	21 Apr 2010 10:52:11 -0000	1.84
>+++ src/org/eclipse/team/internal/ui/TeamUIPlugin.java	22 Nov 2010 13:36:55 -0000
>@@ -70,6 +70,13 @@
> 	
> 	// manages synchronize participants
> 	private SynchronizeManager synchronizeManager;
>+
>+	/**
>+	 * ID of the 'Remove from View' action.
>+	 * Value: <code>"org.eclipse.team.internal.ui.RemoveFromView"</code>
>+	 */
>+	public static final String REMOVE_FROM_VIEW_ACTION_ID = "org.eclipse.team.internal.ui.RemoveFromView"; //$NON-NLS-1$
>+	
> 	
> 	/**
> 	 * Creates a new TeamUIPlugin.
>Index: src/org/eclipse/team/internal/ui/mapping/RemoveFromViewAction.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/RemoveFromViewAction.java,v
>retrieving revision 1.2
>diff -u -r1.2 RemoveFromViewAction.java
>--- src/org/eclipse/team/internal/ui/mapping/RemoveFromViewAction.java	10 May 2006 17:47:28 -0000	1.2
>+++ src/org/eclipse/team/internal/ui/mapping/RemoveFromViewAction.java	22 Nov 2010 13:36:55 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2006 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
>@@ -36,6 +36,7 @@
> 	public RemoveFromViewAction(ISynchronizePageConfiguration configuration) {
> 		super(null, configuration);
> 		Utils.initAction(this, "action.removeFromView."); //$NON-NLS-1$
>+		setId(TeamUIPlugin.REMOVE_FROM_VIEW_ACTION_ID);
> 	}
> 
> 	/* (non-Javadoc)
>Index: src/org/eclipse/team/internal/ui/synchronize/NavigationActionGroup.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/NavigationActionGroup.java,v
>retrieving revision 1.6
>diff -u -r1.6 NavigationActionGroup.java
>--- src/org/eclipse/team/internal/ui/synchronize/NavigationActionGroup.java	1 Feb 2010 11:01:12 -0000	1.6
>+++ src/org/eclipse/team/internal/ui/synchronize/NavigationActionGroup.java	22 Nov 2010 13:36:55 -0000
>@@ -14,6 +14,7 @@
> import org.eclipse.jface.action.*;
> import org.eclipse.jface.viewers.AbstractTreeViewer;
> import org.eclipse.jface.viewers.Viewer;
>+import org.eclipse.team.internal.ui.TeamUIPlugin;
> import org.eclipse.team.internal.ui.Utils;
> import org.eclipse.team.internal.ui.synchronize.actions.ExpandAllAction;
> import org.eclipse.team.internal.ui.synchronize.actions.NavigateAction;
>@@ -58,7 +59,13 @@
> 		}
> 	}
> 	public void fillContextMenu(IMenuManager manager) {
>-		appendToGroup(manager, ISynchronizePageConfiguration.NAVIGATE_GROUP, expandAllAction);
>+		if (manager == null || expandAllAction == null)
>+			return;
>+
>+		if (manager.find(TeamUIPlugin.REMOVE_FROM_VIEW_ACTION_ID) != null)
>+			manager.insertBefore(TeamUIPlugin.REMOVE_FROM_VIEW_ACTION_ID, expandAllAction);
>+		else
>+			appendToGroup(manager, ISynchronizePageConfiguration.NAVIGATE_GROUP, expandAllAction);
> 	}
> 	public void fillActionBars(IActionBars actionBars) {
> 		IToolBarManager manager = actionBars.getToolBarManager();
>Index: src/org/eclipse/team/internal/ui/synchronize/actions/RemoveFromViewAction.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveFromViewAction.java,v
>retrieving revision 1.9
>diff -u -r1.9 RemoveFromViewAction.java
>--- src/org/eclipse/team/internal/ui/synchronize/actions/RemoveFromViewAction.java	10 May 2006 17:47:28 -0000	1.9
>+++ src/org/eclipse/team/internal/ui/synchronize/actions/RemoveFromViewAction.java	22 Nov 2010 13:36:55 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2006 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
>@@ -23,19 +23,17 @@
> import org.eclipse.team.internal.core.subscribers.WorkingSetFilteredSyncInfoCollector;
> import org.eclipse.team.internal.ui.*;
> import org.eclipse.team.internal.ui.synchronize.SubscriberParticipantPage;
>-import org.eclipse.team.ui.synchronize.ISynchronizePage;
>-import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
>-import org.eclipse.team.ui.synchronize.SynchronizeModelAction;
>-import org.eclipse.team.ui.synchronize.SynchronizeModelOperation;
>+import org.eclipse.team.ui.synchronize.*;
> 
> /**
>- * Remove the selected elemements from the page
>+ * Remove the selected elements from the page
>  */
> public class RemoveFromViewAction extends SynchronizeModelAction {
>-
>+	
> 	public RemoveFromViewAction(ISynchronizePageConfiguration configuration) {
> 		super(null, configuration);
> 		Utils.initAction(this, "action.removeFromView."); //$NON-NLS-1$
>+		setId(TeamUIPlugin.REMOVE_FROM_VIEW_ACTION_ID);
> 	}
> 
> 	/* (non-Javadoc)

Actions: View | Diff

Attachments on bug 330797: 183568