fix for JAL-1678
authorJim Procter <jprocter@dundee.ac.uk>
Fri, 27 Feb 2015 16:58:45 +0000 (16:58 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Fri, 27 Feb 2015 16:58:45 +0000 (16:58 +0000)
src/jalview/appletgui/AlignFrame.java

index 1f32da0..e84c335 100644 (file)
@@ -1280,7 +1280,11 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener,
   {
     StringBuffer url = new StringBuffer(jalviewServletURL);
 
-    url.append("?open="
+    // allow servlet parameters to be passed in applet parameter
+    String firstSep = url.indexOf("?") > url.indexOf("/") ? "&" : "?";
+    url.append(firstSep);
+
+    url.append("open="
             + appendProtocol(viewport.applet.getParameter("file")));
 
     if (viewport.applet.getParameter("features") != null)