X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalviewLite.java;h=8a9c54bfc91f60370520bc2c2335488e4ea10d52;hb=8e2f91c6975f077f4313a516a46a5a42b6388b3a;hp=c0a8d730e02c136746904b77b04f89ce03990cb8;hpb=be32c14cd8e48fe0a207cd7030cb9cd46f894678;p=jalview.git

diff --git a/src/jalview/bin/JalviewLite.java b/src/jalview/bin/JalviewLite.java
index c0a8d73..8a9c54b 100644
--- a/src/jalview/bin/JalviewLite.java
+++ b/src/jalview/bin/JalviewLite.java
@@ -69,7 +69,6 @@ import java.util.List;
 import java.util.StringTokenizer;
 import java.util.Vector;
 
-import netscape.javascript.JSException;
 import netscape.javascript.JSObject;
 
 /**
@@ -847,7 +846,7 @@ public class JalviewLite extends Applet implements
    */
   public AlignFrame loadAlignment(String text, String title)
   {
-    Alignment al = null;
+    AlignmentI al = null;
 
     String format = new IdentifyFile().Identify(text,
             AppletFormatAdapter.PASTE);
@@ -1242,7 +1241,7 @@ public class JalviewLite extends Applet implements
 
   String file = "No file";
 
-  String file2 = "No file";
+  String file2 = null;
 
   Button launcher = new Button(
           MessageManager.getString("label.start_jalview"));
@@ -1459,7 +1458,10 @@ public class JalviewLite extends Applet implements
         file = data.toString();
       }
     }
-    file2 = getParameter("file2");
+    if (TRUE.equalsIgnoreCase(getParameter("enableSplitFrame")))
+    {
+      file2 = getParameter("file2");
+    }
 
     embedded = TRUE.equalsIgnoreCase(getParameter("embedded"));
     if (embedded)
@@ -1530,7 +1532,7 @@ public class JalviewLite extends Applet implements
         {
           notFailed = true;
         }
-      } catch (JSException jsex)
+      } catch (Exception jsex)
       {
         System.err.println("Attempt " + tries
                 + " to access LiveConnect javascript failed.");