JAL-3397 impl.IntervalStore and nonc.IntervalStore unified api

[jalview.git] / test / intervalstore / nonc / SimpleFeature.java

diff --git a/src/intervalstore/impl/SimpleFeature.java b/test/intervalstore/nonc/SimpleFeature.java
similarity index 74%
rename from src/intervalstore/impl/SimpleFeature.java
rename to test/intervalstore/nonc/SimpleFeature.java
index be1db97..d10d90a 100644 (file)
--- a/src/intervalstore/impl/SimpleFeature.java
+++ b/test/intervalstore/nonc/SimpleFeature.java
@@ -29,18 +29,20 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-package intervalstore.impl;
+package intervalstore.nonc;
 
 import intervalstore.api.IntervalI;
 
 /**
  * A simplified feature instance sufficient for unit test purposes
  */
-public class SimpleFeature extends Range
+public class SimpleFeature implements IntervalI
 {
+  final private int begin;
 
-  private String description;
+  final private int end;
 
+  private String description;
 
   /**
    * Constructor
@@ -51,7 +53,8 @@ public class SimpleFeature extends Range
    */
   public SimpleFeature(int from, int to, String desc)
   {
-    super(from, to);
+    begin = from;
+    end = to;
     description = desc;
   }
 
@@ -62,48 +65,59 @@ public class SimpleFeature extends Range
    */
   public SimpleFeature(SimpleFeature sf1)
   {
-    this(sf1.start, sf1.end, sf1.description);
+    this(sf1.begin, sf1.end, sf1.description);
   }
 
-  public String getDescription()
+  @Override
+  public int getBegin()
   {
-    return description;
+    return begin;
   }
 
   @Override
-  public int hashCode()
+  public int getEnd()
   {
-    return start + 37 * end
-            + (description == null ? 0 : description.hashCode());
+    return end;
+  }
+
+  public String getDescription()
+  {
+    return description;
   }
 
   @Override
-  public boolean equals(Object o)
+  public int hashCode()
   {
-    return (o != null && o instanceof SimpleFeature
-            && equalsInterval((SimpleFeature) o));
+    return begin + 37 * end
+            + (description == null ? 0 : description.hashCode());
   }
 
   /**
    * Equals method that requires two instances to have the same description, as
-   * well as start and end position. Does not do a test for null
+   * well as start and end position.
    */
   @Override
-  public boolean equalsInterval(IntervalI o)
+  public boolean equals(Object obj)
   {
-    // must override equalsInterval, not equals
-    return (o != null && start == ((SimpleFeature) o).start
-            && end == ((SimpleFeature) o).end)
-            && (description == null
-                    ? ((SimpleFeature) o).description == null
-                    : description.equals(((SimpleFeature) o).description));
+    if (obj != null && obj instanceof SimpleFeature)
+    {
+      SimpleFeature o = (SimpleFeature) obj;
+      if (this.begin == o.begin && this.end == o.end)
+      {
+        if (this.description == null)
+        {
+          return o.description == null;
+        }
+        return this.description.equals(o.description);
+      }
+    }
+    return false;
   }
 
   @Override
   public String toString()
   {
-    return start + ":" + end + ":" + description;
+    return begin + ":" + end + ":" + description;
   }
 
-
 }