X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FCrossRef.java;h=61add1e3c77cb778cd044546e6a60846ee31d7fb;hb=6200addf078b7f7ace90597dc056dafc7fc602c1;hp=ecdd11efd3e38596f3c853302ff72b054ca24e38;hpb=4b1c969e87feaefd4fb9c49ba3d6b828b3ce1a9c;p=jalview.git diff --git a/src/jalview/analysis/CrossRef.java b/src/jalview/analysis/CrossRef.java index ecdd11e..61add1e 100644 --- a/src/jalview/analysis/CrossRef.java +++ b/src/jalview/analysis/CrossRef.java @@ -32,6 +32,7 @@ import jalview.datamodel.SequenceI; import jalview.util.DBRefUtils; import jalview.util.MapList; import jalview.ws.SequenceFetcher; +import jalview.ws.seqfetcher.ASequenceFetcher; import java.util.ArrayList; import java.util.Iterator; @@ -401,6 +402,7 @@ public class CrossRef private void retrieveCrossRef(List sourceRefs, SequenceI seq, List xrfs, boolean fromDna, AlignedCodonFrame cf) { + ASequenceFetcher sftch = SequenceFetcher.getInstance();// Factory.getSequenceFetcher(); SequenceI[] retrieved = null; SequenceI dss = seq.getDatasetSequence() == null ? seq : seq.getDatasetSequence(); @@ -416,8 +418,7 @@ public class CrossRef } try { - retrieved = SequenceFetcher.getInstance() - .getSequences(sourceRefs, !fromDna); + retrieved = sftch.getSequences(sourceRefs, !fromDna); } catch (Exception e) { System.err.println( @@ -640,7 +641,7 @@ public class CrossRef @Override public boolean equals(Object o) { - return equals((SequenceFeature) o, true); + return super.equals(o, true); } }; matched.addSequenceFeature(newFeature); @@ -928,7 +929,7 @@ public class CrossRef if (fromDna) { - AlignmentUtils.computeProteinFeatures(mapFrom, mapTo, mapping); + // AlignmentUtils.computeProteinFeatures(mapFrom, mapTo, mapping); mappings.addMap(mapFrom, mapTo, mapping); } else