X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFileLoader.java;fp=src%2Fjalview%2Fio%2FFileLoader.java;h=7387fa268444eceb1f0bfd07f3de77e46a58c7ff;hb=2a9991ef1eb02d97e9c8ed1644f292117ae6f600;hp=aa76da599eb073f84dc9bcd530b8351694145b5e;hpb=2ce465aaa3047e1ef758a26af2fbfcf8626b4a69;p=jalview.git

diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java
index aa76da5..7387fa2 100755
--- a/src/jalview/io/FileLoader.java
+++ b/src/jalview/io/FileLoader.java
@@ -20,13 +20,16 @@
  */
 package jalview.io;
 
+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;
 
@@ -314,6 +317,7 @@ public class FileLoader implements Runnable
 
         if ((al != null) && (al.getHeight() > 0))
         {
+          // construct and register dataset sequences
           for (SequenceI sq : al.getSequences())
           {
             while (sq.getDatasetSequence() != null)
@@ -324,55 +328,73 @@ public class FileLoader implements Runnable
             {
               for (PDBEntry pdbe : sq.getPDBId())
               {
+                // register PDB entries with desktop's structure selection
+                // manager
                 StructureSelectionManager.getStructureSelectionManager(
                         Desktop.instance).registerPDBEntry(pdbe);
               }
             }
           }
+
           if (viewport != null)
           {
+            // append to existing alignment
             viewport.addAlignment(al, title);
           }
           else
           {
-            alignFrame = new AlignFrame(al, AlignFrame.DEFAULT_WIDTH,
-                    AlignFrame.DEFAULT_HEIGHT);
-
-            alignFrame.statusBar.setText(MessageManager.formatMessage(
-                    "label.successfully_loaded_file", new String[]
-                    { title }));
+            // otherwise construct the alignFrame
 
-            if (!protocol.equals(AppletFormatAdapter.PASTE))
-            {
-              alignFrame.setFileName(file, format);
-            }
-            if (source instanceof HtmlFile)
+            if (source instanceof ComplexAlignFile)
             {
-              ((HtmlFile) source).applySettingsToAlignFrame(alignFrame);
+              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);
+
+              alignFrame.getViewport().setShowSequenceFeatures(
+                      showSeqFeatures);
+              alignFrame.changeColour(cs);
             }
-            else if (source instanceof JSONFile)
+            else
             {
-              ((JSONFile) source).applySettingsToAlignFrame(alignFrame);
+              alignFrame = new AlignFrame(al, AlignFrame.DEFAULT_WIDTH,
+                      AlignFrame.DEFAULT_HEIGHT);
             }
+          }
+          // add metadata and update ui
+          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'
-              Desktop.addInternalFrame(alignFrame, title,
-                      AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT);
-            }
+          alignFrame.statusBar.setText(MessageManager.formatMessage(
+                  "label.successfully_loaded_file", new String[]
+                  { title }));
 
-            try
-            {
-              alignFrame.setMaximum(jalview.bin.Cache.getDefault(
-                      "SHOW_FULLSCREEN", false));
-            } catch (java.beans.PropertyVetoException ex)
-            {
-            }
+          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