X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fio%2FHtmlFile.java;h=e31e78dcc2551fcf2c80df2059c05d0d10834b07;hb=d7361eaa08dc9af7d996851f39b7a2007d1b8832;hp=fd0789311d7cceed503b84604b1180e961bf7230;hpb=e2d6753e8cf3c5eaf8bccf34f4f5e9d651e9cb8e;p=jalview.git
diff --git a/src/jalview/io/HtmlFile.java b/src/jalview/io/HtmlFile.java
index fd07893..e31e78d 100644
--- a/src/jalview/io/HtmlFile.java
+++ b/src/jalview/io/HtmlFile.java
@@ -1,24 +1,55 @@
+/*
+ * 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.schemes.ColourSchemeI;
+import jalview.api.ComplexAlignFile;
+import jalview.api.FeatureSettingsModelI;
+import jalview.api.FeaturesDisplayedI;
+import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.SequenceI;
import java.io.IOException;
+import java.io.StringReader;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
-public class HtmlFile extends AlignFile
+public class HtmlFile extends AlignFile implements ComplexAlignFile
{
public static final String FILE_EXT = "html";
public static final String FILE_DESC = "HTML";
- private ColourSchemeI colourScheme;
+ private String globalColourScheme;
private boolean showSeqFeatures;
+ private ColumnSelection columnSelection;
+
+ private SequenceI[] hiddenSequences;
+
+ private FeaturesDisplayedI displayedFeatures;
+
public HtmlFile()
{
super();
@@ -37,6 +68,8 @@ public class HtmlFile extends AlignFile
@Override
public void parse() throws IOException
{
+ Element content = null;
+ Document doc = null;
try
{
StringBuilder htmlData = new StringBuilder();
@@ -45,38 +78,54 @@ public class HtmlFile extends AlignFile
{
htmlData.append(currentLine);
}
+ doc = Jsoup.parse(htmlData.toString());
+ } catch (OutOfMemoryError oom)
+ {
+ errormessage = "Not enough memory to process HTML document";
+ throw new IOException(errormessage);
+ }
- Document doc = Jsoup.parse(htmlData.toString());
- Element content = doc.getElementById("seqData");
- String alignmentJsonString = content.val();
+ try
+ {
+ boolean contentFromDiv = true;
+ // search for BioJSON data in div element with id seqData
+ content = doc.select("div[id=seqData]").first();
+ if (content == null)
+ {
+ contentFromDiv = false;
+ // search for BioJSON data in input element with id seqData
+ content = doc.getElementById("seqData");
+ }
- JSONFile jsonFile = new JSONFile().parse(alignmentJsonString);
- seqs = jsonFile.seqs;
- seqGroups = jsonFile.seqGroups;
- annotations = jsonFile.annotations;
- showSeqFeatures = jsonFile.isShowSeqFeatures();
- colourScheme = jsonFile.getColourScheme();
+ if (content == null)
+ {
+ errormessage = "The html document is not embedded with BioJSON data";
+ throw new IOException(errormessage);
+ }
+ JSONFile jsonFile = new JSONFile().parse(new StringReader(
+ contentFromDiv ? content.text() : content.val()));
+ this.seqs = jsonFile.getSeqs();
+ this.seqGroups = jsonFile.getSeqGroups();
+ this.annotations = jsonFile.getAnnotations();
+ this.showSeqFeatures = jsonFile.isShowSeqFeatures();
+ this.globalColourScheme = jsonFile.getGlobalColourScheme();
+ this.hiddenSequences = jsonFile.getHiddenSequences();
+ this.columnSelection = jsonFile.getColumnSelection();
+ this.displayedFeatures = jsonFile.getDisplayedFeatures();
} catch (Exception e)
{
- e.printStackTrace();
+ throw e;
}
}
- public void LoadAlignmentFeatures(AlignFrame af)
- {
- af.setShowSeqFeatures(isShowSeqFeatures());
- af.changeColour(getColourScheme());
- af.setMenusForViewport();
- }
-
-
@Override
public String print()
{
throw new UnsupportedOperationException(
- "Print method of HtmlFile not yet supported!");
+ "Print method of HtmlFile is not supported!");
}
+ @Override
public boolean isShowSeqFeatures()
{
return showSeqFeatures;
@@ -87,14 +136,58 @@ public class HtmlFile extends AlignFile
this.showSeqFeatures = showSeqFeatures;
}
- public ColourSchemeI getColourScheme()
+ @Override
+ public String getGlobalColourScheme()
+ {
+ return globalColourScheme;
+ }
+
+ public void setColourScheme(String globalColourScheme)
+ {
+ this.globalColourScheme = globalColourScheme;
+ }
+
+ @Override
+ public ColumnSelection getColumnSelection()
+ {
+ return columnSelection;
+ }
+
+ public void setColumnSelection(ColumnSelection columnSelection)
+ {
+ this.columnSelection = columnSelection;
+ }
+
+ @Override
+ public SequenceI[] getHiddenSequences()
+ {
+ return hiddenSequences;
+ }
+
+ public void setHiddenSequences(SequenceI[] hiddenSequences)
{
- return colourScheme;
+ this.hiddenSequences = hiddenSequences;
}
- public void setColourScheme(ColourSchemeI colourScheme)
+ @Override
+ public FeaturesDisplayedI getDisplayedFeatures()
+ {
+ return displayedFeatures;
+ }
+
+ /**
+ * Returns a descriptor for suitable feature display settings with
+ *
+ * - ResNums or insertions features visible
+ * - insertions features coloured red
+ * - ResNum features coloured by label
+ * - Insertions displayed above (on top of) ResNums
+ *
+ */
+ @Override
+ public FeatureSettingsModelI getFeatureColourScheme()
{
- this.colourScheme = colourScheme;
+ return new PDBFeatureSettings();
}
}