X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FDesktop.java;fp=src%2Fjalview%2Fgui%2FDesktop.java;h=207bba044004ccf20ebc1dea1df20557bf553da7;hb=e4496f5b27c5a01a1cc494653bd3f9f49080d544;hp=7d0eb7f0fe562638ebbac244c8346c1f7db35fef;hpb=dfc0108321583d7a9b88357b079316397d3a107f;p=jalview.git

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 7d0eb7f..207bba0 100644
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -716,7 +716,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
         FileFormatI format = new IdentifyFile().identify(file,
                 DataSourceType.PASTE);
 
-        new FileLoader().LoadFile(file, DataSourceType.PASTE, format);
+        new FileLoader().LoadFile(null, file, DataSourceType.PASTE, format);
 
       }
     } catch (Exception ex)
@@ -1016,7 +1016,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
             format = new IdentifyFile().identify(file, protocol);
           }
 
-          new FileLoader().LoadFile(file, protocol, format);
+          new FileLoader().LoadFile(null, file, protocol, format);
 
         }
       } catch (Exception ex)
@@ -1072,15 +1072,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements
         }
       }
 
-      if (viewport != null)
-      {
-        new FileLoader().LoadFile(viewport, choice, DataSourceType.FILE,
-                format);
-      }
-      else
-      {
-        new FileLoader().LoadFile(choice, DataSourceType.FILE, format);
-      }
+      new FileLoader().LoadFile(viewport, choice, DataSourceType.FILE,
+              format);
     }
   }
 
@@ -1133,16 +1126,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements
 
     if (url.toLowerCase().endsWith(".jar"))
     {
-      if (viewport != null)
-      {
         new FileLoader().LoadFile(viewport, url, DataSourceType.URL,
                 FileFormat.Jalview);
-      }
-      else
-      {
-        new FileLoader().LoadFile(url, DataSourceType.URL,
-                FileFormat.Jalview);
-      }
     }
     else
     {
@@ -1167,15 +1152,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
         return;
       }
 
-      if (viewport != null)
-      {
-        new FileLoader()
-                .LoadFile(viewport, url, DataSourceType.URL, format);
-      }
-      else
-      {
-        new FileLoader().LoadFile(url, DataSourceType.URL, format);
-      }
+      new FileLoader().LoadFile(viewport, url, DataSourceType.URL, format);
     }
   }