X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fio%2FHtmlFile.java;h=e847c589747b66627f384c2b9dd641c0d2912180;hb=93d63f3c608771bb48b5ac18f761194a1ea28554;hp=3cb7c3fc612c7af895aa948d02e0c7d7780c8587;hpb=2273eba5668e5340354da60fed329c6c716cc439;p=jalview.git

diff --git a/src/jalview/io/HtmlFile.java b/src/jalview/io/HtmlFile.java
index 3cb7c3f..e847c58 100644
--- a/src/jalview/io/HtmlFile.java
+++ b/src/jalview/io/HtmlFile.java
@@ -1,28 +1,51 @@
-package jalview.io;
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 
-import jalview.datamodel.Sequence;
-import jalview.datamodel.SequenceFeature;
-import jalview.gui.AlignFrame;
-import jalview.json.binding.v1.BioJsAlignmentPojo.JalviewBioJsColorSchemeMapper;
-import jalview.schemes.ColourSchemeI;
+package jalview.io;
 
 import java.io.IOException;
-import java.util.Iterator;
+import java.io.StringReader;
 
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 
-public class HtmlFile extends AlignFile
+import jalview.api.ComplexAlignFile;
+import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.SequenceI;
+import jalview.schemes.ColourSchemeI;
+
+public class HtmlFile extends AlignFile implements ComplexAlignFile
 {
-  // public static final String FILE_EXT = "html";
-  //
-  // public static final String FILE_DESC = "HTML";
+  public static final String FILE_EXT = "html";
+
+  public static final String FILE_DESC = "HTML";
 
-  private ColourSchemeI cs;
+  private ColourSchemeI colourScheme;
+
+  private boolean showSeqFeatures;
+
+  private ColumnSelection columnSelection;
+
+  private SequenceI[] hiddenSequences;
 
   public HtmlFile()
   {
@@ -39,7 +62,6 @@ public class HtmlFile extends AlignFile
     super(inFile, type);
   }
 
-  @SuppressWarnings("unchecked")
   @Override
   public void parse() throws IOException
   {
@@ -54,99 +76,66 @@ public class HtmlFile extends AlignFile
 
       Document doc = Jsoup.parse(htmlData.toString());
       Element content = doc.getElementById("seqData");
-
-      String alignmentJsonString = content.val();
-      JSONParser jsonParser = new JSONParser();
-      JSONObject alignmentJsonObj = (JSONObject) jsonParser
-              .parse(alignmentJsonString);
-      JSONArray seqJsonArray = (JSONArray) alignmentJsonObj.get("seqs");
-      String bioJsColourScheme = (String) alignmentJsonObj
-              .get("globalColorScheme");
-      cs = getJalviewColorScheme(bioJsColourScheme);
-
-      for (Iterator<JSONObject> sequenceIter = seqJsonArray.iterator(); sequenceIter
-              .hasNext();)
-      {
-        JSONObject sequence = sequenceIter.next();
-        String sequcenceString = sequence.get("seq").toString();
-        Sequence seq = new Sequence(sequence.get("name").toString(),
-                sequcenceString, Integer.valueOf(sequence.get("start")
-                        .toString()), Integer.valueOf(sequence.get("end")
-                        .toString()));
-
-        JSONArray jsonSeqArray = (JSONArray) sequence.get("features");
-        SequenceFeature[] retrievedSeqFeatures = getJalviewSequenceFeatures(
-                jsonSeqArray, seq);
-        if (retrievedSeqFeatures != null)
-        {
-          seq.setSequenceFeatures(retrievedSeqFeatures);
-        }
-        seqs.add(seq);
-
-      }
+      JSONFile jsonFile = new JSONFile().parse(new StringReader(content.val()));
+      this.seqs = jsonFile.getSeqs();
+      this.seqGroups = jsonFile.getSeqGroups();
+      this.annotations = jsonFile.getAnnotations();
+      this.showSeqFeatures = jsonFile.isShowSeqFeatures();
+      this.colourScheme = jsonFile.getColourScheme();
+      this.hiddenSequences = jsonFile.getHiddenSequences();
+      this.columnSelection = jsonFile.getColumnSelection();
     } catch (Exception e)
     {
       e.printStackTrace();
     }
   }
 
-  public SequenceFeature[] getJalviewSequenceFeatures(
-          JSONArray jsonSeqFeatures, Sequence seq)
+
+  @Override
+  public String print()
   {
-    SequenceFeature[] seqFeatures = null;
-    int count = 0;
-    if (jsonSeqFeatures != null)
-    {
-      seqFeatures = new SequenceFeature[jsonSeqFeatures.size()];
-      for (@SuppressWarnings("unchecked")
-      Iterator<JSONObject> seqFeatureItr = jsonSeqFeatures.iterator(); seqFeatureItr
-              .hasNext();)
-      {
+    throw new UnsupportedOperationException(
+            "Print method of HtmlFile is not supported!");
+  }
 
-        SequenceFeature sequenceFeature = new SequenceFeature();
-        JSONObject jsonFeature = seqFeatureItr.next();
-        Long begin = (Long) jsonFeature.get("xStart");
-        Long end = (Long) jsonFeature.get("xEnd");
-        String type = (String) jsonFeature.get("text");
-        // String color = (String) jsonFeature.get("fillColor");
-
-        sequenceFeature.setBegin(seq.findPosition(begin.intValue()));
-        sequenceFeature.setEnd(seq.findPosition(end.intValue()) - 1);
-        sequenceFeature.setType(type);
-        seqFeatures[count++] = sequenceFeature;
-      }
-    }
-    return seqFeatures;
+  public boolean isShowSeqFeatures()
+  {
+    return showSeqFeatures;
   }
 
-  public void LoadAlignmentFeatures(AlignFrame af)
+  public void setShowSeqFeatures(boolean showSeqFeatures)
   {
+    this.showSeqFeatures = showSeqFeatures;
+  }
 
-    af.setShowSeqFeatures(true);
-    af.changeColour(cs);
-    af.setMenusForViewport();
+  public ColourSchemeI getColourScheme()
+  {
+    return colourScheme;
   }
 
-  private ColourSchemeI getJalviewColorScheme(String bioJsColourSchemeName)
+  public void setColourScheme(ColourSchemeI colourScheme)
   {
-    ColourSchemeI jalviewColor = null;
-    for (JalviewBioJsColorSchemeMapper cs : JalviewBioJsColorSchemeMapper
-            .values())
-    {
-      if (cs.getBioJsName().equals(bioJsColourSchemeName))
-      {
-        jalviewColor = cs.getJvColourScheme();
-        break;
-      }
-    }
-    return jalviewColor;
+    this.colourScheme = colourScheme;
   }
 
-  @Override
-  public String print()
+  public ColumnSelection getColumnSelection()
   {
-    throw new UnsupportedOperationException(
-            "Print method of HtmlFile not yet supported!");
+    return columnSelection;
+  }
+
+  public void setColumnSelection(ColumnSelection columnSelection)
+  {
+    this.columnSelection = columnSelection;
+  }
+
+  public SequenceI[] getHiddenSequences()
+  {
+    return hiddenSequences;
+  }
+
+  public void setHiddenSequences(SequenceI[] hiddenSequences)
+  {
+    this.hiddenSequences = hiddenSequences;
   }
 
 }