import jalview.datamodel.SequenceI;
import jalview.util.DBRefUtils;
import jalview.util.MapList;
-import jalview.ws.SequenceFetcherFactory;
-import jalview.ws.seqfetcher.ASequenceFetcher;
+import jalview.ws.SequenceFetcher;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import intervalstore.api.IntervalI;
+
/**
* Functions for cross-referencing sequence databases.
*
private void retrieveCrossRef(List<DBRefEntry> sourceRefs, SequenceI seq,
List<DBRefEntry> xrfs, boolean fromDna, AlignedCodonFrame cf)
{
- ASequenceFetcher sftch = SequenceFetcherFactory.getSequenceFetcher();
SequenceI[] retrieved = null;
SequenceI dss = seq.getDatasetSequence() == null ? seq
: seq.getDatasetSequence();
}
try
{
- retrieved = sftch.getSequences(sourceRefs, !fromDna);
+ retrieved = SequenceFetcher.getInstance()
+ .getSequences(sourceRefs, !fromDna);
} catch (Exception e)
{
System.err.println(
private void removeAlreadyRetrievedSeqs(List<DBRefEntry> sourceRefs,
boolean fromDna)
{
- List<DBRefEntry> dbrSourceSet = new ArrayList<DBRefEntry>(sourceRefs);
+ List<DBRefEntry> dbrSourceSet = new ArrayList<>(sourceRefs);
List<SequenceI> dsSeqs = dataset.getSequences();
for (int ids = 0, nds = dsSeqs.size(); ids < nds; ids++)
{
*/
SequenceFeature newFeature = new SequenceFeature(feat)
{
+ // BH 2019.08.15 We must override equalsInterval, not
+ // equals, because that is part of the IntervalI interface,
+ // and IntervalStore may need that for proper, faster
+ // processing.
+ // @Override
+ // public boolean equals(Object o)
+ // {
+ // return super.equals(o, true);
+ // }
+ //
@Override
- public boolean equals(Object o)
+ public boolean equalsInterval(IntervalI sf)
{
- return super.equals(o, true);
+ return equals((SequenceFeature) sf, true);
}
};
+
matched.addSequenceFeature(newFeature);
}
}