X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FHtmlFile.java;h=92562785557cc57492dace2cab363cadbc99913f;hb=51d3b1944c2c400e157dec7910c047c9521ba872;hp=e31e78dcc2551fcf2c80df2059c05d0d10834b07;hpb=37de9310bec3501cbc6381e0c3dcb282fcaad812;p=jalview.git diff --git a/src/jalview/io/HtmlFile.java b/src/jalview/io/HtmlFile.java index e31e78d..9256278 100644 --- a/src/jalview/io/HtmlFile.java +++ b/src/jalview/io/HtmlFile.java @@ -24,7 +24,7 @@ package jalview.io; import jalview.api.ComplexAlignFile; import jalview.api.FeatureSettingsModelI; import jalview.api.FeaturesDisplayedI; -import jalview.datamodel.ColumnSelection; +import jalview.datamodel.HiddenColumns; import jalview.datamodel.SequenceI; import java.io.IOException; @@ -44,7 +44,7 @@ public class HtmlFile extends AlignFile implements ComplexAlignFile private boolean showSeqFeatures; - private ColumnSelection columnSelection; + private HiddenColumns hiddenColumns; private SequenceI[] hiddenSequences; @@ -60,9 +60,10 @@ public class HtmlFile extends AlignFile implements ComplexAlignFile super(source); } - public HtmlFile(String inFile, String type) throws IOException + public HtmlFile(String inFile, DataSourceType sourceType) + throws IOException { - super(inFile, type); + super(inFile, sourceType); } @Override @@ -110,7 +111,7 @@ public class HtmlFile extends AlignFile implements ComplexAlignFile this.showSeqFeatures = jsonFile.isShowSeqFeatures(); this.globalColourScheme = jsonFile.getGlobalColourScheme(); this.hiddenSequences = jsonFile.getHiddenSequences(); - this.columnSelection = jsonFile.getColumnSelection(); + this.hiddenColumns = jsonFile.getHiddenColumns(); this.displayedFeatures = jsonFile.getDisplayedFeatures(); } catch (Exception e) { @@ -119,7 +120,7 @@ public class HtmlFile extends AlignFile implements ComplexAlignFile } @Override - public String print() + public String print(SequenceI[] sqs, boolean jvsuffix) { throw new UnsupportedOperationException( "Print method of HtmlFile is not supported!"); @@ -148,14 +149,14 @@ public class HtmlFile extends AlignFile implements ComplexAlignFile } @Override - public ColumnSelection getColumnSelection() + public HiddenColumns getHiddenColumns() { - return columnSelection; + return hiddenColumns; } - public void setColumnSelection(ColumnSelection columnSelection) + public void setHiddenColumns(HiddenColumns hidden) { - this.columnSelection = columnSelection; + this.hiddenColumns = hidden; } @Override