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

2004-04-15 Thread pbwest 
pbwest  2004/04/15 04:29:58

  Modified:src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
FoXmlSerialHandler.java
  Log:
  Added setRenderThread()
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.1.2.9   +17 -3 
xml-fop/src/java/org/apache/fop/xml/Attic/FoXmlSerialHandler.java
  
  Index: FoXmlSerialHandler.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/java/org/apache/fop/xml/Attic/FoXmlSerialHandler.java,v
  retrieving revision 1.1.2.8
  retrieving revision 1.1.2.9
  diff -u -r1.1.2.8 -r1.1.2.9
  --- FoXmlSerialHandler.java   8 Mar 2004 12:42:22 -   1.1.2.8
  +++ FoXmlSerialHandler.java   15 Apr 2004 11:29:58 -  1.1.2.9
  @@ -54,6 +54,7 @@
   private Namespaces namespaces;
   private InputSource source;
   private Thread foThread;
  +private Thread renderThread;
   protected Logger log = Logger.getLogger(Fop.fopPackage);
   private boolean errorDump;
   
  @@ -76,10 +77,23 @@
   }
   }
   
  +/**
  + * Allow the thread starter process to notify the serial handler of
  + * the FO Tree building thread.
  + * @param foThread
  + */
   public void setFoThread(Thread foThread) {
   this.foThread = foThread;
   }
   
  +/**
  + * Allow the thread starter process to notify the serial handler of
  + * the rendering thread.
  + * @param renderThread
  + */
  +public void setRenderThread(Thread renderThread) {
  +this.renderThread = renderThread;
  +}
   /**
* This is the run method for the callback parser thread.
*/
  
  
  

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

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

2004-03-08 Thread pbwest 
pbwest  2004/03/08 04:42:22

  Modified:src/java/org/apache/fop/fo/pagination Tag:
FOP_0-20-0_Alt-Design FoLayoutMasterSet.java
   src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
FoXmlSerialHandler.java
  Log:
  Change the way Logger is accessed
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.1.2.10  +4 -5  
xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
  
  Index: FoLayoutMasterSet.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
  retrieving revision 1.1.2.9
  retrieving revision 1.1.2.10
  diff -u -r1.1.2.9 -r1.1.2.10
  --- FoLayoutMasterSet.java25 Feb 2004 22:33:54 -  1.1.2.9
  +++ FoLayoutMasterSet.java8 Mar 2004 12:42:22 -   1.1.2.10
  @@ -26,7 +26,6 @@
   import java.util.NoSuchElementException;
   
   import org.apache.fop.apps.FOPException;
  -import org.apache.fop.apps.Fop;
   import org.apache.fop.datastructs.TreeException;
   import org.apache.fop.fo.FONode;
   import org.apache.fop.fo.FOTree;
  @@ -256,7 +255,7 @@
   public long makePageId() {
   if (++pageId == 0) {
   ++pageId;   // 0 is invalid
  -Fop.logger.warning("Page ID rollover.");
  +log.warning("Page ID rollover.");
   }
   return pageId;
   }
  
  
  
  No   revision
  No   revision
  1.1.2.8   +6 -4  
