X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalviewLite.java;h=0623193b5b1ccaea808d166fe067c4de80e9e28a;hb=d982e0264da4cd35cb993144754e797db11c8c48;hp=e6bb6852678281db5eeeee606976d13c6d21c0a3;hpb=890bd0eac47a4b0f55bd062a359c16a43c3780a0;p=jalview.git

diff --git a/src/jalview/bin/JalviewLite.java b/src/jalview/bin/JalviewLite.java
index e6bb685..0623193 100755
--- a/src/jalview/bin/JalviewLite.java
+++ b/src/jalview/bin/JalviewLite.java
@@ -37,6 +37,8 @@ public class JalviewLite
     extends Applet
 {
 
+
+
   ///////////////////////////////////////////
   //The following public methods maybe called
   //externally, eg via javascript in HTML page
@@ -147,11 +149,25 @@ public class JalviewLite
 
   boolean embedded = false;
 
+  public boolean jmolAvailable = false;
+
   /**
    * init method for Jalview Applet
    */
   public void init()
   {
+    try
+    {
+      Class.forName("org.jmol.adapter.smarter.SmarterJmolAdapter",
+                    true, Thread.currentThread().getContextClassLoader());
+
+      jmolAvailable = true;
+    }
+    catch (java.lang.ClassNotFoundException ex)
+    {
+      System.out.println("Jmol not found - Use MCview for structures");
+    }
+
     int r = 255;
     int g = 255;
     int b = 255;
@@ -489,28 +505,41 @@ public class JalviewLite
           }
         }
 
+
         param = getParameter("PDBFILE");
         if (param != null)
         {
-          if (inArchive(param))
-          {
-            protocol = AppletFormatAdapter.CLASSLOADER;
-          }
-          else
+
+          PDBEntry pdb = new PDBEntry();
+
+          if (!inArchive(param) || jmolAvailable)
           {
-            protocol = AppletFormatAdapter.URL;
             param = addProtocol(param);
           }
 
+          pdb.setFile(param);
+
           String sequence = applet.getParameter("PDBSEQ");
 
           if (sequence != null)
           {
-            new MCview.AppletPDBViewer(param, protocol,
-                                       (Sequence) currentAlignFrame.
-                                       getAlignViewport().getAlignment().
-                                       findName(sequence),
-                                       currentAlignFrame.getSeqcanvas());
+            if (jmolAvailable)
+              new jalview.appletgui.AppletJmol(pdb,
+                                               new SequenceI[]
+                                               { (Sequence) currentAlignFrame.
+                                               getAlignViewport().getAlignment().
+                                               findName(sequence)},
+                                               currentAlignFrame.alignPanel,
+                                               protocol);
+            else
+
+              new MCview.AppletPDBViewer(pdb,
+                                         new SequenceI[]
+                                         { (Sequence) currentAlignFrame.
+                                         getAlignViewport().getAlignment().
+                                         findName(sequence)},
+                                         currentAlignFrame.alignPanel,
+                                         protocol);
           }
 
         }
@@ -552,6 +581,5 @@ public class JalviewLite
 
       return file;
     }
-
   }
 }