X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fdatamodel%2FDBRefEntry.java;h=53642b530103bcb9c4ec61fd704da87481857cf8;hb=e224b72118c12cd77ae96f0f8d86c123e0416dc7;hp=0581845a090b85af1b8538a4cff0404349c6669d;hpb=be32c14cd8e48fe0a207cd7030cb9cd46f894678;p=jalview.git diff --git a/src/jalview/datamodel/DBRefEntry.java b/src/jalview/datamodel/DBRefEntry.java index 0581845..53642b5 100755 --- a/src/jalview/datamodel/DBRefEntry.java +++ b/src/jalview/datamodel/DBRefEntry.java @@ -20,10 +20,13 @@ */ 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 */ @@ -34,6 +37,7 @@ public class DBRefEntry } + public DBRefEntry(String source, String version, String accessionId) { this(source, version, accessionId, null); @@ -60,13 +64,14 @@ public class DBRefEntry 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 @@ -98,7 +103,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,63 +114,60 @@ 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; } - /** - * @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; @@ -194,8 +197,33 @@ public class DBRefEntry + ((accessionId != null) ? accessionId : ""); } + @Override public String toString() { 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; + } }