X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fdatamodel%2FDBRefEntry.java;h=bc8d0cf1d1723e423b1d1d62608ce1a62d2bb6fa;hb=456e5c765ac1e85336fd9f9b1a35453069bb2298;hp=3482a7406b2fb33b61ddda8e6f45c8ecf10d7ea3;hpb=db93a1adcbe0a4eaaf06e0a70ade0d6c5c1961c3;p=jalview.git diff --git a/src/jalview/datamodel/DBRefEntry.java b/src/jalview/datamodel/DBRefEntry.java index 3482a74..bc8d0cf 100755 --- a/src/jalview/datamodel/DBRefEntry.java +++ b/src/jalview/datamodel/DBRefEntry.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) - * Copyright (C) 2015 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -27,7 +27,11 @@ import java.util.List; public class DBRefEntry implements DBRefEntryI { - String source = "", version = "", accessionId = ""; + String source = ""; + + String version = ""; + + String accessionId = ""; /** * maps from associated sequence to the database sequence's coordinate system @@ -68,10 +72,10 @@ public class DBRefEntry implements DBRefEntryI public DBRefEntry(DBRefEntryI entry) { this((entry.getSource() == null ? "" : new String(entry.getSource())), - (entry.getVersion() == null ? "" : new String( - entry.getVersion())), - (entry.getAccessionId() == null ? "" : new String( - entry.getAccessionId())), + (entry.getVersion() == null ? "" + : new String(entry.getVersion())), + (entry.getAccessionId() == null ? "" + : new String(entry.getAccessionId())), (entry.getMap() == null ? null : new Mapping(entry.getMap()))); } @@ -89,9 +93,8 @@ public class DBRefEntry implements DBRefEntryI { return true; } - if (equalRef(entry) - && ((map == null && entry.map == null) || (map != null - && entry.map != null && map.equals(entry.map)))) + if (equalRef(entry) && ((map == null && entry.map == null) + || (map != null && entry.map != null && map.equals(entry.map)))) { return true; } @@ -104,7 +107,8 @@ public class DBRefEntry implements DBRefEntryI *