JAL-3626 from JAL-3253-applet web page embedding
[jalview.git] / src / jalview / bin / Jalview.java
index 02e53ec..98dc039 100755 (executable)
  */
 package jalview.bin;
 
+import jalview.api.AlignCalcWorkerI;
+import jalview.api.AlignViewportI;
+import jalview.api.JalviewApp;
+import jalview.api.StructureSelectionManagerProvider;
+import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.HiddenColumns;
+import jalview.datamodel.PDBEntry;
+import jalview.datamodel.SequenceGroup;
+import jalview.datamodel.SequenceI;
 import jalview.ext.so.SequenceOntology;
 import jalview.gui.AlignFrame;
+import jalview.gui.AlignmentPanel;
+import jalview.gui.CalculationChooser;
 import jalview.gui.Desktop;
 import jalview.gui.PromptUserConfig;
+import jalview.gui.StructureViewer;
 import jalview.io.AppletFormatAdapter;
 import jalview.io.BioJsHTMLOutput;
 import jalview.io.DataSourceType;
@@ -35,12 +47,19 @@ import jalview.io.HtmlSvgOutput;
 import jalview.io.IdentifyFile;
 import jalview.io.NewickFile;
 import jalview.io.gff.SequenceOntologyFactory;
+import jalview.javascript.JSFunctionExec;
+import jalview.javascript.MouseOverStructureListener;
+import jalview.renderer.seqfeatures.FeatureRenderer;
 import jalview.schemes.ColourSchemeI;
 import jalview.schemes.ColourSchemeProperty;
+import jalview.structure.SelectionSource;
+import jalview.structure.VamsasSource;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
 import jalview.ws.jws2.Jws2Discoverer;
+import netscape.javascript.JSObject;
 
+import java.applet.AppletContext;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -58,8 +77,12 @@ import java.security.PermissionCollection;
 import java.security.Permissions;
 import java.security.Policy;
 import java.util.HashMap;
+import java.util.Hashtable;
 import java.util.Map;
 import java.util.Vector;
+import java.util.logging.ConsoleHandler;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import javax.swing.LookAndFeel;
 import javax.swing.UIManager;
@@ -84,35 +107,80 @@ import groovy.util.GroovyScriptEngine;
  * @author $author$
  * @version $Revision$
  */
-public class Jalview
+public class Jalview implements JalviewJSApi
 {
-  /*
-   * singleton instance of this class
-   */
+  static
+  {
+    Platform.getURLCommandArguments();
+  }
+
+  // singleton instance of this class
+
   private static Jalview instance;
 
   private Desktop desktop;
 
   public static AlignFrame currentAlignFrame;
 
+  public boolean isJavaAppletTag;
+
+  public String appletResourcePath;
+
+  JalviewAppLoader appLoader;
+
+  protected JSFunctionExec jsFunctionExec;
+
+  private boolean noCalculation, noMenuBar, noStatus;
+
+  private boolean noAnnotation;
+
+  public boolean getStartCalculations()
+  {
+    return !noCalculation;
+  }
+
+  public boolean getAllowMenuBar()
+  {
+    return !noMenuBar;
+  }
+
+  public boolean getShowStatus()
+  {
+    return !noStatus;
+  }
+
+  public boolean getShowAnnotation()
+  {
+    return !noAnnotation;
+  }
+
+
   static
   {
-    // grab all the rights we can the JVM
-    Policy.setPolicy(new Policy()
+    if (!Platform.isJS())
+    /**
+     * Java only
+     * 
+     * @j2sIgnore
+     */
     {
-      @Override
-      public PermissionCollection getPermissions(CodeSource codesource)
-      {
-        Permissions perms = new Permissions();
-        perms.add(new AllPermission());
-        return (perms);
-      }
-
-      @Override
-      public void refresh()
-      {
-      }
-    });
+      // grab all the rights we can for the JVM
+           Policy.setPolicy(new Policy()
+           {
+             @Override
+             public PermissionCollection getPermissions(CodeSource codesource)
+             {
+               Permissions perms = new Permissions();
+               perms.add(new AllPermission());
+               return (perms);
+             }
+       
+             @Override
+             public void refresh()
+             {
+             }
+           });
+    }
   }
 
   /**
@@ -187,38 +255,52 @@ public class Jalview
    */
   public static void main(String[] args)
   {
+    if (false)
+    {
+      Platform.startJavaLogging();
+    }
+
     instance = new Jalview();
     instance.doMain(args);
-  }
+}
 
   /**
    * @param args
    */
   void doMain(String[] args)
   {
-    System.setSecurityManager(null);
+
+    if (!Platform.isJS())
+    {
+      System.setSecurityManager(null);
+    }
+
     System.out
-            .println("Java version: " + System.getProperty("java.version"));
+            .println("Java version: "
+                    + System.getProperty("java.version"));
+    System.out.println("Java Home: " + System.getProperty("java.home"));
     System.out.println(System.getProperty("os.arch") + " "
             + System.getProperty("os.name") + " "
             + System.getProperty("os.version"));
+    String val = System.getProperty("sys.install4jVersion");
+    if (val != null) {
+    System.out.println("Install4j version: " + val);
+    }
+    val = System.getProperty("installer_template_version");
+    if (val != null) {
+      System.out.println("Install4j template version: " + val);
+    }
+    val = System.getProperty("launcher_version");
+    if (val != null) {
+      System.out.println("Launcher version: " + val);
+    }
+
     // report Jalview version
     Cache.loadBuildProperties(true);
 
     ArgsParser aparser = new ArgsParser(args);
     boolean headless = false;
 
-    if (aparser.contains("help") || aparser.contains("h"))
-    {
-      showUsage();
-      System.exit(0);
-    }
-    if (aparser.contains("nodisplay") || aparser.contains("nogui")
-            || aparser.contains("headless"))
-    {
-      System.setProperty("java.awt.headless", "true");
-      headless = true;
-    }
     String usrPropsFile = aparser.getValue("props");
     Cache.loadProperties(usrPropsFile); // must do this before
     if (usrPropsFile != null)
@@ -227,23 +309,42 @@ public class Jalview
               "CMD [-props " + usrPropsFile + "] executed successfully!");
     }
 
