Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop

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

diff --git a/src/jalview/datamodel/DBRefEntry.java b/src/jalview/datamodel/DBRefEntry.java
index 142d996..53642b5 100755 (executable)
--- a/src/jalview/datamodel/DBRefEntry.java
+++ b/src/jalview/datamodel/DBRefEntry.java
@@ -37,6 +37,7 @@ public class DBRefEntry implements DBRefEntryI
 
   }
 
+
   public DBRefEntry(String source, String version, String accessionId)
   {
     this(source, version, accessionId, null);
@@ -63,13 +64,14 @@ public class DBRefEntry implements DBRefEntryI
     this.map = map;
   }
 
-  public DBRefEntry(DBRefEntry entry)
+  public DBRefEntry(DBRefEntryI entry)
   {
-    this(
-            (entry.source == null ? "" : new String(entry.source)),
-            (entry.version == null ? "" : new String(entry.version)),
-            (entry.accessionId == null ? "" : new String(entry.accessionId)),
-            (entry.map == null ? null : new Mapping(entry.map)));
+    this((entry.getSource() == null ? "" : new String(entry.getSource())),
+            (entry.getVersion() == null ? "" : new String(
+                    entry.getVersion())),
+            (entry.getAccessionId() == null ? "" : new String(
+                    entry.getAccessionId())),
+            (entry.getMap() == null ? null : new Mapping(entry.getMap())));
   }
 
   @Override
@@ -143,39 +145,29 @@ public class DBRefEntry implements DBRefEntryI
     return accessionId;
   }
 
-  /**
-   * @param accessionId
-   *          the accessionId to set
-   */
+
   @Override
   public void setAccessionId(String accessionId)
   {
     this.accessionId = accessionId;
   }
 
-  /**
-   * @param source
-   *          the source to set
-   */
+
   @Override
   public void setSource(String source)
   {
     this.source = source;
   }
 
-  /**
-   * @param version
-   *          the version to set
-   */
+
   @Override
   public void setVersion(String version)
   {
     this.version = version;
   }
 
-  /**
-   * @return the map
-   */
+
+  @Override
   public Mapping getMap()
   {
     return map;
@@ -211,21 +203,25 @@ public class DBRefEntry implements DBRefEntryI
     return getSrcAccString();
   }
 
+  @Override
   public int getStartRes()
   {
     return startRes;
   }
 
+  @Override
   public void setStartRes(int startRes)
   {
     this.startRes = startRes;
   }
 
+  @Override
   public int getEndRes()
   {
     return endRes;
   }
 
+  @Override
   public void setEndRes(int endRes)
   {
     this.endRes = endRes;