From: Jim Procter Date: Wed, 24 Aug 2016 14:44:21 +0000 (+0100) Subject: JAL-2106 formatting X-Git-Tag: Release_2_10_0~47^2~4^2~43^2~15^2^2~9 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=6c59be275478323eb85bbb971fc47ed7b6807016;p=jalview.git JAL-2106 formatting --- diff --git a/src/jalview/datamodel/DBRefEntry.java b/src/jalview/datamodel/DBRefEntry.java index 6a48da7..e2ee195 100755 --- a/src/jalview/datamodel/DBRefEntry.java +++ b/src/jalview/datamodel/DBRefEntry.java @@ -27,6 +27,7 @@ import java.util.Arrays; public class DBRefEntry implements DBRefEntryI { String source = "", version = "", accessionId = ""; + /** * maps from associated sequence to the database sequence's coordinate system */ @@ -37,7 +38,6 @@ public class DBRefEntry implements DBRefEntryI } - public DBRefEntry(String source, String version, String accessionId) { this(source, version, accessionId, null); @@ -140,7 +140,8 @@ public class DBRefEntry implements DBRefEntryI String otherAccession = other.getAccessionId(); if ((accessionId == null && otherAccession != null) || (accessionId != null && otherAccession == null) - || (accessionId != null && !accessionId.equalsIgnoreCase(otherAccession))) + || (accessionId != null && !accessionId + .equalsIgnoreCase(otherAccession))) { return false; } @@ -150,7 +151,7 @@ public class DBRefEntry implements DBRefEntryI * otherwise the versions have to match */ String otherVersion = other.getVersion(); - + if ((version == null || version.equals("0") || version.endsWith(":0")) && otherVersion != null) { @@ -225,28 +226,24 @@ public class DBRefEntry implements DBRefEntryI return accessionId; } - @Override public void setAccessionId(String accessionId) { this.accessionId = accessionId; } - @Override public void setSource(String source) { this.source = source; } - @Override public void setVersion(String version) { this.version = version; } - @Override public Mapping getMap() { @@ -281,6 +278,7 @@ public class DBRefEntry implements DBRefEntryI public String toString() { return getSrcAccString(); + } @Override public boolean isPrimary() @@ -321,5 +319,4 @@ public class DBRefEntry implements DBRefEntryI } return true; } - } }