*/
package jalview.bin;
+import jalview.util.Platform;
+
import java.net.URLDecoder;
-import java.util.Vector;
+import java.util.ArrayList;
+import java.util.List;
/**
* Notes: this argParser does not distinguish between parameter switches,
public static final String VSESS = "vsess";
- private Vector<String> vargs = null;
+ private List<String> vargs = null;
private boolean isApplet;
public ArgsParser(String[] args)
{
- vargs = new Vector<>();
+ vargs = new ArrayList<>();
isApplet = (args.length > 0 && args[0].startsWith("<applet"));
if (isApplet)
{
}
else
{
+ if (Platform.isJS())
+
+ {
+ isApplet = true;
+ appletParams = AppletParams
+ .getAppletParams(Platform.getAppletInfoAsMap(), vargs);
+ }
for (int i = 0; i < args.length; i++)
{
String arg = args[i].trim();
{
arg = arg.substring(1);
}
- vargs.addElement(arg);
+ vargs.add(arg);
}
}
}
String dc = null, ret = null;
if (index != -1)
{
- ret = vargs.elementAt(index + 1).toString();
- vargs.removeElementAt(index);
- vargs.removeElementAt(index);
+ ret = vargs.get(index + 1).toString();
+ vargs.remove(index);
+ vargs.remove(index);
if (utf8decode && ret != null)
{
try
{
if (vargs.contains(arg))
{
- vargs.removeElement(arg);
+ vargs.remove(arg);
return true;
}
else
return vargs.size();
}
- public String getAppletValue(String key, String def)
+ public Object getAppletValue(String key, String def, boolean asString)
{
- String value;
+ Object value;
return (appletParams == null ? null
- : (value = appletParams.get(key.toLowerCase())) != null ? value
- : def);
+ : (value = appletParams.get(key.toLowerCase())) == null
+ ? def : asString ? "" + value
+ : value);
}
}