From 285388369aa586c03977a409a11d44b2ee17be16 Mon Sep 17 00:00:00 2001
From: amwaterhouse <Andrew Waterhouse>
Date: Thu, 22 Dec 2005 16:00:30 +0000
Subject: [PATCH] Allow embedded applet

---
 src/jalview/bin/JalviewLite.java |   44 +++++++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/jalview/bin/JalviewLite.java b/src/jalview/bin/JalviewLite.java
index b4adf07..331e7f5 100755
--- a/src/jalview/bin/JalviewLite.java
+++ b/src/jalview/bin/JalviewLite.java
@@ -46,6 +46,7 @@ public class JalviewLite extends Applet
     Button launcher = new Button("Start Jalview");
 
     static AlignFrame currentAlignFrame;
+    boolean embedded = false;
 
 
     /**
@@ -90,22 +91,30 @@ public class JalviewLite extends Applet
         final String featuresFile = param;
 
         file = getParameter("file");
+        if(file.indexOf("://")==-1)
+               file = getCodeBase() + file;
+
         final JalviewLite applet = this;
-        if (file != null)
+        if(getParameter("embedded")!=null
+           && getParameter("embedded").equalsIgnoreCase("true"))
+        {
+          embedded = true;
+          LoadingThread loader = new LoadingThread(file,
+                            "URL",
+                            featuresFile,
+                            applet);
+          loader.start();
+        }
+        else if (file != null)
         {
             add(launcher);
-            if(file.indexOf("://")==-1)
-               file = getCodeBase() + file;
 
             launcher.addActionListener(new java.awt.event.ActionListener()
                 {
                     public void actionPerformed(ActionEvent e)
                     {
-                        String format = jalview.io.IdentifyFile.Identify(file,
-                                "URL");
                         LoadingThread loader = new LoadingThread(file,
                             "URL",
-                            format,
                             featuresFile,
                             applet);
                         loader.start();
@@ -218,6 +227,15 @@ public class JalviewLite extends Applet
             g.drawString("Jalview can't open file", 5, 15);
             g.drawString("\"" + file + "\"", 5, 30);
         }
+        else if(embedded)
+        {
+          g.setColor(Color.black);
+          g.setFont(new Font("Arial", Font.BOLD, 24));
+          g.drawString("Jalview Applet", 50, this.size().height/2 -30);
+          g.drawString("Loading Data...", 50, this.size().height/2);
+        }
+
+
     }
 
     class LoadingThread extends Thread
@@ -230,13 +248,12 @@ public class JalviewLite extends Applet
 
         public LoadingThread(String file,
                              String protocol,
-                             String format,
                              String features,
                              JalviewLite applet)
         {
             this.file = file;
             this.protocol = protocol;
-            this.format = format;
+            format = jalview.io.IdentifyFile.Identify(file, "URL");
             featuresFile = features;
             this.applet = applet;
         }
@@ -248,11 +265,14 @@ public class JalviewLite extends Applet
 
             if ((sequences != null) && (sequences.length > 0))
             {
-                currentAlignFrame = new AlignFrame(new Alignment(sequences),
-                        applet, file);
-                currentAlignFrame.statusBar.setText("Successfully loaded file " + file);
+              currentAlignFrame = new AlignFrame(new Alignment(sequences),
+                                                 applet, file);
+              if (embedded)
+                currentAlignFrame.setEmbedded();
+
+              currentAlignFrame.statusBar.setText("Successfully loaded file " + file);
 
-                if(featuresFile!=null)
+              if (featuresFile != null)
                   currentAlignFrame.parseFeaturesFile(featuresFile);
 
                 String treeFile = applet.getParameter("treeFile");
-- 
1.7.10.2