cvs commit: xml-fop/src/org/apache/fop/xml FoXMLEventPool.java
pbwest 2002/11/29 09:29:10
Modified:src/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
FoXMLEventPool.java
Log:
Modified acquireFoXMLEvent().
Revision ChangesPath
No revision
No revision
1.1.2.3 +7 -4 xml-fop/src/org/apache/fop/xml/Attic/FoXMLEventPool.java
Index: FoXMLEventPool.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/xml/Attic/FoXMLEventPool.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoXMLEventPool.java 27 Nov 2002 03:31:16 - 1.1.2.2
+++ FoXMLEventPool.java 29 Nov 2002 17:29:10 - 1.1.2.3
@@ -45,8 +45,11 @@
* @return an FoXMLEvent.
*/
public synchronized FoXMLEvent acquireFoXMLEvent() {
-FoXMLEvent ev = (FoXMLEvent)(acquireXMLEvent());
+if (poolSize == 0)
+return new FoXMLEvent(namespaces);
+FoXMLEvent ev = ((FoXMLEvent)(pool.get(--poolSize))).clearFo();
ev.setFoType(FObjectNames.NO_FO);
+eventSet.clear(ev.id);
return ev;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/xml FoXMLEventPool.java
pbwest 2002/11/26 19:31:16
Modified:src/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
FoXMLEventPool.java
Log:
Changed acquireFoXMLEvent() to extend XMLEventPool.acquireEvent() and clear the
FoType field.
Added two-arg constructor with initialSize arg.
Revision ChangesPath
No revision
No revision
1.1.2.2 +17 -17xml-fop/src/org/apache/fop/xml/Attic/FoXMLEventPool.java
Index: FoXMLEventPool.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/xml/Attic/FoXMLEventPool.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FoXMLEventPool.java 23 Nov 2002 14:42:05 - 1.1.2.1
+++ FoXMLEventPool.java 27 Nov 2002 03:31:16 - 1.1.2.2
@@ -1,12 +1,11 @@
package org.apache.fop.xml;
import org.apache.fop.apps.FOPException;
+import org.apache.fop.fo.FObjectNames;
import org.apache.fop.xml.FoXMLEvent;
import org.apache.fop.xml.XMLNamespaces;
import org.apache.fop.xml.XMLEventPool;
-import java.util.LinkedList;
-
/*
* $Id$
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
@@ -25,29 +24,30 @@
private static final String revision = "$Revision$";
/**
- * The one-argument constructor uses the default initialization values:
- * NOEVENT for the event type, and null references for all others
- * except namespaces.
+ * The one-argument constructor requires namespaces.
+ * @param namespaces - an XMLNamespaces object.
*/
public FoXMLEventPool(XMLNamespaces namespaces) {
super(namespaces);
}
/**
- * Acquire an FoXMLEvent.
- * @return an FoXMLEvent.
+ * Construct a pool with a given initial size.
+ * @param namespaces - an XMLNamespaces object.
+ * @param initialSize - the initial size of the pool.
*/
-public synchronized FoXMLEvent acquireFoXMLEvent() {
-return (FoXMLEvent)(acquireXMLEvent());
+public FoXMLEventPool(XMLNamespaces namespaces, int initialSize) {
+super(namespaces, initialSize);
}
/**
- * Return an FoXMLEvent to the pool.
- * @param ev - the event being returned.
+ * Acquire an FoXMLEvent.
+ * @return an FoXMLEvent.
*/
-public synchronized void surrenderFoXMLEvent(FoXMLEvent ev) {
-ev.clear();
-pool.add(ev);
+public synchronized FoXMLEvent acquireFoXMLEvent() {
+FoXMLEvent ev = (FoXMLEvent)(acquireXMLEvent());
+ev.setFoType(FObjectNames.NO_FO);
+return ev;
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/xml FoXMLEventPool.java XMLEventPool.java FoXMLEvent.java FoXMLSerialHandler.java SyncedFoXmlEventsBuffer.java XMLEvent.java
pbwest 2002/11/23 06:42:05
Modified:src/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
FoXMLEvent.java FoXMLSerialHandler.java
SyncedFoXmlEventsBuffer.java XMLEvent.java
Added: src/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
FoXMLEventPool.java XMLEventPool.java
Log:
Extended for XMLEvent pool.
Revision ChangesPath
No revision
No revision
1.1.2.2 +20 -3 xml-fop/src/org/apache/fop/xml/Attic/FoXMLEvent.java
Index: FoXMLEvent.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/xml/Attic/FoXMLEvent.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FoXMLEvent.java 24 Oct 2002 14:39:11 - 1.1.2.1
+++ FoXMLEvent.java 23 Nov 2002 14:42:04 - 1.1.2.2
@@ -73,8 +73,25 @@
this.foType = foType;
}
+/**
+ * Clear the fields of this event. Provided for pool operations.
+ * The namespaces field is not cleared.
+ */
+public void clear() {
+super.clear();
+foType = FObjectNames.NO_FO;
+}
+
+/**
+ * Get the FO type of this FoXMLEvent.
+ * @returns the FO type.
+ */
public int getFoType() { return foType; }
+/**
+ * Set the FO type of this FoXMLEvent.
+ * @param foType -the FO type.
+ */
public void setFoType(int foType) { this.foType = foType; }
public String toString() {
1.1.2.3 +8 -3 xml-fop/src/org/apache/fop/xml/Attic/FoXMLSerialHandler.java
Index: FoXMLSerialHandler.java
===
RCS file: /home/cvs/xml-fop/src/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 13 Nov 2002 15:25:19 - 1.1.2.2
+++ FoXMLSerialHandler.java 23 Nov 2002 14:42:05 - 1.1.2.3
@@ -3,6 +3,7 @@
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.xml.XMLNamespaces;
import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
+import org.apache.fop.xml.FoXMLEventPool;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.Driver;
import org.apache.fop.configuration.Configuration;
@@ -43,6 +44,9 @@
private Thread foThread;
private boolean errorDump;
+/** The pool associated with the buffer. */
+private FoXMLEventPool pool;
+
/**
* @param events the events buffer.
* @param parser the xml parser.
@@ -57,6 +61,7 @@
namespaces = events.getNamespaces();
parser.setContentHandler(this);
errorDump = Configuration.getBooleanValue("debugMode").booleanValue();
+pool = events.getPool();
}
public void setFoThread(Thread foThread) {
1.1.2.5 +17 -2
xml-fop/src/org/apache/fop/xml/Attic/SyncedFoXmlEventsBuffer.java
Index: SyncedFoXmlEventsBuffer.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/xml/Attic/SyncedFoXmlEventsBuffer.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- SyncedFoXmlEventsBuffer.java 13 Nov 2002 15:29:36 - 1.1.2.4
+++ SyncedFoXmlEventsBuffer.java 23 Nov 2002 14:42:05 - 1.1.2.5
@@ -5,6 +5,8 @@
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FObjectSets;
+import org.apache.fop.xml.FoXMLEventPool;
+
import java.util.NoSuchElementException;
import java.util.LinkedList;
import java.util.Iterator;
@@ -33,6 +35,11 @@
private XMLNamespaces namespaces;
/**
+ * The FoXMLEventPool for this buffer.
+ */
+private FoXMLEventPool pool;
+
+/**
* No-argument constructor sets up a buffer with the default number of
* elements.
* The producer and consumer Threads default to the current
@@ -43,6 +50,7 @@
{
super();
namespaces = new XMLNamespaces();
+pool = new FoXMLEventPool(namespaces);
}
/**
@@ -54,6 +62,7 @@
{
super(size);
namespaces = new XMLNamespaces();
+pool = new FoXMLEventPool(namespaces);
}
/**
@@ -61,6 +70,12 @@
* @return - the namespaces object.
*/
public XMLNamespaces getNamespaces() { return namespaces; }
+
+/**
+ * Get the FoXMLEventPool from this buffer.
+ * @return - the pool object.
+ */
+public FoXMLEventPool getPool() { return pool; }
/**
* @return next event from the SyncedCircularBuffer
1.1.2.7 +24 -3 xml-fo
