pbwest      2004/03/14 03:21:27

  Modified:    src/java/org/apache/fop/render/awt/viewer Tag:
                        FOP_0-20-0_Alt-Design PreviewDialog.java
  Log:
  Merged Driver into Fop
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.2.2.2   +9 -9      
xml-fop/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java
  
  Index: PreviewDialog.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java,v
  retrieving revision 1.2.2.1
  retrieving revision 1.2.2.2
  diff -u -r1.2.2.1 -r1.2.2.2
  --- PreviewDialog.java        10 Mar 2004 06:24:29 -0000      1.2.2.1
  +++ PreviewDialog.java        14 Mar 2004 11:21:27 -0000      1.2.2.2
  @@ -48,7 +48,7 @@
   import java.awt.print.PrinterException;
   
   //FOP
  -import org.apache.fop.apps.Driver;
  +import org.apache.fop.apps.Fop;
   import org.apache.fop.apps.InputHandler;
   import org.apache.fop.apps.FOPException;
   import org.apache.fop.render.awt.AWTRenderer;
  @@ -68,8 +68,8 @@
       protected AWTRenderer renderer;
       /** The InputHandler associated with this window */
       protected InputHandler inputHandler;
  -    /** The Driver used for refreshing/reloading the view */
  -    protected Driver driver;
  +    /** The Fop used for refreshing/reloading the view */
  +    protected Fop fop;
   
       private int currentPage = 0;
       private int pageCount = 0;
  @@ -383,11 +383,11 @@
        */
       private class Reloader extends Thread {
           public void run() {
  -            if (driver == null) {
  -                driver = new Driver();
  -                driver.setRenderer(renderer);
  +            if (fop == null) {
  +                fop = new Fop();
  +                fop.setRenderer(renderer);
               } else {
  -                driver.reset();
  +                fop.reset();
               }
               
               pageLabel.setIcon(null);
  @@ -396,7 +396,7 @@
   
               try {
                   setStatus(translator.getString("Status.Build.FO.tree"));
  -                driver.render(inputHandler);
  +                fop.render(inputHandler);
                   setStatus(translator.getString("Status.Show"));
               } catch (FOPException e) {
                   reportException(e);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to