X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalviewLite.java;h=df11327c055dc66112b34ecbe5ee9170606f2f02;hb=d85d658d73b8a2c3595d0d3260637967530134c4;hp=e0f0910ff684a58fa23d8bfd2b45cd8513bcef37;hpb=c2632af10ee5c7c72dea1316cb42dabf1ea4a407;p=jalview.git

diff --git a/src/jalview/bin/JalviewLite.java b/src/jalview/bin/JalviewLite.java
index e0f0910..df11327 100755
--- a/src/jalview/bin/JalviewLite.java
+++ b/src/jalview/bin/JalviewLite.java
@@ -321,7 +321,6 @@ public class JalviewLite
         {
           Class.forName("org.jmol.adapter.smarter.SmarterJmolAdapter");
           jmolAvailable = true;
-          System.out.println("JMOL FOUND");
         }
       }
       catch (java.lang.ClassNotFoundException ex)
@@ -563,7 +562,16 @@ public class JalviewLite
               }
             }
 
-            param = addProtocol(param);
+            if (inArchive(param) && !jmolAvailable)
+            {
+              protocol = AppletFormatAdapter.CLASSLOADER;
+            }
+            else
+            {
+              protocol = AppletFormatAdapter.URL;
+              param = addProtocol(param);
+            }
+
             pdb.setFile(param);
 
             if(seqs!=null)
@@ -582,8 +590,6 @@ public class JalviewLite
                                                  protocol);
                 lastFrameX += 40;
                 lastFrameY+=40;
-
-                System.out.println(lastFrameX+" "+lastFrameY);
               }
               else
                     new MCview.AppletPDBViewer(pdb,