Launch full app parameter takes servlet URL
authoramwaterhouse <Andrew Waterhouse>
Wed, 12 Jul 2006 11:52:42 +0000 (11:52 +0000)
committeramwaterhouse <Andrew Waterhouse>
Wed, 12 Jul 2006 11:52:42 +0000 (11:52 +0000)
src/jalview/appletgui/AlignFrame.java

index 495469c..d1b2da9 100755 (executable)
@@ -40,12 +40,17 @@ public class AlignFrame extends Frame implements ActionListener,
   int NEW_WINDOW_HEIGHT = 500;\r
   jalview.bin.JalviewLite applet;\r
 \r
+  String jalviewServletURL;\r
+\r
 \r
    public AlignFrame(AlignmentI al,\r
                      jalview.bin.JalviewLite applet,\r
                      String title,\r
                      boolean embedded)\r
   {\r
+\r
+    jalviewServletURL = applet.getParameter("APPLICATION_URL");\r
+\r
     try{\r
       jbInit();\r
     }catch(Exception ex)\r
@@ -507,9 +512,9 @@ public void itemStateChanged(ItemEvent evt)
 \r
   void launchFullApplication()\r
   {\r
-    StringBuffer url = new StringBuffer("http://bug.compbio.dundee.ac.uk:8080/Jalview/jalview?");\r
+    StringBuffer url = new StringBuffer(jalviewServletURL);\r
 \r
-    url.append("open="+\r
+    url.append("?open="+\r
                appendProtocol( applet.getParameter("file") ) );\r
 \r
     if(applet.getParameter("features")!=null)\r
@@ -2057,7 +2062,8 @@ public void itemStateChanged(ItemEvent evt)
         alignFrameMenuBar.add(helpMenu);\r
         fileMenu.add(inputText);\r
         fileMenu.add(outputTextboxMenu);\r
-       // fileMenu.add(loadApplication);\r
+        if(jalviewServletURL!=null)\r
+          fileMenu.add(loadApplication);\r
         fileMenu.addSeparator();\r
         fileMenu.add(loadTree);\r
         fileMenu.add(closeMenuItem);\r