X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FDBRefEntry.java;h=142d9965fbed5d376db62c555e04fc83f624ab7f;hb=a21b84a669a9620f6943b9b5054e8756cb6f0687;hp=c9d59ec8bb72b55b6bb737c97453b528b349a3b7;hpb=506d60f0e188723ddc91c26824b41ac7034df3fe;p=jalview.git

diff --git a/src/jalview/datamodel/DBRefEntry.java b/src/jalview/datamodel/DBRefEntry.java
index c9d59ec..142d996 100755
--- a/src/jalview/datamodel/DBRefEntry.java
+++ b/src/jalview/datamodel/DBRefEntry.java
@@ -1,27 +1,32 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)
- * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This file is part of Jalview.
  * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.datamodel;
 
-public class DBRefEntry
+import jalview.api.DBRefEntryI;
+
+public class DBRefEntry implements DBRefEntryI
 {
   String source = "", version = "", accessionId = "";
 
+  private int startRes, endRes;
   /**
    * maps from associated sequence to the database sequence's coordinate system
    */
@@ -40,14 +45,14 @@ public class DBRefEntry
   /**
    * 
    * @param source
-   *                canonical source (uppercase only)
+   *          canonical source (uppercase only)
    * @param version
-   *                (source dependent version string)
+   *          (source dependent version string)
    * @param accessionId
-   *                (source dependent accession number string)
+   *          (source dependent accession number string)
    * @param map
-   *                (mapping from local sequence numbering to source accession
-   *                numbering)
+   *          (mapping from local sequence numbering to source accession
+   *          numbering)
    */
   public DBRefEntry(String source, String version, String accessionId,
           Mapping map)
@@ -67,12 +72,20 @@ public class DBRefEntry
             (entry.map == null ? null : new Mapping(entry.map)));
   }
 
-  public boolean equals(DBRefEntry entry)
+  @Override
+  public boolean equals(Object o)
   {
+    // TODO should also override hashCode to ensure equal objects have equal
+    // hashcodes
+    if (o == null || !(o instanceof DBRefEntry))
+    {
+      return false;
+    }
+    DBRefEntry entry = (DBRefEntry) o;
     if (entry == this)
+    {
       return true;
-    if (entry == null)
-      return false;
+    }
     if (equalRef(entry)
             && ((map == null && entry.map == null) || (map != null
                     && entry.map != null && map.equals(entry.map))))
@@ -88,36 +101,43 @@ public class DBRefEntry
    * @param entry
    * @return true if source, accession and version are equal with those of entry
    */
-  public boolean equalRef(DBRefEntry entry)
+  @Override
+  public boolean equalRef(DBRefEntryI entry)
   {
     if (entry == null)
     {
       return false;
     }
     if (entry == this)
+    {
       return true;
-    if ((source != null && entry.source != null && source
-            .equalsIgnoreCase(entry.source))
-            && (accessionId != null && entry.accessionId != null && accessionId
-                    .equalsIgnoreCase(entry.accessionId))
-            && (version != null && entry.version != null && version
-                    .equalsIgnoreCase(entry.version)))
+    }
+    if (entry != null
+            && (source != null && entry.getSource() != null && source
+                    .equalsIgnoreCase(entry.getSource()))
+            && (accessionId != null && entry.getAccessionId() != null && accessionId
+                    .equalsIgnoreCase(entry.getAccessionId()))
+            && (version != null && entry.getVersion() != null && version
+                    .equalsIgnoreCase(entry.getVersion())))
     {
       return true;
     }
     return false;
   }
 
+  @Override
   public String getSource()
   {
     return source;
   }
 
+  @Override
   public String getVersion()
   {
     return version;
   }
 
+  @Override
   public String getAccessionId()
   {
     return accessionId;
@@ -125,8 +145,9 @@ public class DBRefEntry
 
   /**
    * @param accessionId
-   *                the accessionId to set
+   *          the accessionId to set
    */
+  @Override
   public void setAccessionId(String accessionId)
   {
     this.accessionId = accessionId;
@@ -134,8 +155,9 @@ public class DBRefEntry
 
   /**
    * @param source
-   *                the source to set
+   *          the source to set
    */
+  @Override
   public void setSource(String source)
   {
     this.source = source;
@@ -143,8 +165,9 @@ public class DBRefEntry
 
   /**
    * @param version
-   *                the version to set
+   *          the version to set
    */
+  @Override
   public void setVersion(String version)
   {
     this.version = version;
@@ -160,7 +183,7 @@ public class DBRefEntry
 
   /**
    * @param map
-   *                the map to set
+   *          the map to set
    */
   public void setMap(Mapping map)
   {
@@ -181,4 +204,30 @@ public class DBRefEntry
     return ((source != null) ? source : "") + ":"
             + ((accessionId != null) ? accessionId : "");
   }
+
+  @Override
+  public String toString()
+  {
+    return getSrcAccString();
+  }
+
+  public int getStartRes()
+  {
+    return startRes;
+  }
+
+  public void setStartRes(int startRes)
+  {
+    this.startRes = startRes;
+  }
+
+  public int getEndRes()
+  {
+    return endRes;
+  }
+
+  public void setEndRes(int endRes)
+  {
+    this.endRes = endRes;
+  }
 }