X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FCrossRef.java;fp=src%2Fjalview%2Fanalysis%2FCrossRef.java;h=ed87f0536d7704d544364c83cce6a76c340f5ef2;hb=453687279dd54095ec2a92b69cb2210a3ff0d586;hp=1ab8a2422ddf67ef3aa32c4fbe2c53d4b0c77ec3;hpb=3bc97fb559bcd28299532021c5b62b0ca62d4d3b;p=jalview.git diff --git a/src/jalview/analysis/CrossRef.java b/src/jalview/analysis/CrossRef.java index 1ab8a24..ed87f05 100644 --- a/src/jalview/analysis/CrossRef.java +++ b/src/jalview/analysis/CrossRef.java @@ -37,8 +37,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import intervalstore.api.IntervalI; - /** * Functions for cross-referencing sequence databases. * @@ -643,20 +641,20 @@ public class CrossRef // 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); - // } - // + // But SequenceFeature changes were reverted... @Override - public boolean equalsInterval(IntervalI sf) + public boolean equals(Object o) { - return sf != null - && equals((SequenceFeature) sf, true); + return o instanceof SequenceFeature + && equalsWithParent((SequenceFeature) o); } - }; + @Override + public boolean equalsWithParent(SequenceFeature sf) + { + return sf != null && equals(sf, true); + } + }; matched.addSequenceFeature(newFeature); } }