JAL-1926 added supporting model changes to enable saving sourceDBRef data for sequences

[jalview.git] / src / jalview / datamodel / DBRefEntry.java

diff --git a/src/jalview/datamodel/DBRefEntry.java b/src/jalview/datamodel/DBRefEntry.java
index 0581845..0d6f68d 100755 (executable)
--- a/src/jalview/datamodel/DBRefEntry.java
+++ b/src/jalview/datamodel/DBRefEntry.java
@@ -20,7 +20,9 @@
  */
 package jalview.datamodel;
 
-public class DBRefEntry
+import jalview.api.DBRefEntryI;
+
+public class DBRefEntry implements DBRefEntryI
 {
   String source = "", version = "", accessionId = "";
 
@@ -98,7 +100,8 @@ 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)
     {
@@ -108,28 +111,32 @@ public class DBRefEntry
     {
       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;
@@ -139,6 +146,7 @@ public class DBRefEntry
    * @param accessionId
    *          the accessionId to set
    */
+  @Override
   public void setAccessionId(String accessionId)
   {
     this.accessionId = accessionId;
@@ -148,6 +156,7 @@ public class DBRefEntry
    * @param source
    *          the source to set
    */
+  @Override
   public void setSource(String source)
   {
     this.source = source;
@@ -157,6 +166,7 @@ public class DBRefEntry
    * @param version
    *          the version to set
    */
+  @Override
   public void setVersion(String version)
   {
     this.version = version;
@@ -194,6 +204,7 @@ public class DBRefEntry
             + ((accessionId != null) ? accessionId : "");
   }
 
+  @Override
   public String toString()
   {
     return getSrcAccString();