tmf: Remove deprecated HistoryTree constructor

Change-Id: I7826994d2071c14fd183d778df65c9f6e5879ef2
Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-on: https://git.eclipse.org/r/10637
Tested-by: Hudson CI
Reviewed-by: Bernd Hufmann <bhufmann@gmail.com>
IP-Clean: Bernd Hufmann <bhufmann@gmail.com>

diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/backends/historytree/HistoryTree.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/backends/historytree/HistoryTree.java
index 4deb8a734c9a7566ee514e5710c027f1ea5db42a..39f516d15404b131318e74db76881a11618559d6 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/backends/historytree/HistoryTree.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/backends/historytree/HistoryTree.java
@@ -73,7 +73,7 @@ class HistoryTree {
      * Create a new State History from scratch, using a SHTConfig object for
      * configuration
      */
-    private HistoryTree(HTConfig conf) throws IOException {
+    HistoryTree(HTConfig conf) throws IOException {
         /*
          * Simple check to make sure we have enough place in the 0th block
          * for the tree configuration
@@ -95,18 +95,6 @@ class HistoryTree {
         latestBranch.add(firstNode);
     }
 
-    /**
-     * "New State History" constructor, which doesn't use HTConfig but the
-     * individual values separately. Kept for now for backwards compatibility,
-     * but you should definitely consider using SHTConfig instead (since its
-     * contents can then change without directly affecting SHT's API).
-     */
-    @Deprecated
-    HistoryTree(File newStateFile, int blockSize, int maxChildren,
-            long startTime) throws IOException {
-        this(new HTConfig(newStateFile, blockSize, maxChildren, startTime));
-    }
-
     /**
      * "Reader" constructor : instantiate a SHTree from an existing tree file on
      * disk

diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/backends/historytree/HistoryTreeBackend.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/backends/historytree/HistoryTreeBackend.java
index ef13e62d3b94947bf936a9465d5fc531db193c43..c3e6b9d1f2773c56c78d5777294f863bd8f8b0ff 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/backends/historytree/HistoryTreeBackend.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/backends/historytree/HistoryTreeBackend.java
@@ -45,7 +45,7 @@ public class HistoryTreeBackend implements IStateHistoryBackend {
     protected boolean isFinishedBuilding = false;
 
     /**
-     * Construtor for new history files. Use this when creating a new history
+     * Constructor for new history files. Use this when creating a new history
      * from scratch.
      *
      * @param newStateFile
@@ -63,12 +63,13 @@ public class HistoryTreeBackend implements IStateHistoryBackend {
      */
     public HistoryTreeBackend(File newStateFile, int blockSize,
             int maxChildren, long startTime) throws IOException {
-        sht = new HistoryTree(newStateFile, blockSize, maxChildren, startTime);
+        final HTConfig conf = new HTConfig(newStateFile, blockSize, maxChildren, startTime);
+        sht = new HistoryTree(conf);
         treeIO = sht.getTreeIO();
     }
 
     /**
-     * Construtor for new history files. Use this when creating a new history
+     * Constructor for new history files. Use this when creating a new history
      * from scratch. This version supplies sane defaults for the configuration
      * parameters.
      *