X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFileLoader.java;h=cd9258c36416bc9c21e2f1eb4065928cdf5eb0d9;hb=a40bbc57a85658544e2e5d7cc2a7596b762566dc;hp=6cb1212e179215cf48625351e1af54b32e35dc81;hpb=506d60f0e188723ddc91c26824b41ac7034df3fe;p=jalview.git diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java index 6cb1212..cd9258c 100755 --- a/src/jalview/io/FileLoader.java +++ b/src/jalview/io/FileLoader.java @@ -1,29 +1,40 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4) - * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * - * This program 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 2 - * of the License, or (at your option) any later version. + * This file is part of Jalview. * - * This program 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. + * 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. + * + * 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 this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.io; -import java.util.*; +import jalview.datamodel.AlignmentI; +import jalview.datamodel.PDBEntry; +import jalview.datamodel.SequenceI; +import jalview.gui.AlignFrame; +import jalview.gui.AlignViewport; +import jalview.gui.Desktop; +import jalview.gui.Jalview2XML; +import jalview.structure.StructureSelectionManager; +import jalview.util.MessageManager; -import javax.swing.*; +import java.util.StringTokenizer; +import java.util.Vector; -import jalview.datamodel.*; -import jalview.gui.*; +import javax.swing.JOptionPane; +import javax.swing.SwingUtilities; public class FileLoader implements Runnable { @@ -59,7 +70,7 @@ public class FileLoader implements Runnable * construct a Fileloader that may raise errors non-interactively * * @param raiseGUI - * true if errors are to be raised as GUI dialog boxes + * true if errors are to be raised as GUI dialog boxes */ public FileLoader(boolean raiseGUI) { @@ -140,6 +151,7 @@ public class FileLoader implements Runnable public AlignFrame LoadFileWaitTillLoaded(FileParse source, String format) { this.source = source; + file = source.getInFile(); protocol = source.type; this.format = format; @@ -173,7 +185,12 @@ public class FileLoader implements Runnable public void updateRecentlyOpened() { Vector recent = new Vector(); - + if (protocol.equals(FormatAdapter.PASTE)) + { + // do nothing if the file was pasted in as text... there is no filename to + // refer to it as. + return; + } String type = protocol.equals(FormatAdapter.FILE) ? "RECENT_FILE" : "RECENT_URL"; @@ -237,16 +254,18 @@ public class FileLoader implements Runnable format = new IdentifyFile().Identify(file, protocol); } } + // TODO: cache any stream datasources as a temporary file (eg. PDBs + // retrieved via URL) if (Desktop.desktop != null && Desktop.desktop.isShowMemoryUsage()) { System.gc(); memused = (rt.maxMemory() - rt.totalMemory() + rt.freeMemory()); // free - // memory - // before - // load + // memory + // before + // load } loadtime = -System.currentTimeMillis(); - Alignment al = null; + AlignmentI al = null; if (format.equalsIgnoreCase("Jalview")) { @@ -257,7 +276,7 @@ public class FileLoader implements Runnable .println("IMPLEMENTATION ERROR: Cannot read consecutive Jalview XML projects from a stream."); // We read the data anyway - it might make sense. } - alignFrame = new Jalview2XML(raiseGUI).LoadJalviewAlign(file); + alignFrame = new Jalview2XML(raiseGUI).loadJalviewAlign(file); } else { @@ -295,29 +314,57 @@ public class FileLoader implements Runnable if ((al != null) && (al.getHeight() > 0)) { - if (viewport != null) + for (SequenceI sq : al.getSequences()) { - for (int i = 0; i < al.getHeight(); i++) + while (sq.getDatasetSequence() != null) { - viewport.getAlignment().addSequence(al.getSequenceAt(i)); + sq = sq.getDatasetSequence(); + } + if (sq.getPDBId() != null) + { + for (PDBEntry pdbe : sq.getPDBId()) + { + StructureSelectionManager.getStructureSelectionManager( + Desktop.instance).registerPDBEntry(pdbe); + } } - viewport.firePropertyChange("alignment", null, viewport - .getAlignment().getSequences()); - + } + if (viewport != null) + { + viewport.addAlignment(al, title); } else { alignFrame = new AlignFrame(al, AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT); - alignFrame.statusBar.setText("Successfully loaded file " - + title); + alignFrame.statusBar.setText(MessageManager.formatMessage( + "label.successfully_loaded_file", new String[] + { title })); if (!protocol.equals(AppletFormatAdapter.PASTE)) + { alignFrame.setFileName(file, format); + } + if (source instanceof HtmlFile) + { + ((HtmlFile) source).LoadAlignmentFeatures(alignFrame); + } + else if (source instanceof JSONFile) + { + ((JSONFile) source).LoadAlignmentFeatures(alignFrame); + } - 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 { @@ -344,7 +391,8 @@ public class FileLoader implements Runnable public void run() { JOptionPane.showInternalMessageDialog(Desktop.desktop, - errorMessage, "Error loading file", + errorMessage, MessageManager + .getString("label.error_loading_file"), JOptionPane.WARNING_MESSAGE); } }); @@ -369,8 +417,10 @@ public class FileLoader implements Runnable public void run() { javax.swing.JOptionPane.showInternalMessageDialog( - Desktop.desktop, "Encountered problems opening " + file - + "!!", "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); } }); @@ -390,11 +440,8 @@ public class FileLoader implements Runnable javax.swing.JOptionPane .showInternalMessageDialog( Desktop.desktop, - "Out of memory loading file " - + file - + "!!" - + "\nSee help files for increasing Java Virtual Machine memory.", - "Out of memory", + MessageManager.formatMessage("warn.out_of_memory_loading_file", new String[]{file}), + MessageManager.getString("label.out_of_memory"), javax.swing.JOptionPane.WARNING_MESSAGE); } }); @@ -408,10 +455,10 @@ public class FileLoader implements Runnable // System.gc(); memused = memused - (rt.maxMemory() - rt.totalMemory() + rt.freeMemory()); // difference - // in free - // memory - // after - // load + // in free + // memory + // after + // load if (Desktop.desktop != null && Desktop.desktop.isShowMemoryUsage()) { if (alignFrame != null)