JAL-653 trim initial tab in sequence feature ATTRIBUTES

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

diff --git a/src/jalview/io/FormatAdapter.java b/src/jalview/io/FormatAdapter.java
index df5353c..7c117b9 100755 (executable)
--- a/src/jalview/io/FormatAdapter.java
+++ b/src/jalview/io/FormatAdapter.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -37,10 +37,20 @@ import jalview.datamodel.SequenceI;
  */
 public class FormatAdapter extends AppletFormatAdapter
 {
+  public FormatAdapter(AlignViewportI viewport)
+  {
+    super(viewport);
+    init();
+  }
 
   public FormatAdapter()
   {
     super();
+    init();
+  }
+
+  private void init()
+  {
     if (jalview.bin.Cache.getDefault("STRUCT_FROM_PDB", true))
     {
       annotFromStructure = jalview.bin.Cache.getDefault("ADD_TEMPFACT_ANN",
@@ -58,6 +68,7 @@ public class FormatAdapter extends AppletFormatAdapter
       serviceSecondaryStruct = false;
     }
   }
+
   public String formatSequences(String format, SequenceI[] seqs,
           String[] omitHiddenColumns)
   {
@@ -258,35 +269,14 @@ public class FormatAdapter extends AppletFormatAdapter
   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);
-    }
-
+    Alignment 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);
-    }
+    Alignment al = (Alignment) super.readFromFile(source, format);
     return al;
   }
 
@@ -323,4 +313,5 @@ public class FormatAdapter extends AppletFormatAdapter
     return formatSequences(format, getCacheSuffixDefault(format), av, selectedOnly);
   }
 
+
 }