JAL-1641 Further refactoring of JSON export option, introduction of Viewport to the...

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

diff --git a/src/jalview/io/HtmlFile.java b/src/jalview/io/HtmlFile.java
index 7272830..fd07893 100644 (file)
--- a/src/jalview/io/HtmlFile.java
+++ b/src/jalview/io/HtmlFile.java
@@ -15,7 +15,9 @@ public class HtmlFile extends AlignFile
 
   public static final String FILE_DESC = "HTML";
 
-  private ColourSchemeI cs;
+  private ColourSchemeI colourScheme;
+
+  private boolean showSeqFeatures;
 
   public HtmlFile()
   {
@@ -52,6 +54,8 @@ public class HtmlFile extends AlignFile
       seqs = jsonFile.seqs;
       seqGroups = jsonFile.seqGroups;
       annotations = jsonFile.annotations;
+      showSeqFeatures = jsonFile.isShowSeqFeatures();
+      colourScheme = jsonFile.getColourScheme();
     } catch (Exception e)
     {
       e.printStackTrace();
@@ -60,8 +64,8 @@ public class HtmlFile extends AlignFile
 
   public void LoadAlignmentFeatures(AlignFrame af)
   {
-    af.setShowSeqFeatures(JSONFile.isSeqFeaturesEnabled());
-    af.changeColour(JSONFile.getColourScheme());
+    af.setShowSeqFeatures(isShowSeqFeatures());
+    af.changeColour(getColourScheme());
     af.setMenusForViewport();
   }
 
@@ -73,4 +77,24 @@ public class HtmlFile extends AlignFile
             "Print method of HtmlFile not yet supported!");
   }
 
+  public boolean isShowSeqFeatures()
+  {
+    return showSeqFeatures;
+  }
+
+  public void setShowSeqFeatures(boolean showSeqFeatures)
+  {
+    this.showSeqFeatures = showSeqFeatures;
+  }
+
+  public ColourSchemeI getColourScheme()
+  {
+    return colourScheme;
+  }
+
+  public void setColourScheme(ColourSchemeI colourScheme)
+  {
+    this.colourScheme = colourScheme;
+  }
+
 }