X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FImageExporter.java;h=657601e6f352751b898375253aee5031e1b9b65a;hb=08fece8cdf7aeee3893e1c63fc94c01ce517e3dd;hp=90b212f06a24ba4dfbfbb9ab80032dc5c39dc5c6;hpb=1d01c9f62d4a2d2070d1296abe79a1e0dc7a3d7d;p=jalview.git

diff --git a/src/jalview/gui/ImageExporter.java b/src/jalview/gui/ImageExporter.java
index 90b212f..657601e 100644
--- a/src/jalview/gui/ImageExporter.java
+++ b/src/jalview/gui/ImageExporter.java
@@ -1,5 +1,31 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.gui;
 
+import java.awt.Component;
+import java.awt.Graphics;
+import java.io.File;
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 import jalview.bin.Cache;
 import jalview.bin.Jalview;
 import jalview.io.JalviewFileChooser;
@@ -7,14 +33,7 @@ import jalview.io.JalviewFileView;
 import jalview.util.ImageMaker;
 import jalview.util.ImageMaker.TYPE;
 import jalview.util.MessageManager;
-import jalview.util.dialogrunner.RunResponse;
-
-import java.awt.Component;
-import java.awt.Graphics;
-import java.io.File;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import javax.swing.JOptionPane;
+import jalview.util.Platform;
 
 /**
  * A class that marshals steps in exporting a view in image graphics format
@@ -40,8 +59,7 @@ public class ImageExporter
    */
   public interface ImageWriterI
   {
-    void exportImage(Graphics g)
-            throws Exception;
+    void exportImage(Graphics g) throws Exception;
   }
 
   private IProgressIndicator messageBoard;
@@ -87,6 +105,12 @@ public class ImageExporter
   public void doExport(File file, Component parent, int width, int height,
           String imageSource)
   {
+    doExport(file, parent, width, height, imageSource, null);
+  }
+
+  public void doExport(File file, Component parent, int width, int height,
+          String imageSource, String renderer)
+  {
     final long messageId = System.currentTimeMillis();
     setStatus(
             MessageManager.formatMessage(
@@ -124,10 +148,11 @@ public class ImageExporter
      * for this as EPS_RENDERING / SVG_RENDERING
      * Always set to Text for JalviewJS as Lineart (glyph fonts) not available
      */
-    String renderStyle = Cache.getDefault(
-            imageType.getName() + "_RENDERING",
-            LineartOptions.PROMPT_EACH_TIME);
-    if (Jalview.isJS())
+    String renderStyle = renderer == null
+            ? Cache.getDefault(imageType.getName() + "_RENDERING",
+                    LineartOptions.PROMPT_EACH_TIME)
+            : renderer;
+    if (Platform.isJS())
     {
       renderStyle = "Text";
     }
@@ -138,25 +163,22 @@ public class ImageExporter
             && !Jalview.isHeadlessMode())
     {
       final File chosenFile = file;
-      RunResponse okAction = new RunResponse(JOptionPane.OK_OPTION)
-      {
-        @Override
-        public void run()
-        {
-          exportImage(chosenFile, !textSelected.get(), width, height,
-                  messageId);
-        }
+      Callable<Void> okAction = () -> {
+        exportImage(chosenFile, !textSelected.get(), width, height,
+                messageId);
+        return null;
       };
       LineartOptions epsOption = new LineartOptions(TYPE.EPS.getName(),
               textSelected);
-      epsOption.setResponseAction(1, new RunResponse(JOptionPane.NO_OPTION)
+      epsOption.setResponseAction(1, new Callable<Void>()
       {
         @Override
-        public void run()
+        public Void call()
         {
           setStatus(MessageManager.formatMessage(
                   "status.cancelled_image_export_operation",
                   imageType.getName()), messageId);
+          return null;
         }
       });
       epsOption.setResponseAction(0, okAction);
@@ -190,10 +212,10 @@ public class ImageExporter
     String type = imageType.getName();
     try
     {
-//      setStatus(
-//              MessageManager.formatMessage(
-//                      "status.exporting_alignment_as_x_file", type),
-//              messageId);
+      // setStatus(
+      // MessageManager.formatMessage(
+      // "status.exporting_alignment_as_x_file", type),
+      // messageId);
       ImageMaker im = new ImageMaker(imageType, width, height, chosenFile,
               title, asLineart);
       imageWriter.exportImage(im.getGraphics());
@@ -203,9 +225,8 @@ public class ImageExporter
               messageId);
     } catch (Exception e)
     {
-      System.out
-              .println(String.format("Error creating %s file: %s", type,
-                      e.toString()));
+      System.out.println(String.format("Error creating %s file: %s", type,
+              e.toString()));
       setStatus(MessageManager.formatMessage("info.error_creating_file",
               type), messageId);
     }