Committing fix for bug 20799 to branch pending approvalbug20799

1 files changed, 9 insertions, 1 deletions

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 87ce63ce1..915e523eb 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 @@ public class OpenRemoteFileAction extends TeamAction {
 						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);
 					}