1 files changed, 2 insertions, 13 deletions

diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/annotatedsource/OpenSourceFileAction.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/annotatedsource/OpenSourceFileAction.java
index 7ed9590e1f..8597604563 100644
--- a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/annotatedsource/OpenSourceFileAction.java
+++ b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/view/annotatedsource/OpenSourceFileAction.java
@@ -25,7 +25,6 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.linuxtools.binutils.link2source.STLink2SourceSupport;
-import org.eclipse.linuxtools.dataviewers.annotatedsourceeditor.STAnnotatedSourceEditorActivator;
 import org.eclipse.linuxtools.internal.gcov.Activator;
 import org.eclipse.linuxtools.internal.gcov.parser.SourceFile;
 import org.eclipse.ui.IEditorInput;
@@ -33,6 +32,7 @@ import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IURIEditorInput;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.ide.IDE;
 import org.eclipse.ui.texteditor.IDocumentProvider;
 import org.eclipse.ui.texteditor.ITextEditor;
 
@@ -62,16 +62,6 @@ public class OpenSourceFileAction {
         return null;
     }
 
-    private GcovSourceEditorInput getInput(SourceFile sourceFile, IFileStore fs) {
-        GcovSourceEditorInput input = new GcovSourceEditorInput(fs, sourceFile);
-        IWorkbenchPage p = CUIPlugin.getActivePage();
-        IEditorPart editorPart = p.findEditor(input);
-        if (editorPart != null) {
-            p.closeEditor(editorPart, false);
-        }
-        return input;
-    }
-
     public void openAnnotatedSourceFile(IProject project, IFile binary, SourceFile sourceFile, int lineNumber) {
         if (sourceFile == null) {
             return;
@@ -103,9 +93,8 @@ public class OpenSourceFileAction {
                     Activator.getDefault().getLog().log(s);
                 }
             } else {
-                IEditorInput input = getInput(sourceFile, fs);
                 try {
-                    IEditorPart editor = page.openEditor(input, STAnnotatedSourceEditorActivator.EDITOR_ID, true);
+                    IEditorPart editor = IDE.openEditorOnFileStore(page, fs);
                     if (lineNumber > 0 && editor instanceof ITextEditor) {
                         IDocumentProvider provider = ((ITextEditor) editor).getDocumentProvider();
                         IDocument document = provider.getDocument(editor.getEditorInput());