JAL-3397 final update

[jalview.git] / src / jalview / datamodel / features / SequenceFeatures.java

diff --git a/src/jalview/datamodel/features/SequenceFeatures.java b/src/jalview/datamodel/features/SequenceFeatures.java
index cb2b8cc..6c83013 100644 (file)
--- a/src/jalview/datamodel/features/SequenceFeatures.java
+++ b/src/jalview/datamodel/features/SequenceFeatures.java
@@ -54,32 +54,6 @@ public class SequenceFeatures implements SequenceFeaturesI
   private Map<String, FeatureStoreI> featureStore;
 
   /**
-   * original NCList-based IntervalStore
-   */
-  private final static int INTERVAL_STORE_NCLIST = 0;
-
-  /**
-   * linked-list deferred-sort IntervalStore - experimental only; unused
-   */
-  private final static int INTERVAL_STORE_LINKED_LIST_NO_PRESORT = 1;
-
-  /**
-   * linked-list IntervalStore option for JavaScript
-   */
-  private final static int INTERVAL_STORE_LINKED_LIST = -1;
-
-  /**
-   * mode for Java or JavaScript; can be set differently for testing, but
-   * default is LINKED_LIST for JalviewJS and NCLIST for Java
-   */
-  private final int INTERVAL_STORE_MODE = (
-  // true || //
-  Platform.isJS() ? //
-          INTERVAL_STORE_LINKED_LIST //
-          : INTERVAL_STORE_NCLIST//
-  );
-
-  /**
    * Constructor
    */
   public SequenceFeatures()
@@ -130,16 +104,10 @@ public class SequenceFeatures implements SequenceFeaturesI
 
   private FeatureStoreI newFeatureStore()
   {
-    switch (INTERVAL_STORE_MODE)
-    {
-    default:
-    case INTERVAL_STORE_NCLIST:
-      return new FeatureStoreImpl(true);
-    case INTERVAL_STORE_LINKED_LIST_NO_PRESORT:
-      return new FeatureStoreImpl(false);
-    case INTERVAL_STORE_LINKED_LIST:
-      return new FeatureStoreJS();
-    }
+    return (//
+    Platform.isJS()//
+            ? new FeatureStoreJS()
+            : new FeatureStoreImpl());
   }
 
   /**