tmf: bug 496031 Get the synchronization formula from the original trace

The synchronize traces handler should get the formula from the original
trace's host ID, not the new one, since the host ID falls back to the trace
name and the new name is different than the original one.

Change-Id: Id4af62b64df4f0b6d042a19e12c04b7e3c060176
Signed-off-by: Geneviève Bastien <gbastien+lttng@versatic.net>
Reviewed-on: https://git.eclipse.org/r/75179
Reviewed-by: Hudson CI
Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Tested-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/handlers/SynchronizeTracesHandler.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/handlers/SynchronizeTracesHandler.java
index 6cd37a42bc94eee6b05a3c649de54f1ba1da22fc..125ba1d8abc8f6c3fa33827364a67ae585fee09c 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/handlers/SynchronizeTracesHandler.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/handlers/SynchronizeTracesHandler.java
@@ -225,7 +225,7 @@ public class SynchronizeTracesHandler extends AbstractHandler {
                                     Activator.getDefault().logError(String.format(Messages.SynchronizeTracesHandler_ErrorSynchingForTrace, exp.getName(), traceel.getName()), e);
                                     TraceUtils.displayErrorMsg(Messages.SynchronizeTracesHandler_Title, Messages.SynchronizeTracesHandler_Error + CR + CR + e.getMessage());
                                 }
-                                trace.setTimestampTransform(syncAlgo.getTimestampTransform(trace));
+                                trace.setTimestampTransform(syncAlgo.getTimestampTransform(expTrace));
                                 TmfTraceManager.refreshSupplementaryFiles(trace);
                                 trace.dispose();