Jalview-JS/JAL-3253-applet more argument parsing

[jalview.git] / src / jalview / bin / JalviewLite.java

diff --git a/src/jalview/bin/JalviewLite.java b/src/jalview/bin/JalviewLite.java
index e12b24d..aec0a5e 100644 (file)
--- a/src/jalview/bin/JalviewLite.java
+++ b/src/jalview/bin/JalviewLite.java
@@ -1510,56 +1510,21 @@ public class JalviewLite extends Applet
 
     if (file == null)
     {
-      // Maybe the sequences are added as parameters
-      StringBuffer data = new StringBuffer("PASTE");
-      int i = 1;
-      while ((file = getParameter("sequence" + i)) != null)
-      {
-        data.append(file.toString() + "\n");
-        i++;
-      }
-      if (data.length() > 5)
-      {
-        file = data.toString();
-      }
+      file = appLoader.getPastedSequence(this);
     }
     if (getDefaultParameter("enableSplitFrame", true))
     {
       file2 = getParameter("file2");
     }
 
-    embedded = TRUE.equalsIgnoreCase(getParameter("embedded"));
+    embedded = (TRUE.equalsIgnoreCase(getParameter("embedded"))
+            || file != null
+                    && FALSE.equalsIgnoreCase(getParameter("showbutton")));
     if (embedded)
     {
-      LoadingThread loader = new LoadingThread(file, file2, this);
-      loader.start();
-    }
-    else if (file != null)
-    {
-      /*
-       * Start the applet immediately or show a button to start it
-       */
-      if (FALSE.equalsIgnoreCase(getParameter("showbutton")))
-      {
-        LoadingThread loader = new LoadingThread(file, file2, this);
-        loader.start();
-      }
-      else
-      {
-        add(launcher);
-        launcher.addActionListener(new java.awt.event.ActionListener()
-        {
-          @Override
-          public void actionPerformed(ActionEvent e)
-          {
-            LoadingThread loader = new LoadingThread(file, file2,
-                    JalviewLite.this);
-            loader.start();
-          }
-        });
-      }
+      startLoading();
     }
-    else
+    else if (file == null)
     {
       // jalview initialisation with no alignment. loadAlignment() method can
       // still be called to open new alignments.
@@ -1567,6 +1532,24 @@ public class JalviewLite extends Applet
       fileFound = false;
       callInitCallback();
     }
+    else
+    {
+      add(launcher);
+      launcher.addActionListener(new java.awt.event.ActionListener()
+      {
+        @Override
+        public void actionPerformed(ActionEvent e)
+        {
+          startLoading();
+        }
+      });
+    }
+  }
+
+  protected void startLoading()
+  {
+    LoadingThread loader = new LoadingThread(file, file2, this);
+    loader.start();
   }
 
   private void initLiveConnect()