Committing fix for bug 20799 to branch pending approval
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OpenRemoteFileAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OpenRemoteFileAction.java index 87ce63c..915e523 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OpenRemoteFileAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OpenRemoteFileAction.java
@@ -95,7 +95,15 @@ id = descriptor.getId(); } try { - page.openEditor(new RemoteFileEditorInput(files[i]), id); + try { + page.openEditor(new RemoteFileEditorInput(files[i]), id); + } catch (PartInitException e) { + if (id.equals("org.eclipse.ui.DefaultTextEditor")) { //$NON-NLS-1$ + throw e; + } else { + page.openEditor(new RemoteFileEditorInput(files[i]), "org.eclipse.ui.DefaultTextEditor"); //$NON-NLS-1$ + } + } } catch (PartInitException e) { throw new InvocationTargetException(e); }