Attachment 218881 Details for Bug 385420 – patch to check for external editor and reset default editor after download

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

[patch] patch to check for external editor and reset default editor after download

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

on 2012-07-18 12:29:43 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: David McKnight

Created: 2012-07-18 12:29:43 EDT

Size: 3.17 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.files.ui
>Index: src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java,v
>retrieving revision 1.79
>diff -u -r1.79 SystemEditableRemoteFile.java
>--- src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java	25 Apr 2012 15:38:52 -0000	1.79
>+++ src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java	18 Jul 2012 16:29:14 -0000
>@@ -46,6 +46,7 @@
>  * David McKnight   (IBM)        - [359704] SystemEditableRemoteFile does not release reference to editor
>  * Rick Sawyer      (IBM)        - [376535] RSE does not respect editor overrides
>  * David McKnight   (IBM)        - [357111] [DSTORE]File with invalid characters can't be opened in editor
>+ * David McKnight   (IBM)        - [385420] double-click to open System editor from Remote Systems view not working
>  *******************************************************************************/
> 
> package org.eclipse.rse.files.ui.resources;
>@@ -1737,6 +1738,7 @@
> 			if (_usingDefaultDescriptor){
> 				_editorDescriptor = IDE.getEditorDescriptor(file);
> 				editorId = _editorDescriptor.getId();
>+				_usingDefaultDescriptor = false;
> 			}	
> 			else {
> 				editorId = _editorDescriptor.getId();
>@@ -1744,26 +1746,30 @@
> 		}
> 
> 		IDE.setDefaultEditor(file, editorId);
>-
>-		FileEditorInput finput = new FileEditorInput(file);
>-
>-		// check for files already open
>-
>-		// DKM - when _editorId is not lpex, this causes problem
>-		// DY - changed editor from SystemTextEditor to IEditorPart
>-		//editor = (SystemTextEditor)activePage.openEditor(file, _editorId);
>-		if (_editorDescriptor != null && _editorDescriptor.isOpenExternal()){
>-			editor = ((WorkbenchPage)activePage).openEditorFromDescriptor(new FileEditorInput(file), _editorDescriptor, true, null);
>+		if (_editorDescriptor.isOpenExternal()){
>+			openSystemEditor(); // opening regular way doesn't work anymore
> 		}
> 		else {
>-			editor =  activePage.openEditor(finput, _editorDescriptor.getId());
>-		}
>-
>-
>-		SystemIFileProperties properties = new SystemIFileProperties(file);
>-		properties.setRemoteFileObject(this);
>-		if (properties.getDirty()){
>-			updateDirtyIndicator();
>+			FileEditorInput finput = new FileEditorInput(file);
>+	
>+			// check for files already open
>+	
>+			// DKM - when _editorId is not lpex, this causes problem
>+			// DY - changed editor from SystemTextEditor to IEditorPart
>+			//editor = (SystemTextEditor)activePage.openEditor(file, _editorId);
>+			if (_editorDescriptor != null && _editorDescriptor.isOpenExternal()){
>+				editor = ((WorkbenchPage)activePage).openEditorFromDescriptor(new FileEditorInput(file), _editorDescriptor, true, null);
>+			}
>+			else {
>+				editor =  activePage.openEditor(finput, _editorDescriptor.getId());
>+			}
>+	
>+	
>+			SystemIFileProperties properties = new SystemIFileProperties(file);
>+			properties.setRemoteFileObject(this);
>+			if (properties.getDirty()){
>+				updateDirtyIndicator();
>+			}
> 		}
> 	}
>

Actions: View | Diff

Attachments on bug 385420: 218881