JAL-3253-applet JAL-3397

[jalview.git] / src / jalview / analysis / CrossRef.java

diff --git a/src/jalview/analysis/CrossRef.java b/src/jalview/analysis/CrossRef.java
index 1ab8a24..ed87f05 100644 (file)
--- 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);
                 }
               }