X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDesktop.java;h=516c33fc28bc18242786a3a7f436256dae795217;hb=cf64def09a8b741483854ddd8c034d0aefff15b4;hp=d6ab3ae3ce7a3a04c61270089b363127a04a1794;hpb=3a124a6618aca04d87fa89a76d79cc03c4d45e47;p=jalview.git diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java index d6ab3ae..bbdddbb 100644 --- a/src/jalview/gui/Desktop.java +++ b/src/jalview/gui/Desktop.java @@ -1,29 +1,52 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) - * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * * 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. - * + * 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 Jalview. If not, see . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.gui; +import static jalview.util.UrlConstants.SEQUENCE_ID; + +import jalview.api.AlignViewportI; +import jalview.api.AlignmentViewPanel; import jalview.bin.Cache; +import jalview.bin.Jalview; +import jalview.io.DataSourceType; +import jalview.io.FileFormat; +import jalview.io.FileFormatException; +import jalview.io.FileFormatI; +import jalview.io.FileFormats; 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.urls.IdOrgSettings; +import jalview.util.ImageMaker; +import jalview.util.MessageManager; +import jalview.util.Platform; +import jalview.util.UrlConstants; +import jalview.viewmodel.AlignmentViewport; import jalview.ws.params.ParamManager; +import jalview.ws.utils.UrlDownloadClient; import java.awt.BorderLayout; import java.awt.Color; @@ -34,6 +57,7 @@ import java.awt.GridLayout; import java.awt.Point; import java.awt.Rectangle; import java.awt.Toolkit; +import java.awt.Window; import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.ClipboardOwner; import java.awt.datatransfer.DataFlavor; @@ -45,29 +69,39 @@ 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.InputEvent; +import java.awt.event.KeyEvent; 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.io.IOException; import java.net.URL; import java.util.ArrayList; import java.util.Hashtable; +import java.util.List; +import java.util.ListIterator; 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.AbstractAction; +import javax.swing.Action; +import javax.swing.ActionMap; +import javax.swing.Box; +import javax.swing.BoxLayout; import javax.swing.DefaultDesktopManager; import javax.swing.DesktopManager; +import javax.swing.InputMap; import javax.swing.JButton; +import javax.swing.JCheckBox; import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JDesktopPane; @@ -75,15 +109,19 @@ 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.KeyStroke; import javax.swing.SwingUtilities; import javax.swing.event.HyperlinkEvent; +import javax.swing.event.HyperlinkEvent.EventType; +import javax.swing.event.InternalFrameAdapter; +import javax.swing.event.InternalFrameEvent; import javax.swing.event.MenuEvent; import javax.swing.event.MenuListener; -import javax.swing.event.HyperlinkEvent.EventType; + +import org.stackoverflowusers.file.WindowsShortcut; /** * Jalview Desktop @@ -92,16 +130,28 @@ import javax.swing.event.HyperlinkEvent.EventType; * @author $author$ * @version $Revision: 1.155 $ */ -public class Desktop extends jalview.jbgui.GDesktop implements - DropTargetListener, ClipboardOwner, IProgressIndicator, jalview.api.StructureSelectionManagerProvider +public class Desktop extends jalview.jbgui.GDesktop + implements DropTargetListener, ClipboardOwner, IProgressIndicator, + jalview.api.StructureSelectionManagerProvider { + private static int DEFAULT_MIN_WIDTH = 300; + + private static int DEFAULT_MIN_HEIGHT = 250; + + private static int ALIGN_FRAME_DEFAULT_MIN_WIDTH = 600; + + private static int ALIGN_FRAME_DEFAULT_MIN_HEIGHT = 70; + + private static final String EXPERIMENTAL_FEATURES = "EXPERIMENTAL_FEATURES"; private JalviewChangeSupport changeSupport = new JalviewChangeSupport(); /** * news reader - null if it was never started. */ - private BlogReader jvnews=null; + private BlogReader jvnews = null; + + private File projectFile; /** * @param listener @@ -167,6 +217,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements this.delegate = delegate; } + @Override public void activateFrame(JInternalFrame f) { try @@ -179,81 +230,96 @@ public class Desktop extends jalview.jbgui.GDesktop implements } } + @Override public void beginDraggingFrame(JComponent f) { delegate.beginDraggingFrame(f); } + @Override public void beginResizingFrame(JComponent f, int direction) { delegate.beginResizingFrame(f, direction); } + @Override public void closeFrame(JInternalFrame f) { delegate.closeFrame(f); } + @Override public void deactivateFrame(JInternalFrame f) { delegate.deactivateFrame(f); } + @Override public void deiconifyFrame(JInternalFrame f) { delegate.deiconifyFrame(f); } + @Override public void dragFrame(JComponent f, int newX, int newY) { - if (newY<0) + if (newY < 0) { - newY=0; + newY = 0; } delegate.dragFrame(f, newX, newY); } + @Override public void endDraggingFrame(JComponent f) { delegate.endDraggingFrame(f); + desktop.repaint(); } + @Override public void endResizingFrame(JComponent f) { delegate.endResizingFrame(f); + desktop.repaint(); } + @Override public void iconifyFrame(JInternalFrame f) { delegate.iconifyFrame(f); } + @Override public void maximizeFrame(JInternalFrame f) { delegate.maximizeFrame(f); } + @Override public void minimizeFrame(JInternalFrame f) { delegate.minimizeFrame(f); } + @Override public void openFrame(JInternalFrame f) { delegate.openFrame(f); } + @Override public void resizeFrame(JComponent f, int newX, int newY, int newWidth, int newHeight) { - Rectangle b=desktop.getBounds(); - if (newY<0) + if (newY < 0) { - newY=0; + newY = 0; } delegate.resizeFrame(f, newX, newY, newWidth, newHeight); } + @Override public void setBoundsForFrame(JComponent f, int newX, int newY, int newWidth, int newHeight) { @@ -276,31 +342,35 @@ 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); + 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); + // 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 MyDesktopManager( - new DefaultDesktopManager())); - + desktop.setDesktopManager( + new MyDesktopManager( + (Platform.isWindows() ? new DefaultDesktopManager() + : Platform.isAMac() + ? new AquaInternalFrameManager( + desktop.getDesktopManager()) + : desktop.getDesktopManager()))); + Rectangle dims = getLastKnownDimensions(""); if (dims != null) { @@ -309,39 +379,37 @@ public class Desktop extends jalview.jbgui.GDesktop implements else { Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - setBounds((int) (screenSize.width - 900) / 2, - (int) (screenSize.height - 650) / 2, 900, 650); + setBounds((screenSize.width - 900) / 2, (screenSize.height - 650) / 2, + 900, 650); } jconsole = new Console(this, showjconsole); // add essential build information - jconsole.setHeader("Jalview Desktop " - + jalview.bin.Cache.getProperty("VERSION") + "\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")); + 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); - 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(); - + experimentalFeatures.setSelected(showExperimental()); + + getIdentifiersOrgData(); + + checkURLLinks(); + this.addWindowListener(new WindowAdapter() { + @Override public void windowClosing(WindowEvent evt) { quit(); @@ -349,59 +417,50 @@ public class Desktop extends jalview.jbgui.GDesktop implements }); MouseAdapter ma; - this.addMouseListener(ma=new MouseAdapter() + this.addMouseListener(ma = new MouseAdapter() { + @Override public void mousePressed(MouseEvent evt) { - if (SwingUtilities.isRightMouseButton(evt)) + if (evt.isPopupTrigger()) // Mac { showPasteMenu(evt.getX(), evt.getY()); } } - }); - desktop.addMouseListener(ma); - - this.addFocusListener(new FocusListener() - { - - @Override - public void focusLost(FocusEvent e) - { - // TODO Auto-generated method stub - - } - + @Override - public void focusGained(FocusEvent e) + public void mouseReleased(MouseEvent evt) { - Cache.log.debug("Relaying windows after focus gain"); - // make sure that we sort windows properly after we gain focus - instance.relayerWindows(); + if (evt.isPopupTrigger()) // Windows + { + showPasteMenu(evt.getX(), evt.getY()); + } } }); + desktop.addMouseListener(ma); + this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this)); // Spawn a thread that shows the splashscreen SwingUtilities.invokeLater(new Runnable() { + @Override 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() { + @Override 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")); + String fileFormat = Cache.getProperty("DEFAULT_FILE_FORMAT"); + JalviewFileChooser.forRead(Cache.getProperty("LAST_DIRECTORY"), + fileFormat); Cache.log.debug("Filechooser init thread finished."); } }).start(); @@ -421,25 +480,107 @@ public class Desktop extends jalview.jbgui.GDesktop implements }); } + /** + * Answers true if user preferences to enable experimental features is True + * (on), else false + * + * @return + */ + public boolean showExperimental() + { + String experimental = Cache.getDefault(EXPERIMENTAL_FEATURES, + Boolean.FALSE.toString()); + return Boolean.valueOf(experimental).booleanValue(); + } + + 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); + } + } + + public void checkForNews() + { + 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(); + } + + public void getIdentifiersOrgData() + { + // Thread off the identifiers fetcher + new Thread(new Runnable() + { + @Override + public void run() + { + Cache.log.debug("Downloading data from identifiers.org"); + UrlDownloadClient client = new UrlDownloadClient(); + try + { + client.download(IdOrgSettings.getUrl(), + IdOrgSettings.getDownloadLocation()); + } catch (IOException e) + { + Cache.log.debug("Exception downloading identifiers.org data" + + e.getMessage()); + } + } + }).start(); + ; + } + + @Override protected void showNews_actionPerformed(ActionEvent e) { showNews(showNews.isSelected()); } + void showNews(boolean visible) { { - Cache.log.debug((visible?"Showing":"Hiding")+" news."); + Cache.log.debug((visible ? "Showing" : "Hiding") + " news."); showNews.setSelected(visible); if (visible && !jvnews.isVisible()) { - new Thread(new Runnable() { + new Thread(new Runnable() + { @Override public void run() { - long instance=System.currentTimeMillis(); - Desktop.instance.setProgressBar("Refreshing news", instance); + long now = System.currentTimeMillis(); + Desktop.instance.setProgressBar( + MessageManager.getString("status.refreshing_news"), + now); jvnews.refreshNews(); - Desktop.instance.setProgressBar(null, instance); + Desktop.instance.setProgressBar(null, now); jvnews.showNews(); } }).start(); @@ -461,25 +602,23 @@ public class Desktop extends jalview.jbgui.GDesktop implements 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"); + 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); + 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")))); + 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); @@ -487,19 +626,19 @@ public class Desktop extends jalview.jbgui.GDesktop implements ih = (int) (ih * sh); while (ix >= screenSize.width) { - jalview.bin.Cache.log - .debug("Window geometry location recall error: shifting horizontal to within screenbounds."); + 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."); + 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); + 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); @@ -521,16 +660,19 @@ public class Desktop extends jalview.jbgui.GDesktop implements // reselected again. boolean refresh = true; + @Override public void menuCanceled(MenuEvent e) { refresh = true; } + @Override public void menuDeselected(MenuEvent e) { refresh = true; } + @Override public void menuSelected(MenuEvent e) { if (refresh) @@ -547,9 +689,11 @@ 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() { + @Override public void actionPerformed(ActionEvent evt) { paste(); @@ -572,17 +716,16 @@ public class Desktop extends jalview.jbgui.GDesktop implements String file = (String) contents .getTransferData(DataFlavor.stringFlavor); - String format = new IdentifyFile().Identify(file, - FormatAdapter.PASTE); + FileFormatI format = new IdentifyFile().identify(file, + DataSourceType.PASTE); - new FileLoader().LoadFile(file, FormatAdapter.PASTE, format); + new FileLoader().LoadFile(file, DataSourceType.PASTE, format); } } catch (Exception ex) { - System.out - .println("Unable to paste alignment from system clipboard:\n" - + ex); + System.out.println( + "Unable to paste alignment from system clipboard:\n" + ex); } } @@ -590,38 +733,86 @@ public class Desktop extends jalview.jbgui.GDesktop implements * 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, false); } /** - * DOCUMENT ME! + * Add an internal frame to the Jalview desktop * * @param frame - * DOCUMENT ME! + * Frame to show * @param title - * DOCUMENT ME! + * Visible Title + * @param makeVisible + * When true, display frame immediately, otherwise, caller must call + * setVisible themselves. * @param w - * DOCUMENT ME! + * width * @param h - * DOCUMENT ME! + * height + */ + public static synchronized void addInternalFrame( + final JInternalFrame frame, String title, boolean makeVisible, + int w, int h) + { + addInternalFrame(frame, title, makeVisible, w, h, true, false); + } + + /** + * Add an internal frame to the Jalview desktop and make it visible + * + * @param frame + * Frame to show + * @param title + * Visible Title + * @param w + * width + * @param h + * 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, false); + } + + /** + * 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 + * @param ignoreMinSize + * Do not set the default minimum size for frame + */ + public static synchronized void addInternalFrame( + final JInternalFrame frame, String title, boolean makeVisible, + int w, int h, boolean resizable, boolean ignoreMinSize) + { // TODO: allow callers to determine X and Y position of frame (eg. via // bounds object). @@ -637,58 +828,92 @@ 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); + if (!ignoreMinSize) + { + frame.setMinimumSize( + new Dimension(DEFAULT_MIN_WIDTH, DEFAULT_MIN_HEIGHT)); + + // Set default dimension for Alignment Frame window. + // The Alignment Frame window could be added from a number of places, + // hence, + // I did this here in order not to miss out on any Alignment frame. + if (frame instanceof AlignFrame) + { + frame.setMinimumSize(new Dimension(ALIGN_FRAME_DEFAULT_MIN_WIDTH, + ALIGN_FRAME_DEFAULT_MIN_HEIGHT)); + } + } + + frame.setVisible(makeVisible); frame.setClosable(true); frame.setResizable(resizable); frame.setMaximizable(resizable); frame.setIconifiable(resizable); - frame.setFrameIcon(null); + frame.setOpaque(false); if (frame.getX() < 1 && frame.getY() < 1) { - frame.setLocation(xOffset * openFrameCount, yOffset - * ((openFrameCount - 1) % 10) + yOffset); + frame.setLocation(xOffset * openFrameCount, + yOffset * ((openFrameCount - 1) % 10) + yOffset); } + /* + * add an entry for the new frame in the Window menu + * (and remove it when the frame is closed) + */ final JMenuItem menuItem = new JMenuItem(title); - frame.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter() + frame.addInternalFrameListener(new InternalFrameAdapter() { - public void internalFrameActivated( - javax.swing.event.InternalFrameEvent evt) + @Override + public void internalFrameActivated(InternalFrameEvent evt) { JInternalFrame itf = desktop.getSelectedFrame(); if (itf != null) { + if (itf instanceof AlignFrame) + { + Jalview.setCurrentAlignFrame((AlignFrame) itf); + } itf.requestFocus(); } - } - public void internalFrameClosed( - javax.swing.event.InternalFrameEvent evt) + @Override + public void internalFrameClosed(InternalFrameEvent evt) { PaintRefresher.RemoveComponent(frame); - openFrameCount--; - windowMenu.remove(menuItem); - JInternalFrame itf = desktop.getSelectedFrame(); - if (itf != null) + + /* + * defensive check to prevent frames being + * added half off the window + */ + if (openFrameCount > 0) { - itf.requestFocus(); + openFrameCount--; + } + + /* + * ensure no reference to alignFrame retained by menu item listener + */ + if (menuItem.getActionListeners().length > 0) + { + menuItem.removeActionListener(menuItem.getActionListeners()[0]); } - System.gc(); + windowMenu.remove(menuItem); }; }); menuItem.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { try @@ -701,51 +926,13 @@ 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); + setKeyBindings(frame); desktop.add(frame); + + windowMenu.add(menuItem); + frame.toFront(); try { @@ -753,13 +940,51 @@ public class Desktop extends jalview.jbgui.GDesktop implements frame.requestFocus(); } catch (java.beans.PropertyVetoException ve) { - } - catch (java.lang.ClassCastException cex) + } 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); + 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); } } + /** + * Add key bindings to a JInternalFrame so that Ctrl-W and Cmd-W will close + * the window + * + * @param frame + */ + private static void setKeyBindings(JInternalFrame frame) + { + @SuppressWarnings("serial") + final Action closeAction = new AbstractAction() + { + @Override + public void actionPerformed(ActionEvent e) + { + frame.dispose(); + } + }; + + /* + * set up key bindings for Ctrl-W and Cmd-W, with the same (Close) action + */ + KeyStroke ctrlWKey = KeyStroke.getKeyStroke(KeyEvent.VK_W, + InputEvent.CTRL_DOWN_MASK); + KeyStroke cmdWKey = KeyStroke.getKeyStroke(KeyEvent.VK_W, + Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()); + + InputMap inputMap = frame + .getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); + String ctrlW = ctrlWKey.toString(); + inputMap.put(ctrlWKey, ctrlW); + inputMap.put(cmdWKey, ctrlW); + + ActionMap actionMap = frame.getActionMap(); + actionMap.put(ctrlW, closeAction); + } + + @Override public void lostOwnership(Clipboard clipboard, Transferable contents) { if (!internalCopy) @@ -770,18 +995,22 @@ public class Desktop extends jalview.jbgui.GDesktop implements internalCopy = false; } + @Override public void dragEnter(DropTargetDragEvent evt) { } + @Override public void dragExit(DropTargetEvent evt) { } + @Override public void dragOver(DropTargetDragEvent evt) { } + @Override public void dropActionChanged(DropTargetDragEvent evt) { } @@ -792,56 +1021,24 @@ public class Desktop extends jalview.jbgui.GDesktop implements * @param evt * DOCUMENT ME! */ + @Override public void drop(DropTargetDropEvent evt) { + boolean success = true; + // JAL-1552 - acceptDrop required before getTransferable call for + // Java's Transferable for native dnd + evt.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE); Transferable t = evt.getTransferable(); - java.util.List files = null; - java.util.List protocols = null; + List files = new ArrayList<>(); + List protocols = new ArrayList<>(); try { - DataFlavor uriListFlavor = new DataFlavor( - "text/uri-list;class=java.lang.String"); - if (t.isDataFlavorSupported(DataFlavor.javaFileListFlavor)) - { - // Works on Windows and MacOSX - evt.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE); - files = (java.util.List) t - .getTransferData(DataFlavor.javaFileListFlavor); - } - else if (t.isDataFlavorSupported(uriListFlavor)) - { - // This is used by Unix drag system - 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();) - { - String s = st.nextToken(); - if (s.startsWith("#")) - { - // the line is a comment (as per the RFC 2483) - continue; - } - java.net.URI uri = new java.net.URI(s); - 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()); - } - } - } + Desktop.transferFromDropTarget(files, protocols, evt, t); } catch (Exception e) { + e.printStackTrace(); + success = false; } if (files != null) @@ -851,18 +1048,19 @@ public class Desktop extends jalview.jbgui.GDesktop implements for (int i = 0; i < files.size(); i++) { String file = files.get(i).toString(); - String protocol = (protocols == null) ? FormatAdapter.FILE - : (String) protocols.get(i); - String format = null; + DataSourceType protocol = (protocols == null) + ? DataSourceType.FILE + : protocols.get(i); + FileFormatI format = null; if (file.endsWith(".jar")) { - format = "Jalview"; + format = FileFormat.Jalview; } else { - format = new IdentifyFile().Identify(file, protocol); + format = new IdentifyFile().identify(file, protocol); } new FileLoader().LoadFile(file, protocol, format); @@ -870,8 +1068,11 @@ 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 } /** @@ -880,44 +1081,52 @@ public class Desktop extends jalview.jbgui.GDesktop implements * @param e * DOCUMENT ME! */ + @Override public void inputLocalFileMenuItem_actionPerformed(AlignViewport viewport) { - 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")); + String fileFormat = Cache.getProperty("DEFAULT_FILE_FORMAT"); + JalviewFileChooser chooser = JalviewFileChooser + .forRead(Cache.getProperty("LAST_DIRECTORY"), fileFormat); 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); if (value == JalviewFileChooser.APPROVE_OPTION) { String choice = chooser.getSelectedFile().getPath(); - jalview.bin.Cache.setProperty("LAST_DIRECTORY", chooser - .getSelectedFile().getParent()); + Cache.setProperty("LAST_DIRECTORY", + chooser.getSelectedFile().getParent()); - String format = null; - if (chooser.getSelectedFormat().equals("Jalview")) - { - format = "Jalview"; - } - else + FileFormatI format = chooser.getSelectedFormat(); + + /* + * Call IdentifyFile to verify the file contains what its extension implies. + * Skip this step for dynamically added file formats, because + * IdentifyFile does not know how to recognise them. + */ + if (FileFormats.getInstance().isIdentifiable(format)) { - format = new IdentifyFile().Identify(choice, FormatAdapter.FILE); + try + { + format = new IdentifyFile().identify(choice, DataSourceType.FILE); + } catch (FileFormatException e) + { + // format = null; //?? + } } if (viewport != null) { - new FileLoader().LoadFile(viewport, choice, FormatAdapter.FILE, + new FileLoader().LoadFile(viewport, choice, DataSourceType.FILE, format); } else { - new FileLoader().LoadFile(choice, FormatAdapter.FILE, format); + new FileLoader().LoadFile(choice, DataSourceType.FILE, format); } } } @@ -928,11 +1137,13 @@ public class Desktop extends jalview.jbgui.GDesktop implements * @param e * DOCUMENT ME! */ + @Override 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)); @@ -956,10 +1167,11 @@ public class Desktop extends jalview.jbgui.GDesktop implements } } - int reply = JOptionPane.showInternalConfirmDialog(desktop, panel, - "Input Alignment From URL", JOptionPane.OK_CANCEL_OPTION); + int reply = JvOptionPane.showInternalConfirmDialog(desktop, panel, + MessageManager.getString("label.input_alignment_from_url"), + JvOptionPane.OK_CANCEL_OPTION); - if (reply != JOptionPane.OK_OPTION) + if (reply != JvOptionPane.OK_OPTION) { return; } @@ -970,79 +1182,109 @@ public class Desktop extends jalview.jbgui.GDesktop implements { if (viewport != null) { - new FileLoader().LoadFile(viewport, url, FormatAdapter.URL, - "Jalview"); + new FileLoader().LoadFile(viewport, url, DataSourceType.URL, + FileFormat.Jalview); } else { - new FileLoader().LoadFile(url, FormatAdapter.URL, "Jalview"); + new FileLoader().LoadFile(url, DataSourceType.URL, + FileFormat.Jalview); } } else { - String format = new IdentifyFile().Identify(url, FormatAdapter.URL); + FileFormatI format = null; + try + { + format = new IdentifyFile().identify(url, DataSourceType.URL); + } catch (FileFormatException e) + { + // TODO revise error handling, distinguish between + // URL not found and response not valid + } - if (format.equals("URL NOT FOUND")) + if (format == null) { - JOptionPane.showInternalMessageDialog(Desktop.desktop, - "Couldn't locate " + url, "URL not found", - JOptionPane.WARNING_MESSAGE); + JvOptionPane.showInternalMessageDialog(Desktop.desktop, + MessageManager.formatMessage("label.couldnt_locate", + new Object[] + { url }), + MessageManager.getString("label.url_not_found"), + JvOptionPane.WARNING_MESSAGE); return; } if (viewport != null) { - new FileLoader().LoadFile(viewport, url, FormatAdapter.URL, format); + new FileLoader().LoadFile(viewport, url, DataSourceType.URL, + format); } else { - new FileLoader().LoadFile(url, FormatAdapter.URL, format); + new FileLoader().LoadFile(url, DataSourceType.URL, format); } } } /** - * DOCUMENT ME! + * Opens the CutAndPaste window for the user to paste an alignment in to * - * @param e - * DOCUMENT ME! + * @param viewPanel + * - if not null, the pasted alignment is added to the current + * alignment; if null, to a new alignment window */ - public void inputTextboxMenuItem_actionPerformed(AlignViewport viewport) + @Override + public void inputTextboxMenuItem_actionPerformed( + AlignmentViewPanel viewPanel) { CutAndPasteTransfer cap = new CutAndPasteTransfer(); - cap.setForInput(viewport); - Desktop.addInternalFrame(cap, "Cut & Paste Alignment File", 600, 500); + cap.setForInput(viewPanel); + Desktop.addInternalFrame(cap, + MessageManager.getString("label.cut_paste_alignmen_file"), true, + 600, 500); } /* * Exit the program */ + @Override public void quit() { 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())); + 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) + if (jvnews != null) { storeLastKnownDimensions("JALVIEW_RSS_WINDOW_", jvnews.getBounds()); - - } - - System.exit(0); - } - private void storeLastKnownDimensions(String string, Rectangle jc) + } + if (dialogExecutor != null) + { + dialogExecutor.shutdownNow(); + } + closeAll_actionPerformed(null); + + if (groovyConsole != null) + { + // suppress a possible repeat prompt to save script + groovyConsole.setDirty(false); + groovyConsole.exit(); + } + 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 @@ -1060,13 +1302,21 @@ public class Desktop extends jalview.jbgui.GDesktop implements * @param e * DOCUMENT ME! */ + @Override public void aboutMenuItem_actionPerformed(ActionEvent e) { -// 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(); + // StringBuffer message = getAboutMessage(false); + // JvOptionPane.showInternalMessageDialog(Desktop.desktop, + // + // message.toString(), "About Jalview", JvOptionPane.INFORMATION_MESSAGE); + new Thread(new Runnable() + { + @Override + public void run() + { + new SplashScreen(true); + } + }).start(); } public StringBuffer getAboutMessage(boolean shortv) @@ -1077,7 +1327,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements { message.append("

Version: " + jalview.bin.Cache.getProperty("VERSION") - + "


"); + + ""); message.append("Last Updated: " + jalview.bin.Cache.getDefault("BUILD_DATE", "unknown") + ""); @@ -1092,8 +1342,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements + jalview.bin.Cache.getDefault("BUILD_DATE", "unknown")); } - if (jalview.bin.Cache.getDefault("LATEST_VERSION", "Checking").equals( - "Checking")) + if (jalview.bin.Cache.getDefault("LATEST_VERSION", "Checking") + .equals("Checking")) { message.append("
...Checking latest version...
"); } @@ -1115,20 +1365,19 @@ public class Desktop extends jalview.jbgui.GDesktop implements "..Checking..") + " is available for download from " + jalview.bin.Cache.getDefault("www.jalview.org", - "http://www.jalview.org") + " !!"); + "http://www.jalview.org") + + " !!"); if (red) { message.append(""); } } - message.append("
Authors: " - + jalview.bin.Cache - .getDefault( - "AUTHORNAMES", - "Jim Procter, Andrew Waterhouse, Jan Engelhardt, Lauren Lui, Michele Clamp, James Cuff, Steve Searle, David Martin & Geoff Barton") - + "
Development managed by The Barton Group, University of Dundee, Scotland, UK.
" - + "
For help, see the FAQ at www.jalview.org and/or join the jalview-discuss@jalview.org mailing list" - + "
If you use Jalview, please cite:" + 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" @@ -1142,24 +1391,21 @@ public class Desktop extends jalview.jbgui.GDesktop implements * @param e * DOCUMENT ME! */ + @Override 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) { } } + @Override public void closeAll_actionPerformed(ActionEvent e) { + // TODO show a progress bar while closing? JInternalFrame[] frames = desktop.getAllFrames(); for (int i = 0; i < frames.length; i++) { @@ -1170,19 +1416,32 @@ public class Desktop extends jalview.jbgui.GDesktop implements { } } + Jalview.setCurrentAlignFrame(null); System.out.println("ALL CLOSED"); if (v_client != null) { // TODO clear binding to vamsas document objects on close_all + } + /* + * reset state of singleton objects as appropriate (clear down session state + * when all windows are closed) + */ + StructureSelectionManager ssm = StructureSelectionManager + .getStructureSelectionManager(this); + if (ssm != null) + { + ssm.resetAll(); } } + @Override public void raiseRelated_actionPerformed(ActionEvent e) { reorderAssociatedWindows(false, false); } + @Override public void minimizeAssociated_actionPerformed(ActionEvent e) { reorderAssociatedWindows(true, false); @@ -1199,6 +1458,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements * @seejalview.jbgui.GDesktop#garbageCollect_actionPerformed(java.awt.event. * ActionEvent) */ + @Override protected void garbageCollect_actionPerformed(ActionEvent e) { // We simply collect the garbage @@ -1214,6 +1474,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements * jalview.jbgui.GDesktop#showMemusage_actionPerformed(java.awt.event.ActionEvent * ) */ + @Override protected void showMemusage_actionPerformed(ActionEvent e) { desktop.showMemoryUsage(showMemusage.isSelected()); @@ -1226,6 +1487,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements * jalview.jbgui.GDesktop#showConsole_actionPerformed(java.awt.event.ActionEvent * ) */ + @Override protected void showConsole_actionPerformed(ActionEvent e) { showConsole(showConsole.isSelected()); @@ -1242,8 +1504,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements { showConsole.setSelected(selected); // TODO: decide if we should update properties file - Cache.setProperty("SHOW_JAVA_CONSOLE", Boolean.valueOf(selected) - .toString()); + Cache.setProperty("SHOW_JAVA_CONSOLE", + Boolean.valueOf(selected).toString()); jconsole.setVisible(selected); } @@ -1255,7 +1517,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(); @@ -1330,6 +1592,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements * @param e * DOCUMENT ME! */ + @Override protected void preferences_actionPerformed(ActionEvent e) { new Preferences(); @@ -1341,15 +1604,15 @@ public class Desktop extends jalview.jbgui.GDesktop implements * @param e * DOCUMENT ME! */ - public void saveState_actionPerformed(ActionEvent e) + @Override + public void saveState_actionPerformed(boolean asCastor) { JalviewFileChooser chooser = new JalviewFileChooser( - jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[] - { "jar" }, new String[] - { "Jalview Project" }, "Jalview Project"); + asCastor ? "jvp" : "jvx", + "Jalview Project"); chooser.setFileView(new JalviewFileView()); - chooser.setDialogTitle("Save State"); + chooser.setDialogTitle(MessageManager.getString("label.save_state")); int value = chooser.showSaveDialog(this); @@ -1357,79 +1620,129 @@ public class Desktop extends jalview.jbgui.GDesktop implements { final Desktop me = this; final java.io.File choice = chooser.getSelectedFile(); + setProjectFile(choice); + new Thread(new Runnable() { + @Override public void run() { - - setProgressBar("Saving jalview project " + 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, - "Error whilst saving current state to " + choice.getName(), - "Couldn't save project", JOptionPane.WARNING_MESSAGE); - } - setProgressBar(null, choice.hashCode()); + // TODO: refactor to Jalview desktop session controller action. + 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 + { + if (asCastor) + { + new Jalview2XML().saveState(choice); + } + else + { + new jalview.project.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); + JvOptionPane.showMessageDialog(me, + MessageManager.formatMessage( + "label.error_whilst_saving_current_state_to", + new Object[] + { choice.getName() }), + MessageManager.getString("label.couldnt_save_project"), + JvOptionPane.WARNING_MESSAGE); + } + setProgressBar(null, choice.hashCode()); } }).start(); } } + private void setProjectFile(File choice) + { + this.projectFile = choice; + } + + public File getProjectFile() + { + return this.projectFile; + } + /** * DOCUMENT ME! * * @param e * DOCUMENT ME! */ - public void loadState_actionPerformed(ActionEvent e) - { + @Override + public void loadState_actionPerformed(boolean asCastor) + { + final String[] suffix = asCastor ? new String[] { "jvp", "jar" } + : new String[] + { "jvx" }; + final String[] desc = asCastor + ? new String[] + { "Jalview Project", "Jalview Project (old)" } + : new String[] + { "Jalview Project" }; JalviewFileChooser chooser = new JalviewFileChooser( - jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[] - { "jar" }, new String[] - { "Jalview Project" }, "Jalview Project"); + Cache.getProperty("LAST_DIRECTORY"), suffix, + desc, + "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) { - final String choice = chooser.getSelectedFile().getAbsolutePath(); - jalview.bin.Cache.setProperty("LAST_DIRECTORY", chooser - .getSelectedFile().getParent()); + final File selectedFile = chooser.getSelectedFile(); + setProjectFile(selectedFile); + final String choice = selectedFile.getAbsolutePath(); + Cache.setProperty("LAST_DIRECTORY", selectedFile.getParent()); new Thread(new Runnable() { + @Override public void run() { - setProgressBar("loading jalview project " + choice, - choice.hashCode()); + setProgressBar(MessageManager.formatMessage( + "label.loading_jalview_project", new Object[] + { choice }), choice.hashCode()); try { - new Jalview2XML().LoadJalviewAlign(choice); + if (asCastor) + { + new Jalview2XML().loadJalviewAlign(choice); + } + else + { + new jalview.project.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, - "Error whilst loading project from " + choice, - "Couldn't load project", JOptionPane.WARNING_MESSAGE); + Cache.log.error( + "Problems whilst loading project from " + choice, ex); + JvOptionPane.showMessageDialog(Desktop.desktop, + MessageManager.formatMessage( + "label.error_whilst_loading_project_from", + new Object[] + { choice }), + MessageManager.getString("label.couldnt_load_project"), + JvOptionPane.WARNING_MESSAGE); } setProgressBar(null, choice.hashCode()); } @@ -1437,18 +1750,23 @@ public class Desktop extends jalview.jbgui.GDesktop implements } } + @Override public void inputSequence_actionPerformed(ActionEvent e) { new SequenceFetcher(this); } JPanel progressPanel; - ArrayList fileLoadingPanels=new ArrayList(); + + ArrayList fileLoadingPanels = new ArrayList<>(); + public void startLoading(final String fileName) { if (fileLoadingCount == 0) { - fileLoadingPanels.add(addProgressPanel("Loading File: " + fileName + " ")); + fileLoadingPanels.add(addProgressPanel(MessageManager + .formatMessage("label.loading_file", new Object[] + { fileName }))); } fileLoadingCount++; } @@ -1457,11 +1775,11 @@ public class Desktop extends jalview.jbgui.GDesktop implements { if (progressPanel == null) { - progressPanel = new JPanel(new GridLayout(1,1)); + progressPanel = new JPanel(new GridLayout(1, 1)); totalProgressCount = 0; instance.getContentPane().add(progressPanel, BorderLayout.SOUTH); } - JPanel thisprogress=new JPanel(new BorderLayout(10,5)); + JPanel thisprogress = new JPanel(new BorderLayout(10, 5)); JProgressBar progressBar = new JProgressBar(); progressBar.setIndeterminate(true); @@ -1469,7 +1787,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements thisprogress.add(progressBar, BorderLayout.CENTER); progressPanel.add(thisprogress); - ((GridLayout)progressPanel.getLayout()).setRows(((GridLayout)progressPanel.getLayout()).getRows()+1); + ((GridLayout) progressPanel.getLayout()).setRows( + ((GridLayout) progressPanel.getLayout()).getRows() + 1); ++totalProgressCount; instance.validate(); return thisprogress; @@ -1481,13 +1800,16 @@ public class Desktop extends jalview.jbgui.GDesktop implements { if (progressPanel != null) { - progressPanel.remove(progbar); - GridLayout gl = (GridLayout) progressPanel.getLayout(); - gl.setRows(gl.getRows()-1); - 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(); @@ -1498,9 +1820,9 @@ public class Desktop extends jalview.jbgui.GDesktop implements fileLoadingCount--; if (fileLoadingCount < 1) { - for (JPanel flp : fileLoadingPanels) + while (fileLoadingPanels.size() > 0) { - removeProgressPanel(flp); + removeProgressPanel(fileLoadingPanels.remove(0)); } fileLoadingPanels.clear(); fileLoadingCount = 0; @@ -1510,39 +1832,38 @@ public class Desktop extends jalview.jbgui.GDesktop implements public static int getViewCount(String alignmentId) { - AlignViewport[] aps = getViewports(alignmentId); + AlignmentViewport[] aps = getViewports(alignmentId); return (aps == null) ? 0 : aps.length; } /** * * @param alignmentId + * - if null, all sets are returned * @return all AlignmentPanels concerning the alignmentId sequence set */ public static AlignmentPanel[] getAlignmentPanels(String alignmentId) { - int count = 0; if (Desktop.desktop == null) { // no frames created and in headless mode // TODO: verify that frames are recoverable when in headless mode return null; } - JInternalFrame[] frames = Desktop.desktop.getAllFrames(); - ArrayList aps = new ArrayList(); - for (int t = 0; t < frames.length; t++) + List aps = new ArrayList<>(); + AlignFrame[] frames = getAlignFrames(); + if (frames == null) + { + return null; + } + for (AlignFrame af : frames) { - if (frames[t] instanceof AlignFrame) + 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 (alignmentId - .equals(((AlignmentPanel) af.alignPanels.elementAt(a)).av - .getSequenceSetId())) - { - aps.add(af.alignPanels.elementAt(a)); - } + aps.add(ap); } } } @@ -1550,11 +1871,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements { return null; } - AlignmentPanel[] vap = new AlignmentPanel[aps.size()]; - for (int t = 0; t < vap.length; t++) - { - vap[t] = (AlignmentPanel) aps.get(t); - } + AlignmentPanel[] vap = aps.toArray(new AlignmentPanel[aps.size()]); return vap; } @@ -1562,53 +1879,53 @@ public class Desktop extends jalview.jbgui.GDesktop implements * get all the viewports on an alignment. * * @param sequenceSetId - * unique alignment id + * unique alignment id (may be null - all viewports returned in that + * case) * @return all viewports on the alignment bound to sequenceSetId */ - public static AlignViewport[] getViewports(String sequenceSetId) + public static AlignmentViewport[] getViewports(String sequenceSetId) { - Vector viewp = new Vector(); + List viewp = new ArrayList<>(); if (desktop != null) { - javax.swing.JInternalFrame[] frames = instance.getAllFrames(); + AlignFrame[] frames = Desktop.getAlignFrames(); - for (int t = 0; t < frames.length; t++) + 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; } - public void explodeViews(AlignFrame af) + /** + * Explode the views in the given frame into separate AlignFrame + * + * @param af + */ + public static void explodeViews(AlignFrame af) { int size = af.alignPanels.size(); if (size < 2) @@ -1618,15 +1935,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); @@ -1637,10 +1960,18 @@ 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.getSequenceSetId(); @@ -1652,12 +1983,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); } } @@ -1674,6 +2005,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements jalview.gui.VamsasApplication v_client = null; + @Override public void vamsasImport_actionPerformed(ActionEvent e) { if (v_client == null) @@ -1683,8 +2015,10 @@ public class Desktop extends jalview.jbgui.GDesktop implements 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); @@ -1693,17 +2027,21 @@ public class Desktop extends jalview.jbgui.GDesktop implements String fle = chooser.getSelectedFile().toString(); if (!vamsasImport(chooser.getSelectedFile())) { - JOptionPane.showInternalMessageDialog(Desktop.desktop, - "Couldn't import '" + fle + "' as a new vamsas session.", - "Vamsas Document Import Failed", - JOptionPane.ERROR_MESSAGE); + JvOptionPane.showInternalMessageDialog(Desktop.desktop, + MessageManager.formatMessage( + "label.couldnt_import_as_vamsas_session", + new Object[] + { fle }), + MessageManager + .getString("label.vamsas_document_import_failed"), + JvOptionPane.ERROR_MESSAGE); } } } else { - jalview.bin.Cache.log - .error("Implementation error - load session from a running session is not supported."); + jalview.bin.Cache.log.error( + "Implementation error - load session from a running session is not supported."); } } @@ -1719,8 +2057,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements if (v_client != null) { - jalview.bin.Cache.log - .error("Implementation error - load session from a running session is not supported."); + jalview.bin.Cache.log.error( + "Implementation error - load session from a running session is not supported."); return false; } @@ -1745,7 +2083,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements { jalview.bin.Cache.log.error( "Failed to create new vamsas session from contents of URL " - + url, ex); + + url, + ex); return false; } setupVamsasConnectedGui(); @@ -1764,28 +2103,31 @@ public class Desktop extends jalview.jbgui.GDesktop implements if (v_client != null) { - jalview.bin.Cache.log - .error("Implementation error - load session from a running session is not supported."); + jalview.bin.Cache.log.error( + "Implementation error - load session from a running session is not supported."); return false; } - setProgressBar("Importing VAMSAS session from " + file.getName(), - file.hashCode()); + 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("Importing VAMSAS session from " + file.getName(), - file.hashCode()); + 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("Importing VAMSAS session from " + file.getName(), - file.hashCode()); + setProgressBar(MessageManager.formatMessage( + "status.importing_vamsas_session_from", new Object[] + { file.getName() }), file.hashCode()); return v_client.inSession(); } @@ -1793,12 +2135,13 @@ public class Desktop extends jalview.jbgui.GDesktop implements { if (v_client != null) { - throw new Error( - "Trying to join a vamsas session when another is already connected."); + throw new Error(MessageManager + .getString("error.try_join_vamsas_session_another")); } if (mysesid == null) { - throw new Error("Invalid vamsas session id."); + throw new Error( + MessageManager.getString("error.invalid_vamsas_session_id")); } v_client = new VamsasApplication(this, mysesid); setupVamsasConnectedGui(); @@ -1806,6 +2149,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements return (v_client.inSession()); } + @Override public void vamsasStart_actionPerformed(ActionEvent e) { if (v_client == null) @@ -1838,7 +2182,7 @@ 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 @@ -1850,9 +2194,11 @@ 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")); } + @Override public void vamsasStop_actionPerformed(ActionEvent e) { if (v_client != null) @@ -1873,25 +2219,28 @@ public class Desktop extends jalview.jbgui.GDesktop implements sess = VamsasApplication.getSessionList(); } catch (Exception e) { - jalview.bin.Cache.log.warn( - "Problem getting current sessions list.", e); + jalview.bin.Cache.log.warn("Problem getting current sessions list.", + e); sess = null; } if (sess != null) { - jalview.bin.Cache.log.debug("Got current sessions list: " - + sess.length + " entries."); + jalview.bin.Cache.log.debug( + "Got current sessions list: " + sess.length + " entries."); VamsasStMenu.removeAll(); for (int i = 0; i < sess.length; i++) { 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() { + @Override public void actionPerformed(ActionEvent e) { if (dsktp.v_client == null) @@ -1899,6 +2248,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements Thread rthr = new Thread(new Runnable() { + @Override public void run() { dsktp.v_client = new VamsasApplication(dsktp, mysesid); @@ -1931,27 +2281,28 @@ public class Desktop extends jalview.jbgui.GDesktop implements } } + @Override public void vamsasSave_actionPerformed(ActionEvent e) { if (v_client != null) { - 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"); + // TODO: VAMSAS DOCUMENT EXTENSION is VDJ + JalviewFileChooser chooser = new JalviewFileChooser("vdj", + "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("Saving VAMSAS Document to " - + choice.getName()); - jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice.getParent()); + JPanel progpanel = addProgressPanel(MessageManager + .formatMessage("label.saving_vamsas_doc", new Object[] + { choice.getName() })); + Cache.setProperty("LAST_DIRECTORY", choice.getParent()); String warnmsg = null; String warnttl = null; try @@ -1961,23 +2312,23 @@ public class Desktop extends jalview.jbgui.GDesktop implements { warnttl = "Serious Problem saving Vamsas Document"; warnmsg = ex.toString(); - jalview.bin.Cache.log.error("Error Whilst saving document to " - + choice, ex); + jalview.bin.Cache.log + .error("Error Whilst saving document to " + choice, ex); } catch (Exception ex) { warnttl = "Problem saving Vamsas Document."; warnmsg = ex.toString(); - jalview.bin.Cache.log.warn("Exception Whilst saving document to " - + choice, ex); + jalview.bin.Cache.log.warn( + "Exception Whilst saving document to " + choice, ex); } removeProgressPanel(progpanel); if (warnmsg != null) { - JOptionPane.showInternalMessageDialog(Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.desktop, - warnmsg, warnttl, JOptionPane.ERROR_MESSAGE); + warnmsg, warnttl, JvOptionPane.ERROR_MESSAGE); } } } @@ -1993,7 +2344,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements */ public void setVamsasUpdate(boolean b) { - jalview.bin.Cache.log.debug("Setting gui for Vamsas update " + Cache.log.debug("Setting gui for Vamsas update " + (b ? "in progress" : "finished")); if (vamUpdate != null) @@ -2002,7 +2353,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); @@ -2027,6 +2379,85 @@ public class Desktop extends jalview.jbgui.GDesktop implements new Thread(jvq).start(); } + public void checkURLLinks() + { + // Thread off the URL link checker + addDialogThread(new Runnable() + { + @Override + public void run() + { + if (Cache.getDefault("CHECKURLLINKS", true)) + { + // check what the actual links are - if it's just the default don't + // bother with the warning + List links = Preferences.sequenceUrlLinks + .getLinksForMenu(); + + // only need to check links if there is one with a + // SEQUENCE_ID which is not the default EMBL_EBI link + ListIterator li = links.listIterator(); + boolean check = false; + List urls = new ArrayList<>(); + while (li.hasNext()) + { + String link = li.next(); + if (link.contains(SEQUENCE_ID) + && !UrlConstants.isDefaultString(link)) + { + check = true; + int barPos = link.indexOf("|"); + String urlMsg = barPos == -1 ? link + : link.substring(0, barPos) + ": " + + link.substring(barPos + 1); + urls.add(new JLabel(urlMsg)); + } + } + if (!check) + { + return; + } + + // ask user to check in case URL links use old style tokens + // ($SEQUENCE_ID$ for sequence id _or_ accession id) + JPanel msgPanel = new JPanel(); + msgPanel.setLayout(new BoxLayout(msgPanel, BoxLayout.PAGE_AXIS)); + msgPanel.add(Box.createVerticalGlue()); + JLabel msg = new JLabel(MessageManager + .getString("label.SEQUENCE_ID_for_DB_ACCESSION1")); + JLabel msg2 = new JLabel(MessageManager + .getString("label.SEQUENCE_ID_for_DB_ACCESSION2")); + msgPanel.add(msg); + for (JLabel url : urls) + { + msgPanel.add(url); + } + msgPanel.add(msg2); + + final JCheckBox jcb = new JCheckBox( + MessageManager.getString("label.do_not_display_again")); + jcb.addActionListener(new ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + // update Cache settings for "don't show this again" + boolean showWarningAgain = !jcb.isSelected(); + Cache.setProperty("CHECKURLLINKS", + Boolean.valueOf(showWarningAgain).toString()); + } + }); + msgPanel.add(jcb); + + JvOptionPane.showMessageDialog(Desktop.desktop, msgPanel, + MessageManager + .getString("label.SEQUENCE_ID_no_longer_used"), + JvOptionPane.WARNING_MESSAGE); + } + } + }); + } + /** * Proxy class for JDesktopPane which optionally displays the current memory * usage and highlights the desktop area with a red bar if free memory runs @@ -2037,6 +2468,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; @@ -2051,14 +2484,15 @@ public class Desktop extends jalview.jbgui.GDesktop implements showMemoryUsage(showMemoryUsage); } - public void showMemoryUsage(boolean showMemoryUsage) + public void showMemoryUsage(boolean showMemory) { - this.showMemoryUsage = showMemoryUsage; - if (showMemoryUsage) + this.showMemoryUsage = showMemory; + if (showMemory) { Thread worker = new Thread(this); worker.start(); } + repaint(); } public boolean isShowMemoryUsage() @@ -2066,6 +2500,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements return showMemoryUsage; } + @Override public void run() { df = java.text.NumberFormat.getNumberInstance(); @@ -2076,9 +2511,9 @@ public class Desktop extends jalview.jbgui.GDesktop implements { try { - 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; @@ -2099,93 +2534,86 @@ public class Desktop extends jalview.jbgui.GDesktop implements } } + @Override public void paintComponent(Graphics g) { if (showMemoryUsage && g != null && df != null) { if (percentUsage < 20) + { g.setColor(Color.red); + } FontMetrics fm = g.getFontMetrics(); if (fm != null) { - g.drawString( - "Total Free Memory: " + df.format(totalFreeMemory) - + "MB; Max Memory: " + df.format(maxMemory) - + "MB; " + df.format(percentUsage) + "%", 10, - getHeight() - fm.getHeight()); + 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 + * Accessor method to quickly get all the AlignmentFrames loaded. + * + * @return an array of AlignFrame, or null if none found */ - public void relayerWindows() + public static AlignFrame[] getAlignFrames() { - - } - - protected JMenuItem groovyShell; - - public void doGroovyCheck() - { - if (jalview.bin.Cache.groovyJarsPresent()) + if (Jalview.isHeadlessMode()) { - groovyShell = new JMenuItem(); - groovyShell.setText("Groovy Console..."); - groovyShell.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - groovyShell_actionPerformed(e); - } - }); - toolsMenu.add(groovyShell); - groovyShell.setVisible(true); + // Desktop.desktop is null in headless mode + return new AlignFrame[] { Jalview.currentAlignFrame }; } - } - /** - * Accessor method to quickly get all the AlignmentFrames loaded. - */ - public static AlignFrame[] getAlignframes() - { JInternalFrame[] frames = Desktop.desktop.getAllFrames(); if (frames == null) { 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++) - { - afs[i] = (AlignFrame) avp.elementAt(i); - } - avp.clear(); + AlignFrame afs[] = avp.toArray(new AlignFrame[avp.size()]); return afs; } - public AppJmol[] getJmols() + + /** + * Returns an array of any AppJmol frames in the Desktop (or null if none). + * + * @return + */ + public GStructureViewer[] getJmols() { JInternalFrame[] frames = Desktop.desktop.getAllFrames(); @@ -2193,100 +2621,161 @@ 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 AppJmol) { - if (frames[i] instanceof AppJmol) - { - AppJmol af = (AppJmol) frames[i]; - avp.addElement(af); - } + GStructureViewer af = (GStructureViewer) frames[i]; + avp.add(af); } - } catch (Exception ex) - { - ex.printStackTrace(); } if (avp.size() == 0) { return null; } - AppJmol afs[] = new AppJmol[avp.size()]; - for (int i = 0, j = avp.size(); i < j; i++) - { - afs[i] = (AppJmol) avp.elementAt(i); - } - avp.clear(); + GStructureViewer afs[] = avp.toArray(new GStructureViewer[avp.size()]); return afs; } /** * Add Groovy Support to Jalview */ - public void groovyShell_actionPerformed(ActionEvent e) + @Override + public void groovyShell_actionPerformed() { - // use reflection to avoid creating compilation dependency. - if (!jalview.bin.Cache.groovyJarsPresent()) - { - throw new Error( - "Implementation Error. Cannot create groovyShell without Groovy on the classpath!"); - } try { - Class gcClass = Desktop.class.getClassLoader().loadClass( - "groovy.ui.Console"); - Constructor gccons = gcClass.getConstructor(null); - 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); - setvar.invoke(gc, new Object[] - { "Jalview", this }); - run.invoke(gc, null); + openGroovyConsole(); } catch (Exception ex) { jalview.bin.Cache.log.error("Groovy Shell Creation failed.", ex); - JOptionPane - .showInternalMessageDialog( - Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.desktop, + + MessageManager.getString("label.couldnt_create_groovy_shell"), + MessageManager.getString("label.groovy_support_failed"), + JvOptionPane.ERROR_MESSAGE); + } + } + + /** + * Open the Groovy console + */ + void openGroovyConsole() + { + if (groovyConsole == null) + { + groovyConsole = new groovy.ui.Console(); + groovyConsole.setVariable("Jalview", this); + groovyConsole.run(); + + /* + * We allow only one console at a time, so that AlignFrame menu option + * 'Calculate | Run Groovy script' is unambiguous. + * Disable 'Groovy Console', and enable 'Run script', when the console is + * opened, and the reverse when it is closed + */ + Window window = (Window) groovyConsole.getFrame(); + window.addWindowListener(new WindowAdapter() + { + @Override + public void windowClosed(WindowEvent e) + { + /* + * rebind CMD-Q from Groovy Console to Jalview Quit + */ + addQuitHandler(); + enableExecuteGroovy(false); + } + }); + } + + /* + * show Groovy console window (after close and reopen) + */ + ((Window) groovyConsole.getFrame()).setVisible(true); + + /* + * if we got this far, enable 'Run Groovy' in AlignFrame menus + * and disable opening a second console + */ + enableExecuteGroovy(true); + } + + /** + * Bind Ctrl/Cmd-Q to Quit - for reset as Groovy Console takes over this + * binding when opened + */ + protected void addQuitHandler() + { + getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW) + .put(KeyStroke.getKeyStroke(KeyEvent.VK_Q, + Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), + "Quit"); + getRootPane().getActionMap().put("Quit", new AbstractAction() + { + @Override + public void actionPerformed(ActionEvent e) + { + quit(); + } + }); + } - "Couldn't create the groovy Shell. Check the error log for the details of what went wrong.", - "Jalview Groovy Support Failed", - JOptionPane.ERROR_MESSAGE); + /** + * Enable or disable 'Run Groovy script' in AlignFrame calculate menus + * + * @param enabled + * true if Groovy console is open + */ + public void enableExecuteGroovy(boolean enabled) + { + /* + * disable opening a second Groovy console + * (or re-enable when the console is closed) + */ + groovyShell.setEnabled(!enabled); + + AlignFrame[] alignFrames = getAlignFrames(); + if (alignFrames != null) + { + for (AlignFrame af : alignFrames) + { + af.setGroovyEnabled(enabled); + } } } /** * Progress bars managed by the IProgressIndicator method. */ - private Hashtable progressBars; - private Hashtable progressBarHandlers; + private Hashtable progressBars; + + private Hashtable progressBarHandlers; /* * (non-Javadoc) * * @see jalview.gui.IProgressIndicator#setProgressBar(java.lang.String, long) */ + @Override public void setProgressBar(String message, long id) { if (progressBars == null) { - progressBars = new Hashtable(); - progressBarHandlers = new Hashtable(); + progressBars = new Hashtable<>(); + progressBarHandlers = new Hashtable<>(); } if (progressBars.get(new Long(id)) != null) { - JPanel progressPanel = progressBars - .remove(new Long(id)); + JPanel panel = progressBars.remove(new Long(id)); if (progressBarHandlers.contains(new Long(id))) { progressBarHandlers.remove(new Long(id)); } - removeProgressPanel(progressPanel); + removeProgressPanel(panel); } else { @@ -2300,30 +2789,34 @@ public class Desktop extends jalview.jbgui.GDesktop implements * @see jalview.gui.IProgressIndicator#registerHandler(long, * jalview.gui.IProgressIndicatorHandler) */ + @Override public void registerHandler(final long id, final IProgressIndicatorHandler handler) { - if (progressBarHandlers == null || !progressBars.contains(new Long(id))) + if (progressBarHandlers == null + || !progressBars.containsKey(new Long(id))) { - throw new Error( - "call setProgressBar before registering the progress bar's handler."); + throw new Error(MessageManager.getString( + "error.call_setprogressbar_before_registering_handler")); } progressBarHandlers.put(new Long(id), handler); - final JPanel progressPanel = (JPanel) progressBars.get(new Long(id)); + final JPanel progressPanel = progressBars.get(new Long(id)); if (handler.canCancel()) { - JButton cancel = new JButton("Cancel"); + JButton cancel = new JButton( + MessageManager.getString("action.cancel")); final IProgressIndicator us = this; cancel.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { handler.cancelActivity(id); - us.setProgressBar( - "Cancelled " - + ((JLabel) progressPanel.getComponent(0)) - .getText(), id); + us.setProgressBar(MessageManager + .formatMessage("label.cancelled_params", new Object[] + { ((JLabel) progressPanel.getComponent(0)).getText() }), + id); } }); progressPanel.add(cancel, BorderLayout.EAST); @@ -2345,20 +2838,22 @@ public class Desktop extends jalview.jbgui.GDesktop implements } /** - * This will return the first AlignFrame viewing AlignViewport av. It will - * break if there are more than one AlignFrames viewing a particular av. This + * 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 av - * @return alignFrame for av + * @param viewport + * @return alignFrame for viewport */ - public static AlignFrame getAlignFrameFor(AlignViewport av) + public static AlignFrame getAlignFrameFor(AlignViewportI viewport) { if (desktop != null) { - AlignmentPanel[] aps = getAlignmentPanels(av.getSequenceSetId()); + AlignmentPanel[] aps = getAlignmentPanels( + viewport.getSequenceSetId()); for (int panel = 0; aps != null && panel < aps.length; panel++) { - if (aps[panel] != null && aps[panel].av == av) + if (aps[panel] != null && aps[panel].av == viewport) { return aps[panel].alignFrame; } @@ -2407,48 +2902,27 @@ public class Desktop extends jalview.jbgui.GDesktop implements { boolean alive = true; Thread t0 = null, t1 = null, t2 = null; - - // todo: changesupport handlers need to be transferred - if (discoverer == null) - { - discoverer = new jalview.ws.jws1.Discoverer(); - // register PCS handler for desktop. - discoverer.addPropertyChangeListener(changeSupport); - } - // JAL-940 - disabled JWS1 service configuration - always start discoverer until we phase out completely + // JAL-940 - JALVIEW 1 services are now being EOLed as of JABA 2.1 release if (true) { - (t0 = new Thread(discoverer)).start(); - } - - try - { - if (Cache.getDefault("SHOW_ENFIN_SERVICES", true)) + // todo: changesupport handlers need to be transferred + if (discoverer == null) { - // EnfinEnvision web service menu entries are rebuild every time the - // menu is shown, so no changeSupport events are needed. - jalview.ws.EnfinEnvision2OneWay.getInstance(); - (t1 = new Thread(jalview.ws.EnfinEnvision2OneWay.getInstance())) - .start(); + discoverer = new jalview.ws.jws1.Discoverer(); + // register PCS handler for desktop. + discoverer.addPropertyChangeListener(changeSupport); } - } catch (Exception e) - { - Cache.log - .info("Exception when trying to launch Envision2 workflow discovery.", - e); - Cache.log.info(e.getStackTrace()); + // JAL-940 - disabled JWS1 service configuration - always start discoverer + // until we phase out completely + (t0 = new Thread(discoverer)).start(); } + if (Cache.getDefault("SHOW_JWS2_SERVICES", true)) { - if (jalview.ws.jws2.Jws2Discoverer.getDiscoverer().isRunning()) - { - jalview.ws.jws2.Jws2Discoverer.getDiscoverer().setAborted(true); - } - t2 = jalview.ws.jws2.Jws2Discoverer.getDiscoverer().startDiscoverer( - changeSupport); - + t2 = jalview.ws.jws2.Jws2Discoverer.getDiscoverer() + .startDiscoverer(changeSupport); } - Thread t3=null; + Thread t3 = null; { // TODO: do rest service discovery } @@ -2462,8 +2936,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements } catch (Exception e) { } - alive = (t1 != null && t1.isAlive()) - || (t2 != null && t2.isAlive()) + alive = (t1 != null && t1.isAlive()) || (t2 != null && t2.isAlive()) || (t3 != null && t3.isAlive()) || (t0 != null && t0.isAlive()); } @@ -2485,32 +2958,59 @@ 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() - { - 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; - - } - }); + if (serviceChangedDialog == null) + { + // only run if we aren't already displaying one of these. + addDialogThread(serviceChangedDialog = new Runnable() + { + @Override + 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() { // TODO + * Auto-generated method stub + * + * } }; jd.initDialogFrame(new + * JLabel("
" + 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.
" + * ), true, true, "Web Service Configuration Problem", 450, + * 400); + * + * jd.waitForInput(); + */ + JvOptionPane.showConfirmDialog(Desktop.desktop, + new JLabel("
" + + ermsg + "
" + + "

It may be that you have invalid JABA URLs
in your web service preferences," + + "
or as a command-line argument, or mis-configured HTTP proxy settings.

" + + "

Check the Connections and Web services tab
of the" + + " Tools->Preferences dialog box to change them.

"), + "Web Service Configuration Problem", + JvOptionPane.DEFAULT_OPTION, + JvOptionPane.ERROR_MESSAGE); + serviceChangedDialog = null; + + } + }); + } } - } else { - Cache.log - .error("Errors reported by JABA discovery service. Check web services preferences.\n" + Cache.log.error( + "Errors reported by JABA discovery service. Check web services preferences.\n" + ermsg); } } @@ -2530,36 +3030,43 @@ public class Desktop extends jalview.jbgui.GDesktop implements { showUrl(url, Desktop.instance); } + /** * Like showUrl but allows progress handler to be specified + * * @param url - * @param progress (null) or object implementing IProgressIndicator + * @param progress + * (null) or object implementing IProgressIndicator */ - public static void showUrl(final String url, final IProgressIndicator progress) + public static void showUrl(final String url, + final IProgressIndicator progress) { new Thread(new Runnable() { + @Override public void run() { try { - if (progress!=null) { - progress.setProgressBar("Opening "+url, this.hashCode()); + if (progress != null) + { + progress.setProgressBar(MessageManager + .formatMessage("status.opening_params", new Object[] + { url }), this.hashCode()); } jalview.util.BrowserLauncher.openURL(url); } catch (Exception ex) { - JOptionPane - .showInternalMessageDialog( - Desktop.desktop, - "Unixers: Couldn't find default web browser." - + "\nAdd the full path to your browser in Preferences.", - "Web browser not found", - JOptionPane.WARNING_MESSAGE); + JvOptionPane.showInternalMessageDialog(Desktop.desktop, + MessageManager + .getString("label.web_browser_not_found_unix"), + MessageManager.getString("label.web_browser_not_found"), + JvOptionPane.WARNING_MESSAGE); ex.printStackTrace(); } - if (progress!=null) { + if (progress != null) + { progress.setProgressBar(null, this.hashCode()); } } @@ -2578,32 +3085,522 @@ public class Desktop extends jalview.jbgui.GDesktop implements } /** - * static hyperlink handler proxy method for use by Jalview's internal windows + * static hyperlink handler proxy method for use by Jalview's internal windows + * * @param e */ public static void hyperlinkUpdate(HyperlinkEvent e) { if (e.getEventType() == EventType.ACTIVATED) { - String url=null; + String url = null; try { url = e.getURL().toString(); Desktop.showUrl(url); } catch (Exception x) { - if (url!=null) { - if (Cache.log!=null) { - Cache.log.error("Couldn't handle string "+url+" as a URL."); - } else { - System.err.println("Couldn't handle string "+url+" as a URL."); + if (url != null) + { + if (Cache.log != null) + { + Cache.log.error("Couldn't handle string " + url + " as a URL."); + } + else + { + System.err.println( + "Couldn't handle string " + url + " as a URL."); } } // ignore any exceptions due to dud links. } - } + } + } + + /** + * 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); + + private static groovy.ui.Console groovyConsole; + + /** + * add another dialog thread to the queue + * + * @param prompter + */ + public void addDialogThread(final Runnable prompter) + { + dialogExecutor.submit(new Runnable() + { + @Override + 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(); + } + + @Override + protected void snapShotWindow_actionPerformed(ActionEvent e) + { + invalidate(); + File of; + ImageMaker im = new jalview.util.ImageMaker( + this, ImageMaker.TYPE.EPS, "View of Desktop", getWidth(), + getHeight(), of = new File("Jalview_snapshot" + + System.currentTimeMillis() + ".eps"), + "View of desktop", null, 0, false); + try + { + paintAll(im.getGraphics()); + im.writeImage(); + } catch (Exception q) + { + Cache.log.error("Couldn't write snapshot to " + of.getAbsolutePath(), + q); + return; + } + Cache.log.info("Successfully written snapshot to file " + + of.getAbsolutePath()); + } + + /** + * Explode the views in the given SplitFrame into separate SplitFrame windows. + * This respects (remembers) any previous 'exploded geometry' i.e. the size + * and location last time the view was expanded (if any). However it does not + * remember the split pane divider location - this is set to match the + * 'exploding' frame. + * + * @param sf + */ + public void explodeViews(SplitFrame sf) + { + AlignFrame oldTopFrame = (AlignFrame) sf.getTopFrame(); + AlignFrame oldBottomFrame = (AlignFrame) sf.getBottomFrame(); + List topPanels = oldTopFrame + .getAlignPanels(); + List bottomPanels = oldBottomFrame + .getAlignPanels(); + int viewCount = topPanels.size(); + if (viewCount < 2) + { + return; + } + + /* + * Processing in reverse order works, forwards order leaves the first panels + * not visible. I don't know why! + */ + for (int i = viewCount - 1; i >= 0; i--) + { + /* + * Make new top and bottom frames. These take over the respective + * AlignmentPanel objects, including their AlignmentViewports, so the + * cdna/protein relationships between the viewports is carried over to the + * new split frames. + * + * explodedGeometry holds the (x, y) position of the previously exploded + * SplitFrame, and the (width, height) of the AlignFrame component + */ + AlignmentPanel topPanel = (AlignmentPanel) topPanels.get(i); + AlignFrame newTopFrame = new AlignFrame(topPanel); + newTopFrame.setSize(oldTopFrame.getSize()); + newTopFrame.setVisible(true); + Rectangle geometry = ((AlignViewport) topPanel.getAlignViewport()) + .getExplodedGeometry(); + if (geometry != null) + { + newTopFrame.setSize(geometry.getSize()); + } + + AlignmentPanel bottomPanel = (AlignmentPanel) bottomPanels.get(i); + AlignFrame newBottomFrame = new AlignFrame(bottomPanel); + newBottomFrame.setSize(oldBottomFrame.getSize()); + newBottomFrame.setVisible(true); + geometry = ((AlignViewport) bottomPanel.getAlignViewport()) + .getExplodedGeometry(); + if (geometry != null) + { + newBottomFrame.setSize(geometry.getSize()); + } + + topPanel.av.setGatherViewsHere(false); + bottomPanel.av.setGatherViewsHere(false); + JInternalFrame splitFrame = new SplitFrame(newTopFrame, + newBottomFrame); + if (geometry != null) + { + splitFrame.setLocation(geometry.getLocation()); + } + Desktop.addInternalFrame(splitFrame, sf.getTitle(), -1, -1); + } + + /* + * Clear references to the panels (now relocated in the new SplitFrames) + * before closing the old SplitFrame. + */ + topPanels.clear(); + bottomPanels.clear(); + sf.close(); + } + + /** + * Gather expanded split frames, sharing the same pairs of sequence set ids, + * back into the given SplitFrame as additional views. Note that the gathered + * frames may themselves have multiple views. + * + * @param source + */ + public void gatherViews(GSplitFrame source) + { + /* + * special handling of explodedGeometry for a view within a SplitFrame: - it + * holds the (x, y) position of the enclosing SplitFrame, and the (width, + * height) of the AlignFrame component + */ + AlignFrame myTopFrame = (AlignFrame) source.getTopFrame(); + AlignFrame myBottomFrame = (AlignFrame) source.getBottomFrame(); + myTopFrame.viewport.setExplodedGeometry(new Rectangle(source.getX(), + source.getY(), myTopFrame.getWidth(), myTopFrame.getHeight())); + myBottomFrame.viewport + .setExplodedGeometry(new Rectangle(source.getX(), source.getY(), + myBottomFrame.getWidth(), myBottomFrame.getHeight())); + myTopFrame.viewport.setGatherViewsHere(true); + myBottomFrame.viewport.setGatherViewsHere(true); + String topViewId = myTopFrame.viewport.getSequenceSetId(); + String bottomViewId = myBottomFrame.viewport.getSequenceSetId(); + + JInternalFrame[] frames = desktop.getAllFrames(); + for (JInternalFrame frame : frames) + { + if (frame instanceof SplitFrame && frame != source) + { + SplitFrame sf = (SplitFrame) frame; + AlignFrame topFrame = (AlignFrame) sf.getTopFrame(); + AlignFrame bottomFrame = (AlignFrame) sf.getBottomFrame(); + boolean gatherThis = false; + for (int a = 0; a < topFrame.alignPanels.size(); a++) + { + AlignmentPanel topPanel = topFrame.alignPanels.get(a); + AlignmentPanel bottomPanel = bottomFrame.alignPanels.get(a); + if (topViewId.equals(topPanel.av.getSequenceSetId()) + && bottomViewId.equals(bottomPanel.av.getSequenceSetId())) + { + gatherThis = true; + topPanel.av.setGatherViewsHere(false); + bottomPanel.av.setGatherViewsHere(false); + topPanel.av.setExplodedGeometry( + new Rectangle(sf.getLocation(), topFrame.getSize())); + bottomPanel.av.setExplodedGeometry( + new Rectangle(sf.getLocation(), bottomFrame.getSize())); + myTopFrame.addAlignmentPanel(topPanel, false); + myBottomFrame.addAlignmentPanel(bottomPanel, false); + } + } + + if (gatherThis) + { + topFrame.getAlignPanels().clear(); + bottomFrame.getAlignPanels().clear(); + sf.close(); + } + } + } + + /* + * The dust settles...give focus to the tab we did this from. + */ + myTopFrame.setDisplayedView(myTopFrame.alignPanel); + } + + public static groovy.ui.Console getGroovyConsole() + { + return groovyConsole; + } + + /** + * handles the payload of a drag and drop event. + * + * TODO refactor to desktop utilities class + * + * @param files + * - Data source strings extracted from the drop event + * @param protocols + * - protocol for each data source extracted from the drop event + * @param evt + * - the drop event + * @param t + * - the payload from the drop event + * @throws Exception + */ + public static void transferFromDropTarget(List files, + List protocols, DropTargetDropEvent evt, + Transferable t) throws Exception + { + + DataFlavor uriListFlavor = new DataFlavor( + "text/uri-list;class=java.lang.String"), urlFlavour = null; + try + { + urlFlavour = new DataFlavor( + "application/x-java-url; class=java.net.URL"); + } catch (ClassNotFoundException cfe) + { + Cache.log.debug("Couldn't instantiate the URL dataflavor.", cfe); + } + + if (urlFlavour != null && t.isDataFlavorSupported(urlFlavour)) + { + + try + { + java.net.URL url = (URL) t.getTransferData(urlFlavour); + // nb: java 8 osx bug https://bugs.openjdk.java.net/browse/JDK-8156099 + // means url may be null. + if (url != null) + { + protocols.add(DataSourceType.URL); + files.add(url.toString()); + Cache.log.debug("Drop handled as URL dataflavor " + + files.get(files.size() - 1)); + return; + } + else + { + if (Platform.isAMac()) + { + System.err.println( + "Please ignore plist error - occurs due to problem with java 8 on OSX"); + } + ; + } + } catch (Throwable ex) + { + Cache.log.debug("URL drop handler failed.", ex); + } + } + if (t.isDataFlavorSupported(DataFlavor.javaFileListFlavor)) + { + // Works on Windows and MacOSX + Cache.log.debug("Drop handled as javaFileListFlavor"); + for (Object file : (List) t + .getTransferData(DataFlavor.javaFileListFlavor)) + { + files.add(((File) file).toString()); + protocols.add(DataSourceType.FILE); + } + } + else + { + // Unix like behaviour + boolean added = false; + String data = null; + if (t.isDataFlavorSupported(uriListFlavor)) + { + Cache.log.debug("Drop handled as uriListFlavor"); + // This is used by Unix drag system + data = (String) t.getTransferData(uriListFlavor); + } + if (data == null) + { + // fallback to text: workaround - on OSX where there's a JVM bug + Cache.log.debug("standard URIListFlavor failed. Trying text"); + // try text fallback + DataFlavor textDf = new DataFlavor( + "text/plain;class=java.lang.String"); + if (t.isDataFlavorSupported(textDf)) + { + data = (String) t.getTransferData(textDf); + } + + Cache.log.debug("Plain text drop content returned " + + (data == null ? "Null - failed" : data)); + + } + if (data != null) + { + while (protocols.size() < files.size()) + { + Cache.log.debug("Adding missing FILE protocol for " + + files.get(protocols.size())); + protocols.add(DataSourceType.FILE); + } + for (java.util.StringTokenizer st = new java.util.StringTokenizer( + data, "\r\n"); st.hasMoreTokens();) + { + added = true; + String s = st.nextToken(); + if (s.startsWith("#")) + { + // the line is a comment (as per the RFC 2483) + continue; + } + java.net.URI uri = new java.net.URI(s); + if (uri.getScheme().toLowerCase().startsWith("http")) + { + protocols.add(DataSourceType.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(DataSourceType.FILE); + files.add(file.toString()); + } + } + } + + if (Cache.log.isDebugEnabled()) + { + if (data == null || !added) + { + + if (t.getTransferDataFlavors() != null + && t.getTransferDataFlavors().length > 0) + { + Cache.log.debug( + "Couldn't resolve drop data. Here are the supported flavors:"); + for (DataFlavor fl : t.getTransferDataFlavors()) + { + Cache.log.debug( + "Supported transfer dataflavor: " + fl.toString()); + Object df = t.getTransferData(fl); + if (df != null) + { + Cache.log.debug("Retrieves: " + df); + } + else + { + Cache.log.debug("Retrieved nothing"); + } + } + } + else + { + Cache.log.debug("Couldn't resolve dataflavor for drop: " + + t.toString()); + } + } + } + } + if (Platform.isWindows()) + + { + Cache.log.debug("Scanning dropped content for Windows Link Files"); + + // resolve any .lnk files in the file drop + for (int f = 0; f < files.size(); f++) + { + String source = files.get(f).toLowerCase(); + if (protocols.get(f).equals(DataSourceType.FILE) + && (source.endsWith(".lnk") || source.endsWith(".url") + || source.endsWith(".site"))) + { + try { + File lf = new File(files.get(f)); + // process link file to get a URL + Cache.log.debug("Found potential link file: " + lf); + WindowsShortcut wscfile = new WindowsShortcut(lf); + String fullname = wscfile.getRealFilename(); + protocols.set(f, FormatAdapter.checkProtocol(fullname)); + files.set(f, fullname); + Cache.log.debug("Parsed real filename " + fullname + + " to extract protocol: " + protocols.get(f)); + } + catch (Exception ex) + { + Cache.log.error("Couldn't parse "+files.get(f)+" as a link file.",ex); + } + } + } + } + } + + /** + * Sets the Preferences property for experimental features to True or False + * depending on the state of the controlling menu item + */ + @Override + protected void showExperimental_actionPerformed(boolean selected) + { + Cache.setProperty(EXPERIMENTAL_FEATURES, Boolean.toString(selected)); } + /** + * Answers a (possibly empty) list of any structure viewer frames (currently + * for either Jmol or Chimera) which are currently open. This may optionally + * be restricted to viewers of a specified class, or viewers linked to a + * specified alignment panel. + * + * @param apanel + * if not null, only return viewers linked to this panel + * @param structureViewerClass + * if not null, only return viewers of this class + * @return + */ + public List getStructureViewers( + AlignmentPanel apanel, + Class structureViewerClass) + { + List result = new ArrayList<>(); + JInternalFrame[] frames = Desktop.instance.getAllFrames(); + for (JInternalFrame frame : frames) + { + if (frame instanceof StructureViewerBase) + { + if (structureViewerClass == null + || structureViewerClass.isInstance(frame)) + { + if (apanel == null + || ((StructureViewerBase) frame).isLinkedWith(apanel)) + { + result.add((StructureViewerBase) frame); + } + } + } + } + return result; + } }