X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FGeneticCodes.java;h=137b7f8316e8b21e4e75b581fd81dfbe65e30c18;hb=c491024e7256817870ff7d53f35ea55db045681d;hp=d07253ee429db9975fc012afad7d975bb89830a7;hpb=e0f2d3774e2392feed462fa1707d0fb10602a1e1;p=jalview.git

diff --git a/src/jalview/analysis/GeneticCodes.java b/src/jalview/analysis/GeneticCodes.java
index d07253e..137b7f8 100644
--- a/src/jalview/analysis/GeneticCodes.java
+++ b/src/jalview/analysis/GeneticCodes.java
@@ -65,7 +65,7 @@ public final class GeneticCodes
       loadAmbiguityCodes(AMBIGUITY_CODES_FILE);
       loadCodes(RESOURCE_FILE);
     }
-  };
+  }
 
   /**
    * Returns the singleton instance of this class
@@ -117,6 +117,11 @@ public final class GeneticCodes
     try
     {
       InputStream is = getClass().getResourceAsStream(fileName);
+      if (is == null)
+      {
+        System.err.println("Resource file not found: " + fileName);
+        return;
+      }
       BufferedReader dataIn = new BufferedReader(new InputStreamReader(is));
 
       /*
@@ -136,9 +141,15 @@ public final class GeneticCodes
     } catch (IOException | NullPointerException e)
     {
       Cache.log.error(
-              "Error reading genetic codes data file: "
+              "Error reading genetic codes data file " + fileName + ": "
               + e.getMessage());
     }
+    if (codeTables.isEmpty())
+    {
+      System.err.println(
+              "No genetic code tables loaded, check format of file "
+                      + fileName);
+    }
   }
 
   /**
@@ -157,6 +168,11 @@ public final class GeneticCodes
     try
     {
       InputStream is = getClass().getResourceAsStream(fileName);
+      if (is == null)
+      {
+        System.err.println("Resource file not found: " + fileName);
+        return;
+      }
       BufferedReader dataIn = new BufferedReader(new InputStreamReader(is));
       String line = "";
       while (line != null)
@@ -165,8 +181,16 @@ public final class GeneticCodes
         if (line != null && !"DNA".equals(line.toUpperCase()))
         {
           String[] tokens = line.split("\\t");
+          if (tokens.length == 2)
+          {
           ambiguityCodes.put(tokens[0].toUpperCase(),
                   tokens[1].toUpperCase());
+          }
+          else
+          {
+            System.err.println(
+                    "Unexpected data in " + fileName + ": " + line);
+          }
         }
       }
     } catch (IOException e)