//Need to decide if the Memory Usage is to be included in
//Next release or not.
- // public static MyDesktopPane desktop;
- public static JDesktopPane desktop;
+ public static MyDesktopPane desktop;
+ // public static JDesktopPane desktop;
static int openFrameCount = 0;
*/
public Desktop()
{
+ /**
+ * A note to implementors. It is ESSENTIAL that any
+ * activities that might block are spawned off as threads rather
+ * than waited for during this constructor.
+ */
instance = this;
doVamsasClientCheck();
doGroovyCheck();
setTitle("Jalview " + jalview.bin.Cache.getProperty("VERSION"));
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-
- desktop = new JDesktopPane();
+ boolean selmemusage = jalview.bin.Cache.getDefault("SHOW_MEMUSAGE",false);
+ desktop = new MyDesktopPane(selmemusage);
+ showMemusage.setSelected(selmemusage);
desktop.setBackground(Color.white);
getContentPane().setLayout(new BorderLayout());
getContentPane().add(desktop, BorderLayout.CENTER);
this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this));
+ // Spawn a thread that shows the splashscreen
+ new SplashScreen();
- /////////Add a splashscreen on startup
- /////////Add a splashscreen on startup
- new SplashScreen();
discoverer = new jalview.ws.Discoverer(); // Only gets started if gui is displayed.
reorderAssociatedWindows(false, true);
}
+ /* (non-Javadoc)
+ * @see jalview.jbgui.GDesktop#garbageCollect_actionPerformed(java.awt.event.ActionEvent)
+ */
+ protected void garbageCollect_actionPerformed(ActionEvent e)
+ {
+ // We simply collect the garbage
+ jalview.bin.Cache.log.debug("Collecting garbage...");
+ System.gc();
+ jalview.bin.Cache.log.debug("Finished garbage collection.");
+ }
+
+ /* (non-Javadoc)
+ * @see jalview.jbgui.GDesktop#showMemusage_actionPerformed(java.awt.event.ActionEvent)
+ */
+ protected void showMemusage_actionPerformed(ActionEvent e)
+ {
+ desktop.showMemoryUsage(showMemusage.isSelected());
+ }
+
void reorderAssociatedWindows(boolean minimize, boolean close)
{
JInternalFrame[] frames = desktop.getAllFrames();
}
}
}
-
/**
* DOCUMENT ME!
*
{
if (fileLoadingCount == 0)
{
+ addProgressPanel("Loading File: " + fileName + " ");
+
+ }
+ fileLoadingCount++;
+ }
+ private JProgressBar addProgressPanel(String string)
+ {
+ if (progressPanel==null)
+ {
progressPanel = new JPanel(new BorderLayout());
- JProgressBar progressBar = new JProgressBar();
- progressBar.setIndeterminate(true);
+ totalProgressCount=0;
+ }
+ JProgressBar progressBar = new JProgressBar();
+ progressBar.setIndeterminate(true);
- progressPanel.add(new JLabel("Loading File: " + fileName + " "),
- BorderLayout.WEST);
+ progressPanel.add(new JLabel(string),
+ BorderLayout.WEST);
- progressPanel.add(progressBar, BorderLayout.CENTER);
+ progressPanel.add(progressBar, BorderLayout.CENTER);
- instance.getContentPane().add(progressPanel, BorderLayout.SOUTH);
+ instance.getContentPane().add(progressPanel, BorderLayout.SOUTH);
+ totalProgressCount++;
+ validate();
+ return progressBar;
+ }
+ int totalProgressCount=0;
+ private void removeProgressPanel(JProgressBar progbar)
+ {
+ if (progressPanel!=null)
+ {
+ progressPanel.remove(progbar);
+ if (--totalProgressCount<1)
+ {
+ this.getContentPane().remove(progressPanel);
+ progressPanel = null;
+ }
}
- fileLoadingCount++;
validate();
}
-
public void stopLoading()
{
fileLoadingCount--;
}
validate();
}
-
public static int getViewCount(String viewId)
{
int count = 0;
{
if (dsktp.v_client == null)
{
- dsktp.v_client = new VamsasApplication(dsktp, mysesid);
- dsktp.setupVamsasConnectedGui();
- dsktp.v_client.initial_update();
+ Thread rthr = new Thread(new Runnable() {
+
+ public void run()
+ {
+ dsktp.v_client = new VamsasApplication(dsktp, mysesid);
+ dsktp.setupVamsasConnectedGui();
+ dsktp.v_client.initial_update();
+ }
+
+ });
+ rthr.start();
}
};
});
VamsasStMenu.add(sessit);
}
- VamsasStMenu.setVisible(true);
+ // don't show an empty menu.
+ VamsasStMenu.setVisible(sess.length>0);
+
}
else
{
}
}
}
+ JProgressBar vamUpdate = null;
/**
* hide vamsas user gui bits when a vamsas document event is being handled.
* @param b true to hide gui, false to reveal gui
{
jalview.bin.Cache.log.debug("Setting gui for Vamsas update " +
(b ? "in progress" : "finished"));
+
+ if (vamUpdate!=null)
+ {
+ this.removeProgressPanel(vamUpdate);
+ }
+ if (b)
+ {
+ vamUpdate = this.addProgressPanel("Updating vamsas session");
+ }
vamsasStart.setVisible(!b);
vamsasStop.setVisible(!b);
vamsasSave.setVisible(!b);
public void checkForQuestionnaire(String url)
{
UserQuestionnaireCheck jvq = new UserQuestionnaireCheck(url);
- javax.swing.SwingUtilities.invokeLater(jvq);
+ //javax.swing.SwingUtilities.invokeLater(jvq);
+ new Thread(jvq).start();
}
-
- /*DISABLED
- class MyDesktopPane extends JDesktopPane implements Runnable
+ /**
+ * Proxy class for JDesktopPane which optionally
+ * displays the current memory usage and highlights
+ * the desktop area with a red bar if free memory runs low.
+ * @author AMW
+ */
+ public class MyDesktopPane extends JDesktopPane implements Runnable
{
+
boolean showMemoryUsage = false;
Runtime runtime;
java.text.NumberFormat df;
worker.start();
}
}
-
+ public boolean isShowMemoryUsage()
+ {
+ return showMemoryUsage;
+ }
public void run()
{
df = java.text.NumberFormat.getNumberInstance();
getHeight() - g.getFontMetrics().getHeight());
}
}
- }*/
+
+
+
+ }
protected JMenuItem groovyShell;
public void doGroovyCheck() {
if (jalview.bin.Cache.groovyJarsPresent())
{
groovyShell = new JMenuItem();
- groovyShell.setText("Groovy Shell...");
+ groovyShell.setText("Groovy Console...");
groovyShell.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e) {
* Accessor method to quickly get all the AlignmentFrames
* loaded.
*/
- protected AlignFrame[] getAlignframes() {
+ public static AlignFrame[] getAlignframes() {
JInternalFrame[] frames = Desktop.desktop.getAllFrames();
if (frames == null)
git://source.jalview.org / jalview.git / blobdiff