X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FBioJsHTMLOutput.java;h=9db3df2021214fd62c65c8715c2e8ba44e547ea0;hb=006890b02106eb31841e6e84d75f1027434823e0;hp=52ce845cb4a373c23a7e70221e5b5efcaf8b14f9;hpb=3d0101179759ef157b088ea135423cd909512d9f;p=jalview.git diff --git a/src/jalview/io/BioJsHTMLOutput.java b/src/jalview/io/BioJsHTMLOutput.java index 52ce845..9db3df2 100644 --- a/src/jalview/io/BioJsHTMLOutput.java +++ b/src/jalview/io/BioJsHTMLOutput.java @@ -20,7 +20,6 @@ */ package jalview.io; -import jalview.exceptions.NoFileSelectedException; import jalview.gui.AlignmentPanel; import jalview.gui.OOMWarning; import jalview.json.binding.biojs.BioJSReleasePojo; @@ -41,7 +40,6 @@ import java.util.TreeMap; public class BioJsHTMLOutput extends HTMLOutput { - private static File currentBJSTemplateFile; private static TreeMap bioJsMSAVersions; @@ -58,34 +56,7 @@ public class BioJsHTMLOutput extends HTMLOutput public BioJsHTMLOutput(AlignmentPanel ap) { - super(ap); - } - - @Override - public void exportHTML(String outputFile) - { - exportStarted(); - try - { - if (outputFile == null) - { - outputFile = getOutputFile(); - } - generatedFile = new File(outputFile); - } catch (NoFileSelectedException e) - { - setProgressMessage(MessageManager.formatMessage( - "status.cancelled_image_export_operation", "BioJS MSA")); - return; - } catch (Exception e) - { - setProgressMessage(MessageManager - .formatMessage("info.error_creating_file", "BioJS MSA")); - e.printStackTrace(); - return; - } - new Thread(this).start(); - + super(ap, "BioJS MSA"); } public static void refreshVersionInfo(String dirName) @@ -271,12 +242,6 @@ public class BioJsHTMLOutput extends HTMLOutput } @Override - public File getExportedFile() - { - return generatedFile; - } - - @Override public void run() { try @@ -293,7 +258,7 @@ public class BioJsHTMLOutput extends HTMLOutput out.flush(); out.close(); setProgressMessage(MessageManager - .formatMessage("status.export_complete", "BioJS")); + .formatMessage("status.export_complete", getDescription())); exportCompleted(); } catch (OutOfMemoryError err) @@ -304,7 +269,7 @@ public class BioJsHTMLOutput extends HTMLOutput } catch (Exception e) { setProgressMessage(MessageManager - .formatMessage("info.error_creating_file", "HTML")); + .formatMessage("info.error_creating_file", getDescription())); e.printStackTrace(); }