chrisg      02/04/01 11:21:39

  Modified:    src/org/apache/fop/apps Tag: fop-0_20_2-maintain
                        AWTStarter.java
               src/org/apache/fop/viewer Tag: fop-0_20_2-maintain
                        PreviewDialog.java
  Log:
  exit for closing window is only called for the AWTStarter, command line
  and not on the window (done by Keiron, synced from trunk)
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.9.2.3   +8 -1      xml-fop/src/org/apache/fop/apps/AWTStarter.java
  
  Index: AWTStarter.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/AWTStarter.java,v
  retrieving revision 1.9.2.2
  retrieving revision 1.9.2.3
  diff -u -r1.9.2.2 -r1.9.2.3
  --- AWTStarter.java   27 Mar 2002 19:15:39 -0000      1.9.2.2
  +++ AWTStarter.java   1 Apr 2002 19:21:39 -0000       1.9.2.3
  @@ -1,5 +1,5 @@
   /*
  - * $Id: AWTStarter.java,v 1.9.2.2 2002/03/27 19:15:39 chrisg Exp $
  + * $Id: AWTStarter.java,v 1.9.2.3 2002/04/01 19:21:39 chrisg Exp $
    * Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
    * For details on use and redistribution please refer to the
    * LICENSE file included with these sources.
  @@ -15,6 +15,8 @@
    */
   import org.apache.fop.viewer.*;
   import org.apache.fop.render.awt.*;
  +import java.awt.event.WindowAdapter;
  +import java.awt.event.WindowEvent;
   
   
   import javax.swing.UIManager;
  @@ -129,6 +131,11 @@
               Translator res) {
           PreviewDialog frame = new PreviewDialog(renderer, res);
           frame.validate();
  +        frame.addWindowListener(new WindowAdapter() {
  +                public void windowClosed(WindowEvent we) {
  +                    System.exit(0);
  +                }
  +            });
   
           // center window
           Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.1   +1 -6      xml-fop/src/org/apache/fop/viewer/PreviewDialog.java
  
  Index: PreviewDialog.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/viewer/PreviewDialog.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- PreviewDialog.java        30 Jul 2001 20:29:35 -0000      1.7
  +++ PreviewDialog.java        1 Apr 2002 19:21:39 -0000       1.7.2.1
  @@ -1,5 +1,5 @@
   /*
  - * $Id: PreviewDialog.java,v 1.7 2001/07/30 20:29:35 tore Exp $
  + * $Id: PreviewDialog.java,v 1.7.2.1 2002/04/01 19:21:39 chrisg Exp $
    * Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
    * For details on use and redistribution please refer to the
    * LICENSE file included with these sources.
  @@ -624,11 +624,6 @@
                   }
               }
           }
  -    }
  -
  -
  -    public void dispose() {
  -        System.exit(0);
       }
   
   }    // class PreviewDialog
  
  
  

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

Reply via email to