JAL-281 option pane with error handling for selecting an URL

[jalview.git] / src / jalview / gui / Desktop.java

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 5366d1f..ca82d90 100644 (file)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -456,7 +456,7 @@ public class Desktop extends jalview.jbgui.GDesktop
                 fileFormat);
         Cache.log.debug("Filechooser init thread finished.");
       }
-    }).start();
+    }, "InitFileChooserThread").start();
     // Add the service change listener
     changeSupport.addJalviewPropertyChangeListener("services",
             new PropertyChangeListener()
@@ -575,7 +575,7 @@ public class Desktop extends jalview.jbgui.GDesktop
             Desktop.instance.setProgressBar(null, now);
             jvnews.showNews();
           }
-        }).start();
+        }, "ShowNewsWindowThread").start();
       }
     }
   }
@@ -899,12 +899,7 @@ public class Desktop extends jalview.jbgui.GDesktop
           menuItem.removeActionListener(menuItem.getActionListeners()[0]);
         }
         windowMenu.remove(menuItem);
-        JInternalFrame itf = desktop.getSelectedFrame();
-        if (itf != null)
-        {
-          // itf.requestFocus();
-          //
-        }
+
         System.gc();
       };
     });
@@ -1166,8 +1161,9 @@ public class Desktop extends jalview.jbgui.GDesktop
       if (format == null)
       {
         JvOptionPane.showInternalMessageDialog(Desktop.desktop,
-                MessageManager.formatMessage("label.couldnt_locate",
-                        new Object[]
+                MessageManager.formatMessage(
+                        "label.couldnt_locate",
+                        new String[]
                         { url }),
                 MessageManager.getString("label.url_not_found"),
                 JvOptionPane.WARNING_MESSAGE);
@@ -1276,7 +1272,7 @@ public class Desktop extends jalview.jbgui.GDesktop
       {
         new SplashScreen(true);
       }
-    }).start();
+    }, "ShowAboutMenuThread").start();
   }
 
   public StringBuffer getAboutMessage(boolean shortv)
@@ -1618,7 +1614,7 @@ public class Desktop extends jalview.jbgui.GDesktop
           }
           setProgressBar(null, choice.hashCode());
         }
-      }).start();
+      }, "SaveJalviewProjectThread").start();
     }
   }
 
@@ -1686,7 +1682,7 @@ public class Desktop extends jalview.jbgui.GDesktop
           }
           setProgressBar(null, choice.hashCode());
         }
-      }).start();
+      }, "LoadJalviewProjectThread").start();
     }
   }
 
@@ -2196,7 +2192,7 @@ public class Desktop extends jalview.jbgui.GDesktop
                     dsktp.v_client.initial_update();
                   }
 
-                });
+                }, "VamsasSessionThread");
                 rthr.start();
               }
             };
@@ -2316,7 +2312,7 @@ public class Desktop extends jalview.jbgui.GDesktop
   {
     UserQuestionnaireCheck jvq = new UserQuestionnaireCheck(url);
     // javax.swing.SwingUtilities.invokeLater(jvq);
-    new Thread(jvq).start();
+    new Thread(jvq, "CheckQuestionnaireThread").start();
   }
 
   public void checkURLLinks()
@@ -2429,7 +2425,7 @@ public class Desktop extends jalview.jbgui.GDesktop
       this.showMemoryUsage = showMemory;
       if (showMemory)
       {
-        Thread worker = new Thread(this);
+        Thread worker = new Thread(this, "ShowMemoryUsageThread");
         worker.start();
       }
       repaint();
@@ -2854,7 +2850,7 @@ public class Desktop extends jalview.jbgui.GDesktop
       }
       // JAL-940 - disabled JWS1 service configuration - always start discoverer
       // until we phase out completely
-      (t0 = new Thread(discoverer)).start();
+      (t0 = new Thread(discoverer, "DiscovererThread")).start();
     }
 
     if (Cache.getDefault("SHOW_JWS2_SERVICES", true))
@@ -3010,7 +3006,7 @@ public class Desktop extends jalview.jbgui.GDesktop
           progress.setProgressBar(null, this.hashCode());
         }
       }
-    }).start();
+    }, "OpenURLThread").start();
   }
 
   public static WsParamSetManager wsparamManager = null;