From 3bc97fb559bcd28299532021c5b62b0ca62d4d3b Mon Sep 17 00:00:00 2001 From: hansonr Date: Sun, 22 Sep 2019 12:00:35 -0400 Subject: [PATCH] JAL-3253-applet JAL-3397 --- src/intervalstore/nonc/IntervalStore0Impl.java | 2 +- src/intervalstore/nonc/IntervalStoreImpl.java | 2 +- src/jalview/datamodel/features/FeatureStore.java | 13 +++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/intervalstore/nonc/IntervalStore0Impl.java b/src/intervalstore/nonc/IntervalStore0Impl.java index 8921dd6..dd925c6 100644 --- a/src/intervalstore/nonc/IntervalStore0Impl.java +++ b/src/intervalstore/nonc/IntervalStore0Impl.java @@ -40,7 +40,7 @@ import intervalstore.api.IntervalI; * SequenceFeature.equalsInterval only checks ranges */ @SuppressWarnings("rawtypes") -public class IntervalStore0Impl extends IntervalStore0 +public class IntervalStore0Impl extends IntervalStore0 { diff --git a/src/intervalstore/nonc/IntervalStoreImpl.java b/src/intervalstore/nonc/IntervalStoreImpl.java index 337b774..7cc5f1b 100644 --- a/src/intervalstore/nonc/IntervalStoreImpl.java +++ b/src/intervalstore/nonc/IntervalStoreImpl.java @@ -40,7 +40,7 @@ import intervalstore.api.IntervalI; * SequenceFeature.equalsInterval only checks ranges */ @SuppressWarnings("rawtypes") -public class IntervalStoreImpl extends IntervalStore +public class IntervalStoreImpl extends IntervalStore { public IntervalStoreImpl() diff --git a/src/jalview/datamodel/features/FeatureStore.java b/src/jalview/datamodel/features/FeatureStore.java index 615b340..5c0336a 100644 --- a/src/jalview/datamodel/features/FeatureStore.java +++ b/src/jalview/datamodel/features/FeatureStore.java @@ -110,9 +110,13 @@ public class FeatureStore static final int intervalStoreJavaOption = INTERVAL_STORE_NCLIST_OBJECT; - private final static boolean isJSLinkedTest = false; + private final static boolean useJSOption = false; - static final int intervalStoreJSOption = (isJSLinkedTest + private final static boolean isJSLinkedTest = true; + + static final int intervalStoreJSOption = (!useJSOption + ? intervalStoreJavaOption + : isJSLinkedTest ? INTERVAL_STORE_LINKED_LIST : INTERVAL_STORE_NCARRAY); @@ -257,9 +261,10 @@ public class FeatureStore case INTERVAL_STORE_NCLIST_OBJECT: return new intervalstore.impl.IntervalStore<>(); case INTERVAL_STORE_NCARRAY: - return new intervalstore.nonc.IntervalStoreImpl(); + // TODO: Couldn't figure out how to get rid of this warning + return new intervalstore.nonc.IntervalStoreImpl<>(); case INTERVAL_STORE_LINKED_LIST: - return new intervalstore.nonc.IntervalStore0Impl(); + return new intervalstore.nonc.IntervalStore0Impl<>(); } } -- 1.7.10.2