mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-09 10:05:24 +02:00
Code Issues Wiki Activity

Bug 161200: Open with Default Editor fails for files listed under local files. Will open with In-Place Editor for files such as *.doc, *.ppt, etc.

Browse source
This commit is contained in:
Kushal Munir 2006-10-24 22:41:57 +00:00
parent 064d2fd62a
commit 199f6de12e
1 changed files with 33 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemRemoteFileOpenWithMenu.java
View file

@ -26,7 +26,6 @@ import org.eclipse.core.resources.IFile;
import org.eclipse.jface.action.ContributionItem; import org.eclipse.jface.action.ContributionItem;
import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.files.ui.FileResources; import org.eclipse.rse.files.ui.FileResources;
import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile; import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile;
import org.eclipse.rse.files.ui.resources.SystemIFileProperties; import org.eclipse.rse.files.ui.resources.SystemIFileProperties;
@ -45,6 +44,7 @@ import org.eclipse.swt.widgets.MenuItem;
import org.eclipse.ui.IEditorDescriptor; import org.eclipse.ui.IEditorDescriptor;
import org.eclipse.ui.IEditorRegistry; import org.eclipse.ui.IEditorRegistry;
import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI; import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.ide.IDE; import org.eclipse.ui.ide.IDE;
@ -177,10 +177,10 @@ protected void createMenuItem(Menu menu, final IEditorDescriptor descriptor, fin
} }
protected void openEditor(IRemoteFile remoteFile, IEditorDescriptor descriptor) protected void openEditor(IRemoteFile remoteFile, IEditorDescriptor descriptor) {
{
SystemEditableRemoteFile editable = null; SystemEditableRemoteFile editable = null;
if (descriptor == null) if (descriptor == null)
{ {
editable = new SystemEditableRemoteFile(remoteFile); editable = new SystemEditableRemoteFile(remoteFile);
@ -189,40 +189,25 @@ protected void openEditor(IRemoteFile remoteFile, IEditorDescriptor descriptor)
{ {
editable = new SystemEditableRemoteFile(remoteFile, descriptor.getId()); editable = new SystemEditableRemoteFile(remoteFile, descriptor.getId());
} }
boolean systemEditor = descriptor != null && descriptor.getId().equals(IEditorRegistry.SYSTEM_EXTERNAL_EDITOR_ID); boolean systemEditor = descriptor != null && descriptor.getId().equals(IEditorRegistry.SYSTEM_EXTERNAL_EDITOR_ID);
if (isFileCached(editable, remoteFile)) {
if (isFileCached(editable, remoteFile)) try {
{ if (systemEditor) {
try
{
if (systemEditor)
{
editable.openSystemEditor(); editable.openSystemEditor();
} }
else else {
{
editable.openEditor(); editable.openEditor();
} }
} }
catch (Exception e) catch (Exception e) {}
{
} }
} else {
else
{
DownloadJob oJob = new DownloadJob(editable, systemEditor); DownloadJob oJob = new DownloadJob(editable, systemEditor);
oJob.schedule(); oJob.schedule();
} }
/*
else
{
editableFile.open(SystemBasePlugin.getActiveWorkbenchShell());
}
*/
} }
private boolean isFileCached(ISystemEditableRemoteObject editable, IRemoteFile remoteFile) private boolean isFileCached(ISystemEditableRemoteObject editable, IRemoteFile remoteFile)
@ -299,7 +284,7 @@ protected IEditorDescriptor getDefaultEditor(IRemoteFile remoteFile)
{ {
IFile localFile = getLocalResource(remoteFile); IFile localFile = getLocalResource(remoteFile);
if (localFile == null) { if (localFile == null || !localFile.exists()) {
return registry.getDefaultEditor(remoteFile.getName()); return registry.getDefaultEditor(remoteFile.getName());
} }
else else
@ -427,9 +412,15 @@ protected void createDefaultMenuItem(Menu menu, final IRemoteFile file)
{ {
setDefaultEditor(file, null); setDefaultEditor(file, null);
IEditorDescriptor defaultEditor = getDefaultEditor(file); IEditorDescriptor defaultEditor = null;
openEditor(file, defaultEditor);
try {
defaultEditor = getEditorDescriptor(file);
openEditor(file, defaultEditor);
}
catch (PartInitException e) {
RSEUIPlugin.logError("Error getting default editor descriptor", e);
}
} }
break; break;
} }
@ -439,4 +430,8 @@ protected void createDefaultMenuItem(Menu menu, final IRemoteFile file)
menuItem.addListener(SWT.Selection, listener); menuItem.addListener(SWT.Selection, listener);
} }
protected IEditorDescriptor getEditorDescriptor(IRemoteFile file) throws PartInitException {
return IDE.getEditorDescriptor(file.getName(), true);
}
} }