Attachment 121953 Details for Bug 260331 – backport fix

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

[patch] backport fix

patch.txt (text/plain), 6.35 KB, created by David McKnight

on 2009-01-08 09:46:46 EST

(hide)

Description:

Filename:

MIME Type:

Creator: David McKnight

Created: 2009-01-08 09:46:46 EST

Size: 6.35 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.ui
>Index: UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java,v
>retrieving revision 1.39.2.1
>diff -u -r1.39.2.1 SystemViewPart.java
>--- UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java	24 Nov 2008 14:42:18 -0000	1.39.2.1
>+++ UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java	8 Jan 2009 14:46:25 -0000
>@@ -34,6 +34,7 @@
>  * Kevin Doyle 	 (IBM) - [186769] Enable Contributions to Drop Down menu of Remote Systems view -> Preferences
>  * David McKnight (IBM)  - [244807] System view does not handle restore from cache
>  * Li Ding        (IBM)          - [256135] Subsystem not restored in system view tree if subsystem configuration does not support filter
>+ * David McKnight   (IBM)        - [257721] Doubleclick doing special handling and expanding
>  *******************************************************************************/
> 
> package org.eclipse.rse.internal.ui.view;
>@@ -59,8 +60,6 @@
> import org.eclipse.jface.action.MenuManager;
> import org.eclipse.jface.action.Separator;
> import org.eclipse.jface.resource.ImageDescriptor;
>-import org.eclipse.jface.viewers.DoubleClickEvent;
>-import org.eclipse.jface.viewers.IDoubleClickListener;
> import org.eclipse.jface.viewers.ILabelProvider;
> import org.eclipse.jface.viewers.ISelection;
> import org.eclipse.jface.viewers.ISelectionChangedListener;
>@@ -381,11 +380,6 @@
> 		//hook the part focus to the viewer's control focus.
> 		//hookFocus(systemView.getControl());
> 
>-		systemView.addDoubleClickListener(new IDoubleClickListener() {
>-			public void doubleClick(DoubleClickEvent event) {
>-				handleDoubleClick(event);
>-			}
>-		});
> 
> 		//prime the selection
> 		//selectionChanged(null, getSite().getDesktopWindow().getSelectionService().getSelection());
>@@ -473,23 +467,6 @@
> 		}
> 	}
> 
>-	/**
>-	 * Handles double clicks in viewer.
>-	 * Opens editor if file double-clicked.
>-	 */
>-	protected void handleDoubleClick(DoubleClickEvent event) {
>-		if (!systemView.enabledMode) {
>-			//event.doit = false;
>-			return;
>-		}
>-		IStructuredSelection s = (IStructuredSelection) event.getSelection();
>-		Object element = s.getFirstElement();
>-		if (element == null) return;
>-		ISystemViewElementAdapter adapter = systemView.getViewAdapter(element);
>-		if (adapter != null)
>-			adapter.handleDoubleClick(element);
>-
>-	}
> 
> 	/**
> 	 * Creates the frame source and frame list, and connects them.
>Index: UI/org/eclipse/rse/internal/ui/view/SystemViewForm.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewForm.java,v
>retrieving revision 1.11
>diff -u -r1.11 SystemViewForm.java
>--- UI/org/eclipse/rse/internal/ui/view/SystemViewForm.java	5 Apr 2008 17:47:19 -0000	1.11
>+++ UI/org/eclipse/rse/internal/ui/view/SystemViewForm.java	8 Jan 2009 14:46:24 -0000
>@@ -16,6 +16,7 @@
>  * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core
>  * David McKnight    (IBM)   - [187711] select SystemView APIs exposed by the ISystemTree interface
>  * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
>+ * David McKnight   (IBM)        - [257721] Doubleclick doing special handling and expanding
>  *******************************************************************************/
> package org.eclipse.rse.internal.ui.view;
> import java.util.List;
>@@ -437,6 +438,9 @@
> 	    treeData.heightHint= 200;
> 	    tree.getTree().setLayoutData(treeData);  	  	    		
> 	    tree.setShowActions(showActions);
>+	    
>+	    // for bug 257721, when using system view from a dialog, by default, we don't let adapter handle double-click
>+	    tree.allowAdapterToHandleDoubleClick(false);
> 	}
> 	
> 	protected void addOurMouseListener()
>Index: UI/org/eclipse/rse/internal/ui/view/SystemView.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java,v
>retrieving revision 1.186.2.2
>diff -u -r1.186.2.2 SystemView.java
>--- UI/org/eclipse/rse/internal/ui/view/SystemView.java	11 Nov 2008 10:01:13 -0000	1.186.2.2
>+++ UI/org/eclipse/rse/internal/ui/view/SystemView.java	8 Jan 2009 14:46:24 -0000
>@@ -64,7 +64,8 @@
>  * David McKnight   (IBM)        - [187739] [refresh] Sub Directories are collapsed when Parent Directory is Refreshed on Remote Systems
>  * David Dykstal (IBM) - [233530] Not Prompted on Promptable Filters after using once by double click
>  * David McKnight   (IBM)        - [249245] not showing inappropriate popup actions for: Refresh, Show In Table, Go Into, etc. 
>- * David McKnight   (IBM)        - [251851] Backport Widget disposed exception when renaming/pasting a folder
>+ * David McKnight   (IBM)        - [251625] Widget disposed exception when renaming/pasting a folder
>+ * David McKnight   (IBM)        - [257721] Doubleclick doing special handling and expanding
>  ********************************************************************************/
> 
> package org.eclipse.rse.internal.ui.view;
>@@ -390,6 +391,8 @@
> 	protected ViewerFilter[] initViewerFilters = null;
> 
> 	protected List _setList;
>+	
>+	protected boolean _allowAdapterToHandleDoubleClick = true;
> 
> 	/**
> 	 * Constructor
>@@ -642,7 +645,14 @@
> 		TreePath[] paths = s.getPathsFor(element);
> 		if (paths == null || paths.length == 0 || paths[0] == null) return;
> 		TreePath elementPath = paths[0];
>-		if (isExpandable(elementPath)) {
>+		
>+		// bringing back handling at the adapter level here due to bug 257721
>+		ISystemViewElementAdapter adapter = getViewAdapter(element);
>+		boolean alreadyHandled = false;
>+		if (adapter != null && _allowAdapterToHandleDoubleClick) 
>+			alreadyHandled = adapter.handleDoubleClick(element);	
>+		
>+		if (!alreadyHandled && isExpandable(element)) {
> 			boolean expandedState = getExpandedState(elementPath);
> 			setExpandedState(elementPath, !expandedState);
> 			// DWD:  fire collapse / expand event
>@@ -6621,5 +6631,8 @@
> 		}
> 	}
> 
>-
>+	public void allowAdapterToHandleDoubleClick(boolean flag)
>+	{
>+		_allowAdapterToHandleDoubleClick = flag;
>+	}
> }

Actions: View | Diff

Attachments on bug 260331: 121953