X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFileLoader.java;h=26aff08d94833f4a8bbdbb55939107b3b7515879;hb=b9926a366ae75eb28250166fba939d2f9bcf185f;hp=d2d477ed11354ffc3a7374a0b2a8539f67ed0503;hpb=7a79aff7269435b0719c9cd4f30893b81fa2f7b0;p=jalview.git

diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java
index d2d477e..26aff08 100755
--- a/src/jalview/io/FileLoader.java
+++ b/src/jalview/io/FileLoader.java
@@ -1,3 +1,22 @@
+/*
+* Jalview - A Sequence Alignment Editor and Viewer
+* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+*
+* 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 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.
+*
+* 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
+*/
+
 package jalview.io;
 
 import jalview.gui.AlignFrame;
@@ -6,7 +25,6 @@ import javax.swing.JOptionPane;
 import jalview.datamodel.Alignment;
 import jalview.gui.Desktop;
 import jalview.datamodel.SequenceI;
-import jalview.gui.Preferences;
 
 public class FileLoader
 {
@@ -25,7 +43,7 @@ public class FileLoader
     {
       try
       {
-        Thread.sleep(50);
+        Thread.sleep(500);
       }
       catch (Exception ex)
       {}
@@ -62,7 +80,7 @@ public class FileLoader
     {
       if (FormatAdapter.formats.contains(format))
       {
-        sequences = FormatAdapter.readFile(file, protocol, format);
+        sequences = new FormatAdapter().readFile(file, protocol, format);
       }
 
       if ( (sequences != null) && (sequences.length > 0))
@@ -77,7 +95,7 @@ public class FileLoader
 
         try
         {
-          af.setMaximum(Preferences.showFullscreen);
+          af.setMaximum(jalview.bin.Cache.getDefault("SHOW_FULLSCREEN", false));
         }
         catch (Exception ex)
         {