X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=src%2Fjalview%2Futil%2FImageMaker.java;fp=src%2Fjalview%2Futil%2FImageMaker.java;h=e32dfeef0ec5bcf125f93405688ecc7b5b58944d;hp=8abe96574bbfbacad6f088e26ce9529e6b082fa7;hb=fd78187d73394a2a6358ba8666ba409ee51b59d5;hpb=20dd6fc13a9d903dc580939e7f2722bc9b043c4f

diff --git a/src/jalview/util/ImageMaker.java b/src/jalview/util/ImageMaker.java
index 8abe965..e32dfee 100755
--- a/src/jalview/util/ImageMaker.java
+++ b/src/jalview/util/ImageMaker.java
@@ -20,10 +20,12 @@
  */
 package jalview.util;
 
+import jalview.bin.Cache;
 import jalview.bin.Jalview;
 import jalview.gui.EPSOptions;
 import jalview.gui.SVGOptions;
 import jalview.io.JalviewFileChooser;
+import jalview.io.JalviewFileView;
 
 import java.awt.Component;
 import java.awt.Graphics;
@@ -99,14 +101,14 @@ public class ImageMaker
     {
       JalviewFileChooser chooser;
       chooser = type.getChooser();
-      chooser.setFileView(new jalview.io.JalviewFileView());
+      chooser.setFileView(new JalviewFileView());
       chooser.setDialogTitle(title);
       chooser.setToolTipText(MessageManager.getString("action.save"));
       int value = chooser.showSaveDialog(parent);
 
-      if (value == jalview.io.JalviewFileChooser.APPROVE_OPTION)
+      if (value == JalviewFileChooser.APPROVE_OPTION)
       {
-        jalview.bin.Cache.setProperty("LAST_DIRECTORY", chooser
+        Cache.setProperty("LAST_DIRECTORY", chooser
                 .getSelectedFile().getParent());
         file = chooser.getSelectedFile();
       }
@@ -177,7 +179,7 @@ public class ImageMaker
   {
     boolean accurateText = true;
 
-    String renderStyle = jalview.bin.Cache.getDefault("EPS_RENDERING",
+    String renderStyle = Cache.getDefault("EPS_RENDERING",
             "Prompt each time");
 
     // If we need to prompt, and if the GUI is visible then
@@ -231,7 +233,7 @@ public class ImageMaker
     g2 = new SVGGraphics2D(width, height);
     Graphics2D ig2 = g2;
 
-    String renderStyle = jalview.bin.Cache.getDefault("SVG_RENDERING",
+    String renderStyle = Cache.getDefault("SVG_RENDERING",
             "Prompt each time");
 
     // If we need to prompt, and if the GUI is visible then
@@ -265,7 +267,7 @@ public class ImageMaker
       return null;
     }
     return new jalview.io.JalviewFileChooser(
-            jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[]
+            Cache.getProperty("LAST_DIRECTORY"), new String[]
             { "png" }, new String[]
             { "Portable network graphics" }, "Portable network graphics");
   }
@@ -276,8 +278,8 @@ public class ImageMaker
     {
       return null;
     }
-    return new jalview.io.JalviewFileChooser(
-            jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[]
+    return new JalviewFileChooser(
+            Cache.getProperty("LAST_DIRECTORY"), new String[]
             { "eps" }, new String[]
             { "Encapsulated Postscript" }, "Encapsulated Postscript");
   }
@@ -288,8 +290,8 @@ public class ImageMaker
   {
       return null;
     }
-    return new jalview.io.JalviewFileChooser(
-            jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[]
+    return new JalviewFileChooser(
+            Cache.getProperty("LAST_DIRECTORY"), new String[]
             { "svg" }, new String[]
             { "Scalable Vector Graphics" }, "Scalable Vector Graphics");
   }