X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FIdentifyFile.java;h=c21127ee201140c2b12bded740ab3278afd648c1;hb=d1cf4609268fb7fbae0716b6e699a130eea02647;hp=e7ee711989df0c4de8228147e5f57f0f37b4c493;hpb=f42cec3b999bbed0ce85045760b55701c527da32;p=jalview.git diff --git a/src/jalview/io/IdentifyFile.java b/src/jalview/io/IdentifyFile.java index e7ee711..c21127e 100755 --- a/src/jalview/io/IdentifyFile.java +++ b/src/jalview/io/IdentifyFile.java @@ -20,6 +20,8 @@ */ package jalview.io; +import java.util.Locale; + import java.io.File; import java.io.IOException; @@ -31,12 +33,14 @@ import java.io.IOException; */ public class IdentifyFile { - - public FileFormatI identify(Object file, DataSourceType protocol) throws FileFormatException + + public FileFormatI identify(Object file, DataSourceType protocol) + throws FileFormatException { // BH 2018 - return (file instanceof File ? identify((File) file, protocol) : identify((String) file, protocol)); - + return (file instanceof File ? identify((File) file, protocol) + : identify((String) file, protocol)); + } public FileFormatI identify(File file, DataSourceType sourceType) @@ -165,8 +169,8 @@ public class IdentifyFile if (source.inFile != null) { String fileStr = source.inFile.getName(); - if (fileStr.contains(".jar") - || fileStr.contains(".zip") || fileStr.contains(".jvp")) + if (fileStr.contains(".jar") || fileStr.contains(".zip") + || fileStr.contains(".jvp")) { // possibly a Jalview archive (but check further) reply = FileFormat.Jalview; @@ -178,7 +182,7 @@ public class IdentifyFile break; } } - data = data.toUpperCase(); + data = data.toUpperCase(Locale.ROOT); if (data.startsWith(ScoreMatrixFile.SCOREMATRIX)) { @@ -332,7 +336,7 @@ public class IdentifyFile if ((lessThan > -1)) // possible Markup Language data i.e HTML, // RNAML, XML { - String upper = data.toUpperCase(); + String upper = data.toUpperCase(Locale.ROOT); if (upper.substring(lessThan).startsWith("