X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDesktop.java;h=bbdddbbffe968931270a340644aee3341d50f60f;hb=cf64def09a8b741483854ddd8c034d0aefff15b4;hp=63d88a0834dd058489505395d987313ceee224b7;hpb=a737e315f94a3e9dff12f1f3ed657cdf8ee52882;p=jalview.git diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java index 63d88a0..bbdddbb 100644 --- a/src/jalview/gui/Desktop.java +++ b/src/jalview/gui/Desktop.java @@ -32,6 +32,7 @@ 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; @@ -68,8 +69,7 @@ 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; @@ -93,10 +93,13 @@ 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; @@ -118,6 +121,8 @@ import javax.swing.event.InternalFrameEvent; import javax.swing.event.MenuEvent; import javax.swing.event.MenuListener; +import org.stackoverflowusers.file.WindowsShortcut; + /** * Jalview Desktop * @@ -125,14 +130,18 @@ import javax.swing.event.MenuListener; * @author $author$ * @version $Revision: 1.155 $ */ -public class Desktop extends jalview.jbgui.GDesktop implements - DropTargetListener, ClipboardOwner, IProgressIndicator, +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(); @@ -265,12 +274,14 @@ public class Desktop extends jalview.jbgui.GDesktop implements public void endDraggingFrame(JComponent f) { delegate.endDraggingFrame(f); + desktop.repaint(); } @Override public void endResizingFrame(JComponent f) { delegate.endResizingFrame(f); + desktop.repaint(); } @Override @@ -337,13 +348,9 @@ public class Desktop extends jalview.jbgui.GDesktop implements 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); - if (Platform.isAMac()) - { - desktop.setDoubleBuffered(false); - } showMemusage.setSelected(selmemusage); desktop.setBackground(Color.white); getContentPane().setLayout(new BorderLayout()); @@ -356,8 +363,13 @@ public class Desktop extends jalview.jbgui.GDesktop implements // 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) @@ -367,26 +379,28 @@ public class Desktop extends jalview.jbgui.GDesktop implements else { Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - setBounds((screenSize.width - 900) / 2, - (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 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")); + 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); - + experimentalFeatures.setSelected(showExperimental()); getIdentifiersOrgData(); @@ -425,24 +439,6 @@ public class Desktop extends jalview.jbgui.GDesktop implements }); desktop.addMouseListener(ma); - this.addFocusListener(new FocusListener() - { - - @Override - public void focusLost(FocusEvent e) - { - // TODO Auto-generated method stub - - } - - @Override - public void focusGained(FocusEvent e) - { - Cache.log.debug("Relaying windows after focus gain"); - // make sure that we sort windows properly after we gain focus - instance.relayerWindows(); - } - }); this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this)); // Spawn a thread that shows the splashscreen SwingUtilities.invokeLater(new Runnable() @@ -504,12 +500,12 @@ public class Desktop extends jalview.jbgui.GDesktop implements .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)); + 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 { @@ -523,7 +519,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements { final Desktop me = this; // Thread off the news reader, in case there are connection problems. - addDialogThread(new Runnable() + new Thread(new Runnable() { @Override public void run() @@ -534,13 +530,13 @@ public class Desktop extends jalview.jbgui.GDesktop implements showNews.setVisible(true); Cache.log.debug("Completed news thread."); } - }); + }).start(); } public void getIdentifiersOrgData() { // Thread off the identifiers fetcher - addDialogThread(new Runnable() + new Thread(new Runnable() { @Override public void run() @@ -557,7 +553,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements + e.getMessage()); } } - }); + }).start(); + ; } @Override @@ -580,7 +577,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements { long now = System.currentTimeMillis(); Desktop.instance.setProgressBar( - MessageManager.getString("status.refreshing_news"), now); + MessageManager.getString("status.refreshing_news"), + now); jvnews.refreshNews(); Desktop.instance.setProgressBar(null, now); jvnews.showNews(); @@ -604,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); @@ -630,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); @@ -728,9 +724,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements } } 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); } } @@ -833,9 +828,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements // A HEADLESS STATE WHEN NO DESKTOP EXISTS. MUST RETURN // IF JALVIEW IS RUNNING HEADLESS // /////////////////////////////////////////////// - if (instance == null - || (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; } @@ -844,25 +838,31 @@ public class Desktop extends jalview.jbgui.GDesktop implements if (!ignoreMinSize) { - frame.setMinimumSize(new Dimension(DEFAULT_MIN_WIDTH, - DEFAULT_MIN_HEIGHT)); + 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); - if (Platform.isAMac()) - { - frame.setIconifiable(false); - frame.setFrameIcon(null); - // frame.setDesktopIcon(null); - frame.setDoubleBuffered(false); - } + 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); } /* @@ -878,6 +878,10 @@ public class Desktop extends jalview.jbgui.GDesktop implements JInternalFrame itf = desktop.getSelectedFrame(); if (itf != null) { + if (itf instanceof AlignFrame) + { + Jalview.setCurrentAlignFrame((AlignFrame) itf); + } itf.requestFocus(); } } @@ -904,16 +908,6 @@ public class Desktop extends jalview.jbgui.GDesktop implements menuItem.removeActionListener(menuItem.getActionListeners()[0]); } windowMenu.remove(menuItem); - JInternalFrame itf = desktop.getSelectedFrame(); - if (itf != null) - { - itf.requestFocus(); - if (itf instanceof AlignFrame) - { - Jalview.setCurrentAlignFrame((AlignFrame) itf); - } - } - System.gc(); }; }); @@ -933,6 +927,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements } }); + setKeyBindings(frame); + desktop.add(frame); windowMenu.add(menuItem); @@ -946,12 +942,48 @@ public class Desktop extends jalview.jbgui.GDesktop implements { } 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) { @@ -997,8 +1029,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements // Java's Transferable for native dnd evt.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE); Transferable t = evt.getTransferable(); - List files = new ArrayList(); - List protocols = new ArrayList(); + List files = new ArrayList<>(); + List protocols = new ArrayList<>(); try { @@ -1016,7 +1048,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements for (int i = 0; i < files.size(); i++) { String file = files.get(i).toString(); - DataSourceType protocol = (protocols == null) ? DataSourceType.FILE + DataSourceType protocol = (protocols == null) + ? DataSourceType.FILE : protocols.get(i); FileFormatI format = null; @@ -1052,12 +1085,12 @@ public class Desktop extends jalview.jbgui.GDesktop implements public void inputLocalFileMenuItem_actionPerformed(AlignViewport viewport) { String fileFormat = Cache.getProperty("DEFAULT_FILE_FORMAT"); - JalviewFileChooser chooser = JalviewFileChooser.forRead( - Cache.getProperty("LAST_DIRECTORY"), fileFormat); + JalviewFileChooser chooser = JalviewFileChooser + .forRead(Cache.getProperty("LAST_DIRECTORY"), fileFormat); chooser.setFileView(new JalviewFileView()); - chooser.setDialogTitle(MessageManager - .getString("label.open_local_file")); + chooser.setDialogTitle( + MessageManager.getString("label.open_local_file")); chooser.setToolTipText(MessageManager.getString("action.open")); int value = chooser.showOpenDialog(this); @@ -1065,8 +1098,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements if (value == JalviewFileChooser.APPROVE_OPTION) { String choice = chooser.getSelectedFile().getPath(); - Cache.setProperty("LAST_DIRECTORY", chooser - .getSelectedFile().getParent()); + Cache.setProperty("LAST_DIRECTORY", + chooser.getSelectedFile().getParent()); FileFormatI format = chooser.getSelectedFormat(); @@ -1174,8 +1207,9 @@ public class Desktop extends jalview.jbgui.GDesktop implements { JvOptionPane.showInternalMessageDialog(Desktop.desktop, MessageManager.formatMessage("label.couldnt_locate", - new Object[] { url }), MessageManager - .getString("label.url_not_found"), + new Object[] + { url }), + MessageManager.getString("label.url_not_found"), JvOptionPane.WARNING_MESSAGE); return; @@ -1183,8 +1217,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements if (viewport != null) { - new FileLoader() - .LoadFile(viewport, url, DataSourceType.URL, format); + new FileLoader().LoadFile(viewport, url, DataSourceType.URL, + format); } else { @@ -1207,8 +1241,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements CutAndPasteTransfer cap = new CutAndPasteTransfer(); cap.setForInput(viewPanel); Desktop.addInternalFrame(cap, - MessageManager.getString("label.cut_paste_alignmen_file"), - true, 600, 500); + MessageManager.getString("label.cut_paste_alignmen_file"), true, + 600, 500); } /* @@ -1218,12 +1252,12 @@ public class Desktop extends jalview.jbgui.GDesktop implements 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) { @@ -1292,7 +1326,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements if (shortv) { message.append("

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

