import java.io.File;
import java.io.FileOutputStream;
import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Hashtable;
import java.util.StringTokenizer;
import java.util.Vector;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Semaphore;
import javax.swing.DefaultDesktopManager;
import javax.swing.DesktopManager;
showConsole(showjconsole);
showNews.setVisible(false);
- final Desktop me = this;
- // Thread off the news reader, in case there are connection problems.
- new Thread( new Runnable() {
- @Override
- public void run()
- {
- Cache.log.debug("Starting news thread.");
-
- jvnews = new BlogReader(me);
- showNews.setVisible(true);
- Cache.log.debug("Completed news thread.");
- }
- }).start();
this.addWindowListener(new WindowAdapter()
{
});
}
+ public void checkForNews()
+ {
+ final Desktop me = this;
+ // Thread off the news reader, in case there are connection problems.
+ addDialogThread(new Runnable() {
+ @Override
+ public void run()
+ {
+ Cache.log.debug("Starting news thread.");
+
+ jvnews = new BlogReader(me);
+ showNews.setVisible(true);
+ Cache.log.debug("Completed news thread.");
+ }
+ });
+ }
protected void showNews_actionPerformed(ActionEvent e)
{
showNews(showNews.isSelected());
storeLastKnownDimensions("JALVIEW_RSS_WINDOW_", jvnews.getBounds());
}
+ if (dialogExecutor!=null)
+ {
+ dialogExecutor.shutdownNow();
+ }
System.exit(0);
}
*/
public void aboutMenuItem_actionPerformed(ActionEvent e)
{
- StringBuffer message = getAboutMessage(false);
- JOptionPane.showInternalMessageDialog(Desktop.desktop,
-
- message.toString(), "About Jalview", JOptionPane.INFORMATION_MESSAGE);
+// StringBuffer message = getAboutMessage(false);
+// JOptionPane.showInternalMessageDialog(Desktop.desktop,
+//
+// message.toString(), "About Jalview", JOptionPane.INFORMATION_MESSAGE);
+ new Thread(new Runnable() { public void run() {new SplashScreen(true);}}).start();
}
public StringBuffer getAboutMessage(boolean shortv)
}
}
+ /**
+ * single thread that handles display of dialogs to user.
+ */
+ ExecutorService dialogExecutor=Executors.newSingleThreadExecutor();
+ /**
+ * flag indicating if dialogExecutor should try to acquire a permit
+ */
+ private volatile boolean dialogPause=true;
+ /**
+ * pause the queue
+ */
+ private java.util.concurrent.Semaphore block=new Semaphore(0);
+
+ /**
+ * add another dialog thread to the queue
+ * @param prompter
+ */
+ public void addDialogThread(final Runnable prompter)
+ {
+ dialogExecutor.submit(new Runnable()
+ {
+ public void run()
+ {
+ if (dialogPause) {
+ try { block.acquire(); } catch (InterruptedException x){};
+ }
+ if (instance==null)
+ {
+ return;
+ }
+ try
+ {
+ SwingUtilities.invokeAndWait(prompter);
+ } catch (Exception q)
+ {
+ Cache.log.warn("Unexpected Exception in dialog thread.", q);
+ }
+ }
+ });
+ }
-
+ public void startDialogQueue()
+ {
+ // set the flag so we don't pause waiting for another permit and semaphore the current task to begin
+ dialogPause=false;
+ block.release();
+ }
}