From: Jim Procter Date: Thu, 25 Jun 2015 10:06:45 +0000 (+0100) Subject: JAL-1780 JAL-653 JAL-1892 brackets in wrong place broke ‘add to file’ for splitframe... X-Git-Tag: Release_2_10_0~564^2~2 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b418ccd95340c2d930e69c5f1033aa8eac7c7935;p=jalview.git JAL-1780 JAL-653 JAL-1892 brackets in wrong place broke ‘add to file’ for splitframe/cdna/protein also formatted file for clarity --- diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java index 7387fa2..b11dfd5 100755 --- a/src/jalview/io/FileLoader.java +++ b/src/jalview/io/FileLoader.java @@ -299,7 +299,8 @@ public class FileLoader implements Runnable // open a new source and read from it FormatAdapter fa = new FormatAdapter(); al = fa.readFile(file, protocol, format); - source = fa.getAlignFile(); // keep reference for later if necessary. + source = fa.getAlignFile(); // keep reference for later if + // necessary. } } catch (java.io.IOException ex) { @@ -367,34 +368,34 @@ public class FileLoader implements Runnable alignFrame = new AlignFrame(al, AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT); } - } - // add metadata and update ui - if (!protocol.equals(AppletFormatAdapter.PASTE)) - { - alignFrame.setFileName(file, format); - } + // add metadata and update ui + if (!protocol.equals(AppletFormatAdapter.PASTE)) + { + alignFrame.setFileName(file, format); + } - alignFrame.statusBar.setText(MessageManager.formatMessage( - "label.successfully_loaded_file", new String[] - { title })); + alignFrame.statusBar.setText(MessageManager.formatMessage( + "label.successfully_loaded_file", new String[] + { title })); - if (raiseGUI) - { - // add the window to the GUI - // note - this actually should happen regardless of raiseGUI - // status in Jalview 3 - // TODO: define 'virtual desktop' for benefit of headless scripts - // that perform queries to find the 'current working alignment' - Desktop.addInternalFrame(alignFrame, title, - AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT); - } + if (raiseGUI) + { + // add the window to the GUI + // note - this actually should happen regardless of raiseGUI + // status in Jalview 3 + // TODO: define 'virtual desktop' for benefit of headless scripts + // that perform queries to find the 'current working alignment' + Desktop.addInternalFrame(alignFrame, title, + AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT); + } - try - { - alignFrame.setMaximum(jalview.bin.Cache.getDefault( - "SHOW_FULLSCREEN", false)); - } catch (java.beans.PropertyVetoException ex) - { + try + { + alignFrame.setMaximum(jalview.bin.Cache.getDefault( + "SHOW_FULLSCREEN", false)); + } catch (java.beans.PropertyVetoException ex) + { + } } } else @@ -461,12 +462,12 @@ public class FileLoader implements Runnable { public void run() { - javax.swing.JOptionPane - .showInternalMessageDialog( - Desktop.desktop, - MessageManager.formatMessage("warn.out_of_memory_loading_file", new String[]{file}), - MessageManager.getString("label.out_of_memory"), - javax.swing.JOptionPane.WARNING_MESSAGE); + javax.swing.JOptionPane.showInternalMessageDialog( + Desktop.desktop, MessageManager.formatMessage( + "warn.out_of_memory_loading_file", new String[] + { file }), MessageManager + .getString("label.out_of_memory"), + javax.swing.JOptionPane.WARNING_MESSAGE); } }); }