X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fgui%2FStructureViewer.java;h=0c12eb2fdd5b91b2e7bb24d90b08981b15d36775;hb=4b7d3640209c4434d569c746672cf9eed4250ace;hp=7b1864b977c79b4e6b7e1a11125a4e625bca8bbc;hpb=fa8a0ce92e350f285da4e02da130e2cc1ffee85a;p=jalview.git

diff --git a/src/jalview/gui/StructureViewer.java b/src/jalview/gui/StructureViewer.java
index 7b1864b..0c12eb2 100644
--- a/src/jalview/gui/StructureViewer.java
+++ b/src/jalview/gui/StructureViewer.java
@@ -29,6 +29,7 @@ import java.util.Map.Entry;
 
 import jalview.api.structures.JalviewStructureDisplayI;
 import jalview.bin.Cache;
+import jalview.bin.Console;
 import jalview.datamodel.PDBEntry;
 import jalview.datamodel.SequenceI;
 import jalview.datamodel.StructureViewerModel;
@@ -63,7 +64,8 @@ public class StructureViewer
    * 
    * @param structureSelectionManager
    */
-  public StructureViewer(StructureSelectionManager structureSelectionManager)
+  public StructureViewer(
+          StructureSelectionManager structureSelectionManager)
   {
     ssm = structureSelectionManager;
   }
@@ -80,7 +82,6 @@ public class StructureViewer
     return sv;
   }
 
-  
   @Override
   public String toString()
   {
@@ -90,9 +91,10 @@ public class StructureViewer
     }
     return "New View";
   }
+
   /**
    * 
-   * @return ViewerType for currently configured structure viewer 
+   * @return ViewerType for currently configured structure viewer
    */
   public static ViewerType getViewerType()
   {
@@ -117,6 +119,12 @@ public class StructureViewer
   public JalviewStructureDisplayI viewStructures(PDBEntry[] pdbs,
           SequenceI[] seqs, AlignmentPanel ap)
   {
+    return viewStructures(pdbs, seqs, ap, null);
+  }
+
+  public JalviewStructureDisplayI viewStructures(PDBEntry[] pdbs,
+          SequenceI[] seqs, AlignmentPanel ap, ViewerType viewerType)
+  {
     JalviewStructureDisplayI viewer = onlyOnePdb(pdbs, seqs, ap);
     if (viewer != null)
     {
@@ -126,14 +134,15 @@ public class StructureViewer
       return viewer;
     }
 
-    ViewerType viewerType = getViewerType();
+    if (viewerType == null)
+      viewerType = getViewerType();
 
     Map<PDBEntry, SequenceI[]> seqsForPdbs = getSequencesForPdbs(pdbs,
             seqs);
-    PDBEntry[] pdbsForFile = seqsForPdbs.keySet().toArray(
-            new PDBEntry[seqsForPdbs.size()]);
-    SequenceI[][] theSeqs = seqsForPdbs.values().toArray(
-            new SequenceI[seqsForPdbs.size()][]);
+    PDBEntry[] pdbsForFile = seqsForPdbs.keySet()
+            .toArray(new PDBEntry[seqsForPdbs.size()]);
+    SequenceI[][] theSeqs = seqsForPdbs.values()
+            .toArray(new SequenceI[seqsForPdbs.size()][]);
     if (sview != null)
     {
       sview.setAlignAddedStructures(superposeAdded);
@@ -180,7 +189,7 @@ public class StructureViewer
     }
     else
     {
-      Cache.log.error(UNKNOWN_VIEWER_TYPE + getViewerType().toString());
+      Console.error(UNKNOWN_VIEWER_TYPE + getViewerType().toString());
     }
     return sview;
   }
@@ -297,6 +306,12 @@ public class StructureViewer
   public JalviewStructureDisplayI viewStructures(PDBEntry pdb,
           SequenceI[] seqsForPdb, AlignmentPanel ap)
   {
+    return viewStructures(pdb, seqsForPdb, ap, null);
+  }
+
+  public JalviewStructureDisplayI viewStructures(PDBEntry pdb,
+          SequenceI[] seqsForPdb, AlignmentPanel ap, ViewerType viewerType)
+  {
     if (sview != null)
     {
       sview.setAlignAddedStructures(superposeAdded);
@@ -309,7 +324,8 @@ public class StructureViewer
       sview.raiseViewer();
       return sview;
     }
-    ViewerType viewerType = getViewerType();
+    if (viewerType == null)
+      viewerType = getViewerType();
     if (viewerType.equals(ViewerType.JMOL))
     {
       sview = new AppJmol(pdb, seqsForPdb, null, ap);
@@ -328,7 +344,7 @@ public class StructureViewer
     }
     else
     {
-      Cache.log.error(UNKNOWN_VIEWER_TYPE + getViewerType().toString());
+      Console.error(UNKNOWN_VIEWER_TYPE + getViewerType().toString());
     }
     return sview;
   }
@@ -366,12 +382,11 @@ public class StructureViewer
       viewer = new PymolViewer(viewerData, alignPanel, sessionFile, vid);
       break;
     default:
-      Cache.log.error(UNKNOWN_VIEWER_TYPE + type.toString());
+      Console.error(UNKNOWN_VIEWER_TYPE + type.toString());
     }
     return viewer;
   }
 
-
   public boolean isBusy()
   {
     if (sview != null)