JAL-1925 update source version in license

[jalview.git] / src / jalview / io / BioJsHTMLOutput.java

diff --git a/src/jalview/io/BioJsHTMLOutput.java b/src/jalview/io/BioJsHTMLOutput.java
index 9b9be60..8f16566 100644 (file)
--- a/src/jalview/io/BioJsHTMLOutput.java
+++ b/src/jalview/io/BioJsHTMLOutput.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
- * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
+ * Copyright (C) 2015 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -115,20 +115,15 @@ public class BioJsHTMLOutput
       AlignmentExportData exportData = jalview.gui.AlignFrame
               .getAlignmentForExport(JSONFile.FILE_DESC,
                       ap.getAlignViewport(), exportSettings);
-      if (exportData.getSettings().isCancelled())
-      {
-        return;
-      }
-      String jalviewAlignmentJson = new FormatAdapter(ap,
-              exportData.getSettings()).formatSequences(JSONFile.FILE_DESC,
-              exportData.getAlignment(), exportData.getOmitHidden(),
-              exportData.getStartEndPostions(), ap.getAlignViewport()
-                      .getColumnSelection());
+      String bioJSON = new FormatAdapter(ap, exportData.getSettings())
+              .formatSequences(JSONFile.FILE_DESC, exportData
+                      .getAlignment(), exportData.getOmitHidden(),
+                      exportData.getStartEndPostions(), ap
+                              .getAlignViewport().getColumnSelection());
 
       String bioJSTemplateString = getBioJsTemplateAsString();
       String generatedBioJsWithJalviewAlignmentAsJson = bioJSTemplateString
-              .replaceAll("#sequenceData#", jalviewAlignmentJson)
-              .toString();
+              .replaceAll("#sequenceData#", bioJSON).toString();
 
       PrintWriter out = new java.io.PrintWriter(new java.io.FileWriter(
               outputFile));