exit for closing window is only called for the AWTStarter, command line

and not on the window

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194657 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/org/apache/fop/apps/AWTStarter.java b/src/org/apache/fop/apps/AWTStarter.java
index 85fcaa9be4455fbd132a909664aeda317c4a9a74..20b0d8456a20bd9be6d44b7cdd4735f7032485b2 100644 (file)
--- a/src/org/apache/fop/apps/AWTStarter.java
+++ b/src/org/apache/fop/apps/AWTStarter.java
@@ -19,6 +19,8 @@ import org.apache.fop.render.awt.*;
 
 import javax.swing.UIManager;
 import java.awt.*;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 
 // SAX
 import org.xml.sax.XMLReader;
@@ -130,6 +132,11 @@ public class AWTStarter extends CommandLineStarter {
             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();

diff --git a/src/org/apache/fop/viewer/PreviewDialog.java b/src/org/apache/fop/viewer/PreviewDialog.java
index 219c25078560e3ef2cddc1ca723888868440356d..401124b6e833a08d7286c7f9b4457f49dc4ac415 100644 (file)
--- a/src/org/apache/fop/viewer/PreviewDialog.java
+++ b/src/org/apache/fop/viewer/PreviewDialog.java
@@ -624,9 +624,5 @@ public class PreviewDialog extends JFrame implements ProgressListener {
         }*/
     }
 
-    public void dispose() {
-        System.exit(0);
-    }
-
 }    // class PreviewDialog