JAL-3210 Improvements to eclipse detection. New src tree and SwingJS updated from...

[jalview.git] / src / jalview / io / IdentifyFile.java

diff --git a/src/jalview/io/IdentifyFile.java b/src/jalview/io/IdentifyFile.java
index ed67af8..621cfac 100755 (executable)
--- a/src/jalview/io/IdentifyFile.java
+++ b/src/jalview/io/IdentifyFile.java
@@ -151,7 +151,7 @@ public class IdentifyFile
         {
           for (int i = 0; !isBinary && i < data.length(); i++)
           {
-            char c = data.charAt(i);
+            int c = data.charAt(i);
             isBinary = (c < 32 && c != '\t' && c != '\n' && c != '\r'
                     && c != 5 && c != 27); // nominal binary character filter
             // excluding CR, LF, tab,DEL and ^E
@@ -165,11 +165,12 @@ 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;
+              break;
             }
           }
           if (!lineswereskipped && data.startsWith("PK"))
@@ -452,6 +453,11 @@ public class IdentifyFile
     return true;
   }
 
+  /**
+   * 
+   * @param args
+   * @j2sIgnore
+   */
   public static void main(String[] args)
   {
     for (int i = 0; args != null && i < args.length; i++)