From 156f8090815a677cb6d7856f08a9ddd07f5b6a4e Mon Sep 17 00:00:00 2001 From: David McKnight Date: Thu, 29 Apr 2010 14:11:22 +0000 Subject: [PATCH] [309755] SystemRemoteFileOpenWithMenu.getPreferredEditor(), the listed default editor is not always correct --- .../files/ui/actions/SystemRemoteFileOpenWithMenu.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemRemoteFileOpenWithMenu.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemRemoteFileOpenWithMenu.java index 3f7721a565c..3842f8eef40 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemRemoteFileOpenWithMenu.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemRemoteFileOpenWithMenu.java @@ -18,8 +18,8 @@ * David McKnight (IBM) - [224377] "open with" menu does not have "other" option * David McKnight (IBM) - [277141] System Editor Passed Incorrect Cache Information in Presence of Case-Differentiated-Only filenames * David McKnight (IBM) - [284596] [regression] Open with-> problem when descriptor doesn't match previous + * David McKnight (IBM) - [309755] SystemRemoteFileOpenWithMenu.getPreferredEditor(), the listed default editor is not always correct *******************************************************************************/ - package org.eclipse.rse.internal.files.ui.actions; import java.text.Collator; import java.util.ArrayList; @@ -319,7 +319,7 @@ private void hackOpenEditor(SystemEditableRemoteFile editable, IEditorDescriptor editable.setEditor(editor); SystemIFileProperties properties = new SystemIFileProperties(file); - properties.setRemoteFileObject(this); + properties.setRemoteFileObject(editable); } private boolean isFileCached(ISystemEditableRemoteObject editable, IRemoteFile remoteFile) @@ -395,7 +395,7 @@ protected IEditorDescriptor getPreferredEditor(IRemoteFile remoteFile) { IFile localFile = getLocalResource(remoteFile); - if (localFile == null) { + if (localFile == null || !localFile.exists()){ return registry.getDefaultEditor(remoteFile.getName()); } else {