Merge branch 'master' into lttng-kepler

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

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfExperimentFolder.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfExperimentFolder.java
index 52a83b54ff1869450131d9797c62e64a92b486d9..a5fb5098e60fa1371eb4e0eae93cb01605dfc01b 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfExperimentFolder.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfExperimentFolder.java
@@ -102,11 +102,11 @@ public class TmfExperimentFolder extends TmfProjectModelElement implements IProp
     }
 
     // ------------------------------------------------------------------------
-    // IPropertySource2\r    // ------------------------------------------------------------------------\r
+    // IPropertySource2\r    // ------------------------------------------------------------------------
     /*
      * (non-Javadoc)
      * @see org.eclipse.ui.views.properties.IPropertySource#getEditableValue()
-     */\r    @Override\r    public Object getEditableValue() {\r        return null;\r    }\r
+     */\r    @Override\r    public Object getEditableValue() {\r        return null;\r    }
     /*
      * (non-Javadoc)
      * @see org.eclipse.ui.views.properties.IPropertySource#getPropertyDescriptors()
@@ -117,15 +117,15 @@ public class TmfExperimentFolder extends TmfProjectModelElement implements IProp
      */\r    @Override\r    public Object getPropertyValue(Object id) {\r\r        if (sfName.equals(id))\r            return getName();\r\r        if (sfPath.equals(id))\r            return getPath().toString();\r\r        if (sfLocation.equals(id))\r            return getLocation().toString();\r\r        return null;\r    }\r    /*
      * (non-Javadoc)
      * @see org.eclipse.ui.views.properties.IPropertySource#resetPropertyValue(java.lang.Object)
-     */\r    @Override\r    public void resetPropertyValue(Object id) {\r    }\r
+     */\r    @Override\r    public void resetPropertyValue(Object id) {\r    }
     /*
      * (non-Javadoc)
      * @see org.eclipse.ui.views.properties.IPropertySource#setPropertyValue(java.lang.Object, java.lang.Object)
-     */\r    @Override\r    public void setPropertyValue(Object id, Object value) {\r    }\r
+     */\r    @Override\r    public void setPropertyValue(Object id, Object value) {\r    }
     /*
      * (non-Javadoc)
      * @see org.eclipse.ui.views.properties.IPropertySource2#isPropertyResettable(java.lang.Object)
-     */\r    @Override\r    public boolean isPropertyResettable(Object id) {\r        return false;\r    }\r
+     */\r    @Override\r    public boolean isPropertyResettable(Object id) {\r        return false;\r    }
     /*
      * (non-Javadoc)
      * @see org.eclipse.ui.views.properties.IPropertySource2#isPropertySet(java.lang.Object)