X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FHtmlFile.java;fp=src%2Fjalview%2Fio%2FHtmlFile.java;h=4805b8e6434caa8efa48c5987de4d1bfdc803bb3;hb=f06554784411ddbf871d642e66c8dcb7f147d4a8;hp=0f5cd5515d96a7c66387d7598ce8fb0271529113;hpb=cf06ee5d732af6cc874115aece1138adafca8ad7;p=jalview.git

diff --git a/src/jalview/io/HtmlFile.java b/src/jalview/io/HtmlFile.java
index 0f5cd55..4805b8e 100644
--- a/src/jalview/io/HtmlFile.java
+++ b/src/jalview/io/HtmlFile.java
@@ -68,26 +68,33 @@ public class HtmlFile extends AlignFile implements ComplexAlignFile
   @Override
   public void parse() throws IOException
   {
+    Element content = null;
+    Document doc = null;
     try
     {
-      Element content = null;
-      Document doc = null;
-      try {
-    	  StringBuilder htmlData = new StringBuilder();
-          String currentLine;
-          while ((currentLine = nextLine()) != null)
-          {
-            htmlData.append(currentLine);
-          }
-
-          doc = Jsoup.parse(htmlData.toString());
-      } catch (OutOfMemoryError oom) {
-    	  errormessage = "Not enough memory to process HTML document";
-    	  throw new IOException(errormessage);
+      StringBuilder htmlData = new StringBuilder();
+      String currentLine;
+      while ((currentLine = nextLine()) != null)
+      {
+        htmlData.append(currentLine);
       }
+      doc = Jsoup.parse(htmlData.toString());
+    } catch (OutOfMemoryError oom)
+    {
+      errormessage = "Not enough memory to process HTML document";
+      throw new IOException(errormessage);
+    }
+
+    try
+    {
       content = doc.getElementById("seqData");
-      
-      JSONFile jsonFile = new JSONFile().parse(new StringReader(content.val()));
+      if (content == null)
+      {
+        errormessage = "The html document is not embedded with BioJSON data";
+        throw new IOException(errormessage);
+      }
+      JSONFile jsonFile = new JSONFile().parse(new StringReader(content
+              .val()));
       this.seqs = jsonFile.getSeqs();
       this.seqGroups = jsonFile.getSeqGroups();
       this.annotations = jsonFile.getAnnotations();
@@ -98,8 +105,7 @@ public class HtmlFile extends AlignFile implements ComplexAlignFile
       this.displayedFeatures = jsonFile.getDisplayedFeatures();
     } catch (Exception e)
     {
-      errormessage = "Failed to extract data from HTML document.";
-      throw new IOException("Unexpected exception whilst extracting JSon from HTML.",e);
+      throw e;
     }
   }