tmf: Bug 516848: Open As Experiment doesn't set experiment type

The experiment type was only set if the experiment already existed (and
the experiment type had changed). It should always be set if it is a
newly created experiment.

Change-Id: I994df5ba6b1329ab41bdf70f08deb57a8dc289e9
Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-on: https://git.eclipse.org/r/97384
Reviewed-by: Hudson CI
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/handlers/OpenAsExperimentHandler.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/handlers/OpenAsExperimentHandler.java
index 26db4ebbf98241c0f6c65ef6915a3b70536dd09b..ede22192576c650e489e3026cac45db33d928d7a 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/handlers/OpenAsExperimentHandler.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/handlers/OpenAsExperimentHandler.java
@@ -139,12 +139,16 @@ public class OpenAsExperimentHandler extends AbstractHandler {
             return null;
         }
 
-        if (exists && !experimentElement.getTraceType().equals(traceTypeHelper.getTraceTypeId())) {
-            experimentElement.closeEditors();
+        if (!exists || !experimentElement.getTraceType().equals(traceTypeHelper.getTraceTypeId())) {
+            if (exists) {
+                experimentElement.closeEditors();
+            }
             TmfWorkspaceModifyOperation operation = new TmfWorkspaceModifyOperation() {
                 @Override
                 public void execute(IProgressMonitor monitor) throws CoreException {
-                    experimentElement.deleteSupplementaryResources();
+                    if (exists) {
+                        experimentElement.deleteSupplementaryResources();
+                    }
                     TmfTraceTypeUIUtils.setTraceType(experimentFolder, traceTypeHelper, false);
                 }
             };