git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: eb8eb7f)
JAL-1183 JAL-343 - use dialog queue for JABA warning dialog box and use html table...
authorjprocter <jprocter@compbio.dundee.ac.uk>
Wed, 3 Oct 2012 09:45:50 +0000 (10:45 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Wed, 3 Oct 2012 09:46:54 +0000 (10:46 +0100)
JAL-1026 - note about checking proxy settings as well as JABAWS URLs.

src/jalview/gui/Desktop.java patch | blob | history

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index d357e4f..294beac 100644 (file)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -83,6 +83,7 @@ import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 import javax.swing.JProgressBar;
+import javax.swing.JTextArea;
 import javax.swing.SwingUtilities;
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.MenuEvent;
@@ -2496,28 +2497,58 @@ public class Desktop extends jalview.jbgui.GDesktop implements
       {
         if (Cache.getDefault("SHOW_WSDISCOVERY_ERRORS", true))
         {
-        if (serviceChangedDialog == null)
-        {
-          // only run if we aren't already displaying one of these.
-          javax.swing.SwingUtilities
-                  .invokeLater(serviceChangedDialog = new Runnable()
+          if (serviceChangedDialog == null)
+          {
+            // only run if we aren't already displaying one of these.
+            addDialogThread(serviceChangedDialog = new Runnable()
+            {
+              public void run()
+              {
+
+                /*
+                JalviewDialog jd =new JalviewDialog() {
+                  @Override
+                  protected void cancelPressed()
+                  {
+                    // TODO Auto-generated method stub
+                    
+                  }@Override
+                  protected void okPressed()
+                  {
+                    // TODO Auto-generated method stub
+                    
+                  }@Override
+                  protected void raiseClosed()
                   {
-                    public void run()
-                    {
-
-                      JOptionPane
-                              .showInternalMessageDialog(
-                                      Desktop.desktop,
-                                      ermsg
-                                                + "It may be that you have invalid JABA URLs\nin your web service preferences.\n\nGo to the Web services tab of the\nTools->Preferences dialog box to change them.\n",
-                                      "Preferences Problem",
-                                      JOptionPane.WARNING_MESSAGE);
-                      serviceChangedDialog = null;
-
-                    }
-                  });
+                    // TODO Auto-generated method stub
+                    
+                  }
+                };
+                jd.initDialogFrame(new JLabel("<html><table width=\"450\"><tr><td>"
+                                        + ermsg
+                                        + "<br/>It may be that you have invalid JABA URLs in your web service preferences,"
+                                        + " or mis-configured HTTP proxy settings.<br/>"
+                                        + "Check the <em>Connections</em> and <em>Web services</em> tab of the"
+                                        + " Tools->Preferences dialog box to change them.</td></tr></table></html>"), true, true, "Web Service Configuration Problem", 450, 400);
+                
+                jd.waitForInput();
+                */
+                JOptionPane.showConfirmDialog(
+                        Desktop.desktop, 
+                        new JLabel("<html><table width=\"450\"><tr><td>"
+                                + ermsg+"</td></tr></table>"
+                                + "<p>It may be that you have invalid JABA URLs<br/>in your web service preferences,"
+                                + " or mis-configured HTTP proxy settings.</p>"
+                                + "<p>Check the <em>Connections</em> and <em>Web services</em> tab<br/>of the"
+                                + " Tools->Preferences dialog box to change them.</p></html>"), "Web Service Configuration Problem",
+                                JOptionPane.DEFAULT_OPTION,
+                        JOptionPane.ERROR_MESSAGE);
+                serviceChangedDialog = null;
+
+              }
+            });
+          }
         }
-      }
         else
         {
           Cache.log