JAL-3660 JAL-3561 output alignment as requested file format as validated by FileForma...

Merged jbp patch for 2.11.1.0 to rhanson's Jalview-JS/develop reworking of args parsing

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index fea99fb..b8aa928 100755 (executable)
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -73,7 +73,6 @@ import jalview.schemes.ColourSchemeProperty;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
 import jalview.ws.jws2.Jws2Discoverer;
-//import netscape.javascript.JSObject;
 
 /**
  * Main class for Jalview Application <br>
@@ -1038,28 +1037,43 @@ public class Jalview implements ApplicationSingletonI
                 "Creating image map: " + imageFile.getAbsolutePath());
         continue;
       default:
-        format = FileFormats.getInstance().forName(outputFormat);
-        if (format == null)
-        {
-          System.out.println("Invalid file format: " + outputFormat);
-          break;
-        }
-        fname = new File(aparser.nextValue()).getAbsolutePath();
-        af.saveAlignment(fname, format);
-        if (!af.isSaveAlignmentSuccessful())
-        {
-          System.out.println("Error writing file " + fname + " in " + format
-                  + " format!!");
-          break;
-        }
-        continue;
+         // fall through - try to parse as an alignment data export format
+          FileFormatI outFormat=null;
+          try {
+            outFormat = FileFormats.getInstance().forName(outputFormat);
+          } catch (Exception formatP) {
+          }
+          if (outFormat==null) {
+            System.out.println("Couldn't parse "+outputFormat+" as a valid Jalview format string.");
+           continue;
+         }
+          if (!outFormat.isWritable())
+          {
+            System.out.println(
+                    "This version of Jalview does not support alignment export as "
+                            + outputFormat);
+           continue;
+          }
+          // record file as it was passed to Jalview so it is recognisable to the CLI caller
+          String file;
+         fname = new File(file=aparser.nextValue()).getAbsolutePath();
+         // JBPNote - yuck - really wish we did have a bean returned from this which gave success/fail like before !
+         af.saveAlignment(fname, outFormat);
+         if (!af.isSaveAlignmentSuccessful())
+          {
+              System.out.println("Written alignment in " + outputFormat
+                      + " format to " + file);
+             continue;
+          } else {
+                System.out.println("Error writing file " + file + " in "
+                        + outputFormat + " format!!");
+          }
       }
-      System.out.println("Unknown arg: " + outputFormat);      
-      break;
     }
+    // ??? Should report - 'ignoring' extra args here...
     while (aparser.getSize() > 0)
     {
-      System.out.println("Unknown arg: " + aparser.nextValue());
+      System.out.println("Ignoring extra argument: " + aparser.nextValue());
     }
   }