X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FDBRefEntry.java;h=f7837f75c0b8fd7a563b8b6f9bef3755ab18bd82;hb=42a3c5add84dd6d89be5efb6cbcef72d38c1132c;hp=ec6dcf8d76a0b83a986fc00a74b3b59d8ada17bc;hpb=37de9310bec3501cbc6381e0c3dcb282fcaad812;p=jalview.git
diff --git a/src/jalview/datamodel/DBRefEntry.java b/src/jalview/datamodel/DBRefEntry.java
index ec6dcf8..f7837f7 100755
--- a/src/jalview/datamodel/DBRefEntry.java
+++ b/src/jalview/datamodel/DBRefEntry.java
@@ -68,10 +68,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 +89,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 +103,8 @@ public class DBRefEntry implements DBRefEntryI
*
* - source and accession are identical (ignoring case)
* - version is identical (ignoring case), or this version is of the format
- * "someSource:0", in which case the version for the other entry replaces it
+ * "someSource:0", in which case the version for the other entry replaces
+ * it
* - mappings are not compared but if this entry has no mapping, replace
* with that for the other entry
*
@@ -141,8 +141,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;
}
@@ -160,9 +160,8 @@ public class DBRefEntry implements DBRefEntryI
}
else
{
- if (version != null
- && (otherVersion == null || !version
- .equalsIgnoreCase(otherVersion)))
+ if (version != null && (otherVersion == null
+ || !version.equalsIgnoreCase(otherVersion)))
{
return false;
}
@@ -197,12 +196,12 @@ public class DBRefEntry implements DBRefEntryI
return true;
}
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())))
+ && (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;
}