xml-fop/src/java/org/apache/fop/xml/Attic/FoXmlSerialHandler.java
  
  Index: FoXmlSerialHandler.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/java/org/apache/fop/xml/Attic/FoXmlSerialHandler.java,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -r1.1.2.7 -r1.1.2.8
  --- FoXmlSerialHandler.java   6 Mar 2004 05:56:58 -   1.1.2.7
  +++ FoXmlSerialHandler.java   8 Mar 2004 12:42:22 -   1.1.2.8
  @@ -21,6 +21,7 @@
   
   import java.util.NoSuchElementException;
   import java.util.logging.Level;
  +import java.util.logging.Logger;
   
   import org.xml.sax.Attributes;
   import org.xml.sax.InputSource;
  @@ -53,6 +54,7 @@
   private Namespaces namespaces;
   private InputSource source;
   private Thread foThread;
  +protected Logger log = Logger.getLogger(Fop.fopPackage);
   private boolean errorDump;
   
   /**
  @@ -68,7 +70,7 @@
   this.source = source;
   namespaces = events.getNamespaces();
   parser.setContentHandler(this);
  -Level level = Fop.logger.getLevel();
  +Level level = log.getLevel();
   if (level.intValue() <= Level.FINE.intValue()) {
   errorDump = true;
   }
  
  
  

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

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

2004-03-05 Thread pbwest 
pbwest  2004/03/05 21:56:58

  Modified:src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
FoXmlSerialHandler.java
  Log:
  Adjusted for Configuration instance, and use of java.util.logging
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.1.2.7   +12 -7 
xml-fop/src/java/org/apache/fop/xml/Attic/FoXmlSerialHandler.java
  
  Index: FoXmlSerialHandler.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/java/org/apache/fop/xml/Attic/FoXmlSerialHandler.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- FoXmlSerialHandler.java   19 Feb 2004 03:11:56 -  1.1.2.6
  +++ FoXmlSerialHandler.java   6 Mar 2004 05:56:58 -   1.1.2.7
  @@ -20,6 +20,7 @@
   package org.apache.fop.xml;
   
   import java.util.NoSuchElementException;
  +import java.util.logging.Level;
   
   import org.xml.sax.Attributes;
   import org.xml.sax.InputSource;
  @@ -27,9 +28,8 @@
   import org.xml.sax.helpers.AttributesImpl;
   import org.xml.sax.helpers.DefaultHandler;
   
  -import org.apache.fop.apps.Driver;
   import org.apache.fop.apps.FOPException;
  -import org.apache.fop.configuration.Configuration;
  +import org.apache.fop.apps.Fop;
   import org.apache.fop.fo.FObjectNames;
   import org.apache.fop.xml.Namespaces;
   
  @@ -68,7 +68,10 @@
   this.source = source;
   namespaces = events.getNamespaces();
   parser.setContentHandler(this);
  -errorDump = Configuration.getBooleanValue("debugMode").booleanValue();
  +Level level = Fop.logger.getLevel();
  +if (level.intValue() <= Level.FINE.intValue()) {
  +errorDump = true;
  +}
   }
   
   public void setFoThread(Thread foThread) {
  @@ -83,7 +86,9 @@
   try {
   parser.parse(source);
   } catch (Exception e) {
  -if (errorDump) Driver.dumpError(e);
  +if (errorDump) {
  +e.printStackTrace();
  +}
   if (foThread != null) {
   try {
   foThread.interrupt();
  
  
  

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

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

2004-01-16 Thread pbwest 
pbwest  2004/01/16 07:38:53

  Modified:src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
FoXmlSerialHandler.java
  Log:
  Remove debugging output.
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.1.2.5   +9 -24 
xml-fop/src/java/org/apache/fop/xml/Attic/FoXmlSerialHandler.java
  
  Index: FoXmlSerialHandler.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/java/org/apache/fop/xml/Attic/FoXmlSerialHandler.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- FoXmlSerialHandler.java   15 Jan 2004 03:10:58 -  1.1.2.4
  +++ FoXmlSerialHandler.java   16 Jan 2004 15:38:53 -  1.1.2.5
  @@ -1,6 +1,4 @@
   /*
  - * $Id$
  - * 
* 
*   The Apache Software License, Version 1.1
* 
  @@ -47,10 +45,8 @@
* 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 .
  - *  
  - *
  - * @author mailto:[EMAIL PROTECTED]">Peter B. West
  - * @version $Revision$ $Name$
  + * 
  + * $Id$
*/
   package org.apache.fop.xml;
   
  @@ -71,9 +67,14 @@
   /**
* FoXmlSerialHandler is the ContentHandler for the
* background XMLReader thread.
  + * 
  + * @author mailto:[EMAIL PROTECTED]">Peter B. West
  + * @version $Revision$ $Name$
*/
   
  -public class FoXmlSerialHandler extends DefaultHandler implements Runnable {
  +public class FoXmlSerialHandler
  +extends DefaultHandler
  +implements Runnable {
   
   private static final String tag = "$Name$";
   private static final String revision = "$Revision$";
  @@ -112,7 +113,6 @@
   // I''m in the thread - run the parser
   try {
   parser.parse(source);
  -//System.out.println("Parser terminating.");
   } catch (Exception e) {
   if (errorDump) Driver.dumpError(e);
   if (foThread != null) {
  @@ -146,10 +146,7 @@
   public void startDocument() throws NoSuchElementException {
   synchronized (events) {
   XmlEvent event = acquireXMLEvent(Namespaces.DefAttrNSIndex);
  -//System.out.println("StartDocument thread "
  -//   + Thread.currentThread().getName());
   event.type = XmlEvent.STARTDOCUMENT;
  -//System.out.println("SerialHandler: " + event);
   putEvent(event);
   }
   }
  @@ -160,10 +157,7 @@
   public void endDocument() throws NoSuchElementException {
   synchronized (events) {
   XmlEvent event = acquireXMLEvent(Namespaces.DefAttrNSIndex);
  -//System.out.println("EndDocument thread "
  -   //+ Thread.currentThread().getName());
   event.type = XmlEvent.ENDDOCUMENT;
  -//System.out.println("SerialHandler: " + event);
   putEvent(event);
   events.producerExhausted();
   }
  @@ -203,16 +197,12 @@
   if (uriIndex == Namespaces.XSLNSpaceIndex) {
   event.setFoType(FObjectNames.getFOIndex(localName));
   }
  -//System.out.println("startElement: acquired " + event.id);
  -//System.out.println("StartElement thread "
  -//   + Thread.currentThread().getName());
   event.type = XmlEvent.STARTELEMENT;
   // Is this from the fo: namespace?
   event.uriIndex = uriIndex;
   event.localName = localName;
   //event.qName = qName;
   event.attributes = new AttributesImpl(attributes);
  -//System.out.println("SerialHandler: " + event);
   putEvent(event);
   } catch (FOPException e) {
   // TODO Auto-generated catch block
  @@ -235,9 +225,6 @@
   try {
   int uriIndex = namespaces.getURIIndex(uri);
   XmlEvent event = namespaces.acquireXMLEvent(uriIndex);
  -//System.out.println("endElement: acquired " + event.id);
  -//System.out.println("EndElement thread "
  -   //+ Thread.currentThread().getName());
   event.type = XmlEvent.ENDELEMENT;
   event.uriIndex = uriIndex;
   if (uriIndex == Namespaces.XSLNSpaceIndex) {
  @@ -272,8 +259,6 @@
   // which the characters belong.
   XmlEvent event
   = namespaces.acquireXMLEvent(Namespaces.DefAttrNSIndex);

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

2004-01-14 Thread pbwest 
pbwest  2004/01/14 18:44:48

  Removed: src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
FoXMLSerialHandler.java
  Log:
  Renamed to FoXmlSerialHandler

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

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

2004-01-14 Thread pbwest 
pbwest  2004/01/14 18:00:20

  Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
Driver.java
  Added:   src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
FoXmlSerialHandler.java
  Log:
  FoXMLSerialHandler renamed to FoXmlSerialHandler
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.9.2.7   +5 -5  xml-fop/src/java/org/apache/fop/apps/Driver.java
  
  Index: Driver.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Driver.java,v
  retrieving revision 1.9.2.6
  retrieving revision 1.9.2.7
  diff -u -r1.9.2.6 -r1.9.2.7
  --- Driver.java   14 Jan 2004 14:17:19 -  1.9.2.6
  +++ Driver.java   15 Jan 2004 02:00:19 -  1.9.2.7
  @@ -62,7 +62,7 @@
   import org.apache.fop.layout.AreaTree;
   import org.apache.fop.messaging.MessageHandler;
   import org.apache.fop.version.Version;
  -import org.apache.fop.xml.FoXMLSerialHandler;
  +import org.apache.fop.xml.FoXmlSerialHandler;
   import org.apache.fop.xml.SyncedXmlEventsBuffer;
   
   /**
  @@ -80,7 +80,7 @@
   private XMLReader parser;
   private InputSource source;
   
  -private FoXMLSerialHandler xmlhandler;
  +private FoXmlSerialHandler xmlhandler;
   private SyncedXmlEventsBuffer xmlevents;
   private FOTree foTree;
   private AreaTree areaTree = new AreaTree();
  @@ -108,13 +108,13 @@
* the input source, the parser, the
* [EMAIL PROTECTED] org.apache.fop.xml.SyncedXmlEventsBuffer 
SyncedXmlEventsBuffer}
* (xmlevents), the
  - * [EMAIL PROTECTED] org.apache.fop.xml.FoXMLSerialHandler FoXMLSerialHandler}
  + * [EMAIL PROTECTED] org.apache.fop.xml.FoXmlSerialHandler FoXmlSerialHandler}
* (xmlhandler) and the
* [EMAIL PROTECTED] org.apache.fop.fo.FOTree FOTree} (foTree).
* 
* The xmlhandler uses the source and the parser to
* generate XML events which it stores in xmlevents.
  - * FoXMLSerialHandler implements Runnable.
  + * FoXmlSerialHandler implements Runnable.
* 
* The foTree reads events from the xmlevents
* buffer, which it interprets to build the FO tree.  FOTree
  @@ -139,7 +139,7 @@
   //setParserFeatures(parser);
   
   xmlevents = new SyncedXmlEventsBuffer();
  -xmlhandler = new FoXMLSerialHandler(xmlevents, parser, source);
  +xmlhandler = new FoXmlSerialHandler(xmlevents, parser, source);
   foTree = new FOTree(xmlevents);
   
   driverThread = Thread.currentThread();
  
  
  
  No   revision
  No   revision
  1.1.2.1   +290 -0
xml-fop/src/java/org/apache/fop/xml/Attic/FoXmlSerialHandler.java
  
  
  
  

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

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

2004-01-14 Thread pbwest 
pbwest  2004/01/14 08:15:13

  Modified:src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
FoXMLSerialHandler.java
  Log:
  SyncedFoXmlEventsBuffer renamed to SyncedXmlEventsBuffer
  Handling of character changed to use the DefAttNSpace and
  to generate an XMLEvent rather than ah FoXMLEvent.
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.1.2.3   +17 -15
xml-fop/src/java/org/apache/fop/xml/Attic/FoXMLSerialHandler.java
  
  Index: FoXMLSerialHandler.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/java/org/apache/fop/xml/Attic/FoXMLSerialHandler.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- FoXMLSerialHandler.java   10 Jan 2004 06:29:50 -  1.1.2.2
  +++ FoXMLSerialHandler.java   14 Jan 2004 16:15:13 -  1.1.2.3
  @@ -78,7 +78,7 @@
   private static final String tag = "$Name$";
   private static final String revision = "$Revision$";
   
  -private SyncedFoXmlEventsBuffer events;
  +private SyncedXmlEventsBuffer events;
   private XMLReader parser;
   private XMLNamespaces namespaces;
   private InputSource source;
  @@ -91,7 +91,7 @@
* @param source the parser input source.
*/
   public FoXMLSerialHandler
  -(SyncedFoXmlEventsBuffer events, XMLReader parser, InputSource source)
  +(SyncedXmlEventsBuffer events, XMLReader parser, InputSource source)
   {
   this.events = events;
   this.parser = parser;
  @@ -127,7 +127,7 @@
   /**
* Utility routine for the callback methods.  It captures the
* InterruptedException that is possible from the put
  - * method of a SyncedFoXmlEventsBuffer.
  + * method of a SyncedXmlEventsBuffer.
*/
   public void putEvent(XMLEvent event) throws NoSuchElementException {
   synchronized (events) {
  @@ -177,7 +177,7 @@
   private XMLEvent acquireXMLEvent(int nsIndex) {
   try {
   return
  -namespaces.acquireXMLEvent(XMLNamespaces.DefAttrNSIndex);
  +namespaces.acquireXMLEvent(nsIndex);
   } catch (FOPException ex) {
   throw new RuntimeException(
   "Namespace index " + nsIndex + " not recognized");
  @@ -208,7 +208,7 @@
   //   + Thread.currentThread().getName());
   event.type = XMLEvent.STARTELEMENT;
   // Is this from the fo: namespace?
  -event.uriIndex = namespaces.getURIIndex(uri);
  +event.uriIndex = uriIndex;
   event.localName = localName;
   //event.qName = qName;
   event.attributes = new AttributesImpl(attributes);
  @@ -265,18 +265,20 @@
   {
   synchronized (events) {
   try {
  -// TODO chars events are legitimate XSL-FO events
  -// This may cause problems with other namespaces, and will have
  -// to be checked as those namepsaces are implemented.
  -// As SAX provides no URI information for chars, such
  -// such discrimination may have to be done at a higher level.
  +// TODO chars events have no namespace, but a namespace is
  +// essential for subsequent processing.  Use the default
  +// attribute namespace (the empty string), and rely on
  +// downstream processing to determine the environment in
  +// which the characters belong.
   XMLEvent event
  -= namespaces.acquireXMLEvent(XMLNamespaces.XSLNSpaceIndex);
  += namespaces.acquireXMLEvent(XMLNamespaces.DefAttrNSIndex);
   //System.out.println("characters thread "
   //   + Thread.currentThread().getName());
   event.type = XMLEvent.CHARACTERS;
   event.chars = new String(ch, start, length);
  -event.setFoType(FObjectNames.PCDATA);
  +// Can't setFoType, because this event is now an XMLEvent,
  +// not an FoXMLEvent
  +//event.setFoType(FObjectNames.PCDATA);
   //System.out.println("SerialHandler: " + event);
   putEvent(event);
   } catch (FOPException e) {
  
  
  

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