X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FDesktop.java;h=53fa46333c42f77d3cadaa5372171c5bd0837b8d;hb=f27f81a74bbe1be141d23df8aba578515e3179a2;hp=a0b93fbc55815e3b952e160038b35488ed6deaed;hpb=23dc8a670759fccf7f8f7a72d3a856645c06ae8f;p=jalview.git
diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
old mode 100755
new mode 100644
index a0b93fb..5f45dc1
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -1,61 +1,175 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)
- * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This file is part of Jalview.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.gui;
-import jalview.io.*;
-
-import java.awt.*;
-import java.awt.datatransfer.*;
-import java.awt.dnd.*;
-import java.awt.event.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.GridLayout;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.ClipboardOwner;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.Transferable;
+import java.awt.dnd.DnDConstants;
+import java.awt.dnd.DropTargetDragEvent;
+import java.awt.dnd.DropTargetDropEvent;
+import java.awt.dnd.DropTargetEvent;
+import java.awt.dnd.DropTargetListener;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyVetoException;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
import java.lang.reflect.Constructor;
-import java.util.*;
-
-import javax.swing.*;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.List;
+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;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JDesktopPane;
+import javax.swing.JFrame;
+import javax.swing.JInternalFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JProgressBar;
+import javax.swing.SwingUtilities;
+import javax.swing.event.HyperlinkEvent;
+import javax.swing.event.HyperlinkEvent.EventType;
import javax.swing.event.MenuEvent;
import javax.swing.event.MenuListener;
+import jalview.api.AlignViewportI;
+import jalview.api.AlignmentViewPanel;
+import jalview.bin.Cache;
+import jalview.io.FileLoader;
+import jalview.io.FormatAdapter;
+import jalview.io.IdentifyFile;
+import jalview.io.JalviewFileChooser;
+import jalview.io.JalviewFileView;
+import jalview.jbgui.GSplitFrame;
+import jalview.jbgui.GStructureViewer;
+import jalview.structure.StructureSelectionManager;
+import jalview.util.ImageMaker;
+import jalview.util.MessageManager;
+import jalview.viewmodel.AlignmentViewport;
+import jalview.ws.params.ParamManager;
+
/**
- * DOCUMENT ME!
+ * Jalview Desktop
+ *
*
* @author $author$
- * @version $Revision$
+ * @version $Revision: 1.155 $
*/
public class Desktop extends jalview.jbgui.GDesktop implements
- DropTargetListener, ClipboardOwner, IProgressIndicator
+ DropTargetListener, ClipboardOwner, IProgressIndicator,
+ jalview.api.StructureSelectionManagerProvider
{
- /** DOCUMENT ME!! */
+
+ private JalviewChangeSupport changeSupport = new JalviewChangeSupport();
+
+ /**
+ * news reader - null if it was never started.
+ */
+ private BlogReader jvnews = null;
+
+ private File projectFile;
+
+ /**
+ * @param listener
+ * @see jalview.gui.JalviewChangeSupport#addJalviewPropertyChangeListener(java.beans.PropertyChangeListener)
+ */
+ public void addJalviewPropertyChangeListener(
+ PropertyChangeListener listener)
+ {
+ changeSupport.addJalviewPropertyChangeListener(listener);
+ }
+
+ /**
+ * @param propertyName
+ * @param listener
+ * @see jalview.gui.JalviewChangeSupport#addJalviewPropertyChangeListener(java.lang.String,
+ * java.beans.PropertyChangeListener)
+ */
+ public void addJalviewPropertyChangeListener(String propertyName,
+ PropertyChangeListener listener)
+ {
+ changeSupport.addJalviewPropertyChangeListener(propertyName, listener);
+ }
+
+ /**
+ * @param propertyName
+ * @param listener
+ * @see jalview.gui.JalviewChangeSupport#removeJalviewPropertyChangeListener(java.lang.String,
+ * java.beans.PropertyChangeListener)
+ */
+ public void removeJalviewPropertyChangeListener(String propertyName,
+ PropertyChangeListener listener)
+ {
+ changeSupport.removeJalviewPropertyChangeListener(propertyName,
+ listener);
+ }
+
+ /** Singleton Desktop instance */
public static Desktop instance;
- // Need to decide if the Memory Usage is to be included in
- // Next release or not.
public static MyDesktopPane desktop;
- // public static JDesktopPane desktop;
-
static int openFrameCount = 0;
static final int xOffset = 30;
static final int yOffset = 30;
- public static jalview.ws.Discoverer discoverer;
+ private static final int THREE = 3;
+
+ public static jalview.ws.jws1.Discoverer discoverer;
public static Object[] jalviewClipboard;
@@ -63,6 +177,113 @@ public class Desktop extends jalview.jbgui.GDesktop implements
static int fileLoadingCount = 0;
+ class MyDesktopManager implements DesktopManager
+ {
+
+ private DesktopManager delegate;
+
+ public MyDesktopManager(DesktopManager delegate)
+ {
+ this.delegate = delegate;
+ }
+
+ public void activateFrame(JInternalFrame f)
+ {
+ try
+ {
+ delegate.activateFrame(f);
+ } catch (NullPointerException npe)
+ {
+ Point p = getMousePosition();
+ instance.showPasteMenu(p.x, p.y);
+ }
+ }
+
+ public void beginDraggingFrame(JComponent f)
+ {
+ delegate.beginDraggingFrame(f);
+ }
+
+ public void beginResizingFrame(JComponent f, int direction)
+ {
+ delegate.beginResizingFrame(f, direction);
+ }
+
+ public void closeFrame(JInternalFrame f)
+ {
+ delegate.closeFrame(f);
+ }
+
+ public void deactivateFrame(JInternalFrame f)
+ {
+ delegate.deactivateFrame(f);
+ }
+
+ public void deiconifyFrame(JInternalFrame f)
+ {
+ delegate.deiconifyFrame(f);
+ }
+
+ public void dragFrame(JComponent f, int newX, int newY)
+ {
+ if (newY < 0)
+ {
+ newY = 0;
+ }
+ delegate.dragFrame(f, newX, newY);
+ }
+
+ public void endDraggingFrame(JComponent f)
+ {
+ delegate.endDraggingFrame(f);
+ }
+
+ public void endResizingFrame(JComponent f)
+ {
+ delegate.endResizingFrame(f);
+ }
+
+ public void iconifyFrame(JInternalFrame f)
+ {
+ delegate.iconifyFrame(f);
+ }
+
+ public void maximizeFrame(JInternalFrame f)
+ {
+ delegate.maximizeFrame(f);
+ }
+
+ public void minimizeFrame(JInternalFrame f)
+ {
+ delegate.minimizeFrame(f);
+ }
+
+ public void openFrame(JInternalFrame f)
+ {
+ delegate.openFrame(f);
+ }
+
+ public void resizeFrame(JComponent f, int newX, int newY, int newWidth,
+ int newHeight)
+ {
+ Rectangle b = desktop.getBounds();
+ if (newY < 0)
+ {
+ newY = 0;
+ }
+ delegate.resizeFrame(f, newX, newY, newWidth, newHeight);
+ }
+
+ public void setBoundsForFrame(JComponent f, int newX, int newY,
+ int newWidth, int newHeight)
+ {
+ delegate.setBoundsForFrame(f, newX, newY, newWidth, newHeight);
+ }
+
+ // All other methods, simply delegate
+
+ }
+
/**
* Creates a new Desktop object.
*/
@@ -76,38 +297,56 @@ public class Desktop extends jalview.jbgui.GDesktop implements
instance = this;
doVamsasClientCheck();
doGroovyCheck();
-
+ doConfigureStructurePrefs();
setTitle("Jalview " + jalview.bin.Cache.getProperty("VERSION"));
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
boolean selmemusage = jalview.bin.Cache.getDefault("SHOW_MEMUSAGE",
false);
+ boolean showjconsole = jalview.bin.Cache.getDefault(
+ "SHOW_JAVA_CONSOLE", false);
desktop = new MyDesktopPane(selmemusage);
showMemusage.setSelected(selmemusage);
desktop.setBackground(Color.white);
getContentPane().setLayout(new BorderLayout());
+ // alternate config - have scrollbars - see notes in JAL-153
+ // JScrollPane sp = new JScrollPane();
+ // sp.getViewport().setView(desktop);
+ // getContentPane().add(sp, BorderLayout.CENTER);
getContentPane().add(desktop, BorderLayout.CENTER);
desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE);
// This line prevents Windows Look&Feel resizing all new windows to maximum
// if previous window was maximised
- desktop.setDesktopManager(new DefaultDesktopManager());
+ desktop.setDesktopManager(new MyDesktopManager(
+ new DefaultDesktopManager()));
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- String x = jalview.bin.Cache.getProperty("SCREEN_X");
- String y = jalview.bin.Cache.getProperty("SCREEN_Y");
- String width = jalview.bin.Cache.getProperty("SCREEN_WIDTH");
- String height = jalview.bin.Cache.getProperty("SCREEN_HEIGHT");
-
- if ((x != null) && (y != null) && (width != null) && (height != null))
+ Rectangle dims = getLastKnownDimensions("");
+ if (dims != null)
{
- setBounds(Integer.parseInt(x), Integer.parseInt(y), Integer
- .parseInt(width), Integer.parseInt(height));
+ setBounds(dims);
}
else
{
- setBounds((int) (screenSize.width - 900) / 2,
- (int) (screenSize.height - 650) / 2, 900, 650);
+ Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+ setBounds((screenSize.width - 900) / 2,
+ (screenSize.height - 650) / 2, 900, 650);
}
+ jconsole = new Console(this, showjconsole);
+ // add essential build information
+ jconsole.setHeader("Jalview Version: "
+ + jalview.bin.Cache.getProperty("VERSION") + "\n"
+ + "Jalview Installation: "
+ + jalview.bin.Cache.getDefault("INSTALLATION", "unknown")
+ + "\n" + "Build Date: "
+ + jalview.bin.Cache.getDefault("BUILD_DATE", "unknown") + "\n"
+ + "Java version: " + System.getProperty("java.version") + "\n"
+ + System.getProperty("os.arch") + " "
+ + System.getProperty("os.name") + " "
+ + System.getProperty("os.version"));
+
+ showConsole(showjconsole);
+
+ showNews.setVisible(false);
this.addWindowListener(new WindowAdapter()
{
@@ -117,7 +356,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements
}
});
- this.addMouseListener(new MouseAdapter()
+ MouseAdapter ma;
+ this.addMouseListener(ma = new MouseAdapter()
{
public void mousePressed(MouseEvent evt)
{
@@ -127,13 +367,196 @@ public class Desktop extends jalview.jbgui.GDesktop implements
}
}
});
+ desktop.addMouseListener(ma);
+
+ this.addFocusListener(new FocusListener()
+ {
+
+ @Override
+ public void focusLost(FocusEvent e)
+ {
+ // TODO Auto-generated method stub
+
+ }
+ @Override
+ public void focusGained(FocusEvent e)
+ {
+ Cache.log.debug("Relaying windows after focus gain");
+ // make sure that we sort windows properly after we gain focus
+ instance.relayerWindows();
+ }
+ });
this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this));
// Spawn a thread that shows the splashscreen
- new SplashScreen();
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ new SplashScreen();
+ }
+ });
+
+ // displayed.
+ // Thread off a new instance of the file chooser - this reduces the time it
+ // takes to open it later on.
+ new Thread(new Runnable()
+ {
+ public void run()
+ {
+ Cache.log.debug("Filechooser init thread started.");
+ JalviewFileChooser chooser = new JalviewFileChooser(
+ jalview.bin.Cache.getProperty("LAST_DIRECTORY"),
+ jalview.io.AppletFormatAdapter.READABLE_EXTENSIONS,
+ jalview.io.AppletFormatAdapter.READABLE_FNAMES,
+ jalview.bin.Cache.getProperty("DEFAULT_FILE_FORMAT"));
+ Cache.log.debug("Filechooser init thread finished.");
+ }
+ }).start();
+ // Add the service change listener
+ changeSupport.addJalviewPropertyChangeListener("services",
+ new PropertyChangeListener()
+ {
+
+ @Override
+ public void propertyChange(PropertyChangeEvent evt)
+ {
+ Cache.log.debug("Firing service changed event for "
+ + evt.getNewValue());
+ JalviewServicesChanged(evt);
+ }
+
+ });
+ }
+
+ public void doConfigureStructurePrefs()
+ {
+ // configure services
+ StructureSelectionManager ssm = StructureSelectionManager
+ .getStructureSelectionManager(this);
+ if (jalview.bin.Cache.getDefault(Preferences.ADD_SS_ANN, true))
+ {
+ ssm.setAddTempFacAnnot(jalview.bin.Cache.getDefault(
+ Preferences.ADD_TEMPFACT_ANN, true));
+ ssm.setProcessSecondaryStructure(jalview.bin.Cache.getDefault(
+ Preferences.STRUCT_FROM_PDB, true));
+ ssm.setSecStructServices(jalview.bin.Cache.getDefault(
+ Preferences.USE_RNAVIEW, true));
+ }
+ else
+ {
+ ssm.setAddTempFacAnnot(false);
+ ssm.setProcessSecondaryStructure(false);
+ ssm.setSecStructServices(false);
+ }
+ }
- discoverer = new jalview.ws.Discoverer(); // Only gets started if gui is
- // displayed.
+ 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());
+ }
+
+ void showNews(boolean visible)
+ {
+ {
+ Cache.log.debug((visible ? "Showing" : "Hiding") + " news.");
+ showNews.setSelected(visible);
+ if (visible && !jvnews.isVisible())
+ {
+ new Thread(new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ long instance = System.currentTimeMillis();
+ Desktop.instance.setProgressBar(
+ MessageManager.getString("status.refreshing_news"),
+ instance);
+ jvnews.refreshNews();
+ Desktop.instance.setProgressBar(null, instance);
+ jvnews.showNews();
+ }
+ }).start();
+ }
+ }
+ }
+
+ /**
+ * recover the last known dimensions for a jalview window
+ *
+ * @param windowName
+ * - empty string is desktop, all other windows have unique prefix
+ * @return null or last known dimensions scaled to current geometry (if last
+ * window geom was known)
+ */
+ Rectangle getLastKnownDimensions(String windowName)
+ {
+ // TODO: lock aspect ratio for scaling desktop Bug #0058199
+ Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+ String x = jalview.bin.Cache.getProperty(windowName + "SCREEN_X");
+ String y = jalview.bin.Cache.getProperty(windowName + "SCREEN_Y");
+ String width = jalview.bin.Cache.getProperty(windowName
+ + "SCREEN_WIDTH");
+ String height = jalview.bin.Cache.getProperty(windowName
+ + "SCREEN_HEIGHT");
+ if ((x != null) && (y != null) && (width != null) && (height != null))
+ {
+ int ix = Integer.parseInt(x), iy = Integer.parseInt(y), iw = Integer
+ .parseInt(width), ih = Integer.parseInt(height);
+ if (jalview.bin.Cache.getProperty("SCREENGEOMETRY_WIDTH") != null)
+ {
+ // attempt #1 - try to cope with change in screen geometry - this
+ // version doesn't preserve original jv aspect ratio.
+ // take ratio of current screen size vs original screen size.
+ double sw = ((1f * screenSize.width) / (1f * Integer
+ .parseInt(jalview.bin.Cache
+ .getProperty("SCREENGEOMETRY_WIDTH"))));
+ double sh = ((1f * screenSize.height) / (1f * Integer
+ .parseInt(jalview.bin.Cache
+ .getProperty("SCREENGEOMETRY_HEIGHT"))));
+ // rescale the bounds depending upon the current screen geometry.
+ ix = (int) (ix * sw);
+ iw = (int) (iw * sw);
+ iy = (int) (iy * sh);
+ ih = (int) (ih * sh);
+ while (ix >= screenSize.width)
+ {
+ jalview.bin.Cache.log
+ .debug("Window geometry location recall error: shifting horizontal to within screenbounds.");
+ ix -= screenSize.width;
+ }
+ while (iy >= screenSize.height)
+ {
+ jalview.bin.Cache.log
+ .debug("Window geometry location recall error: shifting vertical to within screenbounds.");
+ iy -= screenSize.height;
+ }
+ jalview.bin.Cache.log.debug("Got last known dimensions for "
+ + windowName + ": x:" + ix + " y:" + iy + " width:" + iw
+ + " height:" + ih);
+ }
+ // return dimensions for new instance
+ return new Rectangle(ix, iy, iw, ih);
+ }
+ return null;
}
private void doVamsasClientCheck()
@@ -176,7 +599,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements
void showPasteMenu(int x, int y)
{
JPopupMenu popup = new JPopupMenu();
- JMenuItem item = new JMenuItem("Paste To New Window");
+ JMenuItem item = new JMenuItem(
+ MessageManager.getString("label.paste_new_window"));
item.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent evt)
@@ -216,42 +640,90 @@ public class Desktop extends jalview.jbgui.GDesktop implements
}
/**
- * DOCUMENT ME!
+ * Adds and opens the given frame to the desktop
*
* @param frame
- * DOCUMENT ME!
+ * Frame to show
* @param title
- * DOCUMENT ME!
+ * Visible Title
* @param w
- * DOCUMENT ME!
+ * width
* @param h
- * DOCUMENT ME!
+ * height
*/
public static synchronized void addInternalFrame(
final JInternalFrame frame, String title, int w, int h)
{
- addInternalFrame(frame, title, w, h, true);
+ addInternalFrame(frame, title, true, w, h, true);
}
/**
- * DOCUMENT ME!
+ * Add an internal frame to the Jalview desktop
+ *
+ * @param frame
+ * Frame to show
+ * @param title
+ * Visible Title
+ * @param makeVisible
+ * When true, display frame immediately, otherwise, caller must call
+ * setVisible themselves.
+ * @param w
+ * width
+ * @param h
+ * height
+ */
+ public static synchronized void addInternalFrame(
+ final JInternalFrame frame, String title, boolean makeVisible,
+ int w, int h)
+ {
+ addInternalFrame(frame, title, makeVisible, w, h, true);
+ }
+
+ /**
+ * Add an internal frame to the Jalview desktop and make it visible
*
* @param frame
- * DOCUMENT ME!
+ * Frame to show
* @param title
- * DOCUMENT ME!
+ * Visible Title
* @param w
- * DOCUMENT ME!
+ * width
* @param h
- * DOCUMENT ME!
+ * height
* @param resizable
- * DOCUMENT ME!
+ * Allow resize
*/
public static synchronized void addInternalFrame(
final JInternalFrame frame, String title, int w, int h,
boolean resizable)
{
+ addInternalFrame(frame, title, true, w, h, resizable);
+ }
+
+ /**
+ * Add an internal frame to the Jalview desktop
+ *
+ * @param frame
+ * Frame to show
+ * @param title
+ * Visible Title
+ * @param makeVisible
+ * When true, display frame immediately, otherwise, caller must call
+ * setVisible themselves.
+ * @param w
+ * width
+ * @param h
+ * height
+ * @param resizable
+ * Allow resize
+ */
+ public static synchronized void addInternalFrame(
+ final JInternalFrame frame, String title, boolean makeVisible,
+ int w, int h, boolean resizable)
+ {
+ // TODO: allow callers to determine X and Y position of frame (eg. via
+ // bounds object).
// TODO: consider fixing method to update entries in the window submenu with
// the current window title
@@ -264,15 +736,16 @@ public class Desktop extends jalview.jbgui.GDesktop implements
// A HEADLESS STATE WHEN NO DESKTOP EXISTS. MUST RETURN
// IF JALVIEW IS RUNNING HEADLESS
// ///////////////////////////////////////////////
- if (System.getProperty("java.awt.headless") != null
- && System.getProperty("java.awt.headless").equals("true"))
+ if (instance == null
+ || (System.getProperty("java.awt.headless") != null && System
+ .getProperty("java.awt.headless").equals("true")))
{
return;
}
openFrameCount++;
- frame.setVisible(true);
+ frame.setVisible(makeVisible);
frame.setClosable(true);
frame.setResizable(resizable);
frame.setMaximizable(resizable);
@@ -286,34 +759,33 @@ public class Desktop extends jalview.jbgui.GDesktop implements
}
final JMenuItem menuItem = new JMenuItem(title);
- frame
- .addInternalFrameListener(new javax.swing.event.InternalFrameAdapter()
- {
- public void internalFrameActivated(
- javax.swing.event.InternalFrameEvent evt)
- {
- JInternalFrame itf = desktop.getSelectedFrame();
- if (itf != null)
- {
- itf.requestFocus();
- }
+ frame.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter()
+ {
+ public void internalFrameActivated(
+ javax.swing.event.InternalFrameEvent evt)
+ {
+ JInternalFrame itf = desktop.getSelectedFrame();
+ if (itf != null)
+ {
+ itf.requestFocus();
+ }
- }
+ }
- public void internalFrameClosed(
- javax.swing.event.InternalFrameEvent evt)
- {
- PaintRefresher.RemoveComponent(frame);
- openFrameCount--;
- windowMenu.remove(menuItem);
- JInternalFrame itf = desktop.getSelectedFrame();
- if (itf != null)
- {
- itf.requestFocus();
- }
- System.gc();
- };
- });
+ public void internalFrameClosed(
+ javax.swing.event.InternalFrameEvent evt)
+ {
+ PaintRefresher.RemoveComponent(frame);
+ openFrameCount--;
+ windowMenu.remove(menuItem);
+ JInternalFrame itf = desktop.getSelectedFrame();
+ if (itf != null)
+ {
+ itf.requestFocus();
+ }
+ System.gc();
+ };
+ });
menuItem.addActionListener(new ActionListener()
{
@@ -329,6 +801,47 @@ public class Desktop extends jalview.jbgui.GDesktop implements
}
}
});
+ menuItem.addMouseListener(new MouseListener()
+ {
+
+ @Override
+ public void mouseReleased(MouseEvent e)
+ {
+ }
+
+ @Override
+ public void mousePressed(MouseEvent e)
+ {
+ }
+
+ @Override
+ public void mouseExited(MouseEvent e)
+ {
+ try
+ {
+ frame.setSelected(false);
+ } catch (PropertyVetoException e1)
+ {
+ }
+ }
+
+ @Override
+ public void mouseEntered(MouseEvent e)
+ {
+ try
+ {
+ frame.setSelected(true);
+ } catch (PropertyVetoException e1)
+ {
+ }
+ }
+
+ @Override
+ public void mouseClicked(MouseEvent e)
+ {
+
+ }
+ });
windowMenu.add(menuItem);
@@ -340,6 +853,11 @@ public class Desktop extends jalview.jbgui.GDesktop implements
frame.requestFocus();
} catch (java.beans.PropertyVetoException ve)
{
+ } catch (java.lang.ClassCastException cex)
+ {
+ Cache.log
+ .warn("Squashed a possible GUI implementation error. If you can recreate this, please look at http://issues.jalview.org/browse/JAL-869",
+ cex);
}
}
@@ -373,12 +891,14 @@ public class Desktop extends jalview.jbgui.GDesktop implements
* DOCUMENT ME!
*
* @param evt
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
public void drop(DropTargetDropEvent evt)
{
+ boolean success = true;
Transferable t = evt.getTransferable();
java.util.List files = null;
+ java.util.List protocols = null;
try
{
@@ -397,6 +917,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
evt.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE);
String data = (String) t.getTransferData(uriListFlavor);
files = new java.util.ArrayList(1);
+ protocols = new java.util.ArrayList(1);
for (java.util.StringTokenizer st = new java.util.StringTokenizer(
data, "\r\n"); st.hasMoreTokens();)
{
@@ -406,14 +927,24 @@ public class Desktop extends jalview.jbgui.GDesktop implements
// the line is a comment (as per the RFC 2483)
continue;
}
-
java.net.URI uri = new java.net.URI(s);
- java.io.File file = new java.io.File(uri);
- files.add(file);
+ if (uri.getScheme().toLowerCase().startsWith("http"))
+ {
+ protocols.add(FormatAdapter.URL);
+ files.add(uri.toString());
+ }
+ else
+ {
+ // otherwise preserve old behaviour: catch all for file objects
+ java.io.File file = new java.io.File(uri);
+ protocols.add(FormatAdapter.FILE);
+ files.add(file.toString());
+ }
}
}
} catch (Exception e)
{
+ success = false;
}
if (files != null)
@@ -423,7 +954,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements
for (int i = 0; i < files.size(); i++)
{
String file = files.get(i).toString();
- String protocol = FormatAdapter.FILE;
+ String protocol = (protocols == null) ? FormatAdapter.FILE
+ : (String) protocols.get(i);
String format = null;
if (file.endsWith(".jar"))
@@ -441,27 +973,31 @@ public class Desktop extends jalview.jbgui.GDesktop implements
}
} catch (Exception ex)
{
+ success = false;
}
}
+ evt.dropComplete(success); // need this to ensure input focus is properly
+ // transfered to any new windows created
}
/**
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
public void inputLocalFileMenuItem_actionPerformed(AlignViewport viewport)
{
- JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache
- .getProperty("LAST_DIRECTORY"),
+ JalviewFileChooser chooser = new JalviewFileChooser(
+ jalview.bin.Cache.getProperty("LAST_DIRECTORY"),
jalview.io.AppletFormatAdapter.READABLE_EXTENSIONS,
jalview.io.AppletFormatAdapter.READABLE_FNAMES,
jalview.bin.Cache.getProperty("DEFAULT_FILE_FORMAT"));
chooser.setFileView(new JalviewFileView());
- chooser.setDialogTitle("Open local file");
- chooser.setToolTipText("Open");
+ chooser.setDialogTitle(MessageManager
+ .getString("label.open_local_file"));
+ chooser.setToolTipText(MessageManager.getString("action.open"));
int value = chooser.showOpenDialog(this);
@@ -472,7 +1008,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements
.getSelectedFile().getParent());
String format = null;
- if (chooser.getSelectedFormat().equals("Jalview"))
+ if (chooser.getSelectedFormat() != null
+ && chooser.getSelectedFormat().equals("Jalview"))
{
format = "Jalview";
}
@@ -497,13 +1034,14 @@ public class Desktop extends jalview.jbgui.GDesktop implements
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
public void inputURLMenuItem_actionPerformed(AlignViewport viewport)
{
// This construct allows us to have a wider textfield
// for viewing
- JLabel label = new JLabel("Enter URL of Input File");
+ JLabel label = new JLabel(
+ MessageManager.getString("label.input_file_url"));
final JComboBox history = new JComboBox();
JPanel panel = new JPanel(new GridLayout(2, 1));
@@ -528,7 +1066,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements
}
int reply = JOptionPane.showInternalConfirmDialog(desktop, panel,
- "Input Alignment From URL", JOptionPane.OK_CANCEL_OPTION);
+ MessageManager.getString("label.input_alignment_from_url"),
+ JOptionPane.OK_CANCEL_OPTION);
if (reply != JOptionPane.OK_OPTION)
{
@@ -556,7 +1095,10 @@ public class Desktop extends jalview.jbgui.GDesktop implements
if (format.equals("URL NOT FOUND"))
{
JOptionPane.showInternalMessageDialog(Desktop.desktop,
- "Couldn't locate " + url, "URL not found",
+ MessageManager.formatMessage("label.couldnt_locate",
+ new Object[]
+ { url }), MessageManager
+ .getString("label.url_not_found"),
JOptionPane.WARNING_MESSAGE);
return;
@@ -577,13 +1119,15 @@ public class Desktop extends jalview.jbgui.GDesktop implements
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
public void inputTextboxMenuItem_actionPerformed(AlignViewport viewport)
{
CutAndPasteTransfer cap = new CutAndPasteTransfer();
cap.setForInput(viewport);
- Desktop.addInternalFrame(cap, "Cut & Paste Alignment File", 600, 500);
+ Desktop.addInternalFrame(cap,
+ MessageManager.getString("label.cut_paste_alignmen_file"),
+ true, 600, 500);
}
/*
@@ -591,66 +1135,141 @@ public class Desktop extends jalview.jbgui.GDesktop implements
*/
public void quit()
{
- jalview.bin.Cache.setProperty("SCREEN_X", getBounds().x + "");
- jalview.bin.Cache.setProperty("SCREEN_Y", getBounds().y + "");
- jalview.bin.Cache.setProperty("SCREEN_WIDTH", getWidth() + "");
- jalview.bin.Cache.setProperty("SCREEN_HEIGHT", getHeight() + "");
+ Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
+ jalview.bin.Cache
+ .setProperty("SCREENGEOMETRY_WIDTH", screen.width + "");
+ jalview.bin.Cache.setProperty("SCREENGEOMETRY_HEIGHT", screen.height
+ + "");
+ storeLastKnownDimensions("", new Rectangle(getBounds().x,
+ getBounds().y, getWidth(), getHeight()));
+
+ if (jconsole != null)
+ {
+ storeLastKnownDimensions("JAVA_CONSOLE_", jconsole.getBounds());
+ jconsole.stopConsole();
+ }
+ if (jvnews != null)
+ {
+ storeLastKnownDimensions("JALVIEW_RSS_WINDOW_", jvnews.getBounds());
+
+ }
+ if (dialogExecutor != null)
+ {
+ dialogExecutor.shutdownNow();
+ }
+
System.exit(0);
}
+ private void storeLastKnownDimensions(String string, Rectangle jc)
+ {
+ jalview.bin.Cache.log.debug("Storing last known dimensions for "
+ + string + ": x:" + jc.x + " y:" + jc.y + " width:" + jc.width
+ + " height:" + jc.height);
+
+ jalview.bin.Cache.setProperty(string + "SCREEN_X", jc.x + "");
+ jalview.bin.Cache.setProperty(string + "SCREEN_Y", jc.y + "");
+ jalview.bin.Cache.setProperty(string + "SCREEN_WIDTH", jc.width + "");
+ jalview.bin.Cache.setProperty(string + "SCREEN_HEIGHT", jc.height + "");
+ }
+
/**
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
public void aboutMenuItem_actionPerformed(ActionEvent e)
{
- StringBuffer message = new StringBuffer("Jalview version "
- + jalview.bin.Cache.getProperty("VERSION") + "; last updated: "
- + jalview.bin.Cache.getDefault("BUILD_DATE", "unknown"));
+ // 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();
+ }
- if (!jalview.bin.Cache.getProperty("LATEST_VERSION").equals(
- jalview.bin.Cache.getProperty("VERSION")))
+ public StringBuffer getAboutMessage(boolean shortv)
+ {
+ StringBuffer message = new StringBuffer();
+ message.append("");
+ if (shortv)
{
- message
- .append("\n\n!! Jalview version "
- + jalview.bin.Cache.getProperty("LATEST_VERSION")
- + " is available for download from http://www.jalview.org !!\n");
+ message.append("
Version: "
+ + jalview.bin.Cache.getProperty("VERSION") + "
");
+ message.append("Last Updated: "
+ + jalview.bin.Cache.getDefault("BUILD_DATE", "unknown")
+ + "");
}
- // TODO: update this text for each release or centrally store it for lite
- // and application
- message
- .append("\nAuthors: Andrew Waterhouse, Jim Procter, Michele Clamp, James Cuff, Steve Searle,\n David Martin & Geoff Barton."
- + "\nDevelopment managed by The Barton Group, University of Dundee, Scotland, UK.\n"
- + "\nFor help, see the FAQ at www.jalview.org and/or join the jalview-discuss@jalview.org mailing list\n"
- + "\nIf you use Jalview, please cite:"
- + "\n\"Clamp, M., Cuff, J., Searle, S. M. and Barton, G. J. (2004), The Jalview Java Alignment Editor\""
- + "\nBioinformatics, 2004 20;426-7.");
+ else
+ {
- JOptionPane.showInternalMessageDialog(Desktop.desktop,
+ message.append("Version "
+ + jalview.bin.Cache.getProperty("VERSION")
+ + "; last updated: "
+ + jalview.bin.Cache.getDefault("BUILD_DATE", "unknown"));
+ }
- message.toString(), "About Jalview", JOptionPane.INFORMATION_MESSAGE);
+ if (jalview.bin.Cache.getDefault("LATEST_VERSION", "Checking").equals(
+ "Checking"))
+ {
+ message.append("
...Checking latest version...");
+ }
+ else if (!jalview.bin.Cache.getDefault("LATEST_VERSION", "Checking")
+ .equals(jalview.bin.Cache.getProperty("VERSION")))
+ {
+ boolean red = false;
+ if (jalview.bin.Cache.getProperty("VERSION").toLowerCase()
+ .indexOf("automated build") == -1)
+ {
+ red = true;
+ // Displayed when code version and jnlp version do not match and code
+ // version is not a development build
+ message.append("");
+ }
+
+ message.append("
!! Version "
+ + jalview.bin.Cache.getDefault("LATEST_VERSION",
+ "..Checking..")
+ + " is available for download from "
+ + jalview.bin.Cache.getDefault("www.jalview.org",
+ "http://www.jalview.org") + " !!");
+ if (red)
+ {
+ message.append("
");
+ }
+ }
+ message.append("
Authors: "
+ + jalview.bin.Cache
+ .getDefault("AUTHORFNAMES",
+ "The Jalview Authors (See AUTHORS file for current list)")
+ + "
Development managed by The Barton Group, University of Dundee, Scotland, UK.
"
+ + "
For help, see the FAQ at www.jalview.org/faq and/or join the jalview-discuss@jalview.org mailing list"
+ + "
If you use Jalview, please cite:"
+ + "
Waterhouse, A.M., Procter, J.B., Martin, D.M.A, Clamp, M. and Barton, G. J. (2009)"
+ + "
Jalview Version 2 - a multiple sequence alignment editor and analysis workbench"
+ + "
Bioinformatics doi: 10.1093/bioinformatics/btp033"
+ + "");
+ return message;
}
/**
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
public void documentationMenuItem_actionPerformed(ActionEvent e)
{
try
{
- ClassLoader cl = jalview.gui.Desktop.class.getClassLoader();
- java.net.URL url = javax.help.HelpSet.findHelpSet(cl, "help/help");
- javax.help.HelpSet hs = new javax.help.HelpSet(cl, url);
-
- javax.help.HelpBroker hb = hs.createHelpBroker();
- hb.setCurrentID("home");
- hb.setDisplayed(true);
+ Help.showHelpWindow();
} catch (Exception ex)
{
}
@@ -669,10 +1288,10 @@ public class Desktop extends jalview.jbgui.GDesktop implements
}
}
System.out.println("ALL CLOSED");
- if (v_client!=null)
+ if (v_client != null)
{
// TODO clear binding to vamsas document objects on close_all
-
+
}
}
@@ -694,7 +1313,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements
/*
* (non-Javadoc)
*
- * @see jalview.jbgui.GDesktop#garbageCollect_actionPerformed(java.awt.event.ActionEvent)
+ * @seejalview.jbgui.GDesktop#garbageCollect_actionPerformed(java.awt.event.
+ * ActionEvent)
*/
protected void garbageCollect_actionPerformed(ActionEvent e)
{
@@ -707,13 +1327,43 @@ public class Desktop extends jalview.jbgui.GDesktop implements
/*
* (non-Javadoc)
*
- * @see jalview.jbgui.GDesktop#showMemusage_actionPerformed(java.awt.event.ActionEvent)
+ * @see
+ * jalview.jbgui.GDesktop#showMemusage_actionPerformed(java.awt.event.ActionEvent
+ * )
*/
protected void showMemusage_actionPerformed(ActionEvent e)
{
desktop.showMemoryUsage(showMemusage.isSelected());
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * jalview.jbgui.GDesktop#showConsole_actionPerformed(java.awt.event.ActionEvent
+ * )
+ */
+ protected void showConsole_actionPerformed(ActionEvent e)
+ {
+ showConsole(showConsole.isSelected());
+ }
+
+ Console jconsole = null;
+
+ /**
+ * control whether the java console is visible or not
+ *
+ * @param selected
+ */
+ void showConsole(boolean selected)
+ {
+ showConsole.setSelected(selected);
+ // TODO: decide if we should update properties file
+ Cache.setProperty("SHOW_JAVA_CONSOLE", Boolean.valueOf(selected)
+ .toString());
+ jconsole.setVisible(selected);
+ }
+
void reorderAssociatedWindows(boolean minimize, boolean close)
{
JInternalFrame[] frames = desktop.getAllFrames();
@@ -722,7 +1372,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
return;
}
- AlignViewport source = null, target = null;
+ AlignmentViewport source = null, target = null;
if (frames[0] instanceof AlignFrame)
{
source = ((AlignFrame) frames[0]).getCurrentView();
@@ -795,7 +1445,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
protected void preferences_actionPerformed(ActionEvent e)
{
@@ -806,51 +1456,155 @@ public class Desktop extends jalview.jbgui.GDesktop implements
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
public void saveState_actionPerformed(ActionEvent e)
{
- JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache
- .getProperty("LAST_DIRECTORY"), new String[]
- { "jar" }, new String[]
- { "Jalview Project" }, "Jalview Project");
+ JalviewFileChooser chooser = new JalviewFileChooser(
+ jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[]
+ { "jvp" }, new String[]
+ { "Jalview Project" }, "Jalview Project");
chooser.setFileView(new JalviewFileView());
- chooser.setDialogTitle("Save State");
+ chooser.setDialogTitle(MessageManager.getString("label.save_state"));
int value = chooser.showSaveDialog(this);
if (value == JalviewFileChooser.APPROVE_OPTION)
{
- java.io.File choice = chooser.getSelectedFile();
- jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice.getParent());
- new Jalview2XML().SaveState(choice);
+ final Desktop me = this;
+ final java.io.File choice = chooser.getSelectedFile();
+ setProjectFile(choice);
+
+ // TODO or move inside the new Thread?
+ saveChimeraSessions(choice.getAbsolutePath());
+
+ new Thread(new Runnable()
+ {
+ public void run()
+ {
+
+ setProgressBar(MessageManager.formatMessage(
+ "label.saving_jalview_project", new Object[]
+ { choice.getName() }), choice.hashCode());
+ jalview.bin.Cache.setProperty("LAST_DIRECTORY",
+ choice.getParent());
+ // TODO catch and handle errors for savestate
+ // TODO prevent user from messing with the Desktop whilst we're saving
+ try
+ {
+ new Jalview2XML().saveState(choice);
+ } catch (OutOfMemoryError oom)
+ {
+ new OOMWarning("Whilst saving current state to "
+ + choice.getName(), oom);
+ } catch (Exception ex)
+ {
+ Cache.log.error(
+ "Problems whilst trying to save to " + choice.getName(),
+ ex);
+ JOptionPane.showMessageDialog(me, MessageManager.formatMessage(
+ "label.error_whilst_saving_current_state_to",
+ new Object[]
+ { choice.getName() }), MessageManager
+ .getString("label.couldnt_save_project"),
+ JOptionPane.WARNING_MESSAGE);
+ }
+ setProgressBar(null, choice.hashCode());
+ }
+ }).start();
+ }
+ }
+
+ /**
+ * Request any open, linked Chimera sessions to save their state.
+ *
+ * @param jalviewProjectFilename
+ * the filename of the Jalview project; Chimera session files should
+ * be given distinct, but obviously related, names.
+ */
+ public void saveChimeraSessions(String jalviewProjectFilename)
+ {
+ int i = 0;
+ for (JInternalFrame frame : getAllFrames())
+ {
+ if (frame instanceof ChimeraViewFrame)
+ {
+ /*
+ * Construct a filename for the Chimera session by append _chimera.py
+ * to the Jalview project file name.
+ */
+ String chimeraPath = jalviewProjectFilename + "_chimera_" + i
+ + ".py";
+ ((ChimeraViewFrame) frame).saveSession(chimeraPath);
+ i++;
+ }
}
}
+ private void setProjectFile(File choice)
+ {
+ this.projectFile = choice;
+ }
+
+ public File getProjectFile()
+ {
+ return this.projectFile;
+ }
+
/**
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
public void loadState_actionPerformed(ActionEvent e)
{
- JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache
- .getProperty("LAST_DIRECTORY"), new String[]
- { "jar" }, new String[]
- { "Jalview Project" }, "Jalview Project");
+ JalviewFileChooser chooser = new JalviewFileChooser(
+ jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[]
+ { "jvp", "jar" }, new String[]
+ { "Jalview Project", "Jalview Project (old)" },
+ "Jalview Project");
chooser.setFileView(new JalviewFileView());
- chooser.setDialogTitle("Restore state");
+ chooser.setDialogTitle(MessageManager.getString("label.restore_state"));
int value = chooser.showOpenDialog(this);
if (value == JalviewFileChooser.APPROVE_OPTION)
{
- String choice = chooser.getSelectedFile().getAbsolutePath();
- jalview.bin.Cache.setProperty("LAST_DIRECTORY", chooser
- .getSelectedFile().getParent());
- new Jalview2XML().LoadJalviewAlign(choice);
+ final File selectedFile = chooser.getSelectedFile();
+ setProjectFile(selectedFile);
+ final String choice = selectedFile.getAbsolutePath();
+ jalview.bin.Cache.setProperty("LAST_DIRECTORY",
+ selectedFile.getParent());
+ new Thread(new Runnable()
+ {
+ public void run()
+ {
+ setProgressBar(MessageManager.formatMessage(
+ "label.loading_jalview_project", new Object[]
+ { choice }), choice.hashCode());
+ try
+ {
+ new Jalview2XML().loadJalviewAlign(choice);
+ } catch (OutOfMemoryError oom)
+ {
+ new OOMWarning("Whilst loading project from " + choice, oom);
+ } catch (Exception ex)
+ {
+ Cache.log.error("Problems whilst loading project from "
+ + choice, ex);
+ JOptionPane.showMessageDialog(Desktop.desktop, MessageManager
+ .formatMessage(
+ "label.error_whilst_loading_project_from",
+ new Object[]
+ { choice }), MessageManager
+ .getString("label.couldnt_load_project"),
+ JOptionPane.WARNING_MESSAGE);
+ }
+ setProgressBar(null, choice.hashCode());
+ }
+ }).start();
}
}
@@ -861,47 +1615,58 @@ public class Desktop extends jalview.jbgui.GDesktop implements
JPanel progressPanel;
+ ArrayList fileLoadingPanels = new ArrayList();
+
public void startLoading(final String fileName)
{
if (fileLoadingCount == 0)
{
- addProgressPanel("Loading File: " + fileName + " ");
-
+ fileLoadingPanels.add(addProgressPanel(MessageManager.formatMessage(
+ "label.loading_file", new Object[]
+ { fileName })));
}
fileLoadingCount++;
}
- private JProgressBar addProgressPanel(String string)
+ private JPanel addProgressPanel(String string)
{
if (progressPanel == null)
{
- progressPanel = new JPanel(new BorderLayout());
+ progressPanel = new JPanel(new GridLayout(1, 1));
totalProgressCount = 0;
+ instance.getContentPane().add(progressPanel, BorderLayout.SOUTH);
}
+ JPanel thisprogress = new JPanel(new BorderLayout(10, 5));
JProgressBar progressBar = new JProgressBar();
progressBar.setIndeterminate(true);
- progressPanel.add(new JLabel(string), BorderLayout.WEST);
-
- progressPanel.add(progressBar, BorderLayout.CENTER);
+ thisprogress.add(new JLabel(string), BorderLayout.WEST);
- instance.getContentPane().add(progressPanel, BorderLayout.SOUTH);
- totalProgressCount++;
- validate();
- return progressBar;
+ thisprogress.add(progressBar, BorderLayout.CENTER);
+ progressPanel.add(thisprogress);
+ ((GridLayout) progressPanel.getLayout())
+ .setRows(((GridLayout) progressPanel.getLayout()).getRows() + 1);
+ ++totalProgressCount;
+ instance.validate();
+ return thisprogress;
}
int totalProgressCount = 0;
- private void removeProgressPanel(JProgressBar progbar)
+ private void removeProgressPanel(JPanel progbar)
{
if (progressPanel != null)
{
- progressPanel.remove(progbar);
- if (--totalProgressCount < 1)
+ synchronized (progressPanel)
{
- this.getContentPane().remove(progressPanel);
- progressPanel = null;
+ progressPanel.remove(progbar);
+ GridLayout gl = (GridLayout) progressPanel.getLayout();
+ gl.setRows(gl.getRows() - 1);
+ if (--totalProgressCount < 1)
+ {
+ this.getContentPane().remove(progressPanel);
+ progressPanel = null;
+ }
}
}
validate();
@@ -912,105 +1677,109 @@ public class Desktop extends jalview.jbgui.GDesktop implements
fileLoadingCount--;
if (fileLoadingCount < 1)
{
- if (progressPanel != null)
+ while (fileLoadingPanels.size() > 0)
{
- this.getContentPane().remove(progressPanel);
- progressPanel = null;
+ removeProgressPanel(fileLoadingPanels.remove(0));
}
+ fileLoadingPanels.clear();
fileLoadingCount = 0;
}
validate();
}
- public static int getViewCount(String viewId)
+ public static int getViewCount(String alignmentId)
{
- AlignViewport[] aps = getViewports(viewId);
- return (aps==null) ? 0 : aps.length;
+ AlignmentViewport[] aps = getViewports(alignmentId);
+ return (aps == null) ? 0 : aps.length;
}
+
/**
*
- * @param viewId
- * @return all AlignmentPanels concerning the viewId sequence set
+ * @param alignmentId
+ * - if null, all sets are returned
+ * @return all AlignmentPanels concerning the alignmentId sequence set
*/
- public static AlignmentPanel[] getAlignmentPanels(String viewId)
+ public static AlignmentPanel[] getAlignmentPanels(String alignmentId)
{
- int count = 0;
- JInternalFrame[] frames = Desktop.desktop.getAllFrames();
- ArrayList aps = new ArrayList();
- for (int t = 0; t < frames.length; t++)
+ if (Desktop.desktop == null)
+ {
+ // no frames created and in headless mode
+ // TODO: verify that frames are recoverable when in headless mode
+ return null;
+ }
+ List aps = new ArrayList();
+ AlignFrame[] frames = getAlignFrames();
+ if (frames == null)
{
- if (frames[t] instanceof AlignFrame)
+ return null;
+ }
+ for (AlignFrame af : frames)
+ {
+ for (AlignmentPanel ap : af.alignPanels)
{
- AlignFrame af = (AlignFrame) frames[t];
- for (int a = 0; a < af.alignPanels.size(); a++)
+ if (alignmentId==null || alignmentId.equals(ap.av.getSequenceSetId()))
{
- if (viewId
- .equals(((AlignmentPanel) af.alignPanels.elementAt(a)).av
- .getSequenceSetId()))
- {
- aps.add(af.alignPanels.elementAt(a));
- }
+ aps.add(ap);
}
}
}
- if (aps.size()==0)
+ if (aps.size() == 0)
{
return null;
}
- AlignmentPanel[] vap = new AlignmentPanel[aps.size()];
- for (int t=0;t viewp = new ArrayList();
if (desktop != null)
{
- javax.swing.JInternalFrame[] frames = instance.getAllFrames();
-
- for (int t = 0; t < frames.length; t++)
+ AlignFrame[] frames = Desktop.getAlignFrames();
+
+ for (AlignFrame afr : frames)
{
- if (frames[t] instanceof AlignFrame)
+ if (sequenceSetId==null || afr.getViewport().getSequenceSetId().equals(sequenceSetId))
{
- AlignFrame afr = ((AlignFrame) frames[t]);
- if (afr.getViewport().getSequenceSetId()
- .equals(sequenceSetId))
+ if (afr.alignPanels != null)
{
- if (afr.alignPanels!=null)
+ for (AlignmentPanel ap : afr.alignPanels)
{
- for (int a = 0; a < afr.alignPanels.size(); a++)
+ if (sequenceSetId == null
+ || sequenceSetId.equals(ap.av.getSequenceSetId()))
{
- if (sequenceSetId
- .equals(((AlignmentPanel) afr.alignPanels.elementAt(a)).av
- .getSequenceSetId()))
- {
- viewp.addElement(((AlignmentPanel)afr.alignPanels.elementAt(a)).av);
- }
+ viewp.add(ap.av);
}
- } else {
- viewp.addElement(((AlignFrame) frames[t]).getViewport());
}
}
+ else
+ {
+ viewp.add(afr.getViewport());
+ }
}
}
if (viewp.size() > 0)
{
- AlignViewport[] vp = new AlignViewport[viewp.size()];
- viewp.copyInto(vp);
- return vp;
+ return viewp.toArray(new AlignmentViewport[viewp.size()]);
}
}
return null;
}
+ /**
+ * Explode the views in the given frame into separate AlignFrame
+ *
+ * @param af
+ */
public void explodeViews(AlignFrame af)
{
int size = af.alignPanels.size();
@@ -1021,15 +1790,21 @@ public class Desktop extends jalview.jbgui.GDesktop implements
for (int i = 0; i < size; i++)
{
- AlignmentPanel ap = (AlignmentPanel) af.alignPanels.elementAt(i);
+ AlignmentPanel ap = af.alignPanels.get(i);
AlignFrame newaf = new AlignFrame(ap);
- if (ap.av.explodedPosition != null
- && !ap.av.explodedPosition.equals(af.getBounds()))
+
+ /*
+ * Restore the view's last exploded frame geometry if known. Multiple
+ * views from one exploded frame share and restore the same (frame)
+ * position and size.
+ */
+ Rectangle geometry = ap.av.getExplodedGeometry();
+ if (geometry != null)
{
- newaf.setBounds(ap.av.explodedPosition);
+ newaf.setBounds(geometry);
}
- ap.av.gatherViewsHere = false;
+ ap.av.setGatherViewsHere(false);
addInternalFrame(newaf, af.getTitle(), AlignFrame.DEFAULT_WIDTH,
AlignFrame.DEFAULT_HEIGHT);
@@ -1040,12 +1815,20 @@ public class Desktop extends jalview.jbgui.GDesktop implements
}
+ /**
+ * Gather expanded views (separate AlignFrame's) with the same sequence set
+ * identifier back in to this frame as additional views, and close the
+ * expanded views. Note the expanded frames may themselves have multiple
+ * views. We take the lot.
+ *
+ * @param source
+ */
public void gatherViews(AlignFrame source)
{
- source.viewport.gatherViewsHere = true;
- source.viewport.explodedPosition = source.getBounds();
+ source.viewport.setGatherViewsHere(true);
+ source.viewport.setExplodedGeometry(source.getBounds());
JInternalFrame[] frames = desktop.getAllFrames();
- String viewId = source.viewport.sequenceSetID;
+ String viewId = source.viewport.getSequenceSetId();
for (int t = 0; t < frames.length; t++)
{
@@ -1055,12 +1838,12 @@ public class Desktop extends jalview.jbgui.GDesktop implements
boolean gatherThis = false;
for (int a = 0; a < af.alignPanels.size(); a++)
{
- AlignmentPanel ap = (AlignmentPanel) af.alignPanels.elementAt(a);
+ AlignmentPanel ap = af.alignPanels.get(a);
if (viewId.equals(ap.av.getSequenceSetId()))
{
gatherThis = true;
- ap.av.gatherViewsHere = false;
- ap.av.explodedPosition = af.getBounds();
+ ap.av.setGatherViewsHere(false);
+ ap.av.setExplodedGeometry(af.getBounds());
source.addAlignmentPanel(ap, false);
}
}
@@ -1082,31 +1865,33 @@ public class Desktop extends jalview.jbgui.GDesktop implements
if (v_client == null)
{
// Load and try to start a session.
- JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache
- .getProperty("LAST_DIRECTORY"));
+ JalviewFileChooser chooser = new JalviewFileChooser(
+ jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
chooser.setFileView(new JalviewFileView());
- chooser.setDialogTitle("Open a saved VAMSAS session");
- chooser
- .setToolTipText("select a vamsas session to be opened as a new vamsas session.");
+ chooser.setDialogTitle(MessageManager
+ .getString("label.open_saved_vamsas_session"));
+ chooser.setToolTipText(MessageManager
+ .getString("label.select_vamsas_session_opened_as_new_vamsas_session"));
int value = chooser.showOpenDialog(this);
if (value == JalviewFileChooser.APPROVE_OPTION)
{
- try
- {
- v_client = new jalview.gui.VamsasApplication(this, chooser
- .getSelectedFile());
- } catch (Exception ex)
+ String fle = chooser.getSelectedFile().toString();
+ if (!vamsasImport(chooser.getSelectedFile()))
{
- jalview.bin.Cache.log.error(
- "New vamsas session from existing session file failed:",
- ex);
- return;
+ JOptionPane
+ .showInternalMessageDialog(
+ Desktop.desktop,
+ MessageManager.formatMessage(
+ "label.couldnt_import_as_vamsas_session",
+ new Object[]
+ { fle }),
+ MessageManager
+ .getString("label.vamsas_document_import_failed"),
+ JOptionPane.ERROR_MESSAGE);
}
- setupVamsasConnectedGui();
- v_client.initial_update(); // TODO: thread ?
}
}
else
@@ -1116,6 +1901,110 @@ public class Desktop extends jalview.jbgui.GDesktop implements
}
}
+ /**
+ * import file into a new vamsas session (uses jalview.gui.VamsasApplication)
+ *
+ * @param file
+ * @return true if import was a success and a session was started.
+ */
+ public boolean vamsasImport(URL url)
+ {
+ // TODO: create progress bar
+ if (v_client != null)
+ {
+
+ jalview.bin.Cache.log
+ .error("Implementation error - load session from a running session is not supported.");
+ return false;
+ }
+
+ try
+ {
+ // copy the URL content to a temporary local file
+ // TODO: be a bit cleverer here with nio (?!)
+ File file = File.createTempFile("vdocfromurl", ".vdj");
+ FileOutputStream fos = new FileOutputStream(file);
+ BufferedInputStream bis = new BufferedInputStream(url.openStream());
+ byte[] buffer = new byte[2048];
+ int ln;
+ while ((ln = bis.read(buffer)) > -1)
+ {
+ fos.write(buffer, 0, ln);
+ }
+ bis.close();
+ fos.close();
+ v_client = new jalview.gui.VamsasApplication(this, file,
+ url.toExternalForm());
+ } catch (Exception ex)
+ {
+ jalview.bin.Cache.log.error(
+ "Failed to create new vamsas session from contents of URL "
+ + url, ex);
+ return false;
+ }
+ setupVamsasConnectedGui();
+ v_client.initial_update(); // TODO: thread ?
+ return v_client.inSession();
+ }
+
+ /**
+ * import file into a new vamsas session (uses jalview.gui.VamsasApplication)
+ *
+ * @param file
+ * @return true if import was a success and a session was started.
+ */
+ public boolean vamsasImport(File file)
+ {
+ if (v_client != null)
+ {
+
+ jalview.bin.Cache.log
+ .error("Implementation error - load session from a running session is not supported.");
+ return false;
+ }
+
+ setProgressBar(MessageManager.formatMessage(
+ "status.importing_vamsas_session_from", new Object[]
+ { file.getName() }), file.hashCode());
+ try
+ {
+ v_client = new jalview.gui.VamsasApplication(this, file, null);
+ } catch (Exception ex)
+ {
+ setProgressBar(MessageManager.formatMessage(
+ "status.importing_vamsas_session_from", new Object[]
+ { file.getName() }), file.hashCode());
+ jalview.bin.Cache.log.error(
+ "New vamsas session from existing session file failed:", ex);
+ return false;
+ }
+ setupVamsasConnectedGui();
+ v_client.initial_update(); // TODO: thread ?
+ setProgressBar(MessageManager.formatMessage(
+ "status.importing_vamsas_session_from", new Object[]
+ { file.getName() }), file.hashCode());
+ return v_client.inSession();
+ }
+
+ public boolean joinVamsasSession(String mysesid)
+ {
+ if (v_client != null)
+ {
+ throw new Error(
+ MessageManager
+ .getString("error.try_join_vamsas_session_another"));
+ }
+ if (mysesid == null)
+ {
+ throw new Error(
+ MessageManager.getString("error.invalid_vamsas_session_id"));
+ }
+ v_client = new VamsasApplication(this, mysesid);
+ setupVamsasConnectedGui();
+ v_client.initial_update();
+ return (v_client.inSession());
+ }
+
public void vamsasStart_actionPerformed(ActionEvent e)
{
if (v_client == null)
@@ -1134,7 +2023,6 @@ public class Desktop extends jalview.jbgui.GDesktop implements
*
* if (value == JalviewFileChooser.APPROVE_OPTION) { v_client = new
* jalview.gui.VamsasApplication(this, chooser.getSelectedFile());
- *
*/
v_client = new VamsasApplication(this);
setupVamsasConnectedGui();
@@ -1149,11 +2037,11 @@ public class Desktop extends jalview.jbgui.GDesktop implements
protected void setupVamsasConnectedGui()
{
- vamsasStart.setText("Session Update");
+ vamsasStart.setText(MessageManager.getString("label.session_update"));
vamsasSave.setVisible(true);
vamsasStop.setVisible(true);
vamsasImport.setVisible(false); // Document import to existing session is
- // not possible for vamsas-client-1.0.
+ // not possible for vamsas-client-1.0.
}
protected void setupVamsasDisconnectedGui()
@@ -1161,7 +2049,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements
vamsasSave.setVisible(false);
vamsasStop.setVisible(false);
vamsasImport.setVisible(true);
- vamsasStart.setText("New Vamsas Session");
+ vamsasStart.setText(MessageManager
+ .getString("label.new_vamsas_session"));
}
public void vamsasStop_actionPerformed(ActionEvent e)
@@ -1197,7 +2086,9 @@ public class Desktop extends jalview.jbgui.GDesktop implements
{
JMenuItem sessit = new JMenuItem();
sessit.setText(sess[i]);
- sessit.setToolTipText("Connect to session " + sess[i]);
+ sessit.setToolTipText(MessageManager.formatMessage(
+ "label.connect_to_session", new Object[]
+ { sess[i] }));
final Desktop dsktp = this;
final String mysesid = sess[i];
sessit.addActionListener(new ActionListener()
@@ -1246,20 +2137,24 @@ public class Desktop extends jalview.jbgui.GDesktop implements
{
if (v_client != null)
{
- JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache
- .getProperty("LAST_DIRECTORY"), new String[]
- { "vdj" }, // TODO: VAMSAS DOCUMENT EXTENSION is VDJ
+ JalviewFileChooser chooser = new JalviewFileChooser(
+ jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[]
+ { "vdj" }, // TODO: VAMSAS DOCUMENT EXTENSION is VDJ
new String[]
{ "Vamsas Document" }, "Vamsas Document");
chooser.setFileView(new JalviewFileView());
- chooser.setDialogTitle("Save Vamsas Document Archive");
+ chooser.setDialogTitle(MessageManager
+ .getString("label.save_vamsas_document_archive"));
int value = chooser.showSaveDialog(this);
if (value == JalviewFileChooser.APPROVE_OPTION)
{
java.io.File choice = chooser.getSelectedFile();
+ JPanel progpanel = addProgressPanel(MessageManager.formatMessage(
+ "label.saving_vamsas_doc", new Object[]
+ { choice.getName() }));
jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice.getParent());
String warnmsg = null;
String warnttl = null;
@@ -1281,6 +2176,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
+ choice, ex);
}
+ removeProgressPanel(progpanel);
if (warnmsg != null)
{
JOptionPane.showInternalMessageDialog(Desktop.desktop,
@@ -1291,13 +2187,13 @@ public class Desktop extends jalview.jbgui.GDesktop implements
}
}
- JProgressBar vamUpdate = null;
+ JPanel 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
+ * true to hide gui, false to reveal gui
*/
public void setVamsasUpdate(boolean b)
{
@@ -1310,7 +2206,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements
}
if (b)
{
- vamUpdate = this.addProgressPanel("Updating vamsas session");
+ vamUpdate = this.addProgressPanel(MessageManager
+ .getString("label.updating_vamsas_session"));
}
vamsasStart.setVisible(!b);
vamsasStop.setVisible(!b);
@@ -1345,6 +2242,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements
public class MyDesktopPane extends JDesktopPane implements Runnable
{
+ private static final float ONE_MB = 1048576f;
+
boolean showMemoryUsage = false;
Runtime runtime;
@@ -1384,10 +2283,9 @@ public class Desktop extends jalview.jbgui.GDesktop implements
{
try
{
- Thread.sleep(3000);
- maxMemory = runtime.maxMemory() / 1048576f;
- allocatedMemory = runtime.totalMemory() / 1048576f;
- freeMemory = runtime.freeMemory() / 1048576f;
+ maxMemory = runtime.maxMemory() / ONE_MB;
+ allocatedMemory = runtime.totalMemory() / ONE_MB;
+ freeMemory = runtime.freeMemory() / ONE_MB;
totalFreeMemory = freeMemory + (maxMemory - allocatedMemory);
percentUsage = (totalFreeMemory / maxMemory) * 100;
@@ -1399,7 +2297,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements
// instance.set.setBorder(border1);
}
repaint();
-
+ // sleep after showing usage
+ Thread.sleep(3000);
} catch (Exception ex)
{
ex.printStackTrace();
@@ -1409,17 +2308,32 @@ public class Desktop extends jalview.jbgui.GDesktop implements
public void paintComponent(Graphics g)
{
- if (showMemoryUsage)
+ if (showMemoryUsage && g != null && df != null)
{
if (percentUsage < 20)
+ {
g.setColor(Color.red);
-
- g.drawString("Total Free Memory: " + df.format(totalFreeMemory)
- + "MB; Max Memory: " + df.format(maxMemory) + "MB; "
- + df.format(percentUsage) + "%", 10, getHeight()
- - g.getFontMetrics().getHeight());
+ }
+ FontMetrics fm = g.getFontMetrics();
+ if (fm != null)
+ {
+ g.drawString(MessageManager.formatMessage(
+ "label.memory_stats",
+ new Object[]
+ { df.format(totalFreeMemory), df.format(maxMemory),
+ df.format(percentUsage) }), 10,
+ getHeight() - fm.getHeight());
+ }
}
}
+ }
+
+ /**
+ * fixes stacking order after a modal dialog to ensure windows that should be
+ * on top actually are
+ */
+ public void relayerWindows()
+ {
}
@@ -1430,7 +2344,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
if (jalview.bin.Cache.groovyJarsPresent())
{
groovyShell = new JMenuItem();
- groovyShell.setText("Groovy Console...");
+ groovyShell.setText(MessageManager.getString("label.groovy_console"));
groovyShell.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -1445,8 +2359,10 @@ public class Desktop extends jalview.jbgui.GDesktop implements
/**
* Accessor method to quickly get all the AlignmentFrames loaded.
+ *
+ * @return an array of AlignFrame, or null if none found
*/
- public static AlignFrame[] getAlignframes()
+ public static AlignFrame[] getAlignFrames()
{
JInternalFrame[] frames = Desktop.desktop.getAllFrames();
@@ -1454,32 +2370,66 @@ public class Desktop extends jalview.jbgui.GDesktop implements
{
return null;
}
- Vector avp = new Vector();
- try
+ List avp = new ArrayList();
+ // REVERSE ORDER
+ for (int i = frames.length - 1; i > -1; i--)
{
- // REVERSE ORDER
- for (int i = frames.length - 1; i > -1; i--)
+ if (frames[i] instanceof AlignFrame)
{
- if (frames[i] instanceof AlignFrame)
+ avp.add((AlignFrame) frames[i]);
+ }
+ else if (frames[i] instanceof SplitFrame)
+ {
+ /*
+ * Also check for a split frame containing an AlignFrame
+ */
+ GSplitFrame sf = (GSplitFrame) frames[i];
+ if (sf.getTopFrame() instanceof AlignFrame)
+ {
+ avp.add((AlignFrame) sf.getTopFrame());
+ }
+ if (sf.getBottomFrame() instanceof AlignFrame)
{
- AlignFrame af = (AlignFrame) frames[i];
- avp.addElement(af);
+ avp.add((AlignFrame) sf.getBottomFrame());
}
}
- } catch (Exception ex)
- {
- ex.printStackTrace();
}
if (avp.size() == 0)
{
return null;
}
- AlignFrame afs[] = new AlignFrame[avp.size()];
- for (int i = 0, j = avp.size(); i < j; i++)
+ AlignFrame afs[] = avp.toArray(new AlignFrame[avp.size()]);
+ return afs;
+ }
+
+ /**
+ * Returns an array of any AppJmol frames in the Desktop (or null if none).
+ *
+ * @return
+ */
+ public GStructureViewer[] getJmols()
+ {
+ JInternalFrame[] frames = Desktop.desktop.getAllFrames();
+
+ if (frames == null)
+ {
+ return null;
+ }
+ List avp = new ArrayList();
+ // REVERSE ORDER
+ for (int i = frames.length - 1; i > -1; i--)
{
- afs[i] = (AlignFrame) avp.elementAt(i);
+ if (frames[i] instanceof AppJmol)
+ {
+ GStructureViewer af = (GStructureViewer) frames[i];
+ avp.add(af);
+ }
+ }
+ if (avp.size() == 0)
+ {
+ return null;
}
- avp.clear();
+ GStructureViewer afs[] = avp.toArray(new GStructureViewer[avp.size()]);
return afs;
}
@@ -1492,38 +2442,39 @@ public class Desktop extends jalview.jbgui.GDesktop implements
if (!jalview.bin.Cache.groovyJarsPresent())
{
throw new Error(
- "Implementation Error. Cannot create groovyShell without Groovy on the classpath!");
+ MessageManager
+ .getString("error.implementation_error_cannot_create_groovyshell"));
}
try
{
- Class gcClass = Desktop.class.getClassLoader().loadClass(
+ Class> gcClass = Desktop.class.getClassLoader().loadClass(
"groovy.ui.Console");
- Constructor gccons = gcClass.getConstructor(null);
+ Constructor> gccons = gcClass.getConstructor();
java.lang.reflect.Method setvar = gcClass.getMethod("setVariable",
new Class[]
{ String.class, Object.class });
- java.lang.reflect.Method run = gcClass.getMethod("run", null);
- Object gc = gccons.newInstance(null);
+ java.lang.reflect.Method run = gcClass.getMethod("run");
+ Object gc = gccons.newInstance();
setvar.invoke(gc, new Object[]
{ "Jalview", this });
- run.invoke(gc, null);
+ run.invoke(gc);
} catch (Exception ex)
{
jalview.bin.Cache.log.error("Groovy Shell Creation failed.", ex);
- JOptionPane
- .showInternalMessageDialog(
- Desktop.desktop,
+ JOptionPane.showInternalMessageDialog(Desktop.desktop,
- "Couldn't create the groovy Shell. Check the error log for the details of what went wrong.",
- "Jalview Groovy Support Failed",
- JOptionPane.ERROR_MESSAGE);
+ MessageManager.getString("label.couldnt_create_groovy_shell"),
+ MessageManager.getString("label.groovy_support_failed"),
+ JOptionPane.ERROR_MESSAGE);
}
}
/**
* Progress bars managed by the IProgressIndicator method.
*/
- private Hashtable progressBars;
+ private Hashtable progressBars;
+
+ private Hashtable progressBarHandlers;
/*
* (non-Javadoc)
@@ -1534,13 +2485,17 @@ public class Desktop extends jalview.jbgui.GDesktop implements
{
if (progressBars == null)
{
- progressBars = new Hashtable();
+ progressBars = new Hashtable();
+ progressBarHandlers = new Hashtable();
}
if (progressBars.get(new Long(id)) != null)
{
- JProgressBar progressPanel = (JProgressBar) progressBars
- .remove(new Long(id));
+ JPanel progressPanel = progressBars.remove(new Long(id));
+ if (progressBarHandlers.contains(new Long(id)))
+ {
+ progressBarHandlers.remove(new Long(id));
+ }
removeProgressPanel(progressPanel);
}
else
@@ -1549,24 +2504,573 @@ public class Desktop extends jalview.jbgui.GDesktop implements
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see jalview.gui.IProgressIndicator#registerHandler(long,
+ * jalview.gui.IProgressIndicatorHandler)
+ */
+ public void registerHandler(final long id,
+ final IProgressIndicatorHandler handler)
+ {
+ if (progressBarHandlers == null || !progressBars.contains(new Long(id)))
+ {
+ throw new Error(
+ MessageManager
+ .getString("error.call_setprogressbar_before_registering_handler"));
+ }
+ progressBarHandlers.put(new Long(id), handler);
+ final JPanel progressPanel = progressBars.get(new Long(id));
+ if (handler.canCancel())
+ {
+ JButton cancel = new JButton(
+ MessageManager.getString("action.cancel"));
+ final IProgressIndicator us = this;
+ cancel.addActionListener(new ActionListener()
+ {
+
+ public void actionPerformed(ActionEvent e)
+ {
+ handler.cancelActivity(id);
+ us.setProgressBar(MessageManager.formatMessage(
+ "label.cancelled_params", new Object[]
+ { ((JLabel) progressPanel.getComponent(0)).getText() }),
+ id);
+ }
+ });
+ progressPanel.add(cancel, BorderLayout.EAST);
+ }
+ }
+
/**
- * This will return the first AlignFrame viewing AlignViewport av. It will
- * break if there are more than one AlignFrames viewing a particular av. This
*
- * @param av
- * @return alignFrame for av
+ * @return true if any progress bars are still active
*/
- public static AlignFrame getAlignFrameFor(AlignViewport av)
+ @Override
+ public boolean operationInProgress()
+ {
+ if (progressBars != null && progressBars.size() > 0)
+ {
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * This will return the first AlignFrame holding the given viewport instance. It
+ * will break if there are more than one AlignFrames viewing a particular av.
+ *
+ * @param viewport
+ * @return alignFrame for viewport
+ */
+ public static AlignFrame getAlignFrameFor(AlignViewportI viewport)
{
if (desktop != null)
{
- AlignmentPanel[] aps = getAlignmentPanels(av.getSequenceSetId());
- for (int panel=0;aps!=null && panel" + ermsg +
+ * " It may be that you have invalid JABA URLs in your web service preferences,"
+ * + " or mis-configured HTTP proxy settings. " +
+ * "Check the Connections and Web services tab of the"
+ * +
+ * " Tools->Preferences dialog box to change them. |