tmf: Support folders in tracing projects

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

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfNavigatorContentProvider.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfNavigatorContentProvider.java
index 057459f8716d813f23a636d8626c36167df46efa..30e128ebdc3282b45f3bfd85f7bafb7e0ab8316c 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfNavigatorContentProvider.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfNavigatorContentProvider.java
@@ -9,6 +9,7 @@
  * Contributors:
  *   Francois Chouinard - Initial API and implementation
  *   Bernd Hufmann - Implement getParent()
+ *   Patrick Tasse - Add support for folder elements
  *******************************************************************************/
 
 package org.eclipse.linuxtools.tmf.ui.project.model;
@@ -48,18 +49,13 @@ public class TmfNavigatorContentProvider implements IPipelinedTreeContentProvide
             return project.getParent();
         }
 
-        if (element instanceof TmfTraceFolder) {
-            TmfTraceFolder folder = (TmfTraceFolder) element;
+        if (element instanceof TmfTracesFolder) {
+            TmfTracesFolder folder = (TmfTracesFolder) element;
             // Return the corresponding IProject as parent because from CNF point of view the IProject is the parent.
             // The IProject is needed e.g. for link with Editor to work correctly.
             return folder.getParent().getResource();
         }
 
-        if (element instanceof TmfTraceElement) {
-            TmfTraceElement traceElement = (TmfTraceElement) element;
-            return traceElement.getParent();
-        }
-
         if (element instanceof TmfExperimentFolder) {
             TmfExperimentFolder folder = (TmfExperimentFolder) element;
             // Return the corresponding IProject as parent because from CNF point of view the IProject is the parent.
@@ -67,10 +63,11 @@ public class TmfNavigatorContentProvider implements IPipelinedTreeContentProvide
             return folder.getParent().getResource();
         }
 
-        if (element instanceof TmfExperimentElement) {
-            TmfExperimentElement expElement = (TmfExperimentElement) element;
-            return expElement.getParent();
+        if (element instanceof ITmfProjectModelElement) {
+            ITmfProjectModelElement modelElement = (ITmfProjectModelElement) element;
+            return modelElement.getParent();
         }
+
         return null;
     }
 
@@ -80,8 +77,8 @@ public class TmfNavigatorContentProvider implements IPipelinedTreeContentProvide
             IProject project = (IProject) element;
             return project.isAccessible();
         }
-        if (element instanceof TmfProjectModelElement) {
-            TmfProjectModelElement modelElement = (TmfProjectModelElement) element;
+        if (element instanceof ITmfProjectModelElement) {
+            ITmfProjectModelElement modelElement = (ITmfProjectModelElement) element;
             return modelElement.hasChildren();
         }
         return false;