Excluded HtmlFile.java dependencies from AppletFomatAdapter

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

diff --git a/src/jalview/io/FormatAdapter.java b/src/jalview/io/FormatAdapter.java
index c2a317a..416773d 100755 (executable)
--- a/src/jalview/io/FormatAdapter.java
+++ b/src/jalview/io/FormatAdapter.java
@@ -21,7 +21,13 @@
 package jalview.io;
 
 import jalview.api.AlignViewportI;
-import jalview.datamodel.*;
+import jalview.datamodel.Alignment;
+import jalview.datamodel.AlignmentAnnotation;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.Sequence;
+import jalview.datamodel.SequenceGroup;
+import jalview.datamodel.SequenceI;
 
 /**
  * Additional formatting methods used by the application in a number of places.
@@ -154,8 +160,10 @@ public class FormatAdapter extends AppletFormatAdapter
   public boolean getCacheSuffixDefault(String format)
   {
     if (isValidFormat(format))
+    {
       return jalview.bin.Cache.getDefault(format.toUpperCase()
               + "_JVSUFFIX", true);
+    }
     return false;
   }
 
@@ -227,6 +235,41 @@ public class FormatAdapter extends AppletFormatAdapter
     return this.formatSequences(format, alignment, suffix);
   }
 
+  public Alignment readFile(String inFile, String type, String format)
+          throws java.io.IOException
+  {
+    Alignment al;
+    if (format.equals("HTML"))
+    {
+      afile = new HtmlFile(inFile, type);
+      al = new Alignment(afile.getSeqsAsArray());
+      afile.addAnnotations(al);
+    }
+    else
+    {
+      al = super.readFile(inFile, type, format);
+    }
+
+    return al;
+  }
+
+  public AlignmentI readFromFile(FileParse source, String format)
+          throws java.io.IOException
+  {
+    Alignment al;
+    if (format.equals("HTML"))
+    {
+      afile = new HtmlFile(source);
+      al = new Alignment(afile.getSeqsAsArray());
+      afile.addAnnotations(al);
+    }
+    else
+    {
+      al = (Alignment) super.readFromFile(source, format);
+    }
+    return al;
+  }
+
   /**
    * validate format is valid for IO in Application. This is basically the
    * AppletFormatAdapter.isValidFormat call with additional checks for