JAL-629 STDOUT documentation. Opt.STDOUT narrower option. Fix for subvals and STDOU...

[jalview.git] / src / jalview / bin / argparser / BootstrapArgs.java

diff --git a/src/jalview/bin/argparser/BootstrapArgs.java b/src/jalview/bin/argparser/BootstrapArgs.java
index 32eb91a..a989206 100644 (file)
--- a/src/jalview/bin/argparser/BootstrapArgs.java
+++ b/src/jalview/bin/argparser/BootstrapArgs.java
@@ -152,11 +152,19 @@ public class BootstrapArgs
           // not a bootstrap arg
 
           // make a check for an output going to stdout
-          if (a != null && a.hasOption(Opt.OUTPUTFILE))
+          if (a != null && a.hasOption(Opt.OUTPUTFILE)
+                  && a.hasOption(Opt.STDOUT))
           {
-            if ((val == null && i + 1 < args.size()
-                    && ArgParser.STDOUTFILENAME.equals(args.get(i + 1)))
-                    || ArgParser.STDOUTFILENAME.equals(val))
+            if (val == null && i + 1 < args.size())
+            {
+              val = args.get(i + 1);
+            }
+            if (val.startsWith("[") && val.indexOf(']') > 0)
+            {
+              val = val.substring(val.indexOf(']') + 1);
+            }
+
+            if (ArgParser.STDOUTFILENAME.equals(val))
             {
               this.outputToStdout = true;
             }