mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-09 09:15:38 +02:00
Code Issues Wiki Activity

[385420] double-click to open System editor from Remote Systems view not working

Browse source
This commit is contained in:
David McKnight 2012-07-19 20:29:18 +00:00
parent 4007c67606
commit 6345d1b3e7
1 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java
View file

@ -46,6 +46,7 @@
* David McKnight (IBM) - [359704] SystemEditableRemoteFile does not release reference to editor * David McKnight (IBM) - [359704] SystemEditableRemoteFile does not release reference to editor
* Rick Sawyer (IBM) - [376535] RSE does not respect editor overrides * 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) - [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; package org.eclipse.rse.files.ui.resources;
@ -1737,6 +1738,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
if (_usingDefaultDescriptor){ if (_usingDefaultDescriptor){
_editorDescriptor = IDE.getEditorDescriptor(file); _editorDescriptor = IDE.getEditorDescriptor(file);
editorId = _editorDescriptor.getId(); editorId = _editorDescriptor.getId();
_usingDefaultDescriptor = false;
} }
else { else {
editorId = _editorDescriptor.getId(); editorId = _editorDescriptor.getId();
@ -1744,26 +1746,30 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
} }
IDE.setDefaultEditor(file, editorId); IDE.setDefaultEditor(file, editorId);
if (_editorDescriptor.isOpenExternal()){
FileEditorInput finput = new FileEditorInput(file); openSystemEditor(); // opening regular way doesn't work anymore
// 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 { else {
editor = activePage.openEditor(finput, _editorDescriptor.getId()); FileEditorInput finput = new FileEditorInput(file);
}
// check for files already open
SystemIFileProperties properties = new SystemIFileProperties(file); // DKM - when _editorId is not lpex, this causes problem
properties.setRemoteFileObject(this); // DY - changed editor from SystemTextEditor to IEditorPart
if (properties.getDirty()){ //editor = (SystemTextEditor)activePage.openEditor(file, _editorId);
updateDirtyIndicator(); 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();
}
} }
} }