X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FBioJsHTMLOutput.java;h=f5a4136f04fc6bf6253c83c52c6c0e3abf8ee919;hb=4d7f98a6dd54d9863ba449ec79dcd95d25ed863d;hp=089f50b0ed03b389508055fd7d74f8d7c2f073af;hpb=a8aec438cd92c74061c89487b2431a52bb0c2799;p=jalview.git

diff --git a/src/jalview/io/BioJsHTMLOutput.java b/src/jalview/io/BioJsHTMLOutput.java
index 089f50b..f5a4136 100644
--- a/src/jalview/io/BioJsHTMLOutput.java
+++ b/src/jalview/io/BioJsHTMLOutput.java
@@ -1,10 +1,11 @@
 package jalview.io;
 
+import jalview.api.AlignExportSettingI;
 import jalview.api.AlignmentViewPanel;
 import jalview.datamodel.AlignmentExportData;
 import jalview.exceptions.NoFileSelectedException;
-import jalview.json.binding.v1.BioJSReleasePojo;
-import jalview.json.binding.v1.BioJSRepositoryPojo;
+import jalview.json.binding.biojs.BioJSReleasePojo;
+import jalview.json.binding.biojs.BioJSRepositoryPojo;
 import jalview.util.MessageManager;
 
 import java.io.BufferedInputStream;
@@ -19,7 +20,6 @@ import java.net.URL;
 import java.util.Objects;
 import java.util.TreeMap;
 
-
 public class BioJsHTMLOutput
 {
   private AlignmentViewPanel ap;
@@ -37,7 +37,7 @@ public class BioJsHTMLOutput
   public static final String BJS_TEMPLATE_GIT_REPO = jalview.bin.Cache
           .getDefault(
                   "biojs_template_git_repo",
-                  "https://raw.githubusercontent.com/tcofoegbu/bjs-template/master/package.json");
+                  "https://raw.githubusercontent.com/jalview/exporter-templates/master/biojs/package.json");
 
   public BioJsHTMLOutput(AlignmentViewPanel ap)
   {
@@ -53,9 +53,48 @@ public class BioJsHTMLOutput
     {
       String outputFile = getOutputFile();
       // String jalviewAlignmentJson = JSONFile.getJSONData(ap);
+      AlignExportSettingI exportSettings = new AlignExportSettingI()
+      {
+        @Override
+        public boolean isExportHiddenSequences()
+        {
+          return true;
+        }
+
+        @Override
+        public boolean isExportHiddenColumns()
+        {
+          return true;
+        }
+
+        @Override
+        public boolean isExportAnnotations()
+        {
+          return true;
+        }
+
+        @Override
+        public boolean isExportFeatures()
+        {
+          return true;
+        }
+
+        @Override
+        public boolean isExportGroups()
+        {
+          return true;
+        }
+
+        @Override
+        public boolean isCancelled()
+        {
+          return false;
+        }
+
+      };
       AlignmentExportData exportData = jalview.gui.AlignFrame
-              .getAlignmentForExport(
-              JSONFile.FILE_DESC, ap.getAlignViewport());
+              .getAlignmentForExport(JSONFile.FILE_DESC,
+                      ap.getAlignViewport(), exportSettings);
       if (exportData.getSettings().isCancelled())
       {
         return;
@@ -68,8 +107,7 @@ public class BioJsHTMLOutput
 
       String bioJSTemplateString = getBioJsTemplateAsString();
       String generatedBioJsWithJalviewAlignmentAsJson = bioJSTemplateString
-              .replaceAll(
-"#sequenceData#", jalviewAlignmentJson)
+              .replaceAll("#sequenceData#", jalviewAlignmentJson)
               .toString();
 
       PrintWriter out = new java.io.PrintWriter(new java.io.FileWriter(
@@ -91,15 +129,13 @@ public class BioJsHTMLOutput
   {
     String selectedFile = null;
     JalviewFileChooser jvFileChooser = new JalviewFileChooser(
-            jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[]
-            { "html" }, new String[]
-            { "HTML files" }, "HTML files");
+            jalview.bin.Cache.getProperty("LAST_DIRECTORY"),
+            new String[] { "html" }, new String[] { "HTML files" },
+            "HTML files");
     jvFileChooser.setFileView(new JalviewFileView());
 
-    // TODO uncomment when supported by MassageManager
     jvFileChooser.setDialogTitle(MessageManager
             .getString("label.save_as_biojs_html"));
-    jvFileChooser.setDialogTitle("save as BioJs HTML");
     jvFileChooser.setToolTipText(MessageManager.getString("action.save"));
 
     int fileChooserOpt = jvFileChooser.showSaveDialog(null);
@@ -116,9 +152,7 @@ public class BioJsHTMLOutput
     return selectedFile;
   }
 
-
-  public static String getBioJsTemplateAsString()
-          throws IOException
+  public static String getBioJsTemplateAsString() throws IOException
   {
     InputStreamReader isReader = null;
     BufferedReader buffReader = null;
@@ -201,10 +235,13 @@ public class BioJsHTMLOutput
         try
         {
           String gitRepoPkgJson = getURLContentAsString(BJS_TEMPLATE_GIT_REPO);
-          BioJSRepositoryPojo release = new BioJSRepositoryPojo(
-                  gitRepoPkgJson);
-          syncUpdates(BJS_TEMPLATES_LOCAL_DIRECTORY, release);
-          refreshBioJSVersionsInfo(BJS_TEMPLATES_LOCAL_DIRECTORY);
+          if (gitRepoPkgJson != null)
+          {
+            BioJSRepositoryPojo release = new BioJSRepositoryPojo(
+                    gitRepoPkgJson);
+            syncUpdates(BJS_TEMPLATES_LOCAL_DIRECTORY, release);
+            refreshBioJSVersionsInfo(BJS_TEMPLATES_LOCAL_DIRECTORY);
+          }
         } catch (URISyntaxException e)
         {
           e.printStackTrace();
@@ -215,7 +252,6 @@ public class BioJsHTMLOutput
 
   }
 
-
   public static void syncUpdates(String localDir, BioJSRepositoryPojo repo)
   {
     for (BioJSReleasePojo bjsRelease : repo.getReleases())