From 3f865a8b811c9a52a2f6dcfca6768f18afc33379 Mon Sep 17 00:00:00 2001 From: BobHanson Date: Sun, 7 Jun 2020 18:39:37 -0500 Subject: [PATCH] JAL-3446 AppletParams --- doc/JalviewJS-startupParams.xlsx | Bin 0 -> 17138 bytes src/jalview/bin/AppletParams.java | 112 +++++++++++++++++++------------------ 2 files changed, 59 insertions(+), 53 deletions(-) create mode 100644 doc/JalviewJS-startupParams.xlsx diff --git a/doc/JalviewJS-startupParams.xlsx b/doc/JalviewJS-startupParams.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..d32fc48048fdcdfa6368d2028b6a0b225aeb9d9e GIT binary patch literal 17138 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 CeDb*f literal 0 HcmV?d00001 diff --git a/src/jalview/bin/AppletParams.java b/src/jalview/bin/AppletParams.java index 3642985..726734d 100644 --- a/src/jalview/bin/AppletParams.java +++ b/src/jalview/bin/AppletParams.java @@ -8,7 +8,15 @@ import java.util.Map; import jalview.gui.Preferences; /** - * Collection of all known applet tags from JalviewLite + * Collection of all known applet tags from JalviewLite. + * Three cases; can be one or more of these: + * + * CASE I. args[] name and value for ArgsParser + * + * CASE II. applet parameter for JalviewJSApp + * + * CASE III. mapped to a Preference + * * * @author hansonr * @@ -163,14 +171,20 @@ public class AppletParams extends HashMap // note that Application arguments ARE case-sensitive, but // Applet.getParameter() is not. - String appletName = prefName.toLowerCase(); - String argName = prefName; + // prefName // CASE III + + String argName = null; // CASE I + + String appletName = prefName.toLowerCase(); // CASE II + + // by nulling one or more of these names, that route will not be used. + switch (appletName) { case "file": argName = "open"; - appletName = null; + prefName = null; value = resourcePath + value; break; case "file2": @@ -178,27 +192,34 @@ public class AppletParams extends HashMap prefName = null; value = resourcePath + value; break; - case "features": - case "jnetfile": - case "jpredfile": - case "pdbfile": - case "scorefile": - case "sequence": + case "oninit": + case "hidefeaturegroups": + // applet parameter only // setting argName to null indicates that we want - // JalviewJSApp to take care of this using getParameter or getParameterAsObject - prefName = argName = null; - value = resourcePath + value; + // JalviewJSApp to take care of this using getParameter or getParameterAsObject + prefName = argName = null; break; case "tree": case "treefile": // setting appletName to null indicates that we want // Jalview.doMain to taken care of this as Jalview args argName = "tree"; - appletName = null; + prefName = null; value = resourcePath + value; break; - // non-loading preferences + case "features": + case "jnetfile": + case "jpredfile": + case "pdbfile": + case "scorefile": + case "sequence": + case "annotations": + prefName = argName = null; + value = resourcePath + value; + break; + + // non-loading preferences case "defaultcolour": prefName = Preferences.DEFAULT_COLOUR; @@ -240,33 +261,23 @@ public class AppletParams extends HashMap case "wrap": prefName = Preferences.WRAP_ALIGNMENT; break; + case "sortbytree": + argName = prefName; + prefName = Preferences.SORT_BY_TREE; + value = checkTF(value); + break; // implemented; not tested: - case "oninit": - argName = null; - break; - case "annotations": - value = resourcePath + value; - argName = null; - break; - case "hidefeaturegroups": - // TODO - break; case "pdbseq": - argName = prefName = null; - break; - case "sortbytree": - prefName = Preferences.SORT_BY_TREE; - value = checkTF(value); - appletName = null; // taken care of by Jalview + case "alignpdbfiles": + prefName = null; break; case "format": - break; - case "alignpdbfiles": - argName = prefName = null; + argName = prefName; break; case "separator": + argName = prefName; break; // TODO: probably not relevant? @@ -305,17 +316,13 @@ public class AppletParams extends HashMap case "widthscale": case "windowheight": case "windowwidth": - argName = prefName = null; + prefName = null; break; // TRUE/FALSE case "debug": - value = checkTF(value); - break; case "embedded": - value = checkTF(value); - break; case "showbutton": value = checkTF(value); break; @@ -355,25 +362,15 @@ public class AppletParams extends HashMap prefName = Preferences.SHOW_CONSENSUS_LOGO; value = checkTF(value); break; - case "showfeaturegroups": + case "showunconserved": + prefName = Preferences.SHOW_UNCONSERVED; value = checkTF(value); break; + case "showfeaturegroups": case "showfeaturesettings": - value = checkTF(value); - break; case "showfullid": - value = checkTF(value); - break; case "showtreebootstraps": - value = checkTF(value); - break; case "showtreedistances": - value = checkTF(value); - break; - case "showunconserved": - prefName = Preferences.SHOW_UNCONSERVED; - value = checkTF(value); - break; case "showunlinkedtreenodes": value = checkTF(value); break; @@ -391,6 +388,9 @@ public class AppletParams extends HashMap break; } + // CASE I. args[] name and value for ArgsParser + // + // If given an argument name, // put name and value into application args if (value != null && argName != null) { @@ -400,16 +400,22 @@ public class AppletParams extends HashMap vargs.add(value.toString()); } } + + // CASE II. applet parameter for JalviewJSApp + if (value == null) { value = "false"; } System.out.println("AppletParams propName=" + prefName + " argName=" - + argName + " appletName=" + appletName + " value=" + value); + + argName + " appletName=" + appletName + " value=" + value); if (appletName != null) { appletParams.put(appletName, value); } + + // CASE III. mapped to a Preference + if (prefName != null) { Cache.setPropertyNoSave(prefName, value.toString()); -- 1.7.10.2