-    // anything else!
-
-    final String jabawsUrl = aparser.getValue("jabaws");
-    if (jabawsUrl != null)
+    if (!Platform.isJS())
+    /**
+     * Java only
+     * 
+     * @j2sIgnore
+     */
     {
-      try
+      if (aparser.contains("help") || aparser.contains("h"))
       {
-        Jws2Discoverer.getDiscoverer().setPreferredUrl(jabawsUrl);
-        System.out.println(
-                "CMD [-jabaws " + jabawsUrl + "] executed successfully!");
-      } catch (MalformedURLException e)
+        showUsage();
+        System.exit(0);
+      }
+      if (aparser.contains("nodisplay") || aparser.contains("nogui")
+              || aparser.contains("headless"))
       {
-        System.err.println(
-                "Invalid jabaws parameter: " + jabawsUrl + " ignored");
+        System.setProperty("java.awt.headless", "true");
+        headless = true;
+      }
+      // anything else!
+
+      final String jabawsUrl = aparser.getValue("jabaws");
+      if (jabawsUrl != null)
+      {
+        try
+        {
+          Jws2Discoverer.getDiscoverer().setPreferredUrl(jabawsUrl);
+          System.out.println(
+                  "CMD [-jabaws " + jabawsUrl + "] executed successfully!");
+        } catch (MalformedURLException e)
+        {
+          System.err.println(
+                  "Invalid jabaws parameter: " + jabawsUrl + " ignored");
+        }
       }
-    }
 
+    }
     String defs = aparser.getValue("setprop");
     while (defs != null)
     {
@@ -255,9 +356,10 @@ public class Jalview
       else
       {
         System.out.println("Executing setprop argument: " + defs);
-        // DISABLED FOR SECURITY REASONS
-        // TODO: add a property to allow properties to be overriden by cli args
-        // Cache.setProperty(defs.substring(0,p), defs.substring(p+1));
+        if (Platform.isJS())
+        {
+          Cache.setProperty(defs.substring(0,p), defs.substring(p+1));
+        }
       }
       defs = aparser.getValue("setprop");
     }
@@ -289,7 +391,7 @@ public class Jalview
       System.err.println("Unexpected Look and Feel Exception");
       ex.printStackTrace();
     }
-    if (Platform.isAMac())
+    if (Platform.isAMacAndNotJS())
     {
 
       LookAndFeel lookAndFeel = ch.randelshofer.quaqua.QuaquaManager
@@ -328,10 +430,11 @@ public class Jalview
     }
 
     /*
-     * configure 'full' SO model if preferences say to, else use the default (SO
-     * Lite)
+     * configure 'full' SO model if preferences say to, else use the default (full SO)
+     * - as JS currently doesn't have OBO parsing, it must use 'Lite' version
      */
-    if (Cache.getDefault("USE_FULL_SO", true))
+    boolean soDefault = !Platform.isJS();
+    if (Cache.getDefault("USE_FULL_SO", soDefault))
     {
       SequenceOntologyFactory.setInstance(new SequenceOntology());
     }
@@ -344,66 +447,71 @@ public class Jalview
       try
       {
         JalviewTaskbar.setTaskbar(this);
-      } catch (Exception e)
-      {
-        System.out.println("Cannot set Taskbar");
-        // e.printStackTrace();
       } catch (Throwable t)
       {
-        System.out.println("Cannot set Taskbar");
-        // t.printStackTrace();
+        System.out.println("Error setting Taskbar: " + t.getMessage());
       }
 
       desktop.setVisible(true);
-      desktop.startServiceDiscovery();
-      if (!aparser.contains("nousagestats"))
-      {
-        startUsageStats(desktop);
-      }
-      else
-      {
-        System.err.println("CMD [-nousagestats] executed successfully!");
-      }
 
