Merge commit 'alpha/update_2_12_for_2_11_2_series_merge^2' into HEAD

[jalview.git] / src / jalview / gui / StructureViewer.java

diff --git a/src/jalview/gui/StructureViewer.java b/src/jalview/gui/StructureViewer.java
index 7b1864b..4db6140 100644 (file)
--- a/src/jalview/gui/StructureViewer.java
+++ b/src/jalview/gui/StructureViewer.java
@@ -26,7 +26,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-
 import jalview.api.structures.JalviewStructureDisplayI;
 import jalview.bin.Cache;
 import jalview.datamodel.PDBEntry;
@@ -34,6 +33,7 @@ import jalview.datamodel.SequenceI;
 import jalview.datamodel.StructureViewerModel;
 import jalview.structure.StructureSelectionManager;
 
+
 /**
  * A proxy for handling structure viewers, that orchestrates adding selected
  * structures, associated with sequences in Jalview, to an existing viewer, or
@@ -44,6 +44,16 @@ import jalview.structure.StructureSelectionManager;
  */
 public class StructureViewer
 {
+  
+  static
+  {
+    Platform.loadStaticResource("core/core_jvjmol.z.js",
+            "org.jmol.viewer.Viewer");
+  }
+
+
+  
+  
   private static final String UNKNOWN_VIEWER_TYPE = "Unknown structure viewer type ";
 
   StructureSelectionManager ssm;
@@ -337,6 +347,9 @@ public class StructureViewer
    * Creates a new panel controlling a structure viewer
    * 
    * @param type
+   * @param pdbf
+   * @param id
+   * @param sq
    * @param alignPanel
    * @param viewerData
    * @param sessionFile
@@ -348,6 +361,7 @@ public class StructureViewer
           String sessionFile, String vid)
   {
     JalviewStructureDisplayI viewer = null;
+
     switch (type)
     {
     case JMOL:
@@ -371,7 +385,6 @@ public class StructureViewer
     return viewer;
   }
 
-
   public boolean isBusy()
   {
     if (sview != null)