cvs commit: xml-fop/src/org/apache/fop/viewer PreviewDialog.java PreviewDialogAboutBox.java Translator.java Command.java GoToPageDialog.java

2003-03-07 Thread jeremias 
jeremias2003/03/07 02:09:58

  Modified:src/org/apache/fop/viewer PreviewDialog.java
PreviewDialogAboutBox.java Translator.java
Command.java GoToPageDialog.java
  Log:
  Switched to long licence
  Some general checkstyle fixing
  
  Revision  ChangesPath
  1.14  +107 -29   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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- PreviewDialog.java29 Nov 2002 23:18:58 -  1.13
  +++ PreviewDialog.java7 Mar 2003 10:09:58 -   1.14
  @@ -1,20 +1,80 @@
   /*
* $Id$
  - * 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.
  - */
  -
  + * 
  + *The Apache Software License, Version 1.1
  + * 
  + * 
  + * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  + * 
  + * Redistribution and use in source and binary forms, with or without modifica-
  + * tion, are permitted provided that the following conditions are met:
  + * 
  + * 1. Redistributions of source code must retain the above copyright notice,
  + *this list of conditions and the following disclaimer.
  + * 
  + * 2. Redistributions in binary form must reproduce the above copyright notice,
  + *this list of conditions and the following disclaimer in the documentation
  + *and/or other materials provided with the distribution.
  + * 
  + * 3. The end-user documentation included with the redistribution, if any, must
  + *include the following acknowledgment: This product includes software
  + *developed by the Apache Software Foundation (http://www.apache.org/).
  + *Alternately, this acknowledgment may appear in the software itself, if
  + *and wherever such third-party acknowledgments normally appear.
  + * 
  + * 4. The names FOP and Apache Software Foundation must not be used to
  + *endorse or promote products derived from this software without prior
  + *written permission. For written permission, please contact
  + *[EMAIL PROTECTED]
  + * 
  + * 5. Products derived from this software may not be called Apache, nor may
  + *Apache appear in their name, without prior written permission of the
  + *Apache Software Foundation.
  + * 
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
  + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
  + * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
  + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
  + * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
  + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
  + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  + * 
  + * 
  + * This software consists of voluntary contributions made by many individuals
  + * on behalf of the Apache Software Foundation and was originally created by
  + * James Tauber [EMAIL PROTECTED]. For more information on the Apache
  + * Software Foundation, please see http://www.apache.org/.
  + */ 
   package org.apache.fop.viewer;
   
   //Java
  -import java.awt.*;
  -import javax.swing.*;
  +import javax.swing.BorderFactory;
  +import javax.swing.JComboBox;
  +import javax.swing.JFrame;
  +import javax.swing.JLabel;
  +import javax.swing.JMenu;
  +import javax.swing.JMenuBar;
  +import javax.swing.JOptionPane;
  +import javax.swing.JPanel;
  +import javax.swing.JScrollPane;
  +import javax.swing.JToolBar;
  +import javax.swing.SwingUtilities;
  +
  +import java.awt.BorderLayout;
  +import java.awt.Color;
  +import java.awt.Dimension;
  +import java.awt.GridBagConstraints;
  +import java.awt.GridBagLayout;
  +import java.awt.Insets;
  +import java.awt.Point;
  +import java.awt.Toolkit;
   import java.awt.event.ActionEvent;
   import java.awt.event.ActionListener;
   import java.awt.print.PrinterJob;
   import java.awt.print.PrinterException;
  -import java.awt.image.BufferedImage;
   
   //FOP
   import org.apache.fop.apps.AWTStarter;
  @@ -29,8 +89,12 @@
* Stanislav Gorkhover: [EMAIL PROTECTED]
*/
   public class

cvs commit: xml-fop/src/org/apache/fop/viewer PreviewDialog.java

2002-04-01 Thread chrisg 

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  ChangesPath
  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 -  1.9.2.2
  +++ AWTStarter.java   1 Apr 2002 19:21:39 -   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.java30 Jul 2001 20:29:35 -  1.7
  +++ PreviewDialog.java1 Apr 2002 19:21:39 -   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]

cvs commit: xml-fop/src/org/apache/fop/viewer PreviewDialog.java

2002-02-20 Thread keiron 

keiron  02/02/20 02:29:40

  Modified:src/org/apache/fop/apps AWTStarter.java
   src/org/apache/fop/viewer PreviewDialog.java
  Log:
  exit for closing window is only called for the AWTStarter, command line
  and not on the window
  
  Revision  ChangesPath
  1.12  +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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- AWTStarter.java   22 Nov 2001 07:11:38 -  1.11
  +++ AWTStarter.java   20 Feb 2002 10:29:40 -  1.12
  @@ -1,5 +1,5 @@
   /*
  - * $Id: AWTStarter.java,v 1.11 2001/11/22 07:11:38 keiron Exp $
  + * $Id: AWTStarter.java,v 1.12 2002/02/20 10:29:40 keiron 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.
  @@ -19,6 +19,8 @@
   
   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 @@
   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();
  
  
  
  1.11  +1 -5  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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- PreviewDialog.java22 Nov 2001 07:11:41 -  1.10
  +++ PreviewDialog.java20 Feb 2002 10:29:40 -  1.11
  @@ -1,5 +1,5 @@
   /*
  - * $Id: PreviewDialog.java,v 1.10 2001/11/22 07:11:41 keiron Exp $
  + * $Id: PreviewDialog.java,v 1.11 2002/02/20 10:29:40 keiron 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.
  @@ -622,10 +622,6 @@
   }
   }
   }*/
  -}
  -
  -public void dispose() {
  -System.exit(0);
   }
   
   }// class PreviewDialog
  
  
  

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