vmote 2003/09/21 04:50:53 Modified: src/org/apache/fop/apps Tag: fop-0_20_2-maintain AWTStarter.java CommandLineStarter.java InputHandler.java PrintStarter.java XSLTInputHandler.java src/org/apache/fop/configuration Tag: fop-0_20_2-maintain ConfigurationReader.java src/org/apache/fop/datatypes Tag: fop-0_20_2-maintain ColorType.java ToBeImplementedProperty.java src/org/apache/fop/extensions Tag: fop-0_20_2-maintain ExtensionObj.java Label.java Outline.java src/org/apache/fop/image Tag: fop-0_20_2-maintain JimiImage.java Log: remove some global imports Revision Changes Path No revision No revision 1.9.2.7 +33 -29 xml-fop/src/org/apache/fop/apps/Attic/AWTStarter.java Index: AWTStarter.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/Attic/AWTStarter.java,v retrieving revision 1.9.2.6 retrieving revision 1.9.2.7 diff -u -r1.9.2.6 -r1.9.2.7 --- AWTStarter.java 25 Feb 2003 10:18:31 -0000 1.9.2.6 +++ AWTStarter.java 21 Sep 2003 11:50:52 -0000 1.9.2.7 @@ -3,34 +3,34 @@ * ============================================================================ * 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 @@ -42,12 +42,12 @@ * (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.apps; /* * originally contributed by @@ -56,24 +56,28 @@ * Stanislav Gorkhover: [EMAIL PROTECTED] * Modified to use streaming API by Mark Lillywhite, [EMAIL PROTECTED] */ -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; -import java.awt.*; - -// SAX -import org.xml.sax.XMLReader; - -// Avalon -import org.apache.avalon.framework.logger.ConsoleLogger; - -// Java -import java.io.InputStream; -import java.net.URL; +import org.apache.fop.viewer.PreviewDialog; +import org.apache.fop.viewer.Translator; +import org.apache.fop.viewer.SecureResourceBundle; +import org.apache.fop.viewer.UserMessage; +import org.apache.fop.render.awt.AWTRenderer; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; + + +import javax.swing.UIManager; +import java.awt.Dimension; +import java.awt.Toolkit; + +// SAX +import org.xml.sax.XMLReader; + +// Avalon +import org.apache.avalon.framework.logger.ConsoleLogger; + +// Java +import java.io.InputStream; +import java.net.URL; /** * initialize AWT previewer 1.11.2.6 +18 -18 xml-fop/src/org/apache/fop/apps/Attic/CommandLineStarter.java Index: CommandLineStarter.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/Attic/CommandLineStarter.java,v retrieving revision 1.11.2.5 retrieving revision 1.11.2.6 diff -u -r1.11.2.5 -r1.11.2.6 --- CommandLineStarter.java 25 Feb 2003 10:18:32 -0000 1.11.2.5 +++ CommandLineStarter.java 21 Sep 2003 11:50:52 -0000 1.11.2.6 @@ -3,34 +3,34 @@ * ============================================================================ * 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 @@ -42,22 +42,22 @@ * (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.apps; // SAX -import org.xml.sax.XMLReader; - -// Java -import java.io.*; - -// FOP -import org.apache.fop.configuration.Configuration; +import org.xml.sax.XMLReader; + +// Java +import java.io.FileOutputStream; + +// FOP +import org.apache.fop.configuration.Configuration; /** * super class for all classes which start Fop from the commandline 1.5.2.4 +22 -22 xml-fop/src/org/apache/fop/apps/Attic/InputHandler.java Index: InputHandler.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/Attic/InputHandler.java,v retrieving revision 1.5.2.3 retrieving revision 1.5.2.4 diff -u -r1.5.2.3 -r1.5.2.4 --- InputHandler.java 25 Feb 2003 10:18:32 -0000 1.5.2.3 +++ InputHandler.java 21 Sep 2003 11:50:52 -0000 1.5.2.4 @@ -3,34 +3,34 @@ * ============================================================================ * 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 @@ -42,25 +42,25 @@ * (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.apps; // SAX -import org.xml.sax.InputSource; -import org.xml.sax.XMLReader; - -// Java -import java.net.URL; -import java.io.File; -import javax.xml.parsers.*; - -// FOP -import org.apache.fop.messaging.MessageHandler; +import org.xml.sax.InputSource; +import org.xml.sax.XMLReader; + +// Java +import java.net.URL; +import java.io.File; +import javax.xml.parsers.SAXParserFactory; + +// FOP +import org.apache.fop.messaging.MessageHandler; abstract public class InputHandler { @@ -104,7 +104,7 @@ SAXParserFactory spf = javax.xml.parsers.SAXParserFactory.newInstance(); spf.setNamespaceAware(true); XMLReader xmlReader = spf.newSAXParser().getXMLReader(); - MessageHandler.logln("Using " + xmlReader.getClass().getName() + " as SAX2 Parser"); + MessageHandler.logln("Using " + xmlReader.getClass().getName() + " as SAX2 Parser"); return xmlReader; } catch (javax.xml.parsers.ParserConfigurationException e) { throw new FOPException(e); 1.7.2.6 +27 -26 xml-fop/src/org/apache/fop/apps/Attic/PrintStarter.java Index: PrintStarter.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/Attic/PrintStarter.java,v retrieving revision 1.7.2.5 retrieving revision 1.7.2.6 diff -u -r1.7.2.5 -r1.7.2.6 --- PrintStarter.java 25 Feb 2003 10:18:32 -0000 1.7.2.5 +++ PrintStarter.java 21 Sep 2003 11:50:52 -0000 1.7.2.6 @@ -3,34 +3,34 @@ * ============================================================================ * 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 @@ -42,37 +42,38 @@ * (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.apps; /* * originally contributed by * Stanislav Gorkhover: [EMAIL PROTECTED] * jCatalog Software AG - * + * * Updated by Mark Lillywhite, [EMAIL PROTECTED] Modified to - * handle the print job better, added -Ddialog option, removed + * handle the print job better, added -Ddialog option, removed * (apparently) redundant copies code, generally cleaned up, and * added interfaces to the new Render API. */ -import org.xml.sax.XMLReader; - -import java.awt.print.*; -import java.io.OutputStream; -import java.io.IOException; -import java.util.ArrayList; - -import org.apache.fop.render.awt.AWTRenderer; -import org.apache.fop.layout.Page; - -// Avalon -import org.apache.avalon.framework.logger.ConsoleLogger; +import org.xml.sax.XMLReader; + +import java.awt.print.PrinterJob; +import java.awt.print.PrinterException; +import java.io.OutputStream; +import java.io.IOException; +import java.util.ArrayList; + +import org.apache.fop.render.awt.AWTRenderer; +import org.apache.fop.layout.Page; + +// Avalon +import org.apache.avalon.framework.logger.ConsoleLogger; /** * This class prints a xsl-fo dokument without interaction. @@ -98,7 +99,7 @@ } // Nov 18, 02 eliminates spurious [ERROR] message to logger - + driver.setLogger (new ConsoleLogger(ConsoleLogger.LEVEL_INFO)) ; log.info (Version.getVersion()) ; 1.7.2.5 +16 -16 xml-fop/src/org/apache/fop/apps/Attic/XSLTInputHandler.java Index: XSLTInputHandler.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/Attic/XSLTInputHandler.java,v retrieving revision 1.7.2.4 retrieving revision 1.7.2.5 diff -u -r1.7.2.4 -r1.7.2.5 --- XSLTInputHandler.java 25 Feb 2003 10:18:32 -0000 1.7.2.4 +++ XSLTInputHandler.java 21 Sep 2003 11:50:52 -0000 1.7.2.5 @@ -3,34 +3,34 @@ * ============================================================================ * 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 @@ -42,20 +42,20 @@ * (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.apps; // Imported SAX classes -import org.xml.sax.InputSource; -import org.xml.sax.XMLReader; - -// Imported java.io classes -import java.io.*; +import org.xml.sax.InputSource; +import org.xml.sax.XMLReader; + +// Imported java.io classes +import java.io.File; /** * XSLTInputHandler takes an XML input, transforms it with XSLT No revision No revision 1.8.2.4 +24 -24 xml-fop/src/org/apache/fop/configuration/Attic/ConfigurationReader.java Index: ConfigurationReader.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/configuration/Attic/ConfigurationReader.java,v retrieving revision 1.8.2.3 retrieving revision 1.8.2.4 diff -u -r1.8.2.3 -r1.8.2.4 --- ConfigurationReader.java 25 Feb 2003 10:36:01 -0000 1.8.2.3 +++ ConfigurationReader.java 21 Sep 2003 11:50:53 -0000 1.8.2.4 @@ -3,34 +3,34 @@ * ============================================================================ * 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 @@ -42,26 +42,26 @@ * (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.configuration; // SAX -import org.xml.sax.XMLReader; -import org.xml.sax.SAXException; -import org.xml.sax.InputSource; - -// Java -import java.io.IOException; -import javax.xml.parsers.*; - -// FOP -import org.apache.fop.messaging.MessageHandler; -import org.apache.fop.apps.FOPException; +import org.xml.sax.XMLReader; +import org.xml.sax.SAXException; +import org.xml.sax.InputSource; + +// Java +import java.io.IOException; +import javax.xml.parsers.SAXParserFactory; + +// FOP +import org.apache.fop.messaging.MessageHandler; +import org.apache.fop.apps.FOPException; /** * Entry class for reading configuration from file and creating a configuration @@ -133,7 +133,7 @@ SAXParserFactory spf = javax.xml.parsers.SAXParserFactory.newInstance(); spf.setNamespaceAware(true); XMLReader xmlReader = spf.newSAXParser().getXMLReader(); - MessageHandler.logln("Using " + xmlReader.getClass().getName() + " as SAX2 Parser"); + MessageHandler.logln("Using " + xmlReader.getClass().getName() + " as SAX2 Parser"); return xmlReader; } catch (javax.xml.parsers.ParserConfigurationException e) { throw new FOPException(e); No revision No revision 1.16.2.2 +13 -13 xml-fop/src/org/apache/fop/datatypes/Attic/ColorType.java Index: ColorType.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/ColorType.java,v retrieving revision 1.16.2.1 retrieving revision 1.16.2.2 diff -u -r1.16.2.1 -r1.16.2.2 --- ColorType.java 25 Feb 2003 10:48:28 -0000 1.16.2.1 +++ ColorType.java 21 Sep 2003 11:50:53 -0000 1.16.2.2 @@ -3,34 +3,34 @@ * ============================================================================ * 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 @@ -42,16 +42,16 @@ * (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.datatypes; -import java.util.*; -import org.apache.fop.messaging.MessageHandler; +import java.util.StringTokenizer; +import org.apache.fop.messaging.MessageHandler; /** * a colour quantity in XSL 1.3.2.4 +15 -13 xml-fop/src/org/apache/fop/datatypes/Attic/ToBeImplementedProperty.java Index: ToBeImplementedProperty.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/ToBeImplementedProperty.java,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -u -r1.3.2.3 -r1.3.2.4 --- ToBeImplementedProperty.java 25 Feb 2003 10:48:28 -0000 1.3.2.3 +++ ToBeImplementedProperty.java 21 Sep 2003 11:50:53 -0000 1.3.2.4 @@ -3,34 +3,34 @@ * ============================================================================ * 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 @@ -42,16 +42,18 @@ * (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.datatypes; -import org.apache.fop.fo.*; -import org.apache.fop.messaging.MessageHandler; +import org.apache.fop.fo.Property; +import org.apache.fop.fo.PropertyList; +import org.apache.fop.fo.FObj; +import org.apache.fop.messaging.MessageHandler; public class ToBeImplementedProperty extends Property { No revision No revision 1.2.2.4 +18 -14 xml-fop/src/org/apache/fop/extensions/Attic/ExtensionObj.java Index: ExtensionObj.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/extensions/Attic/ExtensionObj.java,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -u -r1.2.2.3 -r1.2.2.4 --- ExtensionObj.java 11 Apr 2003 00:24:37 -0000 1.2.2.3 +++ ExtensionObj.java 21 Sep 2003 11:50:53 -0000 1.2.2.4 @@ -3,34 +3,34 @@ * ============================================================================ * 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 @@ -42,17 +42,21 @@ * (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.extensions; -import org.apache.fop.fo.*; -import org.apache.fop.layout.*; -import org.apache.fop.apps.FOPException; +import org.apache.fop.fo.FObj; +import org.apache.fop.fo.PropertyList; +import org.apache.fop.fo.Status; +import org.apache.fop.layout.Area; +import org.apache.fop.layout.AreaTree; +import org.apache.fop.layout.ExtensionArea; +import org.apache.fop.apps.FOPException; /** * base class for extension objects 1.2.2.7 +14 -13 xml-fop/src/org/apache/fop/extensions/Attic/Label.java Index: Label.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/extensions/Attic/Label.java,v retrieving revision 1.2.2.6 retrieving revision 1.2.2.7 diff -u -r1.2.2.6 -r1.2.2.7 --- Label.java 11 Apr 2003 00:24:37 -0000 1.2.2.6 +++ Label.java 21 Sep 2003 11:50:53 -0000 1.2.2.7 @@ -3,34 +3,34 @@ * ============================================================================ * 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 @@ -42,16 +42,17 @@ * (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.extensions; -import org.apache.fop.apps.FOPException; -import org.apache.fop.fo.*; +import org.apache.fop.apps.FOPException; +import org.apache.fop.fo.FObj; +import org.apache.fop.fo.PropertyList; /** 1.4.2.7 +17 -15 xml-fop/src/org/apache/fop/extensions/Attic/Outline.java Index: Outline.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/extensions/Attic/Outline.java,v retrieving revision 1.4.2.6 retrieving revision 1.4.2.7 diff -u -r1.4.2.6 -r1.4.2.7 --- Outline.java 11 Apr 2003 00:24:37 -0000 1.4.2.6 +++ Outline.java 21 Sep 2003 11:50:53 -0000 1.4.2.7 @@ -3,34 +3,34 @@ * ============================================================================ * 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 @@ -42,18 +42,20 @@ * (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.extensions; -import org.apache.fop.apps.FOPException; -import org.apache.fop.fo.*; - -import java.util.*; +import org.apache.fop.apps.FOPException; +import org.apache.fop.fo.FObj; +import org.apache.fop.fo.PropertyList; +import org.apache.fop.fo.FONode; + +import java.util.ArrayList; /** * Class representing an outline entry (an /OUT object in a PDF file, but No revision No revision 1.8.2.3 +13 -13 xml-fop/src/org/apache/fop/image/Attic/JimiImage.java Index: JimiImage.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/image/Attic/JimiImage.java,v retrieving revision 1.8.2.2 retrieving revision 1.8.2.3 diff -u -r1.8.2.2 -r1.8.2.3 --- JimiImage.java 20 Sep 2003 21:48:19 -0000 1.8.2.2 +++ JimiImage.java 21 Sep 2003 11:50:53 -0000 1.8.2.3 @@ -51,18 +51,18 @@ package org.apache.fop.image; // Java -import java.net.URL; -import java.awt.image.ImageProducer; -import java.awt.image.ColorModel; -import java.awt.image.IndexColorModel; - -// Jimi -import com.sun.jimi.core.*; - -// FOP -import org.apache.fop.datatypes.ColorSpace; -import org.apache.fop.pdf.PDFColor; -import org.apache.fop.image.analyser.ImageReader; +import java.net.URL; +import java.awt.image.ImageProducer; +import java.awt.image.ColorModel; +import java.awt.image.IndexColorModel; + +// Jimi +import com.sun.jimi.core.Jimi; + +// FOP +import org.apache.fop.datatypes.ColorSpace; +import org.apache.fop.pdf.PDFColor; +import org.apache.fop.image.analyser.ImageReader; /** * FopImage object for several images types, using Jimi.
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]