X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFileLoader.java;h=4ec464a060ed13f0a27b2524e02f5067347d5e5c;hb=7ab5d6b0ba5fec1ea4a4239e79c476d841622485;hp=199486500ebba3fa17fd00fdd0d6445b01ae734b;hpb=0e2054d29bc49351f000d478659dc3c4371b251c;p=jalview.git diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java index 1994865..4ec464a 100755 --- a/src/jalview/io/FileLoader.java +++ b/src/jalview/io/FileLoader.java @@ -1,19 +1,21 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1) + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) * Copyright (C) 2014 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.io; @@ -305,7 +307,7 @@ public class FileLoader implements Runnable error = format + "\n" + error; } } - + if ((al != null) && (al.getHeight() > 0)) { if (viewport != null) @@ -324,15 +326,19 @@ public class FileLoader implements Runnable alignFrame = new AlignFrame(al, AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT); - 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 (!protocol.equals(AppletFormatAdapter.PASTE)) alignFrame.setFileName(file, format); 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' + // 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); } @@ -362,7 +368,8 @@ public class FileLoader implements Runnable public void run() { JOptionPane.showInternalMessageDialog(Desktop.desktop, - errorMessage, MessageManager.getString("label.error_loading_file"), + errorMessage, MessageManager + .getString("label.error_loading_file"), JOptionPane.WARNING_MESSAGE); } }); @@ -387,8 +394,10 @@ public class FileLoader implements Runnable public void run() { javax.swing.JOptionPane.showInternalMessageDialog( - Desktop.desktop, MessageManager.formatMessage("label.problems_opening_file", new String[]{file}), - MessageManager.getString("label.file_open_error"), + Desktop.desktop, MessageManager.formatMessage( + "label.problems_opening_file", new String[] + { file }), MessageManager + .getString("label.file_open_error"), javax.swing.JOptionPane.WARNING_MESSAGE); } });