Merge branch 'features/JAL-1745_PDB-redownload' into develop

[jalview.git] / src / jalview / ext / jmol / PDBFileWithJmol.java

diff --git a/src/jalview/ext/jmol/PDBFileWithJmol.java b/src/jalview/ext/jmol/PDBFileWithJmol.java
index f5710d3..3df8957 100644 (file)
--- a/src/jalview/ext/jmol/PDBFileWithJmol.java
+++ b/src/jalview/ext/jmol/PDBFileWithJmol.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.
  * 
@@ -177,9 +177,10 @@ public class PDBFileWithJmol extends AlignFile implements
                   PDBEntry pdbe = new PDBEntry();
                   pdbe.setFile(getDataName());
                   pdbe.setId(getDataName());
-                  sq.addPDBId(pdbe);
                   pdbe.setProperty(new Hashtable());
-                  pdbe.getProperty().put("CHAIN", "" + _lastChainId);
+                  // pdbe.getProperty().put("CHAIN", "" + _lastChainId);
+                  pdbe.setChainCode(String.valueOf(_lastChainId));
+                  sq.addPDBId(pdbe);
                   // JAL-1533
                   // Need to put the number of models for this polymer somewhere for Chimera/others to grab
                   //                  pdbe.getProperty().put("PDBMODELS", biopoly.)
@@ -188,7 +189,10 @@ public class PDBFileWithJmol extends AlignFile implements
                   {
                     String mt = model.getModelTitle() == null ? getDataName()
                             : model.getModelTitle();
-                    mt += _lastChainId;
+                    if (_lastChainId >= ' ')
+                    {
+                      mt += _lastChainId;
+                    }
                     AlignmentAnnotation ann = new AlignmentAnnotation(
                             "Secondary Structure",
                             "Secondary Structure for " + mt, asecstr);