tmf: Update copyright headers in tmf.ui

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.ui / src / org / eclipse / linuxtools / internal / tmf / ui / project / model / TmfEditorLinkHelper.java

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/model/TmfEditorLinkHelper.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/model/TmfEditorLinkHelper.java
index b7c33306136a22d03b4a8d2ec5d173298688dcec..8628a8f3d73f3aff645e2f74ab7ba8056f3c2d0a 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/model/TmfEditorLinkHelper.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/model/TmfEditorLinkHelper.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012 Ericsson
+ * Copyright (c) 2012, 2013 Ericsson
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v1.0 which
@@ -12,8 +12,6 @@
 package org.eclipse.linuxtools.internal.tmf.ui.project.model;
 
 import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -110,17 +108,10 @@ public class TmfEditorLinkHelper implements ILinkHelper {
 
             // If trace is under an experiment, use the original trace from the traces folder
             traceElement = traceElement.getElementUnderTraceFolder();
-
-            // Get the editor resource
-            final IResource resource = traceElement.getResource();
-            if (resource instanceof IFile) {
-                file = (IFile) resource;
-            } else if (resource instanceof IFolder) {
-                file = ((IFolder) resource).getFile(traceElement.getName() + '_');
-            }
+            file = traceElement.getBookmarksFile();
         } else if ((aSelection.getFirstElement() instanceof TmfExperimentElement)) {
             TmfExperimentElement experimentElement = (TmfExperimentElement) aSelection.getFirstElement();
-            file = experimentElement.getResource().getFile(experimentElement.getName() + '_');
+            file = experimentElement.getBookmarksFile();
         }
 
         if (file != null) {
@@ -128,7 +119,6 @@ public class TmfEditorLinkHelper implements ILinkHelper {
             IEditorPart localEditor = aPage.findEditor(tmpInput);
             if (localEditor != null) {
                 // Editor found.
-                aPage.activate(localEditor);
                 aPage.bringToTop(localEditor);
             } else {
                 // Search in references for corresponding editor