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
Merge branch 'patch/JAL-3874_newJmolAndGradleDedup' into develop
[jalview.git]
/
src
/
jalview
/
io
/
AppletFormatAdapter.java
diff --git
a/src/jalview/io/AppletFormatAdapter.java
b/src/jalview/io/AppletFormatAdapter.java
index
6db04a0
..
e9c9ce2
100755
(executable)
--- a/
src/jalview/io/AppletFormatAdapter.java
+++ b/
src/jalview/io/AppletFormatAdapter.java
@@
-20,6
+20,8
@@
*/
package jalview.io;
*/
package jalview.io;
+import java.util.Locale;
+
import jalview.api.AlignExportSettingsI;
import jalview.api.AlignmentViewPanel;
import jalview.datamodel.Alignment;
import jalview.api.AlignExportSettingsI;
import jalview.api.AlignmentViewPanel;
import jalview.datamodel.Alignment;
@@
-159,7
+161,9
@@
public class AppletFormatAdapter
this.selectedFile = selectedFile;
if (selectedFile != null)
this.selectedFile = selectedFile;
if (selectedFile != null)
+ {
this.inFile = selectedFile.getPath();
this.inFile = selectedFile.getPath();
+ }
this.inFile = file;
try
{
this.inFile = file;
try
{
@@
-435,11
+439,13
@@
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;
- String ft = data.toLowerCase().trim();
+ String ft = data.toLowerCase(Locale.ROOT).trim();
if (ft.indexOf("http:") == 0 || ft.indexOf("https:") == 0
|| ft.indexOf("file:") == 0)
{
if (ft.indexOf("http:") == 0 || ft.indexOf("https:") == 0
|| ft.indexOf("file:") == 0)
{
@@
-456,6
+462,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;