X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FAppletFormatAdapter.java;h=4916bb3b44b7bedda13e5869b2cdda36920e5c47;hb=9a20ebe6844fd13b704e5b73fe752bd00230aba6;hp=8c376fcfbfd3c5ea7f681e09f4d8b32c099a87d8;hpb=b879c4a2d32d3489e63ac06917e81637e6bb4068;p=jalview.git diff --git a/src/jalview/io/AppletFormatAdapter.java b/src/jalview/io/AppletFormatAdapter.java index 8c376fc..4916bb3 100755 --- a/src/jalview/io/AppletFormatAdapter.java +++ b/src/jalview/io/AppletFormatAdapter.java @@ -30,6 +30,7 @@ import jalview.datamodel.PDBEntry.Type; import jalview.datamodel.SequenceI; import jalview.ext.jmol.JmolParser; import jalview.structure.StructureImportSettings; +import jalview.util.Platform; import java.io.File; import java.io.IOException; @@ -158,7 +159,9 @@ public class AppletFormatAdapter this.selectedFile = selectedFile; if (selectedFile != null) + { this.inFile = selectedFile.getPath(); + } this.inFile = file; try { @@ -434,7 +437,9 @@ public class AppletFormatAdapter public static DataSourceType checkProtocol(Object dataObject) { if(dataObject instanceof File) + { return DataSourceType.FILE; + } String data = dataObject.toString(); DataSourceType protocol = DataSourceType.PASTE; @@ -444,7 +449,7 @@ public class AppletFormatAdapter { protocol = DataSourceType.URL; } - else if (jalview.bin.Jalview.isJS()) + else if (Platform.isJS()) { protocol = DataSourceType.RELATIVE_URL; } @@ -455,6 +460,10 @@ public class AppletFormatAdapter return protocol; } + /** + * @param args + * @j2sIgnore + */ public static void main(String[] args) { int i = 0;