Formatting

[jalview.git] / src / jalview / util / ImageMaker.java

diff --git a/src/jalview/util/ImageMaker.java b/src/jalview/util/ImageMaker.java
index 9323d0d..632c2ad 100755 (executable)
--- a/src/jalview/util/ImageMaker.java
+++ b/src/jalview/util/ImageMaker.java
@@ -1,6 +1,6 @@
 /*\r
  * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
  *\r
  * This program is free software; you can redistribute it and/or\r
  * modify it under the terms of the GNU General Public License\r
@@ -18,17 +18,15 @@
  */\r
 package jalview.util;\r
 \r
-import java.awt.RenderingHints;\r
-import javax.imageio.ImageIO;\r
-import org.jibble.epsgraphics.EpsGraphics2D;\r
-import jalview.gui.EPSOptions;\r
-import java.awt.Graphics2D;\r
 import java.io.*;\r
-import java.awt.image.BufferedImage;\r
-import java.awt.Graphics;\r
-import jalview.io.*;\r
+import javax.imageio.*;\r
+\r
 import java.awt.*;\r
+import java.awt.image.*;\r
 \r
+import org.jibble.epsgraphics.*;\r
+import jalview.gui.*;\r
+import jalview.io.*;\r
 \r
 public class ImageMaker\r
 {\r
@@ -42,7 +40,7 @@ public class ImageMaker
   BufferedImage bi;\r
 \r
   public ImageMaker(Component parent, int type, String title,\r
-                           int width, int height, File file, String EPStitle)\r
+                    int width, int height, File file, String EPStitle)\r
   {\r
     this.type = type;\r
 \r
@@ -66,16 +64,20 @@ public class ImageMaker
       }\r
     }\r
 \r
-    if(file!=null)\r
+    if (file != null)\r
     {\r
       try\r
       {\r
         out = new FileOutputStream(file);\r
 \r
         if (type == EPS)\r
+        {\r
           setupEPS(width, height, EPStitle);\r
+        }\r
         else\r
+        {\r
           setupPNG(width, height);\r
+        }\r
       }\r
       catch (Exception ex)\r
       {\r
@@ -90,21 +92,21 @@ public class ImageMaker
     return graphics;\r
   }\r
 \r
-\r
   void setupPNG(int width, int height)\r
   {\r
-        bi = new BufferedImage(width, height,\r
-                BufferedImage.TYPE_INT_RGB);\r
-        graphics  = bi.getGraphics();\r
-        Graphics2D ig2 = (Graphics2D) graphics;\r
-        ig2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,\r
-                                 RenderingHints.VALUE_ANTIALIAS_ON);\r
+    bi = new BufferedImage(width, height,\r
+                           BufferedImage.TYPE_INT_RGB);\r
+    graphics = bi.getGraphics();\r
+    Graphics2D ig2 = (Graphics2D) graphics;\r
+    ig2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,\r
+                         RenderingHints.VALUE_ANTIALIAS_ON);\r
   }\r
 \r
   public void writeImage()\r
   {\r
-    try{\r
-      switch(type)\r
+    try\r
+    {\r
+      switch (type)\r
       {\r
         case EPS:\r
           pg.flush();\r
@@ -118,7 +120,7 @@ public class ImageMaker
     }\r
     catch (Exception ex)\r
     {\r
-        ex.printStackTrace();\r
+      ex.printStackTrace();\r
     }\r
   }\r
 \r
@@ -140,7 +142,9 @@ public class ImageMaker
       renderStyle = eps.getValue();\r
 \r
       if (renderStyle == null || eps.cancelled)\r
+      {\r
         return;\r
+      }\r
     }\r
 \r
     if (renderStyle.equalsIgnoreCase("text"))\r
@@ -148,9 +152,10 @@ public class ImageMaker
       accurateText = false;\r
     }\r
 \r
-    try   {\r
+    try\r
+    {\r
       pg = new EpsGraphics2D(title, out, 0, 0, width,\r
-                                           height);\r
+                             height);\r
       Graphics2D ig2 = (Graphics2D) pg;\r
       ig2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,\r
                            RenderingHints.VALUE_ANTIALIAS_ON);\r
@@ -159,10 +164,10 @@ public class ImageMaker
 \r
       graphics = pg;\r
     }\r
-    catch (Exception ex) {  }\r
+    catch (Exception ex)\r
+    {}\r
   }\r
 \r
-\r
   JalviewFileChooser getPNGChooser()\r
   {\r
     return new jalview.io.JalviewFileChooser(jalview.bin.Cache.getProperty(\r