X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFileLoader.java;h=9b06fdd9af28f158a0542ca9f31defbf86986422;hb=43a03edb3830394e554e22060f62ad459a8f2a2b;hp=1785e89b9a118dd79d51438654f0f15a63e333ef;hpb=5874ca652d08909c74d422552eb03a996112316d;p=jalview.git

diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java
index 1785e89..9b06fdd 100755
--- a/src/jalview/io/FileLoader.java
+++ b/src/jalview/io/FileLoader.java
@@ -22,9 +22,9 @@ package jalview.io;
 import jalview.gui.AlignFrame;
 import jalview.gui.Jalview2XML;
 import javax.swing.JOptionPane;
+
+import jalview.gui.*;
 import jalview.datamodel.*;
-import jalview.gui.Desktop;
-import jalview.datamodel.SequenceI;
 import java.util.Vector;
 import java.util.StringTokenizer;
 
@@ -33,11 +33,11 @@ public class FileLoader
   String file;
   String protocol;
   String format;
-  AlignmentI alignment;
+  AlignViewport viewport;
 
-  public void LoadFile(AlignmentI alignment, String file, String protocol, String format)
+  public void LoadFile(AlignViewport viewport, String file, String protocol, String format)
   {
-    this.alignment = alignment;
+    this.viewport = viewport;
     LoadFile(file, protocol, format);
   }
 
@@ -122,8 +122,11 @@ public class FileLoader
     AlignFrame af;
 
 
+
     public void run()
     {
+      Desktop.instance.startLoading(file);
+
       SequenceI[] sequences = null;
 
       if (format.equalsIgnoreCase("Jalview"))
@@ -148,10 +151,12 @@ public class FileLoader
 
         if ( (sequences != null) && (sequences.length > 0))
         {
-          if(alignment!=null)
+          if(viewport!=null)
           {
             for(int i=0; i<sequences.length; i++)
-              alignment.addSequence(sequences[i]);
+              viewport.getAlignment().addSequence(sequences[i]);
+
+              viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());
           }
           else
           {
@@ -187,6 +192,8 @@ public class FileLoader
       {
         updateRecentlyOpened();
       }
+
+      Desktop.instance.stopLoading();
     }
   }