Merge develop to Release_2_8_3_Branch
[jalview.git] / src / jalview / io / BioJsHTMLOutput.java
index db43a3f..d2c4a7f 100644 (file)
@@ -5,7 +5,6 @@ import jalview.datamodel.AlignmentI;
 import jalview.datamodel.SequenceFeature;
 import jalview.datamodel.SequenceI;
 import jalview.exceptions.NoFileSelectedException;
-import jalview.gui.AlignViewport;
 import jalview.gui.AlignmentPanel;
 import jalview.gui.FeatureRenderer;
 import jalview.json.binding.v1.BioJsAlignmentPojo;
@@ -13,6 +12,7 @@ import jalview.json.binding.v1.BioJsFeaturePojo;
 import jalview.json.binding.v1.BioJsSeqPojo;
 import jalview.schemes.ColourSchemeProperty;
 import jalview.util.MessageManager;
+import jalview.viewmodel.AlignmentViewport;
 
 import java.awt.Color;
 import java.io.BufferedReader;
@@ -26,7 +26,7 @@ import com.json.JSONException;
 
 public class BioJsHTMLOutput
 {
-  private AlignViewport av;
+  private AlignmentViewport av;
 
   private jalview.api.FeatureRenderer fr;
 
@@ -137,8 +137,7 @@ public class BioJsHTMLOutput
       seqPojo.setName(name.toString());
       seqPojo.setSeq(seq.getSequenceAsString());
 
-      SequenceFeature[] seqFeatures = seq.getDatasetSequence()
-              .getSequenceFeatures();
+      SequenceFeature[] seqFeatures = seq.getSequenceFeatures();
       if (seqFeatures != null)
       {
         ArrayList<BioJsFeaturePojo> bjsSeqFeatures = new ArrayList<BioJsFeaturePojo>();