From 0d813f0fe91cacce89ccd4be77fc8ae6b87d9fe0 Mon Sep 17 00:00:00 2001
From: David McKnight <dmcknigh@ca.ibm.com>
Date: Tue, 29 Mar 2011 14:10:39 +0000
Subject: [PATCH]  [249031] Last used editor should be set to
 SystemEditableRemoteFile

---
 .../resources/SystemEditableRemoteFile.java   |  1 -
 .../ui/view/SystemViewRemoteFileAdapter.java  | 19 ++++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java
index 28443098be3..b64de9616bf 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java
@@ -118,7 +118,6 @@ import org.eclipse.ui.actions.WorkspaceModifyOperation;
 import org.eclipse.ui.ide.IDE;
 import org.eclipse.ui.internal.WorkbenchPage;
 import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.texteditor.AbstractTextEditor;
 import org.eclipse.ui.texteditor.IDocumentProvider;
 import org.eclipse.ui.texteditor.ITextEditor;
 
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java
index 01dcf4082e6..14aef45ee72 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java
@@ -73,6 +73,7 @@
  * David McKnight   (IBM)        - [284157] [performance] too many jobs kicked off for getting file permissions for table
  * David McKnight   (IBM)        - [330398] RSE leaks SWT resources
  * David McKnight   (IBM)        - [215814] [performance] Duplicate Queries between Table and Remote Systems View
+ * David McKnight   (IBM)        - [249031] Last used editor should be set to SystemEditableRemoteFile
  *******************************************************************************/
 
 package org.eclipse.rse.internal.files.ui.view;
@@ -198,14 +199,16 @@ import org.eclipse.rse.ui.view.ISystemPropertyConstants;
 import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
 import org.eclipse.rse.ui.view.ISystemViewDropDestination;
 import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
-import org.eclipse.swt.dnd.Clipboard;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorDescriptor;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IEditorRegistry;
 import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.ide.IDE;
 import org.eclipse.ui.progress.IElementCollector;
 import org.eclipse.ui.views.properties.IPropertyDescriptor;
 import org.eclipse.ui.views.properties.PropertyDescriptor;
@@ -482,6 +485,7 @@ public class SystemViewRemoteFileAdapter
 			}
 			openWithMenu.updateSelection(selection);
 			submenu.add(openWithMenu);
+			menu.add(ISystemContextMenuConstants.GROUP_OPENWITH, action); //test
 			menu.getMenuManager().appendToGroup(ISystemContextMenuConstants.GROUP_OPENWITH, submenu);
 		}
 
@@ -3404,6 +3408,19 @@ public class SystemViewRemoteFileAdapter
 					editable = getEditableRemoteObject(remoteFile);
 				}											
 				
+				if (editable instanceof SystemEditableRemoteFile){
+					SystemEditableRemoteFile edit = (SystemEditableRemoteFile)editable;
+					IEditorDescriptor oldDescriptor = edit.getEditorDescriptor();
+					IEditorDescriptor curDescriptor;
+					try {
+						curDescriptor = IDE.getEditorDescriptor(editable.getLocalResource());
+						if (oldDescriptor != curDescriptor){
+							edit.setEditorDescriptor(curDescriptor);
+						}
+					} catch (PartInitException e) {
+					}					
+				}
+				
 				try
 				{
 					boolean isOpen = editable.checkOpenInEditor() != ISystemEditableRemoteObject.NOT_OPEN;