X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FHtmlFile.java;h=75e99a6c7a6641c78d91523e6a7a71a3cf84c224;hb=a576517d22220abb490437a02c9b37a1f4c2839e;hp=d507362c8cc5188a35eb805977099ee81f3da351;hpb=7ce1382b998c007a78c9b33a3dc331e966eebc4b;p=jalview.git diff --git a/src/jalview/io/HtmlFile.java b/src/jalview/io/HtmlFile.java index d507362..75e99a6 100644 --- a/src/jalview/io/HtmlFile.java +++ b/src/jalview/io/HtmlFile.java @@ -1,6 +1,27 @@ +/* + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors + * + * This file is part of Jalview. + * + * Jalview is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. + * + * Jalview is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. + */ + package jalview.io; -import jalview.gui.AlignFrame; +import jalview.api.AlignViewControllerGuiI; import jalview.schemes.ColourSchemeI; import java.io.IOException; @@ -51,9 +72,9 @@ public class HtmlFile extends AlignFile String alignmentJsonString = content.val(); JSONFile jsonFile = new JSONFile().parse(alignmentJsonString); - seqs = jsonFile.seqs; - seqGroups = jsonFile.seqGroups; - annotations = jsonFile.annotations; + seqs = jsonFile.getSeqs(); + seqGroups = jsonFile.getSeqGroups(); + annotations = jsonFile.getAnnotations(); showSeqFeatures = jsonFile.isShowSeqFeatures(); colourScheme = jsonFile.getColourScheme(); } catch (Exception e) @@ -62,7 +83,7 @@ public class HtmlFile extends AlignFile } } - public void applySettingsToAlignFrame(AlignFrame af) + public void applySettingsToAlignFrame(AlignViewControllerGuiI af) { af.setShowSeqFeatures(isShowSeqFeatures()); af.changeColour(getColourScheme());