"); + + jalview.bin.Cache.getProperty("VERSION") + + ""); message.append("Last Updated: " + jalview.bin.Cache.getDefault("BUILD_DATE", "unknown") + ""); @@ -1307,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...
"); } @@ -1330,16 +1365,16 @@ 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("AUTHORFNAMES", - "The Jalview Authors (See AUTHORS file for current list)") + 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:" @@ -1398,7 +1433,6 @@ public class Desktop extends jalview.jbgui.GDesktop implements { ssm.resetAll(); } - System.gc(); } @Override @@ -1470,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); } @@ -1571,9 +1605,10 @@ public class Desktop extends jalview.jbgui.GDesktop implements * DOCUMENT ME! */ @Override - public void saveState_actionPerformed(ActionEvent e) + public void saveState_actionPerformed(boolean asCastor) { - JalviewFileChooser chooser = new JalviewFileChooser("jvp", + JalviewFileChooser chooser = new JalviewFileChooser( + asCastor ? "jvp" : "jvx", "Jalview Project"); chooser.setFileView(new JalviewFileView()); @@ -1594,28 +1629,38 @@ public class Desktop extends jalview.jbgui.GDesktop implements { // TODO: refactor to Jalview desktop session controller action. setProgressBar(MessageManager.formatMessage( - "label.saving_jalview_project", - new Object[] { choice.getName() }), choice.hashCode()); + "label.saving_jalview_project", new Object[] + { choice.getName() }), choice.hashCode()); jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice.getParent()); // TODO catch and handle errors for savestate // TODO prevent user from messing with the Desktop whilst we're saving try { - new Jalview2XML().saveState(choice); + 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); + 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.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()); @@ -1641,12 +1686,20 @@ public class Desktop extends jalview.jbgui.GDesktop implements * DOCUMENT ME! */ @Override - public void loadState_actionPerformed(ActionEvent e) - { + 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( - Cache.getProperty("LAST_DIRECTORY"), new String[] { - "jvp", "jar" }, new String[] { "Jalview Project", - "Jalview Project (old)" }, "Jalview Project"); + Cache.getProperty("LAST_DIRECTORY"), suffix, + desc, + "Jalview Project"); chooser.setFileView(new JalviewFileView()); chooser.setDialogTitle(MessageManager.getString("label.restore_state")); @@ -1657,32 +1710,38 @@ public class Desktop extends jalview.jbgui.GDesktop implements final File selectedFile = chooser.getSelectedFile(); setProjectFile(selectedFile); final String choice = selectedFile.getAbsolutePath(); - Cache.setProperty("LAST_DIRECTORY", - selectedFile.getParent()); + Cache.setProperty("LAST_DIRECTORY", selectedFile.getParent()); new Thread(new Runnable() { @Override public void run() { - setProgressBar( - MessageManager.formatMessage( - "label.loading_jalview_project", - new Object[] { 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); - JvOptionPane.showMessageDialog(Desktop.desktop, MessageManager - .formatMessage( + 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"), + new Object[] + { choice }), + MessageManager.getString("label.couldnt_load_project"), JvOptionPane.WARNING_MESSAGE); } setProgressBar(null, choice.hashCode()); @@ -1699,14 +1758,15 @@ public class Desktop extends jalview.jbgui.GDesktop implements JPanel progressPanel; - ArrayList fileLoadingPanels = new ArrayList(); + ArrayList fileLoadingPanels = new ArrayList<>(); public void startLoading(final String fileName) { if (fileLoadingCount == 0) { - fileLoadingPanels.add(addProgressPanel(MessageManager.formatMessage( - "label.loading_file", new Object[] { fileName }))); + fileLoadingPanels.add(addProgressPanel(MessageManager + .formatMessage("label.loading_file", new Object[] + { fileName }))); } fileLoadingCount++; } @@ -1727,8 +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; @@ -1790,7 +1850,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements // TODO: verify that frames are recoverable when in headless mode return null; } - List aps = new ArrayList(); + List aps = new ArrayList<>(); AlignFrame[] frames = getAlignFrames(); if (frames == null) { @@ -1825,16 +1885,15 @@ public class Desktop extends jalview.jbgui.GDesktop implements */ public static AlignmentViewport[] getViewports(String sequenceSetId) { - List viewp = new ArrayList(); + List viewp = new ArrayList<>(); if (desktop != null) { AlignFrame[] frames = Desktop.getAlignFrames(); for (AlignFrame afr : frames) { - if (sequenceSetId == null - || afr.getViewport().getSequenceSetId() - .equals(sequenceSetId)) + if (sequenceSetId == null || afr.getViewport().getSequenceSetId() + .equals(sequenceSetId)) { if (afr.alignPanels != null) { @@ -1956,10 +2015,10 @@ public class Desktop extends jalview.jbgui.GDesktop implements jalview.bin.Cache.getProperty("LAST_DIRECTORY")); chooser.setFileView(new JalviewFileView()); - chooser.setDialogTitle(MessageManager - .getString("label.open_saved_vamsas_session")); - chooser.setToolTipText(MessageManager - .getString("label.select_vamsas_session_opened_as_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); @@ -1968,22 +2027,21 @@ public class Desktop extends jalview.jbgui.GDesktop implements String fle = chooser.getSelectedFile().toString(); if (!vamsasImport(chooser.getSelectedFile())) { - 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); + 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."); } } @@ -1999,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; } @@ -2025,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(); @@ -2044,22 +2103,22 @@ 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(MessageManager.formatMessage( - "status.importing_vamsas_session_from", - new Object[] { file.getName() }), file.hashCode()); + "status.importing_vamsas_session_from", new Object[] + { file.getName() }), file.hashCode()); try { v_client = new jalview.gui.VamsasApplication(this, file, null); } catch (Exception ex) { setProgressBar(MessageManager.formatMessage( - "status.importing_vamsas_session_from", - new Object[] { file.getName() }), file.hashCode()); + "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; @@ -2067,8 +2126,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements setupVamsasConnectedGui(); v_client.initial_update(); // TODO: thread ? setProgressBar(MessageManager.formatMessage( - "status.importing_vamsas_session_from", - new Object[] { file.getName() }), file.hashCode()); + "status.importing_vamsas_session_from", new Object[] + { file.getName() }), file.hashCode()); return v_client.inSession(); } @@ -2076,9 +2135,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements { if (v_client != null) { - throw new Error( - MessageManager - .getString("error.try_join_vamsas_session_another")); + throw new Error(MessageManager + .getString("error.try_join_vamsas_session_another")); } if (mysesid == null) { @@ -2136,8 +2194,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements vamsasSave.setVisible(false); vamsasStop.setVisible(false); vamsasImport.setVisible(true); - vamsasStart.setText(MessageManager - .getString("label.new_vamsas_session")); + vamsasStart + .setText(MessageManager.getString("label.new_vamsas_session")); } @Override @@ -2161,21 +2219,22 @@ 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(MessageManager.formatMessage( - "label.connect_to_session", new Object[] { 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() @@ -2227,7 +2286,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements { if (v_client != null) { - // TODO: VAMSAS DOCUMENT EXTENSION is VDJ + // TODO: VAMSAS DOCUMENT EXTENSION is VDJ JalviewFileChooser chooser = new JalviewFileChooser("vdj", "Vamsas Document"); @@ -2240,9 +2299,9 @@ public class Desktop extends jalview.jbgui.GDesktop implements if (value == JalviewFileChooser.APPROVE_OPTION) { java.io.File choice = chooser.getSelectedFile(); - JPanel progpanel = addProgressPanel(MessageManager.formatMessage( - "label.saving_vamsas_doc", - new Object[] { choice.getName() })); + 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; @@ -2253,15 +2312,15 @@ 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); @@ -2269,7 +2328,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements { JvOptionPane.showInternalMessageDialog(Desktop.desktop, - warnmsg, warnttl, JvOptionPane.ERROR_MESSAGE); + warnmsg, warnttl, JvOptionPane.ERROR_MESSAGE); } } } @@ -2294,8 +2353,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements } if (b) { - vamUpdate = this.addProgressPanel(MessageManager - .getString("label.updating_vamsas_session")); + vamUpdate = this.addProgressPanel( + MessageManager.getString("label.updating_vamsas_session")); } vamsasStart.setVisible(!b); vamsasStop.setVisible(!b); @@ -2339,17 +2398,18 @@ public class Desktop extends jalview.jbgui.GDesktop implements // SEQUENCE_ID which is not the default EMBL_EBI link ListIterator li = links.listIterator(); boolean check = false; - List urls = new ArrayList(); + List urls = new ArrayList<>(); while (li.hasNext()) { String link = li.next(); if (link.contains(SEQUENCE_ID) - && !link.equals(UrlConstants.DEFAULT_STRING)) + && !UrlConstants.isDefaultString(link)) { check = true; int barPos = link.indexOf("|"); - String urlMsg = barPos == -1 ? link : link.substring(0, - barPos) + ": " + link.substring(barPos + 1); + String urlMsg = barPos == -1 ? link + : link.substring(0, barPos) + ": " + + link.substring(barPos + 1); urls.add(new JLabel(urlMsg)); } } @@ -2363,12 +2423,10 @@ public class Desktop extends jalview.jbgui.GDesktop implements 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")); + 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) { @@ -2398,7 +2456,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements } } }); - } + } /** * Proxy class for JDesktopPane which optionally displays the current memory @@ -2434,6 +2492,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements Thread worker = new Thread(this); worker.start(); } + repaint(); } public boolean isShowMemoryUsage() @@ -2487,24 +2546,16 @@ public class Desktop extends jalview.jbgui.GDesktop implements FontMetrics fm = g.getFontMetrics(); if (fm != null) { - g.drawString(MessageManager.formatMessage( - "label.memory_stats", - new Object[] { df.format(totalFreeMemory), - df.format(maxMemory), df.format(percentUsage) }), 10, - getHeight() - fm.getHeight()); + g.drawString(MessageManager.formatMessage("label.memory_stats", + new Object[] + { df.format(totalFreeMemory), df.format(maxMemory), + df.format(percentUsage) }), + 10, getHeight() - fm.getHeight()); } } } } - /** - * fixes stacking order after a modal dialog to ensure windows that should be - * on top actually are - */ - public void relayerWindows() - { - - } /** * Accessor method to quickly get all the AlignmentFrames loaded. @@ -2525,7 +2576,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements { return null; } - List avp = new ArrayList(); + List avp = new ArrayList<>(); // REVERSE ORDER for (int i = frames.length - 1; i > -1; i--) { @@ -2570,7 +2621,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements { return null; } - List avp = new ArrayList(); + List avp = new ArrayList<>(); // REVERSE ORDER for (int i = frames.length - 1; i > -1; i--) { @@ -2602,7 +2653,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements jalview.bin.Cache.log.error("Groovy Shell Creation failed.", ex); JvOptionPane.showInternalMessageDialog(Desktop.desktop, - MessageManager.getString("label.couldnt_create_groovy_shell"), + MessageManager.getString("label.couldnt_create_groovy_shell"), MessageManager.getString("label.groovy_support_failed"), JvOptionPane.ERROR_MESSAGE); } @@ -2658,9 +2709,10 @@ public class Desktop extends jalview.jbgui.GDesktop implements */ protected void addQuitHandler() { - getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put( - KeyStroke.getKeyStroke(KeyEvent.VK_Q, Toolkit - .getDefaultToolkit().getMenuShortcutKeyMask()), "Quit"); + getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW) + .put(KeyStroke.getKeyStroke(KeyEvent.VK_Q, + Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), + "Quit"); getRootPane().getActionMap().put("Quit", new AbstractAction() { @Override @@ -2712,8 +2764,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements { if (progressBars == null) { - progressBars = new Hashtable(); - progressBarHandlers = new Hashtable(); + progressBars = new Hashtable<>(); + progressBarHandlers = new Hashtable<>(); } if (progressBars.get(new Long(id)) != null) @@ -2744,9 +2796,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements if (progressBarHandlers == null || !progressBars.containsKey(new Long(id))) { - throw new Error( - MessageManager - .getString("error.call_setprogressbar_before_registering_handler")); + throw new Error(MessageManager.getString( + "error.call_setprogressbar_before_registering_handler")); } progressBarHandlers.put(new Long(id), handler); final JPanel progressPanel = progressBars.get(new Long(id)); @@ -2762,10 +2813,10 @@ public class Desktop extends jalview.jbgui.GDesktop implements public void actionPerformed(ActionEvent e) { handler.cancelActivity(id); - us.setProgressBar(MessageManager.formatMessage( - "label.cancelled_params", - new Object[] { ((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); @@ -2798,7 +2849,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements { if (desktop != null) { - AlignmentPanel[] aps = getAlignmentPanels(viewport.getSequenceSetId()); + AlignmentPanel[] aps = getAlignmentPanels( + viewport.getSequenceSetId()); for (int panel = 0; aps != null && panel < aps.length; panel++) { if (aps[panel] != null && aps[panel].av == viewport) @@ -2867,8 +2919,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements if (Cache.getDefault("SHOW_JWS2_SERVICES", true)) { - t2 = jalview.ws.jws2.Jws2Discoverer.getDiscoverer().startDiscoverer( - changeSupport); + t2 = jalview.ws.jws2.Jws2Discoverer.getDiscoverer() + .startDiscoverer(changeSupport); } Thread t3 = null; { @@ -2884,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()); } @@ -2940,20 +2991,16 @@ public class Desktop extends jalview.jbgui.GDesktop implements * * 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); + 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; } @@ -2962,8 +3009,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements } 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); } } @@ -3003,9 +3050,9 @@ public class Desktop extends jalview.jbgui.GDesktop implements { if (progress != null) { - progress.setProgressBar(MessageManager.formatMessage( - "status.opening_params", new Object[] { url }), this - .hashCode()); + progress.setProgressBar(MessageManager + .formatMessage("status.opening_params", new Object[] + { url }), this.hashCode()); } jalview.util.BrowserLauncher.openURL(url); } catch (Exception ex) @@ -3061,8 +3108,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements } else { - System.err.println("Couldn't handle string " + url - + " as a URL."); + System.err.println( + "Couldn't handle string " + url + " as a URL."); } } // ignore any exceptions due to dud links. @@ -3138,10 +3185,11 @@ public class Desktop extends jalview.jbgui.GDesktop implements { 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); + 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()); @@ -3254,9 +3302,9 @@ public class Desktop extends jalview.jbgui.GDesktop implements 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())); + 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(); @@ -3281,10 +3329,10 @@ public class Desktop extends jalview.jbgui.GDesktop implements 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())); + 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); } @@ -3310,14 +3358,67 @@ public class Desktop extends jalview.jbgui.GDesktop implements 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 + Transferable t) throws Exception { DataFlavor uriListFlavor = new DataFlavor( - "text/uri-list;class=java.lang.String"); + "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 @@ -3345,63 +3446,112 @@ public class Desktop extends jalview.jbgui.GDesktop implements // fallback to text: workaround - on OSX where there's a JVM bug Cache.log.debug("standard URIListFlavor failed. Trying text"); // try text fallback - data = (String) t.getTransferData(new DataFlavor( - "text/plain;class=java.lang.String")); - if (Cache.log.isDebugEnabled()) + DataFlavor textDf = new DataFlavor( + "text/plain;class=java.lang.String"); + if (t.isDataFlavorSupported(textDf)) { - Cache.log.debug("fallback returned " + data); + data = (String) t.getTransferData(textDf); } + + Cache.log.debug("Plain text drop content returned " + + (data == null ? "Null - failed" : data)); + } - 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();) + if (data != null) { - added = true; - String s = st.nextToken(); - if (s.startsWith("#")) + while (protocols.size() < files.size()) { - // 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()); + Cache.log.debug("Adding missing FILE protocol for " + + files.get(protocols.size())); + protocols.add(DataSourceType.FILE); } - else + for (java.util.StringTokenizer st = new java.util.StringTokenizer( + data, "\r\n"); st.hasMoreTokens();) { - // 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()); + 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) { - Cache.log - .debug("Couldn't resolve drop data. Here are the supported flavors:"); - for (DataFlavor fl : t.getTransferDataFlavors()) + + if (t.getTransferDataFlavors() != null + && t.getTransferDataFlavors().length > 0) { - 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( + "Couldn't resolve drop data. Here are the supported flavors:"); + for (DataFlavor fl : t.getTransferDataFlavors()) { - Cache.log.debug("Retrieved nothing"); + 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); + } } } } @@ -3416,4 +3566,41 @@ public class Desktop extends jalview.jbgui.GDesktop implements { 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; + } }