Allow embedded applet

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