Merge branch 'releases/Release_2_10_0_Branch'

[jalview.git] / src / jalview / datamodel / DBRefEntry.java

diff --git a/src/jalview/datamodel/DBRefEntry.java b/src/jalview/datamodel/DBRefEntry.java
index 143a4d2..3482a74 100755 (executable)
--- a/src/jalview/datamodel/DBRefEntry.java
+++ b/src/jalview/datamodel/DBRefEntry.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
- * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
+ * Copyright (C) 2015 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -282,7 +282,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.  
@@ -298,7 +298,7 @@ public class DBRefEntry implements DBRefEntryI
       {
         return false;
       }
-      // check map is really 1:1, between identical single ranges
+      // 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)