From: jprocter <Jim Procter>
Date: Tue, 29 Jan 2008 10:12:51 +0000 (+0000)
Subject: flag to indicate if errors are raised as warning dialog boxes or not.
X-Git-Tag: Release_2_4~140
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=bd185b319f82cc87f4b6866596675ff8fb600cfa;p=jalview.git

flag to indicate if errors are raised as warning dialog boxes or not.
---

diff --git a/src/jalview/gui/Jalview2XML.java b/src/jalview/gui/Jalview2XML.java
index 4f76445..9a56150 100755
--- a/src/jalview/gui/Jalview2XML.java
+++ b/src/jalview/gui/Jalview2XML.java
@@ -52,6 +52,14 @@ public class Jalview2XML
   Hashtable seqRefIds = null;
 
   Vector frefedSequence = null;
+  boolean raiseGUI = true; // whether errors are raised in dialog boxes or not
+  public Jalview2XML()
+  {
+  }
+  public Jalview2XML(boolean raiseGUI)
+  {
+    this.raiseGUI = raiseGUI;
+  }
 
   public void resolveFrefedSequences()
   {
@@ -1227,8 +1235,18 @@ public class Jalview2XML
     } catch (Exception ex)
     {
       //Is Version 1 Jar file?
-      af = new Jalview2XML_V1().LoadJalviewAlign(file);
+      try {
+        af = new Jalview2XML_V1(raiseGUI).LoadJalviewAlign(file);
+      } catch (Exception ex2) {
+        System.err.println("Exception whilst loading as jalviewXMLV1:");
+        ex2.printStackTrace();
+        af = null;
+      }
 
+      if (Desktop.instance != null)
+      {
+        Desktop.instance.stopLoading();
+      }
       if (af != null)
       {
         System.out.println("Successfully loaded archive file");
@@ -1254,15 +1272,20 @@ public class Jalview2XML
     if (errorMessage != null)
     {
       final String finalErrorMessage = errorMessage;
-      javax.swing.SwingUtilities.invokeLater(new Runnable()
-      {
-        public void run()
+      if (raiseGUI)
+        {
+        javax.swing.SwingUtilities.invokeLater(new Runnable()
+        {
+          public void run()
         {
           JOptionPane.showInternalMessageDialog(Desktop.desktop,
                   finalErrorMessage, "Error loading Jalview file",
                   JOptionPane.WARNING_MESSAGE);
         }
       });
+        } else {
+          System.err.println("Problem loading Jalview file: "+errorMessage);
+        }
     }
 
     return af;
diff --git a/src/jalview/gui/Jalview2XML_V1.java b/src/jalview/gui/Jalview2XML_V1.java
index d8e79ce..fe17dff 100755
--- a/src/jalview/gui/Jalview2XML_V1.java
+++ b/src/jalview/gui/Jalview2XML_V1.java
@@ -37,6 +37,14 @@ import jalview.schemes.*;
  */
 public class Jalview2XML_V1
 {
+  boolean raiseGUI=true;
+  public Jalview2XML_V1() {
+    
+  };
+  public Jalview2XML_V1(boolean raiseGUI) {
+    this.raiseGUI = raiseGUI;
+  };
+  
   jalview.schemes.UserColourScheme GetUserColourScheme(
       JalviewModelSequence jms, String id)
   {
@@ -131,7 +139,8 @@ public class Jalview2XML_V1
     catch (final java.net.UnknownHostException ex)
     {
       ex.printStackTrace();
-      javax.swing.SwingUtilities.invokeLater(new Runnable()
+      if (raiseGUI)
+        {javax.swing.SwingUtilities.invokeLater(new Runnable()
       {
         public void run()
         {
@@ -143,14 +152,14 @@ public class Jalview2XML_V1
                                                 "URL not found",
                                                 JOptionPane.WARNING_MESSAGE);
         }
-      });
+      });};
     }
     catch (Exception ex)
     {
+      System.err.println("Exception whilst loading jalview XML file : ");
       ex.printStackTrace();
-      System.err.println("Exception whilst loading jalview XML file : " +
-                         ex + "\n");
-      javax.swing.SwingUtilities.invokeLater(new Runnable()
+      if (raiseGUI)
+      {  javax.swing.SwingUtilities.invokeLater(new Runnable()
       {
         public void run()
         {
@@ -161,6 +170,7 @@ public class Jalview2XML_V1
                                                 JOptionPane.WARNING_MESSAGE);
         }
       });
+      }
     }
 
     return af;