Attachment 149632 Details for Bug 291215 – Fix v01

[patch] Fix v01

bug291215_20091015.txt (text/plain), 20.11 KB, created by Tomasz Zarna

on 2009-10-15 08:47:06 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tomasz Zarna

Created: 2009-10-15 08:47:06 EDT

Size: 20.11 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.team.ui
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.ui/plugin.xml,v
>retrieving revision 1.201
>diff -u -r1.201 plugin.xml
>--- plugin.xml	15 Sep 2009 08:59:45 -0000	1.201
>+++ plugin.xml	15 Oct 2009 12:41:26 -0000
>@@ -293,6 +293,9 @@
>          <showInPart
>                id="org.eclipse.team.ui.GenericHistoryView">
>          </showInPart>
>+         <showInPart
>+               id="org.eclipse.team.sync.views.SynchronizeView">
>+         </showInPart>
>       </perspectiveExtension>
>    </extension>
> 
>Index: src/org/eclipse/team/internal/ui/TeamUIMessages.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIMessages.java,v
>retrieving revision 1.83
>diff -u -r1.83 TeamUIMessages.java
>--- src/org/eclipse/team/internal/ui/TeamUIMessages.java	26 Mar 2009 10:03:22 -0000	1.83
>+++ src/org/eclipse/team/internal/ui/TeamUIMessages.java	15 Oct 2009 12:41:26 -0000
>@@ -361,6 +361,11 @@
> 	public static String SynchronizeView_14;
> 	public static String SynchronizeView_16;
> 	public static String SynchronizeView_statusLine;
>+	public static String SynchronizeView_linkWithEditor;
>+	public static String SynchronizeView_linkWithEditorDescription;
>+	public static String SynchronizeView_linkWithEditorTooltip;
>+	public static String SynchronizeView_fileMustNotBeNull;
>+	public static String SynchronizeView_noActiveWorkbenchPage;
> 
> 	public static String StatisticsPanel_outgoing;
> 	public static String StatisticsPanel_incoming;
>Index: src/org/eclipse/team/internal/ui/messages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties,v
>retrieving revision 1.251
>diff -u -r1.251 messages.properties
>--- src/org/eclipse/team/internal/ui/messages.properties	26 Mar 2009 10:03:22 -0000	1.251
>+++ src/org/eclipse/team/internal/ui/messages.properties	15 Oct 2009 12:41:27 -0000
>@@ -162,6 +162,11 @@
> SynchronizeView_14=Error opening perspective
> SynchronizeView_16=Error opening view
> SynchronizeView_statusLine={0} [{1}]
>+SynchronizeView_linkWithEditor=Link with Editor
>+SynchronizeView_linkWithEditorDescription=Link with active editor
>+SynchronizeView_linkWithEditorTooltip=Link with Editor and Selection
>+SynchronizeView_fileMustNotBeNull=File must not be null
>+SynchronizeView_noActiveWorkbenchPage=No active workbench page
> 
> StatisticsPanel_outgoing=Outgoing
> StatisticsPanel_conflicting=Conflicting
>Index: src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java,v
>retrieving revision 1.47
>diff -u -r1.47 SynchronizeView.java
>--- src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java	6 Mar 2009 15:09:40 -0000	1.47
>+++ src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java	15 Oct 2009 12:41:27 -0000
>@@ -12,30 +12,39 @@
> 
> import java.util.*;
> 
>+import org.eclipse.core.resources.IFile;
>+import org.eclipse.core.resources.IResource;
> import org.eclipse.core.runtime.*;
> import org.eclipse.jface.action.IMenuManager;
> import org.eclipse.jface.action.IToolBarManager;
>+import org.eclipse.jface.commands.ActionHandler;
> import org.eclipse.jface.dialogs.*;
> import org.eclipse.jface.util.IPropertyChangeListener;
> import org.eclipse.jface.util.PropertyChangeEvent;
>-import org.eclipse.jface.viewers.IBasicPropertyConstants;
>+import org.eclipse.jface.viewers.*;
> import org.eclipse.osgi.util.NLS;
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.swt.widgets.Display;
> import org.eclipse.team.core.TeamException;
>+import org.eclipse.team.core.history.IFileRevision;
>+import org.eclipse.team.core.variants.IResourceVariant;
>+import org.eclipse.team.internal.core.mapping.ResourceVariantFileRevision;
> import org.eclipse.team.internal.ui.*;
>+import org.eclipse.team.internal.ui.history.FileRevisionEditorInput;
> import org.eclipse.team.internal.ui.synchronize.actions.*;
> import org.eclipse.team.ui.TeamUI;
> import org.eclipse.team.ui.synchronize.*;
> import org.eclipse.ui.*;
> import org.eclipse.ui.actions.ActionFactory;
>+import org.eclipse.ui.handlers.IHandlerService;
>+import org.eclipse.ui.ide.IDE;
> import org.eclipse.ui.part.*;
> import org.eclipse.ui.progress.IWorkbenchSiteProgressService;
> 
> /**
>  * Implements a Synchronize View that contains multiple synchronize participants. 
>  */
>-public class SynchronizeView extends PageBookView implements ISynchronizeView, ISynchronizeParticipantListener, IPropertyChangeListener, ISaveablesSource, ISaveablePart {
>+public class SynchronizeView extends PageBookView implements ISynchronizeView, ISynchronizeParticipantListener, IPropertyChangeListener, ISaveablesSource, ISaveablePart, IShowInTarget {
> 	
> 	/**
> 	 * Suggested maximum length of participant names when shown in certain menus and dialog.
>@@ -77,11 +86,16 @@
> 	 */
> 	private RemoveSynchronizeParticipantAction fRemoveAllAction;
> 	
>+	private ToggleLinkingAction fToggleLinkingAction;
>+	private boolean fLinkingEnabled;
>+	private OpenAndLinkWithEditorHelper fOpenAndLinkWithEditorHelper;
>+
> 	/**
> 	 * Preference key to save
> 	 */
> 	private static final String KEY_LAST_ACTIVE_PARTICIPANT_ID = "lastactiveparticipant_id"; //$NON-NLS-1$
>     private static final String KEY_LAST_ACTIVE_PARTICIPANT_SECONDARY_ID = "lastactiveparticipant_sec_id"; //$NON-NLS-1$
>+    private static final String KEY_LINK_WITH_EDITOR = "linkWithEditor"; //$NON-NLS-1$
> 	private static final String KEY_SETTINGS_SECTION= "SynchronizeViewSettings"; //$NON-NLS-1$
> 
> 
>@@ -356,6 +370,7 @@
> 	protected void createActions() {
> 		fPageDropDown = new SynchronizePageDropDownAction(this);
> 		fPinAction = new PinParticipantAction();
>+		fToggleLinkingAction = new ToggleLinkingAction(this);
> 		fRemoveCurrentAction = new RemoveSynchronizeParticipantAction(this, false);
> 		fRemoveAllAction = new RemoveSynchronizeParticipantAction(this, true);
> 		updateActionEnablements();
>@@ -365,6 +380,9 @@
> 		if (fPinAction != null) {
> 			fPinAction.setParticipant(activeParticipantRef);
> 		}
>+		if (fToggleLinkingAction != null) {
>+			fToggleLinkingAction.setEnabled(getParticipant() != null);
>+		}
> 		if (fRemoveAllAction != null) {
> 			fRemoveAllAction.setEnabled(getParticipant() != null);
> 		}
>@@ -384,8 +402,12 @@
> 		mgr.add(fPinAction);
> 		IMenuManager menu = bars.getMenuManager();
> 		menu.add(fPinAction);
>+		menu.add(fToggleLinkingAction);
> 		menu.add(fRemoveCurrentAction);
> 		menu.add(fRemoveAllAction);
>+
>+		IHandlerService handlerService= (IHandlerService) this.getViewSite().getService(IHandlerService.class);
>+		handlerService.activateHandler(IWorkbenchCommandConstants.NAVIGATE_TOGGLE_LINK_WITH_EDITOR, new ActionHandler(fToggleLinkingAction));
> 	}
> 
> 	/* (non-Javadoc)
>@@ -396,11 +418,39 @@
> 		if (part != null) {
> 			partActivated(part);
> 			fPageDropDown.update();
>+			createOpenAndLinkWithEditorHelper(getViewer());
>             rememberCurrentParticipant();
>             PlatformUI.getWorkbench().getHelpSystem().setHelp(getPageBook().getParent(), participant.getHelpContextId());
> 		}
> 	}
> 	
>+	private void createOpenAndLinkWithEditorHelper(StructuredViewer viewer) {
>+		if (fOpenAndLinkWithEditorHelper != null)
>+			fOpenAndLinkWithEditorHelper.dispose();
>+		fOpenAndLinkWithEditorHelper= new OpenAndLinkWithEditorHelper(viewer) {
>+			protected void activate(ISelection selection) {
>+				try {
>+					final Object selectedElement = getSingleElement(selection);
>+					if (isOpenInEditor(selectedElement) != null)
>+						if (selectedElement instanceof IFile)
>+							openInEditor((IFile) selectedElement, true);
>+				} catch (PartInitException ex) {
>+					// ignore if no editor input can be found
>+				}
>+			}
>+
>+			protected void linkToEditor(ISelection selection) {
>+				SynchronizeView.this.linkToEditor(selection);
>+			}
>+
>+			protected void open(ISelection selection, boolean activate) {
>+				// TODO: implement
>+			}
>+		};
>+		fOpenAndLinkWithEditorHelper.setLinkWithEditor(isLinkingEnabled());
>+		setLinkingEnabled(isLinkingEnabled());
>+	}
>+
> 	/* (non-Javadoc)
> 	 * @see org.eclipse.ui.part.PageBookView#getBootstrapPart()
> 	 */
>@@ -437,6 +487,7 @@
> 	 */
> 	public void createPartControl(Composite parent) {
> 		super.createPartControl(parent);
>+		restoreLinkingEnabled();
> 		createActions();
> 		configureToolBar(getViewSite().getActionBars());
> 		updateForExistingParticipants();
>@@ -683,4 +734,292 @@
> 							new String[] { description, syncMode }));
> 		}
> 	}
>-}
>+
>+	// copy-pasted from org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart and modified
>+
>+	private IPartListener2 fLinkWithEditorListener= new IPartListener2() {
>+		public void partVisible(IWorkbenchPartReference partRef) {}
>+		public void partBroughtToTop(IWorkbenchPartReference partRef) {}
>+		public void partClosed(IWorkbenchPartReference partRef) {}
>+		public void partDeactivated(IWorkbenchPartReference partRef) {}
>+		public void partHidden(IWorkbenchPartReference partRef) {}
>+		public void partOpened(IWorkbenchPartReference partRef) {}
>+		public void partInputChanged(IWorkbenchPartReference partRef) {
>+			if (partRef instanceof IEditorReference) {
>+				editorActivated(((IEditorReference) partRef).getEditor(true));
>+			}
>+		}
>+
>+		public void partActivated(IWorkbenchPartReference partRef) {
>+			if (partRef instanceof IEditorReference) {
>+				editorActivated(((IEditorReference) partRef).getEditor(true));
>+			}
>+		}
>+
>+	};
>+
>+	public boolean isLinkingEnabled() {
>+		return fLinkingEnabled;
>+	}
>+	
>+	IElementComparer COMPARER = new IElementComparer() {
>+		
>+		public int hashCode(Object element) {
>+			if (element instanceof SyncInfoModelElement) {
>+				SyncInfoModelElement sime = (SyncInfoModelElement) element;
>+				IResource local = sime.getResource();
>+				if (local != null && local.exists())
>+					return local.hashCode();
>+				IResourceVariant remote = sime.getSyncInfo().getRemote();
>+				if (remote != null)
>+					return remote.hashCode();
>+			}
>+			return element.hashCode();
>+		}
>+		
>+		public boolean equals(Object a, Object b) {
>+			// no need to check null, CustomeHashtable cannot contain null keys
>+			if (a instanceof SyncInfoModelElement) {
>+				if (b instanceof IResource) {
>+					IResource r1 = ((SyncInfoModelElement) a).getResource();
>+					IResource r2 = (IResource) b;
>+					return r2.equals(r1); // r1 may be null
>+				} else if (b instanceof IResourceVariant) {
>+					IResourceVariant r1 = ((SyncInfoModelElement) a).getSyncInfo().getRemote();
>+					IResourceVariant r2 = (IResourceVariant) b;
>+					return r2.equals(r1); // r1 may be null
>+				}
>+			}
>+			if (b instanceof SyncInfoModelElement) {
>+				if (a instanceof IResource) {
>+					IResource r1 = (IResource) a;
>+					IResource r2 = ((SyncInfoModelElement) b).getResource();
>+					return r1.equals(r2);
>+				} else if (a instanceof IResourceVariant) {
>+					IResourceVariant r1 = (IResourceVariant) a;
>+					IResourceVariant r2 = ((SyncInfoModelElement) b).getSyncInfo().getRemote();
>+					return r1.equals(r2);
>+				}
>+			}
>+			return a.equals(b);
>+		}
>+	};
>+	
>+	public void setLinkingEnabled(boolean enabled) {
>+		fLinkingEnabled= enabled;
>+		IDialogSettings dialogSettings = getDialogSettings();
>+		dialogSettings.put(KEY_LINK_WITH_EDITOR, fLinkingEnabled);
>+		
>+//		getViewer().setComparer(enabled ? COMPARER : null);
>+		
>+		IWorkbenchPage page= getSite().getPage();
>+		if (enabled) {
>+			page.addPartListener(fLinkWithEditorListener);
>+
>+			IEditorPart editor = page.getActiveEditor();
>+			if (editor != null)
>+				editorActivated(editor);
>+		} else {
>+			page.removePartListener(fLinkWithEditorListener);
>+		}
>+		fOpenAndLinkWithEditorHelper.setLinkWithEditor(enabled);
>+	}
>+
>+
>+	private void restoreLinkingEnabled() {
>+		fLinkingEnabled = getDialogSettings().getBoolean(KEY_LINK_WITH_EDITOR);
>+	}
>+
>+	/**
>+	 * Links to editor (if option enabled)
>+	 * @param selection the selection
>+	 */
>+	private void linkToEditor(ISelection selection) {
>+		Object obj = getSingleElement(selection);
>+		if (obj != null) {
>+			IEditorPart part = isOpenInEditor(obj);
>+			if (part != null) {
>+				IWorkbenchPage page= getSite().getPage();
>+				page.bringToTop(part);
>+			}
>+		}
>+	}
>+
>+	/**
>+	 * An editor has been activated.  Set the selection in this Packages Viewer
>+	 * to be the editor's input, if linking is enabled.
>+	 * @param editor the activated editor
>+	 */
>+	private void editorActivated(IEditorPart editor) {
>+        if (!isLinkingEnabled())
>+            return;
>+		
>+		IEditorInput editorInput= editor.getEditorInput();
>+		if (editorInput == null)
>+			return;
>+		Object input= getInputFromEditor(editorInput);
>+		if (input == null)
>+			return;
>+		
>+		getViewer().setComparer(COMPARER);
>+		
>+		if (!inputIsSelected(editorInput))
>+			showInput(input);
>+		else
>+			getViewer().getTree().showSelection();
>+		
>+		getViewer().setComparer(null);
>+	}
>+
>+	boolean showInput(Object input) {
>+		Object element = input;
>+		if (element != null) {
>+			ISelection newSelection = new StructuredSelection(element);
>+			if (getViewer().getSelection().equals(newSelection)) {
>+				getViewer().reveal(element);
>+			} else {
>+				getViewer().setSelection(newSelection, true);
>+
>+				while (element != null && getViewer().getSelection().isEmpty()) {
>+					// Try to select parent in case element is filtered
>+					element = getParent(element);
>+					if (element != null) {
>+						newSelection = new StructuredSelection(element);
>+						getViewer().setSelection(newSelection, true);
>+					} else {
>+						// Failed to find parent to select
>+						return false;
>+					}
>+				}
>+			}
>+			return true;
>+		}
>+		return false;
>+	}
>+
>+	/**
>+	 * Returns the element's parent.
>+	 * @param element the element
>+	 *
>+	 * @return the parent or <code>null</code> if there's no parent
>+	 */
>+	private Object getParent(Object element) {
>+		if (element instanceof IResource)
>+			return ((IResource)element).getParent();
>+		return null;
>+	}
>+
>+	private TreeViewer getViewer() {
>+		IPage currentPage = getCurrentPage();
>+		if (currentPage instanceof ISynchronizePage) {
>+			return (TreeViewer) ((ISynchronizePage)currentPage).getViewer();
>+		}
>+		// TODO: nobody is expecting null!
>+		return null;
>+	}
>+
>+	private boolean inputIsSelected(IEditorInput input) {
>+		IStructuredSelection selection= (IStructuredSelection) getViewer().getSelection();
>+		if (selection.size() != 1)
>+			return false;
>+		IEditorInput selectionAsInput= getEditorInput(selection.getFirstElement());
>+		return input.equals(selectionAsInput);
>+	}
>+
>+	private static IEditorInput getEditorInput(Object input) {
>+		IResource[] resources = Utils.getContributedResources(new Object[] { input });
>+		if (resources.length > 0)
>+			input = resources[0];
>+		if (input instanceof IFile)
>+			return new FileEditorInput((IFile) input);
>+		return null;
>+	}
>+
>+	private Object getInputFromEditor(IEditorInput editorInput) {
>+		Object input= editorInput.getAdapter(IFile.class);
>+		if (input == null && editorInput instanceof FileRevisionEditorInput) {
>+			IFileRevision fileRevision = ((FileRevisionEditorInput)editorInput).getFileRevision();
>+			if (fileRevision instanceof ResourceVariantFileRevision)
>+				return ((ResourceVariantFileRevision) fileRevision).getVariant();
>+		}
>+		if (input == null && editorInput instanceof IStorageEditorInput) {
>+			try {
>+				input= ((IStorageEditorInput) editorInput).getStorage();
>+			} catch (CoreException e) {
>+				// ignore
>+			}
>+		}
>+		return input;
>+	}
>+
>+	// copy-pasted from org.eclipse.jdt.internal.ui.javaeditor.EditorUtility and modified
>+
>+	private static IEditorPart isOpenInEditor(Object inputElement) {
>+		IEditorInput input = getEditorInput(inputElement);
>+
>+		if (input != null) {
>+			IWorkbenchPage p = TeamUIPlugin.getActivePage();
>+			if (p != null) {
>+				return p.findEditor(input);
>+			}
>+		}
>+		return null;
>+	}
>+
>+	private static IEditorPart openInEditor(IFile file, boolean activate) throws PartInitException {
>+		if (file == null)
>+			throwPartInitException(TeamUIMessages.SynchronizeView_fileMustNotBeNull);
>+
>+		IWorkbenchPage p = TeamUIPlugin.getActivePage();
>+		if (p == null)
>+			throwPartInitException(TeamUIMessages.SynchronizeView_noActiveWorkbenchPage);
>+
>+		IEditorPart editorPart = IDE.openEditor(p, file, activate);
>+		return editorPart;
>+	}
>+
>+	private static void throwPartInitException(String message) throws PartInitException {
>+		IStatus status = new Status(IStatus.ERROR, TeamUIPlugin.ID, IStatus.OK, message, null);
>+		throw new PartInitException(status);
>+	}
>+
>+	// copy-pasted from org.eclipse.jdt.internal.ui.util.SelectionUtil and modified
>+
>+	/**
>+	 * Returns the selected element if the selection consists of a single
>+	 * element only.
>+	 *
>+	 * @param s the selection
>+	 * @return the selected first element or null
>+	 */
>+	private static Object getSingleElement(ISelection s) {
>+		if (!(s instanceof IStructuredSelection))
>+			return null;
>+		IStructuredSelection selection = (IStructuredSelection) s;
>+		if (selection.size() != 1)
>+			return null;
>+
>+		return selection.getFirstElement();
>+	}
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.ui.part.IShowInTarget#show(org.eclipse.ui.part.ShowInContext)
>+	 */
>+	public boolean show(ShowInContext context) {
>+		Object selection = getSingleElement(context.getSelection());
>+		if (selection != null) {
>+			// If can show the selection, do it.
>+			// Otherwise, fall through and attempt to show the input
>+			if (showInput(selection))
>+				return true;
>+		}
>+		Object input = context.getInput();
>+		if (input != null) {
>+			if (input instanceof IEditorInput) {
>+				return showInput(getInputFromEditor((IEditorInput) input));
>+			}
>+			 return showInput(input);
>+		}
>+		return false;
>+	}
>+}
>\ No newline at end of file
>Index: src/org/eclipse/team/internal/ui/synchronize/actions/ToggleLinkingAction.java
>===================================================================
>RCS file: src/org/eclipse/team/internal/ui/synchronize/actions/ToggleLinkingAction.java
>diff -N src/org/eclipse/team/internal/ui/synchronize/actions/ToggleLinkingAction.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/team/internal/ui/synchronize/actions/ToggleLinkingAction.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,36 @@
>+/*******************************************************************************
>+ * Copyright (c) 2009 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.internal.ui.synchronize.actions;
>+
>+import org.eclipse.jface.action.Action;
>+import org.eclipse.team.internal.ui.*;
>+import org.eclipse.team.internal.ui.synchronize.SynchronizeView;
>+import org.eclipse.ui.IWorkbenchCommandConstants;
>+
>+public class ToggleLinkingAction extends Action {
>+
>+	private SynchronizeView view;
>+
>+	public ToggleLinkingAction(SynchronizeView view) {
>+		super(TeamUIMessages.SynchronizeView_linkWithEditor);
>+		setDescription(TeamUIMessages.SynchronizeView_linkWithEditorDescription);
>+		setToolTipText(TeamUIMessages.SynchronizeView_linkWithEditorTooltip);
>+		setImageDescriptor(TeamUIPlugin.getImageDescriptor(ITeamUIImages.IMG_LINK_WITH));
>+		setDisabledImageDescriptor(TeamUIPlugin.getImageDescriptor(ITeamUIImages.IMG_LINK_WITH_DISABLED));
>+		setActionDefinitionId(IWorkbenchCommandConstants.NAVIGATE_TOGGLE_LINK_WITH_EDITOR);
>+		this.view = view;
>+		setChecked(view.isLinkingEnabled());
>+	}
>+
>+	public void run() {
>+		view.setLinkingEnabled(isChecked());
>+	}
>+}
>\ No newline at end of file

Actions: View | Diff

Attachments on bug 291215: 149632 | 149633 | 149733