X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FHtmlFile.java;h=954d12e5dcd53207fcf36c8f5f1466ced038323f;hb=3fd32306db772b6d6756ca20d33519edeb353c2d;hp=dc14cc03916cf551c25bef3d03ad183a57c17aab;hpb=73d2eb017ebcaff4453d676c0d728f61015d102c;p=jalview.git diff --git a/src/jalview/io/HtmlFile.java b/src/jalview/io/HtmlFile.java index dc14cc0..954d12e 100644 --- a/src/jalview/io/HtmlFile.java +++ b/src/jalview/io/HtmlFile.java @@ -25,7 +25,6 @@ import jalview.api.ComplexAlignFile; import jalview.api.FeaturesDisplayedI; import jalview.datamodel.ColumnSelection; import jalview.datamodel.SequenceI; -import jalview.schemes.ColourSchemeI; import java.io.IOException; import java.io.StringReader; @@ -40,7 +39,7 @@ public class HtmlFile extends AlignFile implements ComplexAlignFile public static final String FILE_DESC = "HTML"; - private ColourSchemeI colourScheme; + private String globalColourScheme; private boolean showSeqFeatures; @@ -103,13 +102,12 @@ public class HtmlFile extends AlignFile implements ComplexAlignFile throw new IOException(errormessage); } JSONFile jsonFile = new JSONFile().parse(new StringReader( - contentFromDiv ? content.text() : content - .val())); + contentFromDiv ? content.text() : content.val())); this.seqs = jsonFile.getSeqs(); this.seqGroups = jsonFile.getSeqGroups(); this.annotations = jsonFile.getAnnotations(); this.showSeqFeatures = jsonFile.isShowSeqFeatures(); - this.colourScheme = jsonFile.getColourScheme(); + this.globalColourScheme = jsonFile.getGlobalColourScheme(); this.hiddenSequences = jsonFile.getHiddenSequences(); this.columnSelection = jsonFile.getColumnSelection(); this.displayedFeatures = jsonFile.getDisplayedFeatures(); @@ -119,7 +117,6 @@ public class HtmlFile extends AlignFile implements ComplexAlignFile } } - @Override public String print() { @@ -137,14 +134,14 @@ public class HtmlFile extends AlignFile implements ComplexAlignFile this.showSeqFeatures = showSeqFeatures; } - public ColourSchemeI getColourScheme() + public String getGlobalColourScheme() { - return colourScheme; + return globalColourScheme; } - public void setColourScheme(ColourSchemeI colourScheme) + public void setColourScheme(String globalColourScheme) { - this.colourScheme = colourScheme; + this.globalColourScheme = globalColourScheme; } public ColumnSelection getColumnSelection()