|
Lines 46-51
Link Here
|
| 46 |
* David McKnight (IBM) - [359704] SystemEditableRemoteFile does not release reference to editor |
46 |
* David McKnight (IBM) - [359704] SystemEditableRemoteFile does not release reference to editor |
| 47 |
* Rick Sawyer (IBM) - [376535] RSE does not respect editor overrides |
47 |
* Rick Sawyer (IBM) - [376535] RSE does not respect editor overrides |
| 48 |
* David McKnight (IBM) - [357111] [DSTORE]File with invalid characters can't be opened in editor |
48 |
* David McKnight (IBM) - [357111] [DSTORE]File with invalid characters can't be opened in editor |
|
|
49 |
* David McKnight (IBM) - [385420] double-click to open System editor from Remote Systems view not working |
| 49 |
*******************************************************************************/ |
50 |
*******************************************************************************/ |
| 50 |
|
51 |
|
| 51 |
package org.eclipse.rse.files.ui.resources; |
52 |
package org.eclipse.rse.files.ui.resources; |
|
Lines 1737-1742
Link Here
|
| 1737 |
if (_usingDefaultDescriptor){ |
1738 |
if (_usingDefaultDescriptor){ |
| 1738 |
_editorDescriptor = IDE.getEditorDescriptor(file); |
1739 |
_editorDescriptor = IDE.getEditorDescriptor(file); |
| 1739 |
editorId = _editorDescriptor.getId(); |
1740 |
editorId = _editorDescriptor.getId(); |
|
|
1741 |
_usingDefaultDescriptor = false; |
| 1740 |
} |
1742 |
} |
| 1741 |
else { |
1743 |
else { |
| 1742 |
editorId = _editorDescriptor.getId(); |
1744 |
editorId = _editorDescriptor.getId(); |
|
Lines 1744-1769
Link Here
|
| 1744 |
} |
1746 |
} |
| 1745 |
|
1747 |
|
| 1746 |
IDE.setDefaultEditor(file, editorId); |
1748 |
IDE.setDefaultEditor(file, editorId); |
| 1747 |
|
1749 |
if (_editorDescriptor.isOpenExternal()){ |
| 1748 |
FileEditorInput finput = new FileEditorInput(file); |
1750 |
openSystemEditor(); // opening regular way doesn't work anymore |
| 1749 |
|
|
|
| 1750 |
// check for files already open |
| 1751 |
|
| 1752 |
// DKM - when _editorId is not lpex, this causes problem |
| 1753 |
// DY - changed editor from SystemTextEditor to IEditorPart |
| 1754 |
//editor = (SystemTextEditor)activePage.openEditor(file, _editorId); |
| 1755 |
if (_editorDescriptor != null && _editorDescriptor.isOpenExternal()){ |
| 1756 |
editor = ((WorkbenchPage)activePage).openEditorFromDescriptor(new FileEditorInput(file), _editorDescriptor, true, null); |
| 1757 |
} |
1751 |
} |
| 1758 |
else { |
1752 |
else { |
| 1759 |
editor = activePage.openEditor(finput, _editorDescriptor.getId()); |
1753 |
FileEditorInput finput = new FileEditorInput(file); |
| 1760 |
} |
1754 |
|
| 1761 |
|
1755 |
// check for files already open |
| 1762 |
|
1756 |
|
| 1763 |
SystemIFileProperties properties = new SystemIFileProperties(file); |
1757 |
// DKM - when _editorId is not lpex, this causes problem |
| 1764 |
properties.setRemoteFileObject(this); |
1758 |
// DY - changed editor from SystemTextEditor to IEditorPart |
| 1765 |
if (properties.getDirty()){ |
1759 |
//editor = (SystemTextEditor)activePage.openEditor(file, _editorId); |
| 1766 |
updateDirtyIndicator(); |
1760 |
if (_editorDescriptor != null && _editorDescriptor.isOpenExternal()){ |
|
|
1761 |
editor = ((WorkbenchPage)activePage).openEditorFromDescriptor(new FileEditorInput(file), _editorDescriptor, true, null); |
| 1762 |
} |
| 1763 |
else { |
| 1764 |
editor = activePage.openEditor(finput, _editorDescriptor.getId()); |
| 1765 |
} |
| 1766 |
|
| 1767 |
|
| 1768 |
SystemIFileProperties properties = new SystemIFileProperties(file); |
| 1769 |
properties.setRemoteFileObject(this); |
| 1770 |
if (properties.getDirty()){ |
| 1771 |
updateDirtyIndicator(); |
| 1772 |
} |
| 1767 |
} |
1773 |
} |
| 1768 |
} |
1774 |
} |
| 1769 |
|
1775 |
|
