[Squirrel-sql-commits] sql12/plugins/graph/src/net/sourceforge/squirrel_sql/plugins/graph/graphtofiles SaveToFilePageFormat.java, 1.1, 1.2 GraphToFilesCtrlr.java, 1.2, 1.3

[Gerd W. <ger...@us...>]

Update of /cvsroot/squirrel-sql/sql12/plugins/graph/src/net/sourceforge/squirrel_sql/plugins/graph/graphtofiles
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11605/plugins/graph/src/net/sourceforge/squirrel_sql/plugins/graph/graphtofiles

Modified Files:
	SaveToFilePageFormat.java GraphToFilesCtrlr.java 
Log Message:
Several bug fixes concerning printing a Graph to image files.

Index: SaveToFilePageFormat.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/graph/src/net/sourceforge/squirrel_sql/plugins/graph/graphtofiles/SaveToFilePageFormat.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SaveToFilePageFormat.java	29 Oct 2006 00:52:35 -0000	1.1
--- SaveToFilePageFormat.java	21 Nov 2006 22:55:29 -0000	1.2
***************
*** 5,29 ****
  
  import java.awt.print.PageFormat;
  
  public class SaveToFilePageFormat extends PageFormat
  {
-    private FormatXmlBean _format;
     private PixelCalculater _pc;
  
     public SaveToFilePageFormat(FormatXmlBean format)
     {
-       _format = format;
        _pc = new PixelCalculater(format);
  
     }
  
     public double getImageableHeight()
     {
!       return _pc.getPixelHeight();
     }
  
     public double getImageableWidth()
     {
!       return _pc.getPixelWidth();
     }
  
--- 5,48 ----
  
  import java.awt.print.PageFormat;
+ import java.awt.*;
  
  public class SaveToFilePageFormat extends PageFormat
  {
     private PixelCalculater _pc;
+    private Dimension _graphPixelSize;
  
     public SaveToFilePageFormat(FormatXmlBean format)
     {
        _pc = new PixelCalculater(format);
  
     }
  
+    public SaveToFilePageFormat(Dimension graphPixelSize)
+    {
+       _graphPixelSize = graphPixelSize;
+    }
+ 
     public double getImageableHeight()
     {
!       if(null == _pc)
!       {
!          return _graphPixelSize.height;
!       }
!       else
!       {
!          return _pc.getPixelHeight();
!       }
     }
  
     public double getImageableWidth()
     {
!       if(null == _pc)
!       {
!          return _graphPixelSize.width;
!       }
!       else
!       {
!          return _pc.getPixelWidth();
!       }
     }
  

Index: GraphToFilesCtrlr.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/graph/src/net/sourceforge/squirrel_sql/plugins/graph/graphtofiles/GraphToFilesCtrlr.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GraphToFilesCtrlr.java	29 Oct 2006 01:27:53 -0000	1.2
--- GraphToFilesCtrlr.java	21 Nov 2006 22:55:29 -0000	1.3
***************
*** 9,14 ****
  import javax.swing.*;
  import java.awt.image.BufferedImage;
! import java.awt.event.ActionListener;
! import java.awt.event.ActionEvent;
  import java.io.File;
  import java.io.IOException;
--- 9,13 ----
  import javax.swing.*;
  import java.awt.image.BufferedImage;
! import java.awt.event.*;
  import java.io.File;
  import java.io.IOException;
***************
*** 41,44 ****
--- 40,60 ----
           }
        });
+ 
+       m_dlg.addWindowListener(new WindowAdapter()
+       {
+ 
+          public void windowClosing(WindowEvent e)
+          {
+             onClosing();
+          }
+       });
+    }
+ 
+    private void onClosing()
+    {
+       for (int i = 0; i < _images.length; i++)
+       {
+          _images[i].flush();
+       }
     }