command line hook for questionnaire url argument.
authorjprocter <Jim Procter>
Mon, 5 Feb 2007 14:46:57 +0000 (14:46 +0000)
committerjprocter <Jim Procter>
Mon, 5 Feb 2007 14:46:57 +0000 (14:46 +0000)
src/jalview/bin/Jalview.java
src/jalview/gui/Desktop.java

index 30f91ac..13e9433 100755 (executable)
-/*\r
- * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program; if not, write to the Free Software\r
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
- */\r
-package jalview.bin;\r
-\r
-import jalview.gui.*;\r
-\r
-import javax.swing.*;\r
-\r
-import java.util.Vector;\r
-\r
-\r
-/**\r
- * Main class for Jalview Application\r
- * <br>\r
- * <br>start with java -Djava.ext.dirs=$PATH_TO_LIB$ jalview.bin.Jalview\r
- *\r
- * @author $author$\r
- * @version $Revision$\r
- */\r
-public class Jalview\r
-{\r
-\r
-    /**\r
-     * main class for Jalview application\r
-     *\r
-     * @param args open <em>filename</em>\r
-     */\r
-    public static void main(String[] args)\r
-    {\r
-      System.out.println("Java version: "+System.getProperty("java.version"));\r
-      System.out.println(System.getProperty("os.arch")+" "\r
-                         +System.getProperty("os.name")+" "\r
-                         +System.getProperty("os.version"));\r
-\r
-\r
-      ArgsParser aparser = new ArgsParser(args);\r
-      boolean headless = false;\r
-\r
-      if( aparser.contains("help") || aparser.contains("h") )\r
-      {\r
-        System.out.println("Usage: jalview -open [FILE] [OUTPUT_FORMAT] [OUTPUT_FILE]\n\n"\r
-                           +"-nodisplay\tRun Jalview without User Interface.\n"\r
-                           +"-props FILE\tUse the given Jalview properties file instead of users default.\n"\r
-                           +"-annotations FILE\tAdd precalculated annotations to the alignment.\n"\r
-                           +"-features FILE\tUse the given file to mark features on the alignment.\n"\r
-                           +"-fasta FILE\tCreate alignment file FILE in Fasta format.\n"\r
-                           +"-clustal FILE\tCreate alignment file FILE in Clustal format.\n"\r
-                           +"-pfam FILE\tCreate alignment file FILE in PFAM format.\n"\r
-                           +"-msf FILE\tCreate alignment file FILE in MSF format.\n"\r
-                           +"-pileup FILE\tCreate alignment file FILE in Pileup format\n"\r
-                           +"-pir FILE\tCreate alignment file FILE in PIR format.\n"\r
-                           +"-blc FILE\tCreate alignment file FILE in BLC format.\n"\r
-                           +"-jalview FILE\tCreate alignment file FILE in Jalview format.\n"\r
-                           +"-png FILE\tCreate PNG image FILE from alignment.\n"\r
-                           +"-imgMap FILE\tCreate HTML file FILE with image map of PNG image.\n"\r
-                           +"-eps FILE\tCreate EPS file FILE from alignment."\r
-            +"\n\n~Read documentation in Application or visit http://www.jalview.org for description of Features and Annotations file~\n\n");\r
-        System.exit(0);\r
-          }\r
-\r
-          Cache.loadProperties(aparser.getValue("props")); // must do this before anything else!\r
-\r
-          if (aparser.contains("nodisplay"))\r
-          {\r
-            System.setProperty("java.awt.headless", "true");\r
-          }\r
-          if (System.getProperty("java.awt.headless") != null\r
-              && System.getProperty("java.awt.headless").equals("true"))\r
-          {\r
-            headless = true;\r
-          }\r
-\r
-          try\r
-          {\r
-            Cache.initLogger();\r
-          }\r
-          catch (java.lang.NoClassDefFoundError error)\r
-          {\r
-            error.printStackTrace();\r
-            System.out.println(\r
-                "\nEssential logging libraries not found."\r
-                +"\nUse: java -Djava.ext.dirs=$PATH_TO_LIB$ jalview.bin.Jalview");\r
-            System.exit(0);\r
-          }\r
-\r
-        Desktop desktop = null;\r
-\r
-\r
-        try\r
-        {\r
-          UIManager.setLookAndFeel(\r
-              UIManager.getSystemLookAndFeelClassName()\r
-              //        UIManager.getCrossPlatformLookAndFeelClassName()\r
-      //"com.sun.java.swing.plaf.gtk.GTKLookAndFeel"\r
-      //"javax.swing.plaf.metal.MetalLookAndFeel"\r
-      //"com.sun.java.swing.plaf.windows.WindowsLookAndFeel"\r
-      //"com.sun.java.swing.plaf.motif.MotifLookAndFeel"\r
-\r
-              );\r
-        }\r
-        catch (Exception ex)\r
-        {}\r
-\r
-          if (!headless)\r
-          {\r
-            desktop = new Desktop();\r
-            desktop.setVisible(true);\r
-            desktop.discoverer.start();\r
-          }\r
-\r
-\r
-         String file = null, protocol = null, format = null, data=null;\r
-         jalview.io.FileLoader fileLoader = new jalview.io.FileLoader();\r
-\r
-          file = aparser.getValue("open");\r
-\r
-          if (file == null && desktop==null)\r
-          {\r
-            System.out.println("No files to open!");\r
-            System.exit(1);\r
-          }\r
-\r
-          if(file!=null)\r
-          {\r
-            System.out.println("Opening file: " + file);\r
-\r
-            if (!file.startsWith("http://"))\r
-            {\r
-              if (! (new java.io.File(file)).exists())\r
-              {\r
-                System.out.println("Can't find " + file);\r
-                if(headless)\r
-                  System.exit(1);\r
-              }\r
-            }\r
-\r
-            protocol = "File";\r
-\r
-            if (file.indexOf("http:") > -1 || file.indexOf("file:") >-1)\r
-            {\r
-              protocol = "URL";\r
-            }\r
-\r
-\r
-\r
-            if (file.endsWith(".jar"))\r
-              format = "Jalview";\r
-            else\r
-              format = new jalview.io.IdentifyFile().Identify(file, protocol);\r
-\r
-\r
-\r
-            AlignFrame af = fileLoader.LoadFileWaitTillLoaded(file, protocol, format);\r
-\r
-            if(af==null)\r
-            {\r
-              System.out.println("error");\r
-              return;\r
-            }\r
-\r
-            data = aparser.getValue("colour");\r
-            if(data!=null)\r
-            {\r
-              data.replaceAll("%20", " ");\r
-\r
-              jalview.schemes.ColourSchemeI cs =\r
-                  jalview.schemes.ColourSchemeProperty.getColour(af.getViewport().\r
-                  getAlignment(), data);\r
-\r
-              if(cs == null)\r
-              {\r
-                jalview.schemes.UserColourScheme ucs\r
-                    = new jalview.schemes.UserColourScheme("white");\r
-                ucs.parseAppletParameter(data);\r
-                cs = ucs;\r
-              }\r
-\r
-              System.out.println("colour is " + data);\r
-              af.changeColour( cs );\r
-            }\r
-\r
-\r
-            // Must maintain ability to use the groups flag\r
-            data = aparser.getValue("groups");\r
-            if (data != null)\r
-            {\r
-              af.parseFeaturesFile(data, protocol);\r
-              System.out.println("Added "+data);\r
-            }\r
-            data = aparser.getValue("features");\r
-            if (data != null)\r
-            {\r
-              af.parseFeaturesFile(data, protocol);\r
-              System.out.println("Added "+data);\r
-            }\r
-\r
-            data = aparser.getValue("annotations");\r
-            if (data != null)\r
-            {\r
-              af.loadJalviewDataFile(data);\r
-              System.out.println("Added "+data);\r
-            }\r
-\r
-\r
-            String imageName = "unnamed.png";\r
-            while (aparser.getSize() > 1)\r
-            {\r
-              format = aparser.nextValue();\r
-              file = aparser.nextValue();\r
-\r
-              if (format.equalsIgnoreCase("png"))\r
-              {\r
-                af.createPNG(new java.io.File(file));\r
-                imageName = (new java.io.File(file)).getName();\r
-                System.out.println("Creating PNG image: " + file);\r
-                continue;\r
-              }\r
-              else if (format.equalsIgnoreCase("imgMap"))\r
-              {\r
-                af.createImageMap(new java.io.File(file), imageName);\r
-                System.out.println("Creating image map: " + file);\r
-                continue;\r
-              }\r
-              else if (format.equalsIgnoreCase("eps"))\r
-              {\r
-                System.out.println("Creating EPS file: " + file);\r
-                af.createEPS(new java.io.File(file));\r
-                continue;\r
-              }\r
-\r
-              if (af.saveAlignment(file, format))\r
-                System.out.println("Written alignment in " + format +\r
-                                   " format to " + file);\r
-              else\r
-                System.out.println("Error writing file " + file + " in " + format +\r
-                                   " format!!");\r
-\r
-            }\r
-\r
-            while (aparser.getSize() > 0)\r
-            {\r
-              System.out.println("Unknown arg: " + aparser.nextValue());\r
-            }\r
-          }\r
-\r
-        // We'll only open the default file if the desktop is visible.\r
-        // And the user\r
-        //////////////////////\r
-          if (\r
-              !headless\r
-          && file==null\r
-          && jalview.bin.Cache.getDefault("SHOW_STARTUP_FILE", true)\r
-                    )\r
-          {\r
-\r
-            file = jalview.bin.Cache.getDefault("STARTUP_FILE",\r
-                                                "http://www.jalview.org/examples/exampleFile.jar");\r
-\r
-            protocol = "File";\r
-\r
-            if (file.indexOf("http:") > -1)\r
-            {\r
-              protocol = "URL";\r
-            }\r
-\r
-            if (file.endsWith(".jar"))\r
-            {\r
-              format = "Jalview";\r
-            }\r
-            else\r
-            {\r
-              format = new jalview.io.IdentifyFile().Identify(file, protocol);\r
-            }\r
-\r
-            fileLoader.LoadFile(file, protocol, format);\r
-\r
-          }\r
-    }\r
-}\r
-\r
- class ArgsParser\r
- {\r
-   Vector vargs = null;\r
-   public ArgsParser(String [] args)\r
-   {\r
-     vargs = new Vector();\r
-     for (int i = 0; i < args.length; i++)\r
-     {\r
-       String arg = args[i].trim();\r
-       if (arg.charAt(0) == '-')\r
-         arg = arg.substring(1);\r
-       vargs.addElement(arg);\r
-     }\r
-   }\r
-\r
-   public String getValue(String arg)\r
-   {\r
-     int index = vargs.indexOf(arg);\r
-     String ret = null;\r
-     if (index != -1)\r
-     {\r
-       ret = vargs.elementAt(index + 1).toString();\r
-       vargs.removeElementAt(index);\r
-       vargs.removeElementAt(index);\r
-     }\r
-     return ret;\r
-   }\r
-\r
-   public boolean contains(String arg)\r
-   {\r
-     if(vargs.contains(arg))\r
-     {\r
-       vargs.removeElement(arg);\r
-       return true;\r
-     }\r
-     else\r
-       return false;\r
-   }\r
-\r
-   public String nextValue()\r
-   {\r
-     return  vargs.remove(0).toString();\r
-   }\r
-\r
-   public int getSize()\r
-   {\r
-     return vargs.size();\r
-   }\r
-\r
- }\r
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+package jalview.bin;
+
+import jalview.gui.*;
+
+import javax.swing.*;
+
+import java.util.Vector;
+
+
+/**
+ * Main class for Jalview Application
+ * <br>
+ * <br>start with java -Djava.ext.dirs=$PATH_TO_LIB$ jalview.bin.Jalview
+ *
+ * @author $author$
+ * @version $Revision$
+ */
+public class Jalview
+{
+
+    /**
+     * main class for Jalview application
+     *
+     * @param args open <em>filename</em>
+     */
+    public static void main(String[] args)
+    {
+      System.out.println("Java version: "+System.getProperty("java.version"));
+      System.out.println(System.getProperty("os.arch")+" "
+                         +System.getProperty("os.name")+" "
+                         +System.getProperty("os.version"));
+
+
+      ArgsParser aparser = new ArgsParser(args);
+      boolean headless = false;
+
+      if( aparser.contains("help") || aparser.contains("h") )
+      {
+        System.out.println("Usage: jalview -open [FILE] [OUTPUT_FORMAT] [OUTPUT_FILE]\n\n"
+                           +"-nodisplay\tRun Jalview without User Interface.\n"
+                           +"-props FILE\tUse the given Jalview properties file instead of users default.\n"
+                           +"-annotations FILE\tAdd precalculated annotations to the alignment.\n"
+                           +"-features FILE\tUse the given file to mark features on the alignment.\n"
+                           +"-fasta FILE\tCreate alignment file FILE in Fasta format.\n"
+                           +"-clustal FILE\tCreate alignment file FILE in Clustal format.\n"
+                           +"-pfam FILE\tCreate alignment file FILE in PFAM format.\n"
+                           +"-msf FILE\tCreate alignment file FILE in MSF format.\n"
+                           +"-pileup FILE\tCreate alignment file FILE in Pileup format\n"
+                           +"-pir FILE\tCreate alignment file FILE in PIR format.\n"
+                           +"-blc FILE\tCreate alignment file FILE in BLC format.\n"
+                           +"-jalview FILE\tCreate alignment file FILE in Jalview format.\n"
+                           +"-png FILE\tCreate PNG image FILE from alignment.\n"
+                           +"-imgMap FILE\tCreate HTML file FILE with image map of PNG image.\n"
+                           +"-eps FILE\tCreate EPS file FILE from alignment."
+                           +"-questionnaire URL\tQueries the given URL for information about any Jalview user questionnaires."
+            +"\n\n~Read documentation in Application or visit http://www.jalview.org for description of Features and Annotations file~\n\n");
+        System.exit(0);
+          }
+
+          Cache.loadProperties(aparser.getValue("props")); // must do this before anything else!
+
+          if (aparser.contains("nodisplay"))
+          {
+            System.setProperty("java.awt.headless", "true");
+          }
+          if (System.getProperty("java.awt.headless") != null
+              && System.getProperty("java.awt.headless").equals("true"))
+          {
+            headless = true;
+          }
+
+          try
+          {
+            Cache.initLogger();
+          }
+          catch (java.lang.NoClassDefFoundError error)
+          {
+            error.printStackTrace();
+            System.out.println(
+                "\nEssential logging libraries not found."
+                +"\nUse: java -Djava.ext.dirs=$PATH_TO_LIB$ jalview.bin.Jalview");
+            System.exit(0);
+          }
+
+        Desktop desktop = null;
+
+
+        try
+        {
+          UIManager.setLookAndFeel(
+              UIManager.getSystemLookAndFeelClassName()
+              //        UIManager.getCrossPlatformLookAndFeelClassName()
+      //"com.sun.java.swing.plaf.gtk.GTKLookAndFeel"
+      //"javax.swing.plaf.metal.MetalLookAndFeel"
+      //"com.sun.java.swing.plaf.windows.WindowsLookAndFeel"
+      //"com.sun.java.swing.plaf.motif.MotifLookAndFeel"
+
+              );
+        }
+        catch (Exception ex)
+        {}
+          if (!headless)
+          {
+            desktop = new Desktop();
+            desktop.setVisible(true);
+            desktop.discoverer.start();
+          }
+          String url = aparser.getValue("questionnaire");
+          if (url!=null && !headless) {
+              // Start the desktop questionnaire prompter
+              Cache.log.debug("Starting questionnaire url at "+url);
+              if (url!=null) {
+                  desktop.checkForQuestionnaire(url);
+              }
+          }
+
+
+         String file = null, protocol = null, format = null, data=null;
+         jalview.io.FileLoader fileLoader = new jalview.io.FileLoader();
+
+          file = aparser.getValue("open");
+
+          if (file == null && desktop==null)
+          {
+            System.out.println("No files to open!");
+            System.exit(1);
+          }
+
+          if(file!=null)
+          {
+            System.out.println("Opening file: " + file);
+
+            if (!file.startsWith("http://"))
+            {
+              if (! (new java.io.File(file)).exists())
+              {
+                System.out.println("Can't find " + file);
+                if(headless)
+                  System.exit(1);
+              }
+            }
+
+            protocol = "File";
+
+            if (file.indexOf("http:") > -1 || file.indexOf("file:") >-1)
+            {
+              protocol = "URL";
+            }
+
+
+
+            if (file.endsWith(".jar"))
+              format = "Jalview";
+            else
+              format = new jalview.io.IdentifyFile().Identify(file, protocol);
+
+
+
+            AlignFrame af = fileLoader.LoadFileWaitTillLoaded(file, protocol, format);
+
+            if(af==null)
+            {
+              System.out.println("error");
+              return;
+            }
+
+            data = aparser.getValue("colour");
+            if(data!=null)
+            {
+              data.replaceAll("%20", " ");
+
+              jalview.schemes.ColourSchemeI cs =
+                  jalview.schemes.ColourSchemeProperty.getColour(af.getViewport().
+                  getAlignment(), data);
+
+              if(cs == null)
+              {
+                jalview.schemes.UserColourScheme ucs
+                    = new jalview.schemes.UserColourScheme("white");
+                ucs.parseAppletParameter(data);
+                cs = ucs;
+              }
+
+              System.out.println("colour is " + data);
+              af.changeColour( cs );
+            }
+
+
+            // Must maintain ability to use the groups flag
+            data = aparser.getValue("groups");
+            if (data != null)
+            {
+              af.parseFeaturesFile(data, protocol);
+              System.out.println("Added "+data);
+            }
+            data = aparser.getValue("features");
+            if (data != null)
+            {
+              af.parseFeaturesFile(data, protocol);
+              System.out.println("Added "+data);
+            }
+
+            data = aparser.getValue("annotations");
+            if (data != null)
+            {
+              af.loadJalviewDataFile(data);
+              System.out.println("Added "+data);
+            }
+
+
+            String imageName = "unnamed.png";
+            while (aparser.getSize() > 1)
+            {
+              format = aparser.nextValue();
+              file = aparser.nextValue();
+
+              if (format.equalsIgnoreCase("png"))
+              {
+                af.createPNG(new java.io.File(file));
+                imageName = (new java.io.File(file)).getName();
+                System.out.println("Creating PNG image: " + file);
+                continue;
+              }
+              else if (format.equalsIgnoreCase("imgMap"))
+              {
+                af.createImageMap(new java.io.File(file), imageName);
+                System.out.println("Creating image map: " + file);
+                continue;
+              }
+              else if (format.equalsIgnoreCase("eps"))
+              {
+                System.out.println("Creating EPS file: " + file);
+                af.createEPS(new java.io.File(file));
+                continue;
+              }
+
+              if (af.saveAlignment(file, format))
+                System.out.println("Written alignment in " + format +
+                                   " format to " + file);
+              else
+                System.out.println("Error writing file " + file + " in " + format +
+                                   " format!!");
+
+            }
+
+            while (aparser.getSize() > 0)
+            {
+              System.out.println("Unknown arg: " + aparser.nextValue());
+            }
+          }
+
+        // We'll only open the default file if the desktop is visible.
+        // And the user
+        //////////////////////
+          if (
+              !headless
+          && file==null
+          && jalview.bin.Cache.getDefault("SHOW_STARTUP_FILE", true)
+                    )
+          {
+
+            file = jalview.bin.Cache.getDefault("STARTUP_FILE",
+                                                "http://www.jalview.org/examples/exampleFile.jar");
+
+            protocol = "File";
+
+            if (file.indexOf("http:") > -1)
+            {
+              protocol = "URL";
+            }
+
+            if (file.endsWith(".jar"))
+            {
+              format = "Jalview";
+            }
+            else
+            {
+              format = new jalview.io.IdentifyFile().Identify(file, protocol);
+            }
+
+            fileLoader.LoadFile(file, protocol, format);
+
+          }
+    }
+}
+
+ class ArgsParser
+ {
+   Vector vargs = null;
+   public ArgsParser(String [] args)
+   {
+     vargs = new Vector();
+     for (int i = 0; i < args.length; i++)
+     {
+       String arg = args[i].trim();
+       if (arg.charAt(0) == '-')
+         arg = arg.substring(1);
+       vargs.addElement(arg);
+     }
+   }
+
+   public String getValue(String arg)
+   {
+     int index = vargs.indexOf(arg);
+     String ret = null;
+     if (index != -1)
+     {
+       ret = vargs.elementAt(index + 1).toString();
+       vargs.removeElementAt(index);
+       vargs.removeElementAt(index);
+     }
+     return ret;
+   }
+
+   public boolean contains(String arg)
+   {
+     if(vargs.contains(arg))
+     {
+       vargs.removeElement(arg);
+       return true;
+     }
+     else
+       return false;
+   }
+
+   public String nextValue()
+   {
+     return  vargs.remove(0).toString();
+   }
+
+   public int getSize()
+   {
+     return vargs.size();
+   }
+
+ }
index 45a03fa..6d8f125 100755 (executable)
@@ -19,7 +19,6 @@
 package jalview.gui;
 
 import jalview.io.*;
-
 import java.awt.*;
 import java.awt.datatransfer.*;
 import java.awt.dnd.*;
@@ -884,6 +883,15 @@ public class Desktop extends jalview.jbgui.GDesktop
       vamsasStop.setVisible(!b);
 
     }
+    /**
+     * Checks the given url to see if it gives a response indicating that 
+     * the user should be informed of a new questionnaire.
+     * @param url
+     */
+    public void checkForQuestionnaire(String url) {
+        UserQuestionnaireCheck jvq = new UserQuestionnaireCheck(url);
+        javax.swing.SwingUtilities.invokeLater(jvq);
+    }
 
 }