*/
package jalview.datamodel.features;
-import jalview.datamodel.SequenceFeature;
-import jalview.io.gff.SequenceOntologyFactory;
-import jalview.io.gff.SequenceOntologyI;
-
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
-import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import intervalstore.api.IntervalI;
+import jalview.datamodel.SequenceFeature;
+import jalview.io.gff.SequenceOntologyFactory;
+import jalview.io.gff.SequenceOntologyI;
/**
* A class that stores sequence features in a way that supports efficient
*/
public class SequenceFeatures implements SequenceFeaturesI
{
- /**
- * a comparator for sorting features by start position ascending
- */
- private static Comparator<IntervalI> FORWARD_STRAND = new Comparator<IntervalI>()
- {
- @Override
- public int compare(IntervalI o1, IntervalI o2)
- {
- return Integer.compare(o1.getBegin(), o2.getBegin());
- }
- };
-
- /**
- * a comparator for sorting features by end position descending
- */
- private static Comparator<IntervalI> REVERSE_STRAND = new Comparator<IntervalI>()
- {
- @Override
- public int compare(IntervalI o1, IntervalI o2)
- {
- return Integer.compare(o2.getEnd(), o1.getEnd());
- }
- };
-
/*
* map from feature type to structured store of features for that type
* null types are permitted (but not a good idea!)
/**
* A convenience method that converts a vararg for feature types to an
- * Iterable over matched feature sets in key order
+ * Iterable over matched feature sets. If no types are specified, all feature
+ * sets are returned. If one or more types are specified, feature sets for
+ * those types are returned, preserving the order of the types.
*
* @param type
* @return
}
List<FeatureStore> types = new ArrayList<>();
- List<String> args = Arrays.asList(type);
- for (Entry<String, FeatureStore> featureType : featureStore.entrySet())
+ for (String theType : type)
{
- if (args.contains(featureType.getKey()))
+ if (theType != null && featureStore.containsKey(theType))
{
- types.add(featureType.getValue());
+ types.add(featureStore.get(theType));
}
}
return types;
* @param features
* @param forwardStrand
*/
- public static void sortFeatures(List<SequenceFeature> features,
+ public static void sortFeatures(List<? extends IntervalI> features,
final boolean forwardStrand)
{
- Collections.sort(features, forwardStrand ? FORWARD_STRAND
- : REVERSE_STRAND);
+ Collections.sort(features,
+ forwardStrand
+ ? IntervalI.COMPARE_BEGIN_ASC_END_DESC
+ : IntervalI.COMPARE_END_DESC);
}
/**
* {@inheritDoc}
*/
@Override
- public boolean shiftFeatures(int shift)
+ public boolean shiftFeatures(int fromPosition, int shiftBy)
{
boolean modified = false;
for (FeatureStore fs : featureStore.values())
{
- modified |= fs.shiftFeatures(shift);
+ modified |= fs.shiftFeatures(fromPosition, shiftBy);
}
return modified;
}
-}
\ No newline at end of file
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void deleteAll()
+ {
+ featureStore.clear();
+ }
+}