-      if (!aparser.contains("noquestionnaire"))
+      if (!Platform.isJS())
+      /**
+       * Java only
+       * 
+       * @j2sIgnore
+       */
       {
-        String url = aparser.getValue("questionnaire");
-        if (url != null)
+        desktop.startServiceDiscovery();
+        if (!aparser.contains("nousagestats"))
         {
-          // Start the desktop questionnaire prompter with the specified
-          // questionnaire
-          Cache.log.debug("Starting questionnaire url at " + url);
-          desktop.checkForQuestionnaire(url);
-          System.out.println(
-                  "CMD questionnaire[-" + url + "] executed successfully!");
+          startUsageStats(desktop);
         }
         else
         {
-          if (Cache.getProperty("NOQUESTIONNAIRES") == null)
+          System.err.println("CMD [-nousagestats] executed successfully!");
+        }
+
+        if (!aparser.contains("noquestionnaire"))
+        {
+          String url = aparser.getValue("questionnaire");
+          if (url != null)
           {
             // Start the desktop questionnaire prompter with the specified
             // questionnaire
-            // String defurl =
-            // "http://anaplog.compbio.dundee.ac.uk/cgi-bin/questionnaire.pl";
-            // //
-            String defurl = "http://www.jalview.org/cgi-bin/questionnaire.pl";
-            Cache.log.debug(
-                    "Starting questionnaire with default url: " + defurl);
-            desktop.checkForQuestionnaire(defurl);
+            Cache.log.debug("Starting questionnaire url at " + url);
+            desktop.checkForQuestionnaire(url);
+            System.out.println("CMD questionnaire[-" + url
+                    + "] executed successfully!");
+          }
+          else
+          {
+            if (Cache.getProperty("NOQUESTIONNAIRES") == null)
+            {
+              // Start the desktop questionnaire prompter with the specified
+              // questionnaire
+              // String defurl =
+              // "http://anaplog.compbio.dundee.ac.uk/cgi-bin/questionnaire.pl";
+              // //
+              String defurl = "http://www.jalview.org/cgi-bin/questionnaire.pl";
+              Cache.log.debug(
+                      "Starting questionnaire with default url: " + defurl);
+              desktop.checkForQuestionnaire(defurl);
+            }
           }
         }
-      }
-      else
-      {
-        System.err.println("CMD [-noquestionnaire] executed successfully!");
-      }
+        else
+        {
+          System.err
+                  .println("CMD [-noquestionnaire] executed successfully!");
+        }
 
-      if (!aparser.contains("nonews"))
-      {
-        desktop.checkForNews();
-      }
+        if (!aparser.contains("nonews"))
+        {
+          desktop.checkForNews();
+        }
 
-      BioJsHTMLOutput.updateBioJS();
+        BioJsHTMLOutput.updateBioJS();
+      }
     }
 
     // Move any new getdown-launcher-new.jar into place over old
@@ -441,91 +549,6 @@ public class Jalview
       System.out.println("No files to open!");
       System.exit(1);
     }
-    String vamsasImport = aparser.getValue("vdoc");
-    String vamsasSession = aparser.getValue("vsess");
-    if (vamsasImport != null || vamsasSession != null)
-    {
-      if (desktop == null || headless)
-      {
-        System.out.println(
-                "Headless vamsas sessions not yet supported. Sorry.");
-        System.exit(1);
-      }
-      // if we have a file, start a new session and import it.
-      boolean inSession = false;
-      if (vamsasImport != null)
-      {
-        try
-        {
-          DataSourceType viprotocol = AppletFormatAdapter
-                  .checkProtocol(vamsasImport);
-          if (viprotocol == DataSourceType.FILE)
-          {
-            inSession = desktop.vamsasImport(new File(vamsasImport));
-          }
-          else if (viprotocol == DataSourceType.URL)
-          {
-            inSession = desktop.vamsasImport(new URL(vamsasImport));
-          }
-
-        } catch (Exception e)
-        {
-          System.err.println("Exeption when importing " + vamsasImport
-                  + " as a vamsas document.");
-          e.printStackTrace();
-        }
-        if (!inSession)
-        {
-          System.err.println("Failed to import " + vamsasImport
-                  + " as a vamsas document.");
-        }
-        else
-        {
-          System.out.println("Imported Successfully into new session "
-                  + desktop.getVamsasApplication().getCurrentSession());
-        }
-      }
-      if (vamsasSession != null)
-      {
-        if (vamsasImport != null)
-        {
-          // close the newly imported session and import the Jalview specific
-          // remnants into the new session later on.
-          desktop.vamsasStop_actionPerformed(null);
-        }
-        // now join the new session
-        try
-        {
-          if (desktop.joinVamsasSession(vamsasSession))
-          {
-            System.out.println(
-                    "Successfully joined vamsas session " + vamsasSession);
-          }
-          else
-          {
-            System.err.println("WARNING: Failed to join vamsas session "
-                    + vamsasSession);
-          }
-        } catch (Exception e)
-        {
-          System.err.println(
-                  "ERROR: Failed to join vamsas session " + vamsasSession);
-          e.printStackTrace();
-        }
-        if (vamsasImport != null)
-        {
-          // the Jalview specific remnants can now be imported into the new
-          // session at the user's leisure.
-          Cache.log.info(
-                  "Skipping Push for import of data into existing vamsas session."); // TODO:
-          // enable
-          // this
-          // when
-          // debugged
-          // desktop.getVamsasApplication().push_update();
-        }
-      }
-    }
     long progress = -1;
     // Finally, deal with the remaining input data.
     if (file != null)
