From 7b21db5b8c3f010f481ac13cc13c67d34f3d1d9c Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Fri, 29 Jun 2018 16:39:12 +0100 Subject: [PATCH] JAL-1551 JAL-3048 formatting --- src/jalview/gui/Desktop.java | 135 +++++++++++++++++++++--------------------- 1 file changed, 66 insertions(+), 69 deletions(-) diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java index 65e936c..774dd4c 100644 --- a/src/jalview/gui/Desktop.java +++ b/src/jalview/gui/Desktop.java @@ -344,9 +344,8 @@ public class Desktop extends jalview.jbgui.GDesktop public Desktop() { /** - * A note to implementors. It is ESSENTIAL that any activities that might - * block are spawned off as threads rather than waited for during this - * constructor. + * A note to implementors. It is ESSENTIAL that any activities that might block + * are spawned off as threads rather than waited for during this constructor. */ instance = this; doVamsasClientCheck(); @@ -371,13 +370,12 @@ public class Desktop extends jalview.jbgui.GDesktop // This line prevents Windows Look&Feel resizing all new windows to maximum // if previous window was maximised - desktop.setDesktopManager( - new MyDesktopManager( - (Platform.isWindows() ? new DefaultDesktopManager() - : Platform.isAMac() - ? new AquaInternalFrameManager( - desktop.getDesktopManager()) - : desktop.getDesktopManager()))); + desktop.setDesktopManager(new MyDesktopManager( + (Platform.isWindows() ? new DefaultDesktopManager() + : Platform.isAMac() + ? new AquaInternalFrameManager( + desktop.getDesktopManager()) + : desktop.getDesktopManager()))); Rectangle dims = getLastKnownDimensions(""); if (dims != null) @@ -543,10 +541,10 @@ public class Desktop extends jalview.jbgui.GDesktop * @j2sNative */ { - final Desktop me = this; - // Thread off the news reader, in case there are connection problems. - addDialogThread(new Runnable() - { + final Desktop me = this; + // Thread off the news reader, in case there are connection problems. + addDialogThread(new Runnable() + { @Override public void run() { @@ -556,7 +554,7 @@ public class Desktop extends jalview.jbgui.GDesktop showNews.setVisible(true); Cache.log.debug("Completed news thread."); } - }); + }); } } @@ -983,8 +981,8 @@ public class Desktop extends jalview.jbgui.GDesktop } /** - * Add key bindings to a JInternalFrame so that Ctrl-W and Cmd-W will close - * the window + * Add key bindings to a JInternalFrame so that Ctrl-W and Cmd-W will close the + * window * * @param frame */ @@ -1208,9 +1206,8 @@ public class Desktop extends jalview.jbgui.GDesktop String dialogOption = "label.input_alignment_from_url"; desktop.dialogData = new Object[] { dialogOption, viewport, history }; - desktop.onDialogReturn( - JvOptionPane.showInternalConfirmDialog(desktop, panel, - MessageManager.getString(dialogOption), + desktop.onDialogReturn(JvOptionPane.showInternalConfirmDialog(desktop, + panel, MessageManager.getString(dialogOption), JvOptionPane.OK_CANCEL_OPTION)); // no code may follow this, as SwingJS will not block @@ -1220,7 +1217,6 @@ public class Desktop extends jalview.jbgui.GDesktop } - /** * Opens the CutAndPaste window for the user to paste an alignment in to * @@ -1942,9 +1938,9 @@ public class Desktop extends jalview.jbgui.GDesktop /** * 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. + * 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 */ @@ -2445,8 +2441,7 @@ public class Desktop extends jalview.jbgui.GDesktop /** * Proxy class for JDesktopPane which optionally displays the current memory - * usage and highlights the desktop area with a red bar if free memory runs - * low. + * usage and highlights the desktop area with a red bar if free memory runs low. * * @author AMW */ @@ -2580,7 +2575,7 @@ public class Desktop extends jalview.jbgui.GDesktop JvOptionPane.showInternalMessageDialog(Desktop.desktop, MessageManager.formatMessage("label.couldnt_locate", new Object[] - { url }), + { url }), MessageManager.getString("label.url_not_found"), JvOptionPane.WARNING_MESSAGE); @@ -2691,7 +2686,6 @@ public class Desktop extends jalview.jbgui.GDesktop } } - /** * Accessor method to quickly get all the AlignmentFrames loaded. * @@ -2839,8 +2833,8 @@ public class Desktop extends jalview.jbgui.GDesktop } /** - * Bind Ctrl/Cmd-Q to Quit - for reset as Groovy Console takes over this - * binding when opened + * Bind Ctrl/Cmd-Q to Quit - for reset as Groovy Console takes over this binding + * when opened */ protected void addQuitHandler() { @@ -2973,9 +2967,8 @@ public class Desktop extends jalview.jbgui.GDesktop } /** - * 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. + * This will return the first AlignFrame holding the given viewport instance. It + * will break if there are more than one AlignFrames viewing a particular av. * * @param viewport * @return alignFrame for viewport @@ -3341,8 +3334,8 @@ public class Desktop extends jalview.jbgui.GDesktop /** * 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 + * 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. * @@ -3512,25 +3505,26 @@ public class Desktop extends jalview.jbgui.GDesktop List protocols, DropTargetDropEvent evt, Transferable t) throws Exception { - + // BH 2018 changed List to List to allow for File from SwingJS -// DataFlavor[] flavors = t.getTransferDataFlavors(); -// for (int i = 0; i < flavors.length; i++) { -// if (flavors[i].isFlavorJavaFileListType()) { -// evt.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE); -// List list = (List) t.getTransferData(flavors[i]); -// for (int j = 0; j < list.size(); j++) { -// File file = (File) list.get(j); -// byte[] data = getDroppedFileBytes(file); -// fileName.setText(file.getName() + " - " + data.length + " " + evt.getLocation()); -// JTextArea target = (JTextArea) ((DropTarget) evt.getSource()).getComponent(); -// target.setText(new String(data)); -// } -// dtde.dropComplete(true); -// return; -// } -// + // DataFlavor[] flavors = t.getTransferDataFlavors(); + // for (int i = 0; i < flavors.length; i++) { + // if (flavors[i].isFlavorJavaFileListType()) { + // evt.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE); + // List list = (List) t.getTransferData(flavors[i]); + // for (int j = 0; j < list.size(); j++) { + // File file = (File) list.get(j); + // byte[] data = getDroppedFileBytes(file); + // fileName.setText(file.getName() + " - " + data.length + " " + + // evt.getLocation()); + // JTextArea target = (JTextArea) ((DropTarget) evt.getSource()).getComponent(); + // target.setText(new String(data)); + // } + // dtde.dropComplete(true); + // return; + // } + // DataFlavor uriListFlavor = new DataFlavor( "text/uri-list;class=java.lang.String"), urlFlavour = null; @@ -3548,15 +3542,15 @@ public class Desktop extends jalview.jbgui.GDesktop try { - java.net.URL url = (URL) t.getTransferData(urlFlavour); + 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)); + 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 @@ -3567,7 +3561,7 @@ public class Desktop extends jalview.jbgui.GDesktop "Please ignore plist error - occurs due to problem with java 8 on OSX"); } ; - } + } } catch (Throwable ex) { Cache.log.debug("URL drop handler failed.", ex); @@ -3691,9 +3685,11 @@ public class Desktop extends jalview.jbgui.GDesktop && (source.endsWith(".lnk") || source.endsWith(".url") || source.endsWith(".site"))) { - try { + try + { Object obj = files.get(f); - File lf = (obj instanceof File ? (File) obj : new File((String) obj)); + File lf = (obj instanceof File ? (File) obj + : new File((String) obj)); // process link file to get a URL Cache.log.debug("Found potential link file: " + lf); WindowsShortcut wscfile = new WindowsShortcut(lf); @@ -3702,10 +3698,11 @@ public class Desktop extends jalview.jbgui.GDesktop files.set(f, fullname); Cache.log.debug("Parsed real filename " + fullname + " to extract protocol: " + protocols.get(f)); - } - catch (Exception ex) + } catch (Exception ex) { - Cache.log.error("Couldn't parse "+files.get(f)+" as a link file.",ex); + Cache.log.error( + "Couldn't parse " + files.get(f) + " as a link file.", + ex); } } } @@ -3723,10 +3720,10 @@ public class Desktop extends jalview.jbgui.GDesktop } /** - * 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. + * 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 -- 1.7.10.2