Merge develop to Release_2_8_3_Branch

[jalview.git] / src / jalview / ext / rbvi / chimera / ChimeraCommands.java

diff --git a/src/jalview/ext/rbvi/chimera/ChimeraCommands.java b/src/jalview/ext/rbvi/chimera/ChimeraCommands.java
index fa1b7e2..148f252 100644 (file)
--- a/src/jalview/ext/rbvi/chimera/ChimeraCommands.java
+++ b/src/jalview/ext/rbvi/chimera/ChimeraCommands.java
@@ -20,6 +20,13 @@
  */
 package jalview.ext.rbvi.chimera;
 
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
 import jalview.api.FeatureRenderer;
 import jalview.api.SequenceRenderer;
 import jalview.datamodel.AlignmentI;
@@ -30,13 +37,6 @@ import jalview.structure.StructureSelectionManager;
 import jalview.util.ColorUtils;
 import jalview.util.Comparison;
 
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
 /**
  * Routines for generating Chimera commands for Jalview/Chimera binding
  * 
@@ -121,6 +121,7 @@ public class ChimeraCommands
         final Map<String, List<int[]>> modelData = colourData.get(model);
         for (String chain : modelData.keySet())
         {
+          boolean hasChain = !"".equals(chain.trim());
           for (int[] range : modelData.get(chain))
           {
             if (!firstPositionForModel)
@@ -135,7 +136,10 @@ public class ChimeraCommands
             {
               sb.append(range[0]).append("-").append(range[1]);
             }
-            sb.append(".").append(chain);
+            if (hasChain)
+            {
+              sb.append(".").append(chain);
+            }
             firstPositionForModel = false;
           }
         }