@@ -539,19 +562,28 @@ public class Jalview
       }
       System.out.println("CMD [-open " + file + "] executed successfully!");
 
-      if (!file.startsWith("http://"))
+      if (!Platform.isJS())
+        /**
+         * ignore in JavaScript -- can't just file existence - could load it?
+         * 
+         * @j2sIgnore
+         */
       {
-        if (!(new File(file)).exists())
+        if (!file.startsWith("http://") && !file.startsWith("https://"))
+        // BH 2019 added https check for Java
         {
-          System.out.println("Can't find " + file);
-          if (headless)
+          if (!(new File(file)).exists())
           {
-            System.exit(1);
+            System.out.println("Can't find " + file);
+            if (headless)
+            {
+              System.exit(1);
+            }
           }
         }
       }
 
-      protocol = AppletFormatAdapter.checkProtocol(file);
+        protocol = AppletFormatAdapter.checkProtocol(file);
 
       try
       {
@@ -737,7 +769,8 @@ public class Jalview
             continue;
           }
 
-          if (af.saveAlignment(file, format))
+          af.saveAlignment(file, format);
+          if (af.isSaveAlignmentSuccessful())
           {
             System.out.println("Written alignment in " + format
                     + " format to " + file);
@@ -761,11 +794,16 @@ public class Jalview
     // And the user
     // ////////////////////
 
-    if (!headless && file == null && vamsasImport == null
-            && jalview.bin.Cache.getDefault("SHOW_STARTUP_FILE", true))
+    if (!Platform.isJS() && !headless && file == null
+            && Cache.getDefault("SHOW_STARTUP_FILE", true))
+    /**
+     * Java only
+     * 
+     * @j2sIgnore
+     */
     {
-      file = jalview.bin.Cache.getDefault("STARTUP_FILE",
-              jalview.bin.Cache.getDefault("www.jalview.org",
+      file = Cache.getDefault("STARTUP_FILE",
+              Cache.getDefault("www.jalview.org",
                       "http://www.jalview.org")
                       + "/examples/exampleFile_2_7.jar");
       if (file.equals(
@@ -774,7 +812,7 @@ public class Jalview
         // hardwire upgrade of the startup file
         file.replace("_2_3.jar", "_2_7.jar");
         // and remove the stale setting
-        jalview.bin.Cache.removeProperty("STARTUP_FILE");
+        Cache.removeProperty("STARTUP_FILE");
       }
 
       protocol = DataSourceType.FILE;
@@ -867,10 +905,6 @@ public class Jalview
                     // passed in correctly)"
                     + "-jabaws URL\tSpecify URL for Jabaws services (e.g. for a local installation).\n"
                     + "-fetchfrom nickname\tQuery nickname for features for the alignments and display them.\n"
-                    // +
-                    // "-vdoc vamsas-document\tImport vamsas document into new
-                    // session or join existing session with same URN\n"
-                    // + "-vses vamsas-session\tJoin session with given URN\n"
                     + "-groovy FILE\tExecute groovy script in FILE, after all other arguments have been processed (if FILE is the text 'STDIN' then the file will be read from STDIN)\n"
                     + "\n~Read documentation in Application or visit http://www.jalview.org for description of Features and Annotations file~\n\n");
   }
@@ -1066,4 +1100,817 @@ public class Jalview
   {
     Jalview.currentAlignFrame = currentAlignFrame;
   }
+  
+  /**
+   * Get the SwingJS applet ID and combine that with the frameType
+   * 
+   * @param frameType
+   *          "alignment", "desktop", etc., or null
+   * @return
+   */
+  public static String getAppID(String frameType)
+  {
+    String id = Cache.getProperty("Info.j2sAppletID");
+    if (id == null)
+    {
+      id = "jalview";
+    }
+    return id + (frameType == null ? "" : "-" + frameType);
+  }
+
+  /**
+   * Handle all JalviewLite applet parameters
+   * 
+   * @param aparser
+   * @param af
+   */
+  private void loadAppletParams(ArgsParser aparser, AlignFrame af)
+  {
+    JalviewApp app = new JalviewApp()
+    {
+
+      // TODO BH 2019
+      //
+      // These are methods that are in JalviewLite that various classes call
+      // but are not in JalviewLiteJsApi. Or, even if they are, other classes
+      // call
+      // them to JalviewLite directly. Some may not be necessary, but they have
+      // to
+      // be at least mentioned here, or the classes calling them should
+      // reference
+      // JalviewLite itself.
+
+      private boolean alignPDBStructures; // From JalviewLite; not implemented
+
+      private Hashtable<String, Hashtable<String, String[]>> jsmessages;
+
+      private Hashtable<String, int[]> jshashes;
+
+      @Override
+      public String getParameter(String name)
+      {
+        return aparser.getAppletValue(name, null);
+      }
+
+      @Override
+      public boolean getDefaultParameter(String name, boolean def)
+      {
+        String stn;
+        return ((stn = getParameter(name)) == null ? def
+                : "true".equalsIgnoreCase(stn));
+      }
+
+      /**
+       * Get the applet-like document base even though this is an application.
+       */
+      @Override
+      public URL getDocumentBase()
+      {
+        return Platform.getDocumentBase();
+      }
+
+      /**
+       * Get the applet-like code base even though this is an application.
+       */
+      @Override
+      public URL getCodeBase()
+      {
+        return Platform.getCodeBase();
+      }
+
+      @Override
+      public AlignViewportI getViewport()
+      {
+        return af.getViewport();
+      }
+
+      /**
+       * features
+       * 
+       */
+      @Override
+      public boolean parseFeaturesFile(String filename,
+              DataSourceType protocol)
+      {
+        return af.parseFeaturesFile(filename, protocol);
+      }
+
+      /**
+       * scorefile
+       * 
+       */
+      @Override
+      public boolean loadScoreFile(String sScoreFile) throws IOException
+      {
+        af.loadJalviewDataFile(sScoreFile, null, null, null);
+        return true;
+      }
+
+      /**
+       * annotations, jpredfile, jnetfile
+       * 
+       */
+      @Override
+      public void updateForAnnotations()
+      {
+        af.updateForAnnotations();
+      }
+
+      @Override
+      public void loadTree(NewickFile fin, String treeFile)
+              throws IOException
+      {
+        // n/a -- already done by standard Jalview command line processing
+      }
+
+      @Override
+      public void setAlignPdbStructures(boolean defaultParameter)
+      {
+        alignPDBStructures = true;
+      }
+
+      @Override
+      public void newStructureView(PDBEntry pdb, SequenceI[] seqs,
+              String[] chains, DataSourceType protocol)
+      {
+        StructureViewer.launchStructureViewer(af.alignPanel, pdb, seqs);
+      }
+
+      @Override
+      public void setFeatureGroupState(String[] groups, boolean state)
+      {
+        af.setFeatureGroupState(groups, state);
+      }
+
+      @Override
+      public void alignedStructureView(PDBEntry[] pdb, SequenceI[][] seqs,
+              String[][] chains, String[] protocols)
+      {
+        System.err.println(
+                "Jalview applet interface alignedStructureView not implemented");
+      }
+
+      @Override
+      public void newFeatureSettings()
+      {
+        System.err.println(
+                "Jalview applet interface newFeatureSettings not implemented");
+      }
+
+      private Vector<Runnable> jsExecQueue;
+
+      @Override
+      public Vector<Runnable> getJsExecQueue(JSFunctionExec exec)
+      {
+        jsFunctionExec = exec;
+        return (jsExecQueue == null ? (jsExecQueue = new Vector<>())
+                : jsExecQueue);
+      }
+
+      @Override
+      public AppletContext getAppletContext()
+      {
+        // TODO Auto-generated method stub
+        return null;
+      }
+
+      @Override
+      public boolean isJsfallbackEnabled()
+      {
+        // TODO Auto-generated method stub
+        return false;
+      }
+
+      @Override
+      public JSObject getJSObject()
+      {
+        // TODO Auto-generated method stub
+        return null;
+      }
+
+      @Override
+      public StructureSelectionManagerProvider getStructureSelectionManagerProvider()
+      {
+        // TODO Q: what exactly is this? BH
+        return null;
+      }
+
+      @Override
+      public void updateColoursFromMouseOver(Object source,
+              MouseOverStructureListener mouseOverStructureListener)
+      {
+        // TODO Auto-generated method stub
+
+      }
+
+      @Override
+      public Object[] getSelectionForListener(SequenceGroup seqsel,
+              ColumnSelection colsel, HiddenColumns hidden,
+              SelectionSource source, Object alignFrame)
+      {
+        return appLoader.getSelectionForListener(getCurrentAlignFrame(),
+                seqsel, colsel, hidden, source, alignFrame);
+      }
+
+      @Override
+      public String arrayToSeparatorList(String[] array)
+      {
+        return appLoader.arrayToSeparatorList(array);
+      }
+
+      @Override
+      public Hashtable<String, int[]> getJSHashes()
+      {
+        return (jshashes == null ? (jshashes = new Hashtable<>())
+                : jshashes);
+      }
+
+      @Override
+      public Hashtable<String, Hashtable<String, String[]>> getJSMessages()
+      {
+        return (jsmessages == null ? (jsmessages = new Hashtable<>())
+                : jsmessages);
+      }
+
+      @Override
+      public Object getFrameForSource(VamsasSource source)
+      {
+        if (source != null)
+        {
+          AlignFrame af;
+          if (source instanceof jalview.gui.AlignViewport
+                  && source == (af = getCurrentAlignFrame()).getViewport())
+          {
+            // should be valid if it just generated an event!
+            return af;
+          }
+          // TODO: ensure that if '_af' is specified along with a handler
+          // function, then only events from that alignFrame are sent to that
+          // function
+        }
+        return null;
+      }
+
+      @Override
+      public FeatureRenderer getNewFeatureRenderer(AlignViewportI vp)
+      {
+        return new jalview.gui.FeatureRenderer((AlignmentPanel) vp);
+      }
+
+    };
+
+    appLoader = new JalviewAppLoader(true);
+    appLoader.load(app);
+  }
+
+  /**
+   * 
+   * @see jalview.bin.JalviewLiteJsApi#getSelectedSequences()
+   */
+  @Override
+  public String getSelectedSequences()
+  {
+    return getSelectedSequencesFrom(getCurrentAlignFrame());
+  }
+
+  /**
+   * 
+   * @see jalview.bin.JalviewLiteJsApi#getSelectedSequences(java.lang.String)
+   */
+  @Override
+  public String getSelectedSequences(String sep)
+  {
+    return getSelectedSequencesFrom(getCurrentAlignFrame(), sep);
+  }
+
+  /**
+   * 
+   * @see jalview.bin.JalviewLiteJsApi#getSelectedSequencesFrom(jalview.appletgui
+   *      .AlignFrame)
+   */
+  @Override
+  public String getSelectedSequencesFrom(AlignFrame alf)
+  {
+    if (alf == null)
+    {
+      alf = getCurrentAlignFrame();
+    }
+    return getSelectedSequencesFrom(alf, null);
+  }
+
+  /**
+   * 
+   * @see jalview.bin.JalviewLiteJsApi#getSelectedSequencesFrom(jalview.appletgui
+   *      .AlignFrame, java.lang.String)
+   */
+  @Override
+  public String getSelectedSequencesFrom(AlignFrame alf, String sep)
+  {
+    if (alf == null)
+    {
+      alf = getCurrentAlignFrame();
+    }
+    return appLoader.getSelectedSequencesFrom(alf, sep);
+  }
+
+  /**
+   * 
+   * @see jalview.bin.JalviewLiteJsApi#getSelectedSequencesFrom(jalview.appletgui
+   *      .AlignFrame, java.lang.String)
+   */
+  @Override
+  public void highlight(String sequenceId, String position,
+          String alignedPosition)
+  {
+    highlightIn(null, sequenceId, position,
+            alignedPosition);
+  }
+
+  @Override
+  public void highlightIn(AlignFrame alf, String sequenceId,
+          String position, String alignedPosition)
+  {
+    if (alf == null)
+    {
+      alf = getCurrentAlignFrame();
+    }
+    appLoader.highlightIn(alf, sequenceId, position, alignedPosition);
+  }
+
+  @Override
+  public void select(String sequenceIds, String columns)
+  {
+    selectIn(getCurrentAlignFrame(), sequenceIds, columns, null);
+  }
+
+  @Override
+  public void select(String sequenceIds, String columns, String sep)
+  {
+    selectIn(null, sequenceIds, columns, sep);
+  }
+
+  @Override
+  public void selectIn(AlignFrame alf, String sequenceIds, String columns)
+  {
+    selectIn(alf, sequenceIds, columns, null);
+  }
+
+  @Override
+  public void selectIn(AlignFrame alf, String sequenceIds, String columns,
+          String sep)
+  {
+    if (alf == null)
+    {
+      alf = getCurrentAlignFrame();
+    }
+    appLoader.selectIn(alf, sequenceIds, columns, sep);
+  }
+
+  @Override
+  public String getSelectedSequencesAsAlignment(String format,
+          String suffix)
+  {
+    return getSelectedSequencesAsAlignmentFrom(null,
+            format, suffix);
+  }
+
+  @Override
+  public String getSelectedSequencesAsAlignmentFrom(AlignFrame alf,
+          String format, String sep)
+  {
+    if (alf == null)
+    {
+      alf = getCurrentAlignFrame();
+    }
+    return appLoader.getSelectedSequencesAsAlignmentFrom(alf, format, sep);
+  }
+
+  @Override
+  public String getAlignmentOrder()
+  {
+    return getAlignmentFrom(getCurrentAlignFrame(), null);
+  }
+
+  @Override
+  public String getAlignmentOrderFrom(AlignFrame alf)
+  {
+    return getAlignmentFrom(alf, null);
+  }
+
+  @Override
+  public String getAlignmentOrderFrom(AlignFrame alf, String sep)
+  {
+    if (alf == null)
+    {
+      alf = getCurrentAlignFrame();
+    }
+    return appLoader.getAlignmentOrderFrom(alf, sep);
+  }
+
+  @Override
+  public String orderBy(String order, String undoName)
+  {
+    return orderBy(order, undoName, null);
+  }
+
+  @Override
+  public String orderBy(String order, String undoName, String sep)
+  {
+    return orderAlignmentBy(getCurrentAlignFrame(), order, undoName, sep);
+  }
+
+  @Override
+  public String orderAlignmentBy(AlignFrame alf, String order,
+          String undoName, String sep)
+  {
+    if (alf == null)
+    {
+      alf = getCurrentAlignFrame();
+    }
+    return appLoader.orderAlignmentBy(alf, order, undoName, sep);
+  }
+
+  @Override
+  public String getAlignment(String format)
+  {
+    return getAlignmentFrom(null, format, null);
+  }
+
+  @Override
+  public String getAlignmentFrom(AlignFrame alf, String format)
+  {
+    return getAlignmentFrom(alf, format, null);
+  }
+
+  @Override
+  public String getAlignment(String format, String suffix)
+  {
+    return getAlignmentFrom(getCurrentAlignFrame(), format, suffix);
+  }
+
+  @Override
+  public String getAlignmentFrom(AlignFrame alf, String format,
+          String suffix)
+  {
+    return appLoader.getAlignmentFrom(alf, format, suffix);
+  }
+
+  @Override
+  public void loadAnnotation(String annotation)
+  {
+    loadAnnotationFrom(getCurrentAlignFrame(), annotation);
+  }
+
+  @Override
+  public void loadAnnotationFrom(AlignFrame alf, String annotation)
+  {
+    if (alf == null)
+    {
+      alf = getCurrentAlignFrame();
+    }
+    appLoader.loadAnnotationFrom(alf, annotation);
+  }
+
+  @Override
+  public void loadFeatures(String features, boolean autoenabledisplay)
+  {
+    loadFeaturesFrom(currentAlignFrame, features, autoenabledisplay);
+  }
+
+  @Override
+  public boolean loadFeaturesFrom(AlignFrame alf, String features,
+          boolean autoenabledisplay)
+  {
+    if (alf == null)
+    {
+      alf = getCurrentAlignFrame();
+    }
+    return appLoader.loadFeaturesFrom(alf, features, autoenabledisplay);
+  }
+
+  @Override
+  public String getFeatures(String format)
+  {
+    return getFeaturesFrom(null, format);
+  }
+
+  @Override
+  public String getFeaturesFrom(AlignFrame alf, String format)
+  {
+    if (alf == null)
+    {
+      alf = getCurrentAlignFrame();
+    }
+    return appLoader.getFeaturesFrom(alf, format);
+  }
+
+  @Override
+  public String getAnnotation()
+  {
+    return getAnnotationFrom(null);
+  }
+
+  @Override
+  public String getAnnotationFrom(AlignFrame alf)
+  {
+    if (alf == null)
+    {
+      alf = getCurrentAlignFrame();
+    }
+    return appLoader.getAnnotationFrom(alf);
+  }
+
+//  @Override
+//  public AlignFrame newView()
+//  {
+//    return newViewFrom(null, null);
+//  }
+//
+//  @Override
+//  public AlignFrame newView(String name)
+//  {
+//    return newViewFrom(null, name);
+//  }
+//
+//  @Override
+//  public AlignFrame newViewFrom(AlignFrame alf)
+//  {
+//    return newViewFrom(alf, null);
+//  }
+//
+//  @Override
+//  public AlignFrame newViewFrom(AlignFrame alf, String name)
+//  {
+//    if (alf == null)
+//    {
+//      alf = getCurrentAlignFrame();
+//    }
+//    return appLoader.newViewFrom(alf, name);
+//  }
+
+  @Override
+  public AlignFrame loadAlignment(String text, String title)
+  {
+    return appLoader.loadAlignment(text, AlignFrame.DEFAULT_WIDTH,
+            AlignFrame.DEFAULT_HEIGHT, title);
+  }
+
+  @Override
+  public boolean addPdbFile(AlignFrame alFrame, String sequenceId,
+          String pdbEntryString, String pdbFile)
+  {
+    if (alFrame == null)
+    {
+      alFrame = getCurrentAlignFrame();
+    }
+    return appLoader.addPdbFile(alFrame, sequenceId, pdbEntryString,
+            pdbFile);
+  }
+
+  @Override
+  public void scrollViewToIn(AlignFrame alf, String topRow,
+          String leftHandColumn)
+  {
+    if (alf == null)
+    {
+      alf = getCurrentAlignFrame();
+    }
+    appLoader.scrollViewToIn(alf, topRow, leftHandColumn);
+  }
+
+  @Override
+  public void scrollViewToRowIn(AlignFrame alf, String topRow)
+  {
+    if (alf == null)
+    {
+      alf = getCurrentAlignFrame();
+    }
+    appLoader.scrollViewToRowIn(alf, topRow);
+  }
+
+  @Override
+  public void scrollViewToColumnIn(AlignFrame alf, String leftHandColumn)
+  {
+    if (alf == null)
+    {
+      alf = getCurrentAlignFrame();
+    }
+    appLoader.scrollViewToColumnIn(alf, leftHandColumn);
+  }
+
+  @Override
+  public String getFeatureGroups()
+  {
+    return getFeatureGroupsOn(null);
+  }
+
+  @Override
+  public String getFeatureGroupsOn(AlignFrame alf)
+  {
+    if (alf == null)
+    {
+      alf = getCurrentAlignFrame();
+    }
+    return appLoader.getFeatureGroupsOn(alf);
+  }
+
+  @Override
+  public String getFeatureGroupsOfState(boolean visible)
+  {
+    return getFeatureGroupsOfStateOn(null, visible);
+  }
+
+  @Override
+  public String getFeatureGroupsOfStateOn(AlignFrame alf, boolean visible)
+  {
+    if (alf == null)
+    {
+      alf = getCurrentAlignFrame();
+    }
+    return appLoader.getFeatureGroupsOfStateOn(alf, visible);
+  }
+
+  @Override
+  public void setFeatureGroupState(String groups, boolean state)
+  { // JalviewLite API
+    setFeatureGroupStateOn(null, groups, state);
+  }
+
+  @Override
+  public void setFeatureGroupStateOn(AlignFrame alf, String groups,
+          boolean state)
+  {
+    if (alf == null)
+    {
+      alf = getCurrentAlignFrame();
+    }
+    appLoader.setFeatureGroupStateOn(alf, groups, state);
+  }
+
+  @Override
+  public String getSeparator()
+  {
+    return appLoader.getSeparator();
+  }
+
+  @Override
+  public void setSeparator(String separator)
+  {
+    appLoader.setSeparator(separator);
+  }
+
+  @Override
+  public String getJsMessage(String messageclass, String viewId)
+  {
+    // see http://www.jalview.org/examples/jalviewLiteJs.html
+    return null;
+  }
+
+  /**
+   * Open a new Tree panel on the desktop statically. Params are standard (not
+   * set by Groovy). No dialog is opened.
+   * 
+   * @param af
+   * @param treeType
+   * @param modelName
+   * @return null, or the string "label.you_need_at_least_n_sequences" if number
+   *         of sequences selected is inappropriate
+   */
+  @Override
+  public Object openTreePanel(AlignFrame af, String treeType,
+          String modelName)
+  { // JalviewJS api
+    if (af == null)
+    {
+      af = getCurrentAlignFrame();
+    }
+    return CalculationChooser.openTreePanel(af, treeType, modelName, null);
+  }
+
+  /**
+   * public static method for JalviewJS API to open a PCAPanel without
+   * necessarily using a dialog.
+   * 
+   * @param af
+   * @param modelName
+   * @return the PCAPanel, or the string "label.you_need_at_least_n_sequences"
+   *         if number of sequences selected is inappropriate
+   */
+  @Override
+  public Object openPcaPanel(AlignFrame af, String modelName)
+  {
+    if (af == null)
+    {
+      af = getCurrentAlignFrame();
+    }
+    return CalculationChooser.openPcaPanel(af, modelName, null);
+  }
+
+  @Override
+  public String getSelectedSequencesAsAlignment(String format,
+          boolean suffix)
+  {
+    return getSelectedSequencesAsAlignmentFrom(null,
+            format, suffix);
+  }
+
+  @Override
+  public String getSelectedSequencesAsAlignmentFrom(AlignFrame alf,
+          String format, boolean suffix)
+  {
+    if (alf == null)
+    {
+      alf = getCurrentAlignFrame();
+    }
+    return appLoader.getSelectedSequencesAsAlignmentFrom(alf, format,
+            "" + suffix);
+  }
+
+  @Override
+  public String arrayToSeparatorList(String[] array)
+  {
+    return appLoader.arrayToSeparatorList(array);
+  }
+
+  @Override
+  public String[] separatorListToArray(String list)
+  {
+    return appLoader.separatorListToArray(list);
+  }
+
+  //// probably not needed in JalviewJS -- From when Jmol and Jalview did not
+  //// have a direct connection?
+
+  @Override
+  public void setMouseoverListener(String listener)
+  {
+    // TODO Auto-generated method stub
+
+  }
+
+  @Override
+  public void setMouseoverListener(AlignFrame af, String listener)
+  {
+    // TODO Auto-generated method stub
+
+  }
+
+  @Override
+  public void setSelectionListener(String listener)
+  {
+    // TODO Auto-generated method stub
+
+  }
+
+  @Override
+  public void setSelectionListener(AlignFrame af, String listener)
+  {
+    // TODO Auto-generated method stub
+
+  }
+
+  @Override
+  public void setStructureListener(String listener, String modelSet)
+  {
+    // TODO Auto-generated method stub
+
+  }
+
+  @Override
+  public void removeJavascriptListener(AlignFrame af, String listener)
+  {
+    // TODO Auto-generated method stub
+
+  }
+
+  @Override
+  public void mouseOverStructure(String pdbResNum, String chain,
+          String pdbfile)
+  {
+    // TODO Auto-generated method stub
+
+  }
+
+  @Override
+  public void showOverview()
+  {
+    currentAlignFrame.overviewMenuItem_actionPerformed(null);
+  }
+
+  public void notifyWorker(AlignCalcWorkerI worker, String status)
+  {
+    // System.out.println("Jalview worker " + worker.getClass().getSimpleName()
+    // + " " + status);
+  }
+
+  @Override
+  public Object parseArguments(String[] args)
+  {
+    // TODO Auto-generated method stub
+    return null;
+  }
+
+
+  
+  
 }