JAL-674 store ID in MCview.PDBfile calcId string, not PDB filename

[jalview.git] / src / MCview / PDBfile.java

diff --git a/src/MCview/PDBfile.java b/src/MCview/PDBfile.java
index 20b3171..7e37277 100755 (executable)
--- a/src/MCview/PDBfile.java
+++ b/src/MCview/PDBfile.java
@@ -269,8 +269,29 @@ public class PDBfile extends jalview.io.AlignFile
         System.err.println(line);
       }
     }
+    markCalcIds();
   }
 
+  public static boolean isCalcIdForFile(String calcId, String pdbFile)
+  {
+    return (calcId != null && calcId.startsWith("JalviewPDB:" + pdbFile
+            + ":JalviewPDB:"));
+  }
+  private void markCalcIds()
+  {
+    for (SequenceI sq : seqs)
+    {
+      for (AlignmentAnnotation aa : sq.getAnnotation())
+      {
+        String oldId = aa.getCalcId();
+        if (oldId == null)
+        {
+          oldId = "";
+        }
+        aa.setCalcId("JalviewPDB:" + id + ":JalviewPDB:" + oldId);
+      }
+    }
+  }
   private void processPdbFileWithJmol(ArrayList<SequenceI> prot)
           throws Exception
   {