tmf: bug 517583 fix the experiment sync file path

Commit 4b40a764980500b35c92f5a5da561905bbfcfcce removed the @Deprecated
public field containing the file name, but it just should have been made
private instead of removed.

Change-Id: Ie5fe921f98c56427ec3667184992d16f5bd169bd
Signed-off-by: Geneviève Bastien <gbastien+lttng@versatic.net>
Reviewed-on: https://git.eclipse.org/r/98366
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.core/src/org/eclipse/tracecompass/tmf/core/trace/experiment/TmfExperiment.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/experiment/TmfExperiment.java
index 0f92bd13c748d0fb8206bcf396db0c6b1dcebad2..2e1d30dded3c35c40941c9bb6117a5999ff35651 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/experiment/TmfExperiment.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/experiment/TmfExperiment.java
@@ -85,6 +85,11 @@ public class TmfExperiment extends TmfTrace implements ITmfPersistentlyIndexable
     // Constants
     // ------------------------------------------------------------------------
 
+    /**
+     * The file name of the Synchronization
+     */
+    private static final String SYNCHRONIZATION_FILE_NAME = "synchronization.bin"; //$NON-NLS-1$
+
     /**
      * The name of the directory containing trace synchronization data. This
      * directory typically will be preserved when traces are synchronized.
@@ -614,7 +619,7 @@ public class TmfExperiment extends TmfTrace implements ITmfPersistentlyIndexable
         try {
             String syncDirectory = getSynchronizationFolder(true);
 
-            final File syncFile = (syncDirectory != null) ? new File(syncDirectory + File.separator + getSynchronizationFolder(true)) : null;
+            final File syncFile = (syncDirectory != null) ? new File(syncDirectory + File.separator + SYNCHRONIZATION_FILE_NAME) : null;
 
             final SynchronizationAlgorithm syncAlgo = SynchronizationManager.synchronizeTraces(syncFile, Collections.singleton(this), doSync);