JAL-1683 replace year/version strings with tokens in source

[jalview.git] / src / jalview / analysis / SequenceIdMatcher.java

diff --git a/src/jalview/analysis/SequenceIdMatcher.java b/src/jalview/analysis/SequenceIdMatcher.java
index aec7faf..c3d7ac1 100755 (executable)
--- a/src/jalview/analysis/SequenceIdMatcher.java
+++ b/src/jalview/analysis/SequenceIdMatcher.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 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.
  * 
@@ -42,10 +42,15 @@ public class SequenceIdMatcher
       // TODO: deal with ID collisions - SequenceI should be appended to list
       // associated with this key.
       names.put(new SeqIdName(seqs[i].getDisplayId(true)), seqs[i]);
+      SequenceI dbseq = seqs[i];
+      while (dbseq.getDatasetSequence()!=null)
+      {
+        dbseq = dbseq.getDatasetSequence();
+      }
       // add in any interesting identifiers
-      if (seqs[i].getDBRef() != null)
+      if (dbseq.getDBRef() != null)
       {
-        DBRefEntry dbr[] = seqs[i].getDBRef();
+        DBRefEntry dbr[] = dbseq.getDBRef();
         SeqIdName sid = null;
         for (int r = 0; r < dbr.length; r++)
         {