cvs commit: xml-fop/src/java/org/apache/fop/apps Fop.java FOPException.java CommandLineStarter.java

2003-07-10 Thread pbwest 
pbwest  2003/07/10 04:26:29

  Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
Fop.java FOPException.java CommandLineStarter.java
  Log:
  Responded to some style complaints.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.2   +29 -26xml-fop/src/java/org/apache/fop/apps/Fop.java
  
  Index: Fop.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Fop.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- Fop.java  5 Jul 2003 19:04:50 -   1.1.2.1
  +++ Fop.java  10 Jul 2003 11:26:28 -  1.1.2.2
  @@ -65,48 +65,48 @@
   
   public static void main(String[] args) {
   
  - long endtotal, endfree, gctotal, gcfree;
  +long endtotal, endfree, gctotal, gcfree;
   Driver driver;
   Boolean bool = null;
   
  - runtime = Runtime.getRuntime();
  - startTotal = runtime.totalMemory();
  - startFree = runtime.freeMemory();
  - startTime = System.currentTimeMillis();
  +runtime = Runtime.getRuntime();
  +startTotal = runtime.totalMemory();
  +startFree = runtime.freeMemory();
  +startTime = System.currentTimeMillis();
   
   try {
   Options.configure(args);
   driver = new Driver();
   driver.run();
   System.out.println("Back from driver.run()");
  - System.out.println("Elapsed time: " +
  - (System.currentTimeMillis() - startTime));
  - endtotal = runtime.totalMemory();
  - endfree = runtime.freeMemory();
  - System.gc();
  - gctotal = runtime.totalMemory();
  - gcfree = runtime.freeMemory();
  - System.out.println("Total memory before run : " + startTotal);
  - System.out.println("Total memory after run  : " + endtotal);
  - System.out.println("Total memory after GC   : " + gctotal);
  - System.out.println("Diff before/after total : "
  +System.out.println("Elapsed time: " +
  +(System.currentTimeMillis() - startTime));
  +endtotal = runtime.totalMemory();
  +endfree = runtime.freeMemory();
  +System.gc();
  +gctotal = runtime.totalMemory();
  +gcfree = runtime.freeMemory();
  +System.out.println("Total memory before run : " + startTotal);
  +System.out.println("Total memory after run  : " + endtotal);
  +System.out.println("Total memory after GC   : " + gctotal);
  +System.out.println("Diff before/after total : "
  + (endtotal - startTotal));
  - System.out.println("Diff before/GC total: "
  +System.out.println("Diff before/GC total: "
  + (gctotal - startTotal));
  - System.out.println("Diff after/GC total : "
  +System.out.println("Diff after/GC total : "
  + (gctotal - endtotal));
  - System.out.println("Free memory before run  : " + startFree);
  - System.out.println("Free memory after run   : " + endfree);
  - System.out.println("Free memory after GC: " + gcfree);
  - System.out.println("Diff before/after free  : "
  +System.out.println("Free memory before run  : " + startFree);
  +System.out.println("Free memory after run   : " + endfree);
  +System.out.println("Free memory after GC: " + gcfree);
  +System.out.println("Diff before/after free  : "
  + (endfree - startFree));
  - System.out.println("Diff before/GC free : "
  +System.out.println("Diff before/GC free : "
  + (gcfree - startFree));
  - System.out.println("Diff after/GC free  : "
  +System.out.println("Diff after/GC free  : "
  + (gcfree - endfree));
  - System.out.println("cg() freed  : "
  +System.out.println("cg() freed  : "
   + (gcfree - endfree));
  - //System.out.println("PC time : " + (endPCi - startPCi));
  +//System.out.println("PC time : " + (endPCi - startPCi));
   
   } catch (FOPException e) {
   MessageHandler.errorln("ERROR: " + e.getMessage());
  @@ -121,6 +121,9 @@
   e.printStackTrace();
   }
   }
  +}
  +
  +private Fop() {
   }
   
   }
  
  
  
  1.2.2.2   +40 -15xml-fop/sr

cvs commit: xml-fop/src/java/org/apache/fop/apps Fop.java FOPException.java CommandLineStarter.java package.html InputHandler.java ErrorHandler.java Options.java FOInputHandler.java Driver.java

2003-07-05 Thread pbwest 
pbwest  2003/07/05 12:04:51

  Added:   src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
Fop.java FOPException.java CommandLineStarter.java
package.html InputHandler.java ErrorHandler.java
Options.java FOInputHandler.java Driver.java
  Log:
  Moved from src to src/java.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.1   +81 -45xml-fop/src/java/org/apache/fop/apps/Fop.java
  
  Index: Fop.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Fop.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- Fop.java  11 Mar 2003 13:05:28 -  1.1
  +++ Fop.java  5 Jul 2003 19:04:50 -   1.1.2.1
  @@ -1,7 +1,8 @@
   /*
* $Id$
  + * 
* 
  - *The Apache Software License, Version 1.1
  + *   The Apache Software License, Version 1.1
* 
* 
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  @@ -9,7 +10,7 @@
* 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,
  + * 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,
  @@ -17,72 +18,107 @@
*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
  + *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
  + * 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
  + * 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
  + * 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 <[EMA