X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FDBRefEntry.java;h=f7837f75c0b8fd7a563b8b6f9bef3755ab18bd82;hb=f063821ed0be9c1581af74643a1aa5798731af65;hp=e2ee1958dd8bbbb155a1984aad7258927551cd36;hpb=6c59be275478323eb85bbb971fc47ed7b6807016;p=jalview.git

diff --git a/src/jalview/datamodel/DBRefEntry.java b/src/jalview/datamodel/DBRefEntry.java
index e2ee195..f7837f7 100755
--- a/src/jalview/datamodel/DBRefEntry.java
+++ b/src/jalview/datamodel/DBRefEntry.java
@@ -23,6 +23,7 @@ package jalview.datamodel;
 import jalview.api.DBRefEntryI;
 
 import java.util.Arrays;
+import java.util.List;
 
 public class DBRefEntry implements DBRefEntryI
 {
@@ -67,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())));
   }
 
@@ -88,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;
     }
@@ -103,7 +103,8 @@ public class DBRefEntry implements DBRefEntryI
    * <ul>
    * <li>source and accession are identical (ignoring case)</li>
    * <li>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</li>
+   * "someSource:0", in which case the version for the other entry replaces
+   * it</li>
    * <li>mappings are not compared but if this entry has no mapping, replace
    * with that for the other entry</li>
    * </ul>
@@ -140,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;
     }
@@ -159,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;
       }
@@ -196,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;
     }
@@ -281,7 +281,7 @@ public class DBRefEntry implements DBRefEntryI
   }
 
   @Override
-  public boolean isPrimary()
+  public boolean isPrimaryCandidate()
   {
     /*
      * if a map is present, unless it is 1:1 and has no SequenceI mate, it cannot be a primary reference.  
@@ -297,6 +297,18 @@ public class DBRefEntry implements DBRefEntryI
       {
         return false;
       }
+      // check map is between identical single contiguous ranges
+      List<int[]> fromRanges = map.getMap().getFromRanges();
+      List<int[]> toRanges = map.getMap().getToRanges();
+      if (fromRanges.size() != 1 || toRanges.size() != 1)
+      {
+        return false;
+      }
+      if (fromRanges.get(0)[0] != toRanges.get(0)[0]
+              || fromRanges.get(0)[1] != toRanges.get(0)[1])
+      {
+        return false;
+      }
     }
     if (version == null)
     {