X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fio%2FHTMLOutput.java;h=eb44180a9095157205893ec98f1c05f6de52b2f3;hb=f4b18ae31d37e694b59875f26e0863179de248f1;hp=3a7b441c1db0063e0747abc1de2154e12eac066e;hpb=2cbf9d005db462396fa1dc0750aa63a2e6cd0735;p=jalview.git

diff --git a/src/jalview/io/HTMLOutput.java b/src/jalview/io/HTMLOutput.java
index 3a7b441..eb44180 100644
--- a/src/jalview/io/HTMLOutput.java
+++ b/src/jalview/io/HTMLOutput.java
@@ -20,16 +20,6 @@
  */
 package jalview.io;
 
-import jalview.api.AlignExportSettingI;
-import jalview.datamodel.AlignExportSettingBeanI;
-import jalview.datamodel.AlignmentExportData;
-import jalview.exceptions.NoFileSelectedException;
-import jalview.gui.AlignmentPanel;
-import jalview.gui.IProgressIndicator;
-import jalview.util.MessageManager;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -37,103 +27,73 @@ import java.io.InputStreamReader;
 import java.net.URL;
 import java.util.Objects;
 
+import jalview.api.AlignExportSettingsI;
+import jalview.bin.Cache;
+import jalview.datamodel.AlignExportSettingsAdapter;
+import jalview.datamodel.AlignmentExportData;
+import jalview.gui.AlignmentPanel;
+import jalview.gui.IProgressIndicator;
+import jalview.util.MessageManager;
+
 public abstract class HTMLOutput implements Runnable
 {
   protected AlignmentPanel ap;
 
+  /*
+   * key for progress or status messages
+   */
   protected long pSessionId;
 
+  /*
+   * (optional) place to write progress messages to
+   */
   protected IProgressIndicator pIndicator;
 
   protected File generatedFile;
 
-  public HTMLOutput(AlignmentPanel ap)
-  {
-    if (ap != null)
-    {
-      this.ap = ap;
-      this.pIndicator = ap.alignFrame;
-    }
-  }
+  String _bioJson = null;
 
-  String _bioJson=null;
-  public String getBioJSONData()
+  private String description;
+
+  /**
+   * Constructor given an alignment panel (which should not be null)
+   * 
+   * @param ap
+   * @param desc
+   */
+  public HTMLOutput(AlignmentPanel ap, String desc)
   {
-    if (_bioJson==null) {
-      getBioJSONData(null);
-    }
-    return _bioJson;
+    this.ap = ap;
+    this.pIndicator = ap.alignFrame;
+    this.description = desc;
+    this.pSessionId = System.currentTimeMillis();
   }
 
-  public void getBioJSONData(AlignExportSettingBeanI exportSettings)
+  /**
+   * Gets the BioJSON data as a string, with lazy evaluation (first time called
+   * only). If the output format is configured not to embed BioJSON, returns
+   * null.
+   * 
+   * @return
+   */
+  public String getBioJSONData()
   {
     if (!isEmbedData())
     {
-      return;
+      return null;
     }
-    if (exportSettings == null)
+    if (_bioJson == null)
     {
-      exportSettings = new AlignExportSettingBeanI()
-      {
-        @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;
-        }
-        
-      };
+      AlignExportSettingsI options = new AlignExportSettingsAdapter(true);
+      AlignmentExportData exportData = ap.getAlignViewport()
+              .getAlignExportData(options);
+      _bioJson = new FormatAdapter(ap, options).formatSequences(
+              FileFormat.Json, exportData.getAlignment(),
+              exportData.getOmitHidden(), exportData.getStartEndPostions(),
+              ap.getAlignViewport().getAlignment().getHiddenColumns());
     }
-    AlignExportSettingI exportDataSettings = jalview.gui.AlignFrame
-            .getAlignmentForExport(FileFormat.Json, ap,
-                    exportSettings);
-    exportDataSettings.addActionListener(new ActionListener()
-    {
-      
-      @Override
-      public void actionPerformed(ActionEvent e)
-      {
-        AlignmentExportData exportData = exportDataSettings.getAlignExportData();
-        _bioJson = new FormatAdapter(ap, exportData.getSettings())
-                .formatSequences(FileFormat.Json, exportData.getAlignment(),
-                        exportData.getOmitHidden(),
-                        exportData.getStartEndPostions(), ap.getAlignViewport()
-                                .getAlignment().getHiddenColumns());
-        
-      }
-    
-      
-    });
-    exportDataSettings.doShowSettings();
+
+    return _bioJson;
   }
 
   /**
@@ -238,15 +198,15 @@ public abstract class HTMLOutput implements Runnable
 
   }
 
-  public String getOutputFile() throws NoFileSelectedException
+  /**
+   * Prompts the user to choose an output file and returns the file path, or
+   * null on Cancel
+   * 
+   * @return
+   */
+  public String getOutputFile()
   {
     String selectedFile = null;
-    if (pIndicator != null && !isHeadless())
-    {
-      pIndicator.setProgressBar(MessageManager.formatMessage(
-              "status.waiting_for_user_to_select_output_file", "HTML"),
-              pSessionId);
-    }
 
     // TODO: JAL-3048 generate html rendered view (requires SvgGraphics and/or
     // Jalview HTML rendering system- probably not required for Jalview-JS)
@@ -261,14 +221,11 @@ public abstract class HTMLOutput implements Runnable
     int fileChooserOpt = jvFileChooser.showSaveDialog(null);
     if (fileChooserOpt == JalviewFileChooser.APPROVE_OPTION)
     {
-      jalview.bin.Cache.setProperty("LAST_DIRECTORY",
+      Cache.setProperty("LAST_DIRECTORY",
               jvFileChooser.getSelectedFile().getParent());
       selectedFile = jvFileChooser.getSelectedFile().getPath();
     }
-    else
-    {
-      throw new NoFileSelectedException("No file was selected.");
-    }
+
     return selectedFile;
   }
 
@@ -297,16 +254,6 @@ public abstract class HTMLOutput implements Runnable
 
   /**
    * This method provides implementation of consistent behaviour which should
-   * occur before a HTML file export. It MUST be called at the start of the
-   * exportHTML() method implementation.
-   */
-  protected void exportStarted()
-  {
-    pSessionId = System.currentTimeMillis();
-  }
-
-  /**
-   * This method provides implementation of consistent behaviour which should
    * occur after a HTML file export. It MUST be called at the end of the
    * exportHTML() method implementation.
    */
@@ -314,14 +261,17 @@ public abstract class HTMLOutput implements Runnable
   {
     if (isLaunchInBrowserAfterExport() && !isHeadless())
     {
+      /*
       try
       {
-        jalview.util.BrowserLauncher
-                .openURL("file:///" + getExportedFile());
+      */
+      jalview.util.BrowserLauncher.openURL("file:///" + getExportedFile());
+      /*
       } catch (IOException e)
       {
         e.printStackTrace();
       }
+      */
     }
   }
 
@@ -346,13 +296,51 @@ public abstract class HTMLOutput implements Runnable
    * 
    * @return
    */
-  public abstract File getExportedFile();
+  public File getExportedFile()
+  {
+    return generatedFile;
+  }
+
+  public void exportHTML(String outputFile)
+  {
+    setProgressMessage(MessageManager.formatMessage(
+            "status.exporting_alignment_as_x_file", getDescription()));
+    try
+    {
+      if (outputFile == null)
+      {
+        /*
+         * prompt for output file
+         */
+        outputFile = getOutputFile();
+        if (outputFile == null)
+        {
+          setProgressMessage(MessageManager.formatMessage(
+                  "status.cancelled_image_export_operation",
+                  getDescription()));
+          return;
+        }
+      }
+      generatedFile = new File(outputFile);
+    } catch (Exception e)
+    {
+      setProgressMessage(MessageManager
+              .formatMessage("info.error_creating_file", getDescription()));
+      e.printStackTrace();
+      return;
+    }
+    new Thread(this).start();
+
+  }
 
   /**
-   * This is the main method to handle the HTML generation.
+   * Answers a short description of the image format suitable for display in
+   * messages
    * 
-   * @param outputFile
-   *          the file path of the generated HTML
+   * @return
    */
-  public abstract void exportHTML(String outputFile);
+  protected final String getDescription()
+  {
+    return description;
+  }
 }
\ No newline at end of file