X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fext%2Frbvi%2Fchimera%2FJalviewChimeraBinding.java;h=e5934bfd865bc0273963975c891306ee5dcb7205;hb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;hp=cee271ae24ef397ae327a2d19de3eadf533f5eca;hpb=3bc2fbe640abb0d8941aead117c9624dd16773a3;p=jalview.git

diff --git a/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java b/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
index cee271a..e5934bf 100644
--- a/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
+++ b/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.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.
  * 
@@ -20,18 +20,6 @@
  */
 package jalview.ext.rbvi.chimera;
 
-import java.awt.Color;
-import java.net.BindException;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import ext.edu.ucsf.rbvi.strucviz2.ChimeraManager;
-import ext.edu.ucsf.rbvi.strucviz2.ChimeraModel;
-import ext.edu.ucsf.rbvi.strucviz2.StructureManager;
-import ext.edu.ucsf.rbvi.strucviz2.StructureManager.ModelType;
-
 import jalview.api.AlignmentViewPanel;
 import jalview.api.FeatureRenderer;
 import jalview.api.SequenceRenderer;
@@ -49,6 +37,18 @@ import jalview.structure.StructureSelectionManager;
 import jalview.structures.models.AAStructureBindingModel;
 import jalview.util.MessageManager;
 
+import java.awt.Color;
+import java.net.BindException;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import ext.edu.ucsf.rbvi.strucviz2.ChimeraManager;
+import ext.edu.ucsf.rbvi.strucviz2.ChimeraModel;
+import ext.edu.ucsf.rbvi.strucviz2.StructureManager;
+import ext.edu.ucsf.rbvi.strucviz2.StructureManager.ModelType;
+
 public abstract class JalviewChimeraBinding extends AAStructureBindingModel
 {
   // Chimera clause to exclude alternate locations in atom selection
@@ -86,11 +86,6 @@ public abstract class JalviewChimeraBinding extends AAStructureBindingModel
    */
   private boolean loadingFinished = true;
 
-  /*
-   * state flag used to check if the Chimera viewer's paint method can be called
-   */
-  private boolean finishedInit = false;
-
   public String fileLoadingError;
 
   /*
@@ -613,6 +608,11 @@ public abstract class JalviewChimeraBinding extends AAStructureBindingModel
    */
   public void sendChimeraCommand(final String command, boolean logResponse)
   {
+    if (viewer == null)
+    {
+      // ? thread running after viewer shut down
+      return;
+    }
     viewerCommandHistory(false);
     if (lastCommand == null || !lastCommand.equals(command))
     {
@@ -1079,16 +1079,6 @@ public abstract class JalviewChimeraBinding extends AAStructureBindingModel
     return true;
   }
 
-  public boolean isFinishedInit()
-  {
-    return finishedInit;
-  }
-
-  public void setFinishedInit(boolean finishedInit)
-  {
-    this.finishedInit = finishedInit;
-  }
-
   /**
    * Returns a list of chains mapped in this viewer. Note this list is not
    * currently scoped per structure.