import jalview.api.FeaturesDisplayedI;
import jalview.datamodel.ColumnSelection;
import jalview.datamodel.SequenceI;
-import jalview.schemes.ColourSchemeI;
import java.io.IOException;
import java.io.StringReader;
public static final String FILE_DESC = "HTML";
- private ColourSchemeI colourScheme;
+ private String globalColourScheme;
private boolean showSeqFeatures;
@Override
public void parse() throws IOException
{
+ Element content = null;
+ Document doc = null;
try
{
- Element content = null;
- Document doc = null;
- try {
- StringBuilder htmlData = new StringBuilder();
- String currentLine;
- while ((currentLine = nextLine()) != null)
- {
- htmlData.append(currentLine);
- }
-
- doc = Jsoup.parse(htmlData.toString());
- } catch (OutOfMemoryError oom) {
- errormessage = "Not enough memory to process HTML document";
- throw new IOException(errormessage);
+ StringBuilder htmlData = new StringBuilder();
+ String currentLine;
+ while ((currentLine = nextLine()) != null)
+ {
+ htmlData.append(currentLine);
}
- content = doc.getElementById("seqData");
-
- JSONFile jsonFile = new JSONFile().parse(new StringReader(content.val()));
+ doc = Jsoup.parse(htmlData.toString());
+ } catch (OutOfMemoryError oom)
+ {
+ errormessage = "Not enough memory to process HTML document";
+ throw new IOException(errormessage);
+ }
+
+ 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");
+ }
+
+ 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.colourScheme = jsonFile.getColourScheme();
+ this.globalColourScheme = jsonFile.getGlobalColourScheme();
this.hiddenSequences = jsonFile.getHiddenSequences();
this.columnSelection = jsonFile.getColumnSelection();
this.displayedFeatures = jsonFile.getDisplayedFeatures();
} catch (Exception e)
{
- errormessage = "Failed to extract data from HTML document.";
- throw new IOException("Unexpected exception whilst extracting JSon from HTML.",e);
+ throw e;
}
}
-
@Override
public String print()
{
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()