git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3446 from applet -- reload; also fixes some repaint issues
[jalview.git]
/
src
/
jalview
/
io
/
AppletFormatAdapter.java
diff --git
a/src/jalview/io/AppletFormatAdapter.java
b/src/jalview/io/AppletFormatAdapter.java
index
8c376fc
..
f01bfdc
100755
(executable)
--- 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.datamodel.SequenceI;
import jalview.ext.jmol.JmolParser;
import jalview.structure.StructureImportSettings;
+import jalview.util.Platform;
import java.io.File;
import java.io.IOException;
import java.io.File;
import java.io.IOException;
@@
-157,9
+158,7
@@
public class AppletFormatAdapter
{
this.selectedFile = selectedFile;
{
this.selectedFile = selectedFile;
- if (selectedFile != null)
- this.inFile = selectedFile.getPath();
- this.inFile = file;
+ inFile = (selectedFile == null ? file : selectedFile.getPath());
try
{
if (fileFormat.isStructureFile())
try
{
if (fileFormat.isStructureFile())
@@
-434,7
+433,9
@@
public class AppletFormatAdapter
public static DataSourceType checkProtocol(Object dataObject)
{
if(dataObject instanceof File)
public static DataSourceType checkProtocol(Object dataObject)
{
if(dataObject instanceof File)
+ {
return DataSourceType.FILE;
return DataSourceType.FILE;
+ }
String data = dataObject.toString();
DataSourceType protocol = DataSourceType.PASTE;
String data = dataObject.toString();
DataSourceType protocol = DataSourceType.PASTE;
@@
-444,7
+445,7
@@
public class AppletFormatAdapter
{
protocol = DataSourceType.URL;
}
{
protocol = DataSourceType.URL;
}
- else if (jalview.bin.Jalview.isJS())
+ else if (Platform.isJS())
{
protocol = DataSourceType.RELATIVE_URL;
}
{
protocol = DataSourceType.RELATIVE_URL;
}
@@
-455,6
+456,10
@@
public class AppletFormatAdapter
return protocol;
}
return protocol;
}
+ /**
+ * @param args
+ * @j2sIgnore
+ */
public static void main(String[] args)
{
int i = 0;
public static void main(String[] args)
{
int i = 0;