X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFileLoader.java;h=0cd298713579df83ba113ffa73460e1ad5877e0d;hb=2de26e5c27ab904c1921329e7c498560bc0a1e4e;hp=6f07b693f3f382e1ab6f5d7e63d4d942d2f37ed4;hpb=b8a88837ea01a9c6cfdde8bfa160d646eae5dbfe;p=jalview.git
diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java
index 6f07b69..0cd2987 100755
--- a/src/jalview/io/FileLoader.java
+++ b/src/jalview/io/FileLoader.java
@@ -1,28 +1,43 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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;
-import java.util.*;
-
-import javax.swing.*;
-
-import jalview.datamodel.*;
-import jalview.gui.*;
+import jalview.api.ComplexAlignFile;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.ColumnSelection;
+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.schemes.ColourSchemeI;
+import jalview.structure.StructureSelectionManager;
+import jalview.util.MessageManager;
+
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
public class FileLoader implements Runnable
{
@@ -139,6 +154,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;
@@ -252,7 +268,7 @@ public class FileLoader implements Runnable
// load
}
loadtime = -System.currentTimeMillis();
- Alignment al = null;
+ AlignmentI al = null;
if (format.equalsIgnoreCase("Jalview"))
{
@@ -263,7 +279,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
{
@@ -283,7 +299,7 @@ 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.afile; // keep reference for later if necessary.
+ source = fa.getAlignFile(); // keep reference for later if necessary.
}
} catch (java.io.IOException ex)
{
@@ -301,44 +317,85 @@ public class FileLoader implements Runnable
if ((al != null) && (al.getHeight() > 0))
{
- if (viewport != null)
+ // construct and register dataset sequences
+ for (SequenceI sq : al.getSequences())
{
- // TODO: create undo object for this JAL-1101
- 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())
+ {
+ // register PDB entries with desktop's structure selection
+ // manager
+ StructureSelectionManager.getStructureSelectionManager(
+ Desktop.instance).registerPDBEntry(pdbe);
+ }
}
- viewport.firePropertyChange("alignment", null, viewport
- .getAlignment().getSequences());
+ }
+ if (viewport != null)
+ {
+ // append to existing alignment
+ viewport.addAlignment(al, title);
}
else
{
- alignFrame = new AlignFrame(al, AlignFrame.DEFAULT_WIDTH,
- AlignFrame.DEFAULT_HEIGHT);
+ // otherwise construct the alignFrame
- alignFrame.statusBar.setText("Successfully loaded file "
- + title);
-
- if (!protocol.equals(AppletFormatAdapter.PASTE))
- alignFrame.setFileName(file, format);
- if (raiseGUI)
+ if (source instanceof ComplexAlignFile)
{
- // 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,
+ ColumnSelection colSel = ((ComplexAlignFile) source)
+ .getColumnSelection();
+ SequenceI[] hiddenSeqs = ((ComplexAlignFile) source)
+ .getHiddenSequences();
+ boolean showSeqFeatures = ((ComplexAlignFile) source)
+ .isShowSeqFeatures();
+ ColourSchemeI cs = ((ComplexAlignFile) source)
+ .getColourScheme();
+ alignFrame = new AlignFrame(al, hiddenSeqs, colSel,
AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT);
- }
- try
- {
- alignFrame.setMaximum(jalview.bin.Cache.getDefault(
- "SHOW_FULLSCREEN", false));
- } catch (java.beans.PropertyVetoException ex)
+ alignFrame.getViewport().setShowSequenceFeatures(
+ showSeqFeatures);
+ alignFrame.changeColour(cs);
+ }
+ else
{
+ alignFrame = new AlignFrame(al, AlignFrame.DEFAULT_WIDTH,
+ AlignFrame.DEFAULT_HEIGHT);
}
}
+ // 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 }));
+
+ 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)
+ {
+ }
}
else
{
@@ -356,7 +413,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);
}
});
@@ -381,8 +439,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);
}
});
@@ -402,11 +462,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);
}
});