Revert to old editor opening behaviour

1 files changed, 12 insertions, 5 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 4afee2a67..b26421640 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
@@ -22,9 +22,6 @@ import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
 import org.eclipse.team.internal.ccvs.ui.Policy;
 import org.eclipse.team.internal.ccvs.ui.RemoteFileEditorInput;
 import org.eclipse.team.ui.actions.TeamAction;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
 
@@ -70,7 +67,17 @@ public class OpenRemoteFileAction extends TeamAction {
 	public void run(IAction action) {
 		run(new IRunnableWithProgress() {
 			public void run(IProgressMonitor monitor) throws InvocationTargetException {
-				IWorkbench workbench = CVSUIPlugin.getPlugin().getWorkbench();
+				IWorkbenchPage page = CVSUIPlugin.getPlugin().getWorkbench().getActiveWorkbenchWindow().getActivePage();
+				ICVSRemoteFile[] files = getSelectedRemoteFiles();
+				for (int i = 0; i < files.length; i++) {
+					try {
+						page.openEditor(new RemoteFileEditorInput(files[i]), "org.eclipse.ui.DefaultTextEditor");
+					} catch (PartInitException e) {
+						throw new InvocationTargetException(e);
+					}
+				}
+
+/*				IWorkbench workbench = CVSUIPlugin.getPlugin().getWorkbench();
 				IEditorRegistry registry = workbench.getEditorRegistry();
 				IWorkbenchPage page = workbench.getActiveWorkbenchWindow().getActivePage();
 				ICVSRemoteFile[] files = getSelectedRemoteFiles();
@@ -89,7 +96,7 @@ public class OpenRemoteFileAction extends TeamAction {
 					} catch (PartInitException e) {
 						throw new InvocationTargetException(e);
 					}
-				}
+				}*/
 			}
 		}, Policy.bind("OpenRemoteFileAction.open"), this.PROGRESS_BUSYCURSOR);
 	}