Re: Justification in HEAD
J.Pietschmann wrote:
Thanks for your responses, they are useful in helping my thought process.
Well, the line may be parsed while rendering, which means you don't have
to create area objects, roughly:
StringTokenizer tok=new StringTokenizer(...);
while( tok.hasMoreTokens ) {
String word = tok.nextToken();
renderText(x,y,word);
x+=width(word);
x+=adjustedSpaceWidth;
}
An interesting idea... but hasnt this already been done in more detail
in TextLM.getNextBreakPoss? So why should the renderer have to do it
again (although in less complexity)? I would rather have layout do this,
otherwise this logic would have to live in every renderer.
There is a tradeoff between avoiding recomputing the word width and
carrying it around for probably some significant time.
I dont understand this bit fully. Are you saying its inefficient to
carry around data items such as dAdjust, TSAdjust, etc? I would
definitely say it is better than re-computing them in the renderer.
Chris
Re: Justification in HEAD
Simon Pepping wrote: The trouble is renderText is being presented with a whole line at a time. It should be presented with smaller chunks if it is going to be able to add the TSAdjust space to each word space. Do you need to break the line is as many separate text areas as there are word spaces ( + 1 )? Well yes, but I'm open to alternative ideas. I also believe dAdjust is computed incorrectly. I'm going to change the dAdjust in LineLM.makeLineBreak to be targetWidth - realWidth instead of (targetWidth - realWidth) / realWidth. Have you got any ideas why dAdjust is computed this way? I guess it is supposed to be a relative, not an absolute length difference, so that it can be used as a factor. I have not followed the calculations in that much detail. Well thats what I thought, but relative factors still need to produce absolute results and realWidth isnt available to use as a multiplier in the TextLM.addAreas method. Chris
Re: [Bug 25480] - Experimental performance improvements.
[me] 1) Only store the specified properties. That is what HEAD does now. 2) Put the relevant properties in a fast Property[] array and the remaining specified properties in a HashMap. For fo:root the result would be an array of size 1 for the 'media-usage' property. 3) Expect to store every valid property. For fo:root that would mean allocating an array large enough to store every defined property. This is what my patch does, and the values array works as the PropertyWindow. ... I'll try to come up with some numbers to see how much memory that would use/save compared to 1) and 3). You can find the counts of relevant and valid properties for each element type here: http://bckfnn-modules.sf.net/valid http://bckfnn-modules.sf.net/relevant and a trace of the number of (base) properties defined at each element in the DocBook:TDG example I've been using all along. http://bckfnn-modules.sf.net/prop-count Adding these numbers together in a rough sort of way, I've come to this result. The number to the right is the amount of bytes it takes to store the references to the properties. 1) hashsize(specified): 713828 2) relevant * 4 + hashsize(specified) 3906168 3) valid * 4 7007052 Where hashsize is a function cnt * (16 + 12) + int(cnt * 1.) * 4 that tries calculate to amount of memory consumed by each entry in a HashMap. 16 bytes is taken by each HashMap.Entry object and I estimate 12 bytes system overhead for each object. 1. is the loadfactor of the HashMap.table array. The number for 2) is most likely too high, it should only be necessary to store the non-relevant properties in the HashMap, but I don't have the count of non-relevant properties available. The full summary can be found here: http://bckfnn-modules.sf.net/summary occur: the number of times the element occurs in the input. spec: the number of specified properties on all the occurrences of that element type. relev: the maximum number of relevant slots that can be filled on all the occurrences of that element type. valid: the maximum number of valid slots that can be filled on all the occurrences of that element type. regards, finn
cvs commit: xml-fop/src/java/org/apache/fop/apps FOPException.java
pbwest 2004/01/14 06:05:15
Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
FOPException.java
Log:
Modified to use 1.4 exception chaining
Revision ChangesPath
No revision
No revision
1.2.2.4 +16 -8 xml-fop/src/java/org/apache/fop/apps/FOPException.java
Index: FOPException.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/FOPException.java,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- FOPException.java 11 Jul 2003 04:03:47 - 1.2.2.3
+++ FOPException.java 14 Jan 2004 14:05:15 - 1.2.2.4
@@ -52,8 +52,6 @@
package org.apache.fop.apps;
-import org.xml.sax.SAXException;
-
/**
* Exception thrown when FOP has a problem
@@ -62,9 +60,9 @@
private static final String TAG = $Name$;
private static final String REVISION = $Revision$;
-private static final String EXCEPTION_SEPARATOR = \n-\n;
+//private static final String EXCEPTION_SEPARATOR = \n-\n;
-private Throwable exception;
+//private Throwable exception;
/**
* create a new FOP Exception
@@ -79,8 +77,7 @@
* @param e incoming Throwable
*/
public FOPException(Throwable e) {
-super(e.getMessage());
-setException(e);
+super(e);
}
/**
@@ -88,30 +85,34 @@
* @param e the exception
*/
public FOPException(String message, Throwable e) {
-super(message);
-setException(e);
+super(message, e);
}
/**
* Sets this exception to the Throwable parameter
* @param t the exception
*/
+/*
protected void setException(Throwable t) {
exception = t;
}
+*/
/**
* Gets this exception.
* @return a Throwable
*/
+/*
public Throwable getException() {
return exception;
}
+*/
/**
* Gets the root exception of this exception.
* @return the Throwable root exception
*/
+/*
protected Throwable getRootException() {
Throwable result = exception;
@@ -127,11 +128,13 @@
}
return null;
}
+*/
/**
* @see java.lang.Throwable#printStackTrace()
*/
+/*
public void printStackTrace() {
synchronized (System.err) {
super.printStackTrace();
@@ -145,10 +148,12 @@
}
}
}
+*/
/**
* @see java.lang.Throwable#printStackTrace(java.io.PrintStream)
*/
+/*
public void printStackTrace(java.io.PrintStream stream) {
synchronized (stream) {
super.printStackTrace(stream);
@@ -162,10 +167,12 @@
}
}
}
+*/
/**
* @see java.lang.Throwable#printStackTrace(java.io.PrintWriter)
*/
+/*
public void printStackTrace(java.io.PrintWriter writer) {
synchronized (writer) {
super.printStackTrace(writer);
@@ -179,5 +186,6 @@
}
}
}
+*/
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/apps Driver.java
pbwest 2004/01/14 06:13:17
Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
Driver.java
Log:
Name change: SyncedFoXmlEventsBuffer to SyncedXmlEventsBuffer
Exception handling modified for 1.4 exception chaining
Revision ChangesPath
No revision
No revision
1.9.2.5 +4 -9 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.4
retrieving revision 1.9.2.5
diff -u -r1.9.2.4 -r1.9.2.5
--- Driver.java 5 Jan 2004 02:24:04 - 1.9.2.4
+++ Driver.java 14 Jan 2004 14:13:17 - 1.9.2.5
@@ -63,7 +63,7 @@
import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.version.Version;
import org.apache.fop.xml.FoXMLSerialHandler;
-import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
+import org.apache.fop.xml.SyncedXmlEventsBuffer;
/**
* Sets up and runs serialized component threads.
@@ -81,7 +81,7 @@
private InputSource source;
private FoXMLSerialHandler xmlhandler;
-private SyncedFoXmlEventsBuffer xmlevents;
+private SyncedXmlEventsBuffer xmlevents;
private FOTree foTree;
private AreaTree areaTree = new AreaTree();
@@ -106,7 +106,7 @@
* Sets up the environment and start processing threads.
* The primary elements of the environment include:br
* the input source, the parser, the
- * [EMAIL PROTECTED] org.apache.fop.xml.SyncedFoXmlEventsBuffer
SyncedFoXmlEventsBuffer}
+ * [EMAIL PROTECTED] org.apache.fop.xml.SyncedXmlEventsBuffer
SyncedXmlEventsBuffer}
* (codexmlevents/code), the
* [EMAIL PROTECTED] org.apache.fop.xml.FoXMLSerialHandler FoXMLSerialHandler}
* (codexmlhandler/code) and the
@@ -138,7 +138,7 @@
// Setting of namespace-prefixes feature no longer required
//setParserFeatures(parser);
-xmlevents = new SyncedFoXmlEventsBuffer();
+xmlevents = new SyncedXmlEventsBuffer();
xmlhandler = new FoXMLSerialHandler(xmlevents, parser, source);
foTree = new FOTree(xmlevents);
@@ -213,11 +213,6 @@
e.printStackTrace();
if (((SAXException)e).getException() != null) {
((SAXException)e).getException().printStackTrace();
-}
-} else if (e instanceof FOPException) {
-e.printStackTrace();
-if (((FOPException)e).getException() != null) {
-((FOPException)e).getException().printStackTrace();
}
} else {
e.printStackTrace();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/apps Driver.java InputHandler.java package.html FOPException.java CommandLineStarter.java Fop.java FOInputHandler.java
pbwest 2004/01/14 06:17:20 Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design Driver.java InputHandler.java package.html FOPException.java CommandLineStarter.java Fop.java FOInputHandler.java Log: Changed to ASCII -kkv from -ko Revision ChangesPath No revision No revision 1.9.2.6 +0 -0 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.5 retrieving revision 1.9.2.6 diff -u -r1.9.2.5 -r1.9.2.6 1.4.2.2 +0 -0 xml-fop/src/java/org/apache/fop/apps/InputHandler.java Index: InputHandler.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/InputHandler.java,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -u -r1.4.2.1 -r1.4.2.2 1.1.2.2 +0 -0 xml-fop/src/java/org/apache/fop/apps/package.html Index: package.html === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/package.html,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 1.2.2.5 +0 -0 xml-fop/src/java/org/apache/fop/apps/FOPException.java Index: FOPException.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/FOPException.java,v retrieving revision 1.2.2.4 retrieving revision 1.2.2.5 diff -u -r1.2.2.4 -r1.2.2.5 1.3.2.4 +0 -0 xml-fop/src/java/org/apache/fop/apps/Attic/CommandLineStarter.java Index: CommandLineStarter.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Attic/CommandLineStarter.java,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -u -r1.3.2.3 -r1.3.2.4 1.1.2.3 +0 -0 xml-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.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 1.4.2.2 +0 -0 xml-fop/src/java/org/apache/fop/apps/Attic/FOInputHandler.java Index: FOInputHandler.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Attic/FOInputHandler.java,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -u -r1.4.2.1 -r1.4.2.2 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/apps CommandLineStarter.java FOInputHandler.java
pbwest 2004/01/14 06:18:45 Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design CommandLineStarter.java FOInputHandler.java Log: Changed to ASCII -kkv from -ko Revision ChangesPath No revision No revision 1.3.2.5 +0 -0 xml-fop/src/java/org/apache/fop/apps/Attic/CommandLineStarter.java Index: CommandLineStarter.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Attic/CommandLineStarter.java,v retrieving revision 1.3.2.4 retrieving revision 1.3.2.5 diff -u -r1.3.2.4 -r1.3.2.5 1.4.2.3 +0 -0 xml-fop/src/java/org/apache/fop/apps/Attic/FOInputHandler.java Index: FOInputHandler.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Attic/FOInputHandler.java,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -r1.4.2.2 -r1.4.2.3 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo FObjects.java
pbwest 2004/01/14 06:40:19
Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FObjects.java
Log:
defaultConstructorArgs moved here from FONode
Method makeFlowObject overridden by version with
XMLEvent event signature, used when it is possible the
event is a XMLEvent of type CHARACTERS, as opposed
to an FoXMLEvent.
Revision ChangesPath
No revision
No revision
1.1.2.4 +67 -4 xml-fop/src/java/org/apache/fop/fo/Attic/FObjects.java
Index: FObjects.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/FObjects.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- FObjects.java 5 Jan 2004 02:53:04 - 1.1.2.3
+++ FObjects.java 14 Jan 2004 14:40:19 - 1.1.2.4
@@ -62,7 +62,9 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.datatypes.Ints;
+import org.apache.fop.fo.flow.FoPcdata;
import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.XMLEvent;
/**
* Data class for common data and methods relating to Flow Objects.
@@ -130,6 +132,24 @@
= new Constructor[FObjectNames.foLocalNamesLength];
/**
+ * The default constructor arguments for an FObject. bN.B./b not
+ * all subclasses of ttFONode/tt use this constructor; e.g.
+ * ttFoRoot/tt, ttFoPageSequence/tt amp; ttFoFlow/tt.
+ * Generally these FObjects are not invoked through reflection. If such
+ * invocation becomes necessary for a particular class, a contructor of
+ * this kind must be added to the class.
+ * pAt present, the only difference is in the addition of the
+ * ttint.class/tt constructor argument.
+ */
+protected static final Class[] defaultConstructorArgs =
+new Class[] {
+FOTree.class
+,FONode.class
+,FoXMLEvent.class
+,int.class
+};
+
+/**
* A HashMap whose elements are an integer index value keyed by an
* fo local name. The index value is the index of the fo local name in
* the FObjectNames.foLocalNames[] array.
@@ -207,6 +227,18 @@
}
}
+/**
+ * This method generates generates new FO objects, except for FoPcdata
+ * objects, which require an XMLEvent argument. Use only when it is
+ * known that no CHARACTERS event will be passed.
+ * @param foTree
+ * @param parent
+ * @param event the codeFoXMLEvent/code event that triggered the
+ * generation of this FO
+ * @param stateFlags
+ * @return the new FO node
+ * @throws FOPException
+ */
public Object makeFlowObject(FOTree foTree,
FONode parent, FoXMLEvent event, int stateFlags)
throws FOPException
@@ -225,7 +257,7 @@
// Generate the constructor object
foclass = Class.forName(foPkgClassNames[foType]);
foConstructors[foType] =
-foclass.getConstructor(FONode.defaultConstructorArgs);
+foclass.getConstructor(defaultConstructorArgs);
}
// Now generate a new instance
return foConstructors[foType].newInstance(args);
@@ -240,6 +272,37 @@
} catch (InvocationTargetException e) {
throw new FOPException(e);
}
+}
+
+/**
+ * This method generates generates new FO objects, including FoPcdata
+ * objects. It is more general in this sense than the overloaded
+ * version which takes the codeFoXMLEvent event/code parameter.
+ * objects, which require an XMLEvent argument.
+ * @param foTree
+ * @param parent
+ * @param event the codeXMLEvent/code which triggered the generation
+ * of this fo
+ * @param stateFlags
+ * @return
+ * @throws FOPException
+ */
+public Object makeFlowObject(FOTree foTree,
+FONode parent, XMLEvent event, int stateFlags)
+throws FOPException
+{
+if (event instanceof FoXMLEvent) {
+return makeFlowObject(
+foTree, parent, (FoXMLEvent)event, stateFlags);
+}
+if (event.getType() != XMLEvent.CHARACTERS) {
+throw new FOPException(
+Attempt to makeFlowObject() with XMLEvent for event type
++ XMLEvent.eventTypeName(event.getType()));
+}
+int foType = FObjectNames.PCDATA;
+
+return new FoPcdata(foTree, parent, event, stateFlags);
}
public static int getFoIndex(String name) {
cvs commit: xml-fop/src/java/org/apache/fop/fo FObjects.java
pbwest 2004/01/14 06:59:05
Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FObjects.java
Log:
Removed redundant statement from makeFlowObject
Added Javadoc comments
Revision ChangesPath
No revision
No revision
1.1.2.5 +33 -10xml-fop/src/java/org/apache/fop/fo/Attic/FObjects.java
Index: FObjects.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/FObjects.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FObjects.java 14 Jan 2004 14:40:19 - 1.1.2.4
+++ FObjects.java 14 Jan 2004 14:59:05 - 1.1.2.5
@@ -77,19 +77,24 @@
public static final String packageNamePrefix = org.apache.fop;
+/**
+ * Create a singleton FObjects object
+ */
public static final FObjects fobjects;
static {
-//try {
-fobjects = new FObjects();
-//} catch (FOPException e) {
-//throw new RuntimeException(e.getMessage());
-//}
+fobjects = new FObjects();
}
+/**
+ * @return the singleton
+ */
public static final FObjects getFObjects() {
return fobjects;
}
+/**
+ * FObjects cannot be instantiated
+ */
private FObjects() {}
/**
@@ -300,23 +305,41 @@
Attempt to makeFlowObject() with XMLEvent for event type
+ XMLEvent.eventTypeName(event.getType()));
}
-int foType = FObjectNames.PCDATA;
-
return new FoPcdata(foTree, parent, event, stateFlags);
}
+/**
+ * Get the index of an unqualified FO class name
+ * @param name of the FO
+ * @return the index
+ */
public static int getFoIndex(String name) {
return ((Integer)(foToIndex.get(name))).intValue();
}
+/**
+ * Get the unqualified class name of the indicated FO
+ * @param foIndex of the rwquired FO
+ * @return the unqualified class name
+ */
public static String getClassName(int foIndex) {
return foClassNames[foIndex];
}
+/**
+ * Get the fully-qualified class name of the indicated FO
+ * @param foIndex of the required FO
+ * @return the fully-qualified class name
+ */
public static String getPkgClassName(int foIndex) {
return foPkgClassNames[foIndex];
}
+/**
+ * Get the codeConstructor/code object for a given FO
+ * @param foIndex of the FO
+ * @return the codeConstructor/code
+ */
public Constructor getConstructor(int foIndex) {
return foConstructors[foIndex];
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo FONode.java
pbwest 2004/01/14 07:02:36
Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FONode.java
Log:
SyncedFoXmlEventsBuffer renamed to SyncedXmlEventsBuffer
Changed constructor signature to take XMLEvent instead of FoXMLEvent
Moved defaultConstructorArgs to FObjects
Revision ChangesPath
No revision
No revision
1.2.2.4 +4 -22 xml-fop/src/java/org/apache/fop/fo/FONode.java
Index: FONode.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FONode.java,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- FONode.java 10 Jan 2004 06:29:50 - 1.2.2.3
+++ FONode.java 14 Jan 2004 15:02:36 - 1.2.2.4
@@ -73,8 +73,8 @@
import org.apache.fop.fo.expr.PropertyParser;
import org.apache.fop.fo.properties.Property;
import org.apache.fop.messaging.MessageHandler;
-import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
+import org.apache.fop.xml.XMLEvent;
+import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.XMLNamespaces;
/**
@@ -139,7 +139,7 @@
PAGESEQ | FLOW | STATIC | TITLE | MC_MARKER;
/** The buffer from which parser events are drawn. */
-protected final SyncedFoXmlEventsBuffer xmlevents;
+protected final SyncedXmlEventsBuffer xmlevents;
/** The namespaces object associated with ixmlevents/i. */
protected XMLNamespaces namespaces;
@@ -208,24 +208,6 @@
protected FONode ancestorRefArea = null;
/**
- * The default constructor arguments for an FObject. bN.B./b not
- * all subclasses of ttFONode/tt use this constructor; e.g.
- * ttFoRoot/tt, ttFoPageSequence/tt amp; ttFoFlow/tt.
- * Generally these FObjects are not invoked through reflection. If such
- * invocation becomes necessary for a particular class, a contructor of
- * this kind must be added to the class.
- * pAt present, the only difference is in the addition of the
- * ttint.class/tt constructor argument.
- */
-protected static final Class[] defaultConstructorArgs =
-new Class[] {
-FOTree.class
-,FONode.class
-,FoXMLEvent.class
-,int.class
-};
-
-/**
* @param foTree an ttFOTree/tt to which this node belongs
* @param type the fo type of this FONode.
* @param parent an ttFONode/tt, the parent node of this node in
@@ -244,7 +226,7 @@
* properties.
*/
public FONode
-(FOTree foTree, int type, FONode parent, FoXMLEvent event,
+(FOTree foTree, int type, FONode parent, XMLEvent event,
int stateFlags, int[] sparsePropsMap, int[] sparseIndices)
throws TreeException, FOPException, PropertyException
{
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo FOTree.java
pbwest 2004/01/14 07:05:03
Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FOTree.java
Log:
SyncedFoXmlEventsBuffer renamed to SyncedXmlEventsBuffer
Some instances of FoXMLEvent changed to XMLEvent
Revision ChangesPath
No revision
No revision
1.1.2.2 +10 -10xml-fop/src/java/org/apache/fop/fo/Attic/FOTree.java
Index: FOTree.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/FOTree.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FOTree.java 5 Jul 2003 19:26:05 - 1.1.2.1
+++ FOTree.java 14 Jan 2004 15:05:02 - 1.1.2.2
@@ -63,8 +63,8 @@
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.expr.PropertyParser;
-import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
+import org.apache.fop.xml.SyncedXmlEventsBuffer;
+import org.apache.fop.xml.XMLEvent;
/**
* ttFOTree/tt is the class that generates and maintains the FO Tree.
@@ -80,7 +80,7 @@
* The buffer from which the ttXMLEvent/tts from the parser will
* be read. ttprotected/tt so that FONode can access it.
*/
-protected SyncedFoXmlEventsBuffer xmlevents;
+protected SyncedXmlEventsBuffer xmlevents;
private Thread parserThread;
private boolean errorDump;
@@ -94,7 +94,7 @@
* @param xmlevents the buffer from which ttXMLEvent/tts from the
* parser are read.
*/
-public FOTree(SyncedFoXmlEventsBuffer xmlevents)
+public FOTree(SyncedXmlEventsBuffer xmlevents)
throws PropertyException
{
super();
@@ -139,7 +139,7 @@
* parser events.
* @return ixmlevents/i.
*/
-public SyncedFoXmlEventsBuffer getXmlevents() {
+public SyncedXmlEventsBuffer getXmlevents() {
return xmlevents;
}
@@ -149,7 +149,7 @@
*/
public void run() {
FoRoot foRoot;
-FoXMLEvent event;
+XMLEvent event;
try {
// Let the parser look after STARTDOCUMENT and the correct
// positioning of the root element
@@ -158,7 +158,7 @@
foRoot.buildFoTree();
System.out.println(Back from buildFoTree);
// Clean up the fo:root event
-event = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV,
event);
+event = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV,
event);
// Get the end of document
xmlevents.getEndDocument();
} catch (Exception e) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo FOAttributes.java
pbwest 2004/01/14 07:07:46
Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FOAttributes.java
Log:
Changed constructor signature to take XMLEvent instead of FoXMLEvent
Test for CHARACTERS event now performed using event.type rather than event.foType
Revision ChangesPath
No revision
No revision
1.1.2.5 +6 -6 xml-fop/src/java/org/apache/fop/fo/Attic/FOAttributes.java
Index: FOAttributes.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/FOAttributes.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FOAttributes.java 5 Jan 2004 02:52:09 - 1.1.2.4
+++ FOAttributes.java 14 Jan 2004 15:07:46 - 1.1.2.5
@@ -68,7 +68,7 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.datatypes.Ints;
import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.XMLEvent;
import org.apache.fop.xml.XMLNamespaces;
/**
@@ -135,7 +135,7 @@
* @param foNode - the ttFONode/tt with which these attributes are
* associated.
*/
-public FOAttributes(FoXMLEvent event, FONode foNode) throws FOPException {
+public FOAttributes(XMLEvent event, FONode foNode) throws FOPException {
// If the event is null, there is no event associated with this
// node, probably because this is a manufactured node; e.g.,
@@ -143,7 +143,7 @@
// includes an empty foAttrMap HashMap.
if (event == null) return;
-if (event.getFoType() == FObjectNames.PCDATA)
+if (event.getType() == XMLEvent.CHARACTERS)
return; // go with the empty foAttrMap
// Create the foAttrMap.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo FoRoot.java
pbwest 2004/01/14 07:19:25
Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FoRoot.java
Log:
SyncedFoXmlEventsBuffer renamed to SyncedXmlEventsBuffer
Some instances of FoXMLEvent changed to XMLEvent
Changes to signatures of FO constructors reflected here
Revision ChangesPath
No revision
No revision
1.1.2.3 +14 -14xml-fop/src/java/org/apache/fop/fo/Attic/FoRoot.java
Index: FoRoot.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/FoRoot.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoRoot.java 10 Jan 2004 06:29:50 - 1.1.2.2
+++ FoRoot.java 14 Jan 2004 15:19:25 - 1.1.2.3
@@ -66,7 +66,7 @@
import org.apache.fop.fo.flow.FoPageSequence;
import org.apache.fop.fo.pagination.FoLayoutMasterSet;
import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
+import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.XMLEvent;
import org.apache.fop.xml.XMLNamespaces;
@@ -125,11 +125,11 @@
/**
* @param foTree the FO tree being built
- * @param event the ttFoXMLEvent/tt that triggered the creation of this
+ * @param event the ttXMLEvent/tt that triggered the creation of this
* node
*/
public FoRoot
-(FOTree foTree, FoXMLEvent event)
+(FOTree foTree, XMLEvent event)
throws TreeException, FOPException, PropertyException
{
// This is the root node of the tree; hence the null argument
@@ -162,7 +162,7 @@
* in the page-sequence-sequence.
*/
public void buildFoTree() throws FOPException{
-FoXMLEvent ev;
+XMLEvent ev;
String nowProcessing;
//System.out.println(buildFoTree: + event);
nowProcessing = layout-master-set;
@@ -175,7 +175,7 @@
new FoLayoutMasterSet(getFOTree(), this, ev);
// Clean up the fo:layout-master-set event
pageSequenceMasters = layoutMasters.getPageSequenceMasters();
-ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
+ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
layoutMasters.deleteSubTree();
@@ -187,7 +187,7 @@
// process the declarations
declarations = numChildren();
new FoDeclarations(getFOTree(), this, ev);
-ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV,
ev);
+ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
}
@@ -199,15 +199,15 @@
if (ev == null)
throw new FOPException(No page-sequence found.);
firstPageSeq = numChildren();
-new FoPageSequence(getFOTree(), this, ev);
-ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
+new FoPageSequence(getFOTree(), this, (FoXMLEvent)ev);
+ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
while ((ev = xmlevents.expectStartElement
(FObjectNames.PAGE_SEQUENCE, XMLEvent.DISCARD_W_SPACE))
!= null) {
// Loop over remaining fo:page-sequences
-new FoPageSequence(getFOTree(), this, ev);
-ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV,
ev);
+new FoPageSequence(getFOTree(), this, (FoXMLEvent)ev);
+ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
}
} catch (NoSuchElementException e) {
@@ -224,7 +224,7 @@
for (int i = 0; i = XMLNamespaces.LAST_NS_INDEX; i++) {
System.out.println(Namespace + namespaces.getIndexURI(i));
System.out.println(Size of event pool: +
-namespaces.getPoolSize(i));
+namespaces.getNSPoolSize(i));
System.out.println(Next event id : +
namespaces.getSequenceValue(i));
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo FObjectNames.java
pbwest 2004/01/14 07:20:43 Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FObjectNames.java Log: Whitespace change only Revision ChangesPath No revision No revision 1.1.2.4 +3 -3 xml-fop/src/java/org/apache/fop/fo/Attic/FObjectNames.java Index: FObjectNames.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/FObjectNames.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- FObjectNames.java 5 Jan 2004 02:54:59 - 1.1.2.3 +++ FObjectNames.java 14 Jan 2004 15:20:43 - 1.1.2.4 @@ -231,7 +231,7 @@ Duplicate values in propertyToIndex for key + foLocalNames[i][NAMEX]); } - + /** * Get the FObject index corresponding to the FObject name. * @param foName - the FO name. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/declarations FoDeclarations.java
pbwest 2004/01/14 07:23:30
Modified:src/java/org/apache/fop/fo/declarations Tag:
FOP_0-20-0_Alt-Design FoDeclarations.java
Log:
SyncedFoXmlEventsBuffer renamed to SyncedXmlEventsBuffer
Constructor signature change
Some instances of FoXMLEvent changed to XMLEvent
Changes to signatures of FO constructors reflected here
Revision ChangesPath
No revision
No revision
1.1.2.3 +8 -9
xml-fop/src/java/org/apache/fop/fo/declarations/Attic/FoDeclarations.java
Index: FoDeclarations.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/declarations/Attic/FoDeclarations.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoDeclarations.java 10 Jan 2004 06:29:50 - 1.1.2.2
+++ FoDeclarations.java 14 Jan 2004 15:23:30 - 1.1.2.3
@@ -64,8 +64,7 @@
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
+import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.XMLEvent;
/**
@@ -111,20 +110,20 @@
* this node
*/
public FoDeclarations
-(FOTree foTree, FONode parent, FoXMLEvent event)
+(FOTree foTree, FONode parent, XMLEvent event)
throws TreeException, FOPException, PropertyException
{
super(foTree, FObjectNames.DECLARATIONS, parent, event,
FONode.DECLARATIONS_SET, sparsePropsMap, sparseIndices);
try {
-FoXMLEvent ev =
+XMLEvent ev =
xmlevents.expectStartElement
(FObjectNames.COLOR_PROFILE, XMLEvent.DISCARD_W_SPACE);
if (ev == null)
throw new FOPException
(No fo:color-profile in fo:declarations.);
new FoColorProfile(foTree, this, ev);
-ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev);
+ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
do {
ev = xmlevents.expectStartElement
@@ -132,7 +131,7 @@
if (ev == null) break; // No instance of these elements found
new FoColorProfile(foTree, this, ev);
// Flush the master event
-ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV,
ev);
+ev = xmlevents.getEndElement(SyncedXmlEventsBuffer.DISCARD_EV, ev);
namespaces.surrenderEvent(ev);
} while (true);
} catch (NoSuchElementException e) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/declarations FoColorProfile.java
pbwest 2004/01/14 07:24:26
Modified:src/java/org/apache/fop/fo/declarations Tag:
FOP_0-20-0_Alt-Design FoColorProfile.java
Log:
Changed constructor signature to take XMLEvent instead of FoXMLEvent
Revision ChangesPath
No revision
No revision
1.1.2.2 +4 -4
xml-fop/src/java/org/apache/fop/fo/declarations/Attic/FoColorProfile.java
Index: FoColorProfile.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/declarations/Attic/FoColorProfile.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FoColorProfile.java 5 Jul 2003 19:13:25 - 1.1.2.1
+++ FoColorProfile.java 14 Jan 2004 15:24:26 - 1.1.2.2
@@ -63,7 +63,7 @@
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.PropNames;
-import org.apache.fop.xml.FoXMLEvent;
+import org.apache.fop.xml.XMLEvent;
/**
* Implements the fo:simple-page-master flow object
@@ -118,7 +118,7 @@
* @param event the ttFoXMLEvent/tt that triggered the creation of
* this node
*/
-public FoColorProfile(FOTree foTree, FONode parent, FoXMLEvent event)
+public FoColorProfile(FOTree foTree, FONode parent, XMLEvent event)
throws TreeException, FOPException
{
super(foTree, FObjectNames.COLOR_PROFILE, parent, event,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/xml SyncedXmlEventsBuffer.java
pbwest 2004/01/14 07:36:39 Added: src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design SyncedXmlEventsBuffer.java Log: Name changed from SyncedFoXmlEventsBuffer Revision ChangesPath No revision No revision 1.1.2.1 +1437 -0 xml-fop/src/java/org/apache/fop/xml/Attic/SyncedXmlEventsBuffer.java - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/pool - New directory
pbwest 2004/01/14 07:37:57 xml-fop/src/java/org/apache/fop/pool - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/pool XMLEventPool.java
pbwest 2004/01/14 07:38:04 Added: src/java/org/apache/fop/pool Tag: FOP_0-20-0_Alt-Design XMLEventPool.java Log: Moved from org.apache.fop.xml Revision ChangesPath No revision No revision 1.1.2.1 +91 -0 xml-fop/src/java/org/apache/fop/pool/Attic/XMLEventPool.java - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/pool FopPool.java Sequenced.java UriLocalNamePool.java Poolable.java
pbwest 2004/01/14 07:39:23 Added: src/java/org/apache/fop/pool Tag: FOP_0-20-0_Alt-Design FopPool.java Sequenced.java UriLocalNamePool.java Poolable.java Log: Generalized support for pools of the type used for XMLEventPool Revision ChangesPath No revision No revision 1.1.2.1 +148 -0xml-fop/src/java/org/apache/fop/pool/Attic/FopPool.java 1.1.2.1 +69 -0 xml-fop/src/java/org/apache/fop/pool/Attic/Sequenced.java 1.1.2.1 +89 -0 xml-fop/src/java/org/apache/fop/pool/Attic/UriLocalNamePool.java 1.1.2.1 +89 -0 xml-fop/src/java/org/apache/fop/pool/Attic/Poolable.java - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 18977] - Duplicate ID reported in ListItemLabel
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18977. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18977 Duplicate ID reported in ListItemLabel [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Additional Comments From [EMAIL PROTECTED] 2004-01-14 15:40 --- *** This bug has been marked as a duplicate of 14962 ***
DO NOT REPLY [Bug 14962] - Bug in ID Generation
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14962. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14962 Bug in ID Generation [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] --- Additional Comments From [EMAIL PROTECTED] 2004-01-14 15:40 --- *** Bug 18977 has been marked as a duplicate of this bug. ***
cvs commit: xml-fop/src/java/org/apache/fop/xml UriLocalName.java
pbwest 2004/01/14 07:42:29
Modified:src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
UriLocalName.java
Log:
Changed to extend Poolable
Revision ChangesPath
No revision
No revision
1.1.2.2 +70 -6 xml-fop/src/java/org/apache/fop/xml/Attic/UriLocalName.java
Index: UriLocalName.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/xml/Attic/UriLocalName.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- UriLocalName.java 5 Jul 2003 19:12:36 - 1.1.2.1
+++ UriLocalName.java 14 Jan 2004 15:42:29 - 1.1.2.2
@@ -1,20 +1,84 @@
+/*
+ * $Id$
+ *
+ *
+ *
+ * The Apache Software License, Version 1.1
+ *
+ *
+ * Copyright (C) 1999-2004 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/.
+ *
+ *
+ * @author a href=mailto:[EMAIL PROTECTED]Peter B. West/a
+ * @version $Revision$ $Name$
+ */
package org.apache.fop.xml;
+import org.apache.fop.pool.Poolable;
+
/**
* A class for holding and passing a URI index and local name
* pair, as used in the ttXMLEvent/tt class.
*/
-public class UriLocalName {
-public final int uriIndex;
-public final String localName;
+public class UriLocalName extends Poolable {
+protected int uriIndex;
+protected String localName;
/**
* @param uriIndex - the index of the namespace URI maintained in
* the associated ttXMLNamespaces/tt object.
* @param localName - the local name of the event.
*/
-public UriLocalName(int uriIndex, String localName) {
- this.uriIndex = uriIndex;
- this.localName = localName;
+public UriLocalName(int uriIndex, String localName, int sequence) {
+super(sequence);
+this.uriIndex = uriIndex;
+this.localName = localName;
+}
+
+public Poolable clear() {
+uriIndex = XMLNamespaces.NO_NAMESPACE;
+localName = ;
+return this;
}
}
-
cvs commit: xml-fop/src/java/org/apache/fop/xml NameSpaceType.java
pbwest 2004/01/14 07:47:13 Added: src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design NameSpaceType.java Log: Type to extend UriLocalName by adding a namespace-specific type int Revision ChangesPath No revision No revision 1.1.2.1 +76 -0 xml-fop/src/java/org/apache/fop/xml/Attic/NameSpaceType.java - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/xml XMLNamespaces.java
pbwest 2004/01/14 08:11:23
Modified:src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
XMLNamespaces.java
Log:
Variable name changes and other changes to support UriLocalName pool
Use org.apache.fop.pool package classes
Revision ChangesPath
No revision
No revision
1.1.2.5 +87 -39xml-fop/src/java/org/apache/fop/xml/Attic/XMLNamespaces.java
Index: XMLNamespaces.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/xml/Attic/XMLNamespaces.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- XMLNamespaces.java10 Jan 2004 06:29:50 - 1.1.2.4
+++ XMLNamespaces.java14 Jan 2004 16:11:22 - 1.1.2.5
@@ -50,10 +50,11 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.datastructs.SyncedCircularBuffer;
+import org.apache.fop.pool.*;
/**
- * Maintains the namespaces encountered by an invocation of
ttXMLSerialHandler/tt.
- * p
+ * Maintains the namespaces encountered by an invocation of
+ * ttXMLSerialHandler/tt.
* One instance of iXMLNamespaces/i is maintained across all documents
* that may be processed in a single invocation of ttXMLSerialhandler/tt.
* A reference to that instance is kept with every instance of ttXMLEvent/tt.
@@ -84,6 +85,12 @@
public static final String SVGNamespace = http://www.w3.org/2000/svg;;
public static final int NO_NAMESPACE = -1;
+
+/**
+ * Generic undefined type for namespace-specific event types.
+ */
+public static final int NO_NS_TYPE = -1;
+
/** Index for associated namespace */
public static final int DefAttrNSIndex = 0
,XSLNSpaceIndex = 1
@@ -119,20 +126,31 @@
* namespace active in the current document.
*/
private XMLEventPool[] pools = new XMLEventPool[LAST_NS_INDEX + 1];
+
+/**
+ * The pool for codeUriLocalName/code objects.
+ */
+private UriLocalNamePool uriLocalNamePool;
/**
- * Sequence objects for use by ttXMLEvent/tts. Because an
+ * Sequenced objects for use by ttXMLEvent/tts. Because an
* ttXMLEvent/tt object must always be associated with an
* iXMLNamespace/i object, this namespace object will act as a
* singleton for ttXMLEvent/tts. This field provides a counter for
* those objects. The range of values which may be assigned to
- * isequence/i is restricted by iseqMask/i.
+ * insSequences/i is restricted by insSeqMasks/i.
+ */
+private int nsSequences[] = new int[LAST_NS_INDEX + 1];
+
+/**
+ * This field is used to provide sequence numbers for
+ * codePoolable UriLocalName/code objects.
*/
-private int sequence[] = new int[LAST_NS_INDEX + 1];
+private int uriLocalSeq = 0;
/**
- * Number of bits in the sequence mask for the associated namespace.
- * This value will determine the number of sequence values the pool
+ * Number of bits in the nsSequences mask for the associated namespace.
+ * This value will determine the number of nsSequences values the pool
* for the associated namespace will track.
*/
private static final int DEF_ATTR_SEQ_BITS = 14
@@ -142,39 +160,46 @@
;
/**
- * Masks to restrict the range of values within which the sequence value
+ * Masks to restrict the range of values within which the nsSequences value
* for each namespace may cycle.
*/
-private final int[] seqMask =
+private final int[] nsSeqMasks =
{
(1 DEF_ATTR_SEQ_BITS) - 1
,(1 FO_SEQ_BITS) - 1
,(1 FOX_SEQ_BITS) - 1
,(1 SVG_SEQ_BITS) - 1 };
+
+/**
+ * Mask to restrict the range of values within which uriLocalSeq will
+ * cycle.
+ */
+private final int uriLocalSeqMask = (1 FO_SEQ_BITS) - 1;
public XMLNamespaces() {
for (int i = 0; i = LAST_NS_INDEX; i++) {
pools[i] = null;
-sequence[i] = 0;
+nsSequences[i] = 0;
}
pools[DefAttrNSIndex] =
-new XMLEventPool(this, INITIAL_DEF_ATTR_NS_POOL_SIZE);
+new XMLEventPool(INITIAL_DEF_ATTR_NS_POOL_SIZE);
pools[XSLNSpaceIndex] =
-new XMLEventPool(this, INITIAL_XSL_NS_POOL_SIZE);
+new XMLEventPool(INITIAL_XSL_NS_POOL_SIZE);
pools[FOXNSpaceIndex] =
-new XMLEventPool(this, INITIAL_FOX_NS_POOL_SIZE);
+new XMLEventPool(INITIAL_FOX_NS_POOL_SIZE);
pools[SVGNSpaceIndex] =
-new XMLEventPool(this,
cvs commit: xml-fop/src/java/org/apache/fop/xml FoXMLSerialHandler.java
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
* ttInterruptedException/tt that is possible from the iput/i
- * method of a ttSyncedFoXmlEventsBuffer/tt.
+ * method of a ttSyncedXmlEventsBuffer/tt.
*/
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]
cvs commit: xml-fop/src/java/org/apache/fop/xml FoXMLEvent.java
pbwest 2004/01/14 08:27:19
Modified:src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
FoXMLEvent.java
Log:
Constructors require sequence and uriIndex
Revision ChangesPath
No revision
No revision
1.1.2.3 +19 -15xml-fop/src/java/org/apache/fop/xml/Attic/FoXMLEvent.java
Index: FoXMLEvent.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/xml/Attic/FoXMLEvent.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoXMLEvent.java 10 Jan 2004 06:29:50 - 1.1.2.2
+++ FoXMLEvent.java 14 Jan 2004 16:27:19 - 1.1.2.3
@@ -57,6 +57,7 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.FObjectNames;
+import org.apache.fop.pool.Poolable;
/**
* This is a data class to encapsulate the data of an individual XML
@@ -71,15 +72,16 @@
private static final String revision = $Revision$;
/** The FO type, as defined in FObjectNames, of fo: XML events. */
-protected int foType = FObjectNames.NO_FO;
+private int foType = FObjectNames.NO_FO;
/**
- * The one-argument constructor uses the default initialization values:
- * NOEVENT for the event itype/i, and null references for all others
- * except inamespaces/i.
+ * @param namespaces the codeXMLNamespaces/code object
+ * @param sequence the sequence number of the event within its
+ * namespace
+ * @param uriIndex the namesopace index
*/
-public FoXMLEvent (XMLNamespaces namespaces, int sequence) {
-super(namespaces, sequence);
+public FoXMLEvent (XMLNamespaces namespaces, int sequence, int uriIndex) {
+super(namespaces, sequence, uriIndex);
}
/**
@@ -100,20 +102,22 @@
/**
* The cloning constructor takes a reference to an existing
* ttFoXMLEvent/tt object.
+ * @param ev the event to clone
+ * @param sequence number of the clone
*/
-public FoXMLEvent(FoXMLEvent ev) throws FOPException {
-super(ev);
+public FoXMLEvent(FoXMLEvent ev, int sequence) {
+super(ev, sequence);
foType = ev.foType;
}
public FoXMLEvent(XMLNamespaces namespaces, int sequence,
-int type, String chars) {
-super(namespaces, sequence, type, chars);
+int uriIndex, int type, String chars) {
+super(namespaces, sequence, uriIndex, type, chars);
}
public FoXMLEvent(XMLNamespaces namespaces, int sequence,
int type, int uriIndex, AttributesImpl attributes, int foType) {
-super(namespaces, sequence);
+super(namespaces, sequence, uriIndex);
this.type = type;
this.uriIndex = uriIndex;
this.attributes = attributes;
@@ -125,7 +129,7 @@
* Neither the inamespaces/i nor the iid/i field is cleared.
* @return the cleared ttXMLEvent/tt event.
*/
-public XMLEvent clear() {
+public Poolable clear() {
foType = FObjectNames.NO_FO;
return super.clear();
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/pool package.html
pbwest 2004/01/14 08:29:50 Added: src/java/org/apache/fop/pool Tag: FOP_0-20-0_Alt-Design package.html Log: Package overview Revision ChangesPath No revision No revision 1.1.2.1 +6 -0 xml-fop/src/java/org/apache/fop/pool/Attic/package.html - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/xml package.html
pbwest 2004/01/14 08:30:23 Modified:src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design package.html Log: Fixed package name Revision ChangesPath No revision No revision 1.1.2.2 +1 -1 xml-fop/src/java/org/apache/fop/xml/Attic/package.html Index: package.html === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/xml/Attic/package.html,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- package.html 5 Jul 2003 19:12:36 - 1.1.2.1 +++ package.html 14 Jan 2004 16:30:23 - 1.1.2.2 @@ -1,5 +1,5 @@ HTML -TITLEorg.apache.fop.datastructs Package/TITLE +TITLEorg.apache.fop.xml Package/TITLE BODY PClasses for FO parsing and XML event serialisation./P /BODY - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/pagination FoSimplePageMaster.java FoRegionEnd.java FoPageSequenceMaster.java FoLayoutMasterSet.java FoRegionBody.java FoRegionStartEnd.java FoRegionStart.java FoRegionAfter.java FoRegionBeforeAfter.java FoRegionBefore.java
pbwest 2004/01/14 08:32:04
Modified:src/java/org/apache/fop/fo/pagination Tag:
FOP_0-20-0_Alt-Design FoSimplePageMaster.java
FoRegionEnd.java FoPageSequenceMaster.java
FoLayoutMasterSet.java FoRegionBody.java
FoRegionStartEnd.java FoRegionStart.java
FoRegionAfter.java FoRegionBeforeAfter.java
FoRegionBefore.java
Log:
Constructor modifiactions to discriminate situations requiring an
FoXMLEvent arg and those requiring XMLEvent
Revision ChangesPath
No revision
No revision
1.1.2.3 +10 -11
xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java
Index: FoSimplePageMaster.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoSimplePageMaster.java 10 Jan 2004 06:29:49 - 1.1.2.2
+++ FoSimplePageMaster.java 14 Jan 2004 16:32:03 - 1.1.2.3
@@ -67,8 +67,7 @@
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.PropertySets;
import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.xml.FoXMLEvent;
-import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
+import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.xml.XMLEvent;
/**
@@ -132,13 +131,13 @@
* @param event the ttXMLEvent/tt that triggered the creation of
* this node
*/
-public FoSimplePageMaster(FOTree foTree, FONode parent, FoXMLEvent event)
+public FoSimplePageMaster(FOTree foTree, FONode parent, XMLEvent event)
throws TreeException, FOPException
{
super(foTree, FObjectNames.SIMPLE_PAGE_MASTER, parent, event,
FONode.LAYOUT_SET, sparsePropsMap, sparseIndices);
// Process regions here
-FoXMLEvent regionEv;
+XMLEvent regionEv;
if ((regionEv = xmlevents.expectStartElement
(FObjectNames.REGION_BODY, XMLEvent.DISCARD_W_SPACE)) == null)
throw new FOPException
@@ -147,7 +146,7 @@
// Process region-body
regionBody = new FoRegionBody(foTree, this, regionEv);
regionEv = xmlevents.getEndElement
-(SyncedFoXmlEventsBuffer.DISCARD_EV, regionEv);
+(SyncedXmlEventsBuffer.DISCARD_EV, regionEv);
namespaces.surrenderEvent(regionEv);
// Remaining regions are optional
@@ -157,7 +156,7 @@
{
regionBefore = new FoRegionBefore(foTree, this, regionEv);
regionEv = xmlevents.getEndElement
-(SyncedFoXmlEventsBuffer.DISCARD_EV, regionEv);
+(SyncedXmlEventsBuffer.DISCARD_EV, regionEv);
namespaces.surrenderEvent(regionEv);
}
@@ -167,7 +166,7 @@
{
regionAfter = new FoRegionAfter(foTree, this, regionEv);
regionEv = xmlevents.getEndElement
-(SyncedFoXmlEventsBuffer.DISCARD_EV, regionEv);
+(SyncedXmlEventsBuffer.DISCARD_EV, regionEv);
namespaces.surrenderEvent(regionEv);
}
@@ -177,7 +176,7 @@
{
regionStart = new FoRegionStart(foTree, this, regionEv);
regionEv = xmlevents.getEndElement
-(SyncedFoXmlEventsBuffer.DISCARD_EV, regionEv);
+(SyncedXmlEventsBuffer.DISCARD_EV, regionEv);
namespaces.surrenderEvent(regionEv);
}
@@ -187,7 +186,7 @@
{
regionEnd = new FoRegionEnd(foTree, this, regionEv);
regionEv = xmlevents.getEndElement
-(SyncedFoXmlEventsBuffer.DISCARD_EV, regionEv);
+(SyncedXmlEventsBuffer.DISCARD_EV, regionEv);
namespaces.surrenderEvent(regionEv);
}
1.1.2.2 +4 -4
xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoRegionEnd.java
Index: FoRegionEnd.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoRegionEnd.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FoRegionEnd.java 5 Jul 2003 19:16:49 - 1.1.2.1
+++ FoRegionEnd.java 14 Jan 2004 16:32:03 - 1.1.2.2
@@ -60,7 +60,7 @@
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.xml.FoXMLEvent;
+import
cvs commit: xml-fop/src/java/org/apache/fop/fo/flow FoFootnote.java FoTableColumn.java FoTableBody.java FoRetrieveMarker.java FoMultiCase.java FoMultiPropertySet.java FoListBlock.java FoListItem.java FoTable.java FoPageSequence.java FoFloat.java FoInstreamForeignObject.java FoStaticContent.java FoTitle.java FoFlow.java FoBasicLink.java FoInitialPropertySet.java FoBidiOverride.java FoLeader.java FoTableCell.java FoPageNumberCitation.java FoBlockContainer.java FoMultiToggle.java FoTableRow.java FoMultiProperties.java FoMultiSwitch.java FoWrapper.java FoMarker.java FoTableAndCaption.java FoListItemLabel.java FoTableHeader.java FoPageNumber.java FoFootnoteBody.java FoCharacter.java FoBlock.java FoListItemBody.java FoInline.java FoPcdata.java FoExternalGraphic.java FoNoFo.java FoTableCaption.java FoTableFooter.java FoInlineContainer.java
pbwest 2004/01/14 08:34:22 Modified:src/java/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design FoFootnote.java FoTableColumn.java FoTableBody.java FoRetrieveMarker.java FoMultiCase.java FoMultiPropertySet.java FoListBlock.java FoListItem.java FoTable.java FoPageSequence.java FoFloat.java FoInstreamForeignObject.java FoStaticContent.java FoTitle.java FoFlow.java FoBasicLink.java FoInitialPropertySet.java FoBidiOverride.java FoLeader.java FoTableCell.java FoPageNumberCitation.java FoBlockContainer.java FoMultiToggle.java FoTableRow.java FoMultiProperties.java FoMultiSwitch.java FoWrapper.java FoMarker.java FoTableAndCaption.java FoListItemLabel.java FoTableHeader.java FoPageNumber.java FoFootnoteBody.java FoCharacter.java FoBlock.java FoListItemBody.java FoInline.java FoPcdata.java FoExternalGraphic.java FoNoFo.java FoTableCaption.java FoTableFooter.java FoInlineContainer.java Log: Constructor modifications to discriminate situations requiring an FoXMLEvent arg and those requiring XMLEvent Revision ChangesPath No revision No revision 1.1.2.3 +14 -11xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFootnote.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFootnote.java.diff?r1=1.1.2.2r2=1.1.2.3 1.1.2.2 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableColumn.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableColumn.java.diff?r1=1.1.2.1r2=1.1.2.2 1.1.2.3 +13 -11xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableBody.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableBody.java.diff?r1=1.1.2.2r2=1.1.2.3 1.1.2.2 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoRetrieveMarker.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoRetrieveMarker.java.diff?r1=1.1.2.1r2=1.1.2.2 1.1.2.3 +11 -8 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiCase.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiCase.java.diff?r1=1.1.2.2r2=1.1.2.3 1.1.2.2 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiPropertySet.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiPropertySet.java.diff?r1=1.1.2.1r2=1.1.2.2 1.1.2.3 +11 -9 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListBlock.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListBlock.java.diff?r1=1.1.2.2r2=1.1.2.3 1.1.2.3 +12 -11xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListItem.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListItem.java.diff?r1=1.1.2.2r2=1.1.2.3 1.1.2.3 +25 -17xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTable.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTable.java.diff?r1=1.1.2.2r2=1.1.2.3 1.1.2.3 +13 -13 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageSequence.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageSequence.java.diff?r1=1.1.2.2r2=1.1.2.3 1.1.2.3 +15 -11xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFloat.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFloat.java.diff?r1=1.1.2.2r2=1.1.2.3 1.1.2.2 +3 -3 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoInstreamForeignObject.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoInstreamForeignObject.java.diff?r1=1.1.2.1r2=1.1.2.2 1.1.2.3 +12 -11 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoStaticContent.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoStaticContent.java.diff?r1=1.1.2.2r2=1.1.2.3 1.1.2.3 +15 -12xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTitle.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTitle.java.diff?r1=1.1.2.2r2=1.1.2.3 1.1.2.3 +13 -11xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFlow.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoFlow.java.diff?r1=1.1.2.2r2=1.1.2.3 1.1.2.3 +13 -10xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBasicLink.java
cvs commit: xml-fop/src/java/org/apache/fop/fo/pagination package.html
pbwest 2004/01/14 08:38:03 Added: src/java/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design package.html Log: Package overview Revision ChangesPath No revision No revision 1.1.2.1 +6 -0 xml-fop/src/java/org/apache/fop/fo/pagination/Attic/package.html - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/properties package.html
pbwest 2004/01/14 08:39:09 Added: src/java/org/apache/fop/fo/properties Tag: FOP_0-20-0_Alt-Design package.html Log: Package overview Revision ChangesPath No revision No revision 1.1.2.1 +6 -0 xml-fop/src/java/org/apache/fop/fo/properties/Attic/package.html - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/properties package.html
pbwest 2004/01/14 08:40:50 Modified:src/java/org/apache/fop/fo/properties Tag: FOP_0-20-0_Alt-Design package.html Log: Comment fixed Revision ChangesPath No revision No revision 1.1.2.2 +1 -1 xml-fop/src/java/org/apache/fop/fo/properties/Attic/package.html Index: package.html === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/package.html,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- package.html 14 Jan 2004 16:39:09 - 1.1.2.1 +++ package.html 14 Jan 2004 16:40:50 - 1.1.2.2 @@ -1,6 +1,6 @@ HTML TITLEorg.apache.fop.fo.flow Package/TITLE BODY -PClasses used in processing flow-related FO elements: fo:title, fo:static-content amp; fo:flow. +PClasses defining Properties. /BODY /HTML - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/pagination package.html
pbwest 2004/01/14 08:42:01 Modified:src/java/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design package.html Log: Comment fixed Revision ChangesPath No revision No revision 1.1.2.2 +1 -1 xml-fop/src/java/org/apache/fop/fo/pagination/Attic/package.html Index: package.html === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Attic/package.html,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- package.html 14 Jan 2004 16:38:03 - 1.1.2.1 +++ package.html 14 Jan 2004 16:42:01 - 1.1.2.2 @@ -1,6 +1,6 @@ HTML TITLEorg.apache.fop.fo.pagination Package/TITLE BODY -PClasses used in maintaining and processing page-masters. +PClasses used in maintaining page-master and generating new pages. /BODY /HTML - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [Bug 25480] - Experimental performance improvements.
-Original Message- From: Peter B. West [mailto:[EMAIL PROTECTED] snip / If I mentioned PropertyValue singletons, it was a slip of the fingers. I maintain Property singletons, which are exist solely to provide access to certain static information about individual properties. Don't worry, your fingers still OK. The slip was all mine... In any case: thanks for a very fine explanation. I'm going to digest your remarks first, then maybe I'll be back for more. Cheers, Andreas
cvs commit: xml-fop/src/java/org/apache/fop/xml SyncedFoXmlEventsBuffer.java
pbwest 2004/01/14 08:52:24 Removed: src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design SyncedFoXmlEventsBuffer.java Log: SyncedFoXmlEventsBuffer renamed to SyncedXmlEventsBuffer - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/xml XMLEventPool.java
pbwest 2004/01/14 08:52:52 Removed: src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design XMLEventPool.java Log: Moved to org.apache.fop.pool - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [Bug 25480] - Experimental performance improvements.
[Peter B. West] Alt-design (trying the hyphen for a while) takes different approaches at different times. While building the subtree of any node, all of the properties are maintained in a HashMap, along with a BitSet of specified properties. When the subtree construction is complete, the HashMap and BitSet are used to build the sparse array of only the relevant *resolved* property values If I understand the Alt-design code correctly, the function calls, like from-parent(), are resolved but percentage are not resolved at this point, but still saved as an IndirectValue, right? The percentage will be resolved at a later stage? (not properties - one of the differences with HEAD) I think you have mentioned this before, but is it such a big difference? HEAD wraps its datavalues in a very thin Property wrapper, but otherwise there is a one-to-one binding between a HEAD Property and its value. regards, finn
Re: Justification in HEAD
Chris Bowditch wrote: An interesting idea... but hasnt this already been done in more detail in TextLM.getNextBreakPoss? So why should the renderer have to do it again (although in less complexity)? I would rather have layout do this, otherwise this logic would have to live in every renderer. There is a tradeoff between avoiding recomputing the word width and carrying it around for probably some significant time. I dont understand this bit fully. Are you saying its inefficient to carry around data items such as dAdjust, TSAdjust, etc? I would definitely say it is better than re-computing them in the renderer. As you noticed, the TextLM.getNextBreakPoss examines the content character by character for calculating the break possiblities, thereby also keeping track of accumulated text width for the line. The break possiblities, or something else, could be marked whether they delimit adjustable space, refer to the x-offset or something equivalent and the text snippet and all passed to the renderer, thereby avoiding reparsing the line for adjustable space and recalculating offsets/widths. The point is that this data could as well be discarded after the line break is finalized. The most convenient way to keep it around until rendering without copying is as a list of small objects. Because redering doesn't start until a full page is laid out, this would lock up a significant amount memory. Whether it matters, compared to other problems, is yet to be determined. Summarizing: we have a bunch of strategies: - Keep data associated with adjustable spaces from layout for rendering, thereby avoiding recalculation - Discard the data as early as possible, thereby reducing peak memory usage - Use something in between: copy into a compact representation, or discard part of the data. I lean somewhat to the first strategy, because memory is usually more of a problem then bare performance. I also have the gut feeling this approach makes integration of leader expansion easier. Of course, if someone implements several possiblities and runs benchmarks, or even makes it a user choice, I wont object. J.Pietschmann
Re: [Bug 25480] - Experimental performance improvements.
Finn Bock wrote: [Peter B. West] Alt-design (trying the hyphen for a while) takes different approaches at different times. While building the subtree of any node, all of the properties are maintained in a HashMap, along with a BitSet of specified properties. When the subtree construction is complete, the HashMap and BitSet are used to build the sparse array of only the relevant *resolved* property values If I understand the Alt-design code correctly, the function calls, like from-parent(), are resolved but percentage are not resolved at this point, but still saved as an IndirectValue, right? The percentage will be resolved at a later stage? Basically, yes. There are complications with from-parent() and from-nearest-specified-value() when used with shorthands. These have lead to the creation of the FromParent and FromNearestSpecified pseudo-types. (not properties - one of the differences with HEAD) I think you have mentioned this before, but is it such a big difference? HEAD wraps its datavalues in a very thin Property wrapper, but otherwise there is a one-to-one binding between a HEAD Property and its value. I freely admit that when I started working with properties, I had only the fuzziest notion of the way they were processed in the original code. I'm not a lot better informed now. However, the idea of expressing properties in terms of data values still seems to me to be strange. Even though individual properties may *eventually* resolve to a particular basic type, the road there can be very complicated. It seemed to me that I should be able to process property values into a range of possible data types (e.g. enumerations and lengths), postponing the resolution into a particular, say, length, as long as possible. The other issue was that some types (enumerations, strings) resolve eventually into very different types depending on the property on which they are expressed. The Rec. (and consequently the parser) allow a multiplicity of different data types in the expressions on many properties. It just seemed cleaner to me to separate properties (which have certain static characteristics) out from data types. That way, I have the option of resolving different datatypes into their final datatype downstream of the parsing and FO tree building. I am open to enlightenment on this. Peter -- Peter B. West http://www.powerup.com.au/~pbwest/resume.html
HashMap
A friend was watching over my shoulder as I was responding to an earlier message on fop-dev. HashMaps... I won't say what image that conjures up for me. Well? A map of where you have the stash. I never thought of it that way. Peter -- Peter B. West http://www.powerup.com.au/~pbwest/resume.html
cvs commit: xml-fop/src/java/org/apache/fop/xml FoXmlSerialHandler.java
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} * (codexmlevents/code), the - * [EMAIL PROTECTED] org.apache.fop.xml.FoXMLSerialHandler FoXMLSerialHandler} + * [EMAIL PROTECTED] org.apache.fop.xml.FoXmlSerialHandler FoXmlSerialHandler} * (codexmlhandler/code) and the * [EMAIL PROTECTED] org.apache.fop.fo.FOTree FOTree} (codefoTree/code). * * pThe codexmlhandler/code uses the source and the parser to * generate XML events which it stores in codexmlevents/code. - * codeFoXMLSerialHandler/code implements codeRunnable/code. + * codeFoXmlSerialHandler/code implements codeRunnable/code. * * pThe codefoTree/code reads events from the codexmlevents/code * buffer, which it interprets to build the FO tree. codeFOTree/code @@ -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/.externalToolBuilders - New directory
pbwest 2004/01/14 18:06:53 xml-fop/.externalToolBuilders - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/.externalToolBuilders .cvsignore
pbwest 2004/01/14 18:06:59 Added: .externalToolBuilders Tag: FOP_0-20-0_Alt-Design .cvsignore Log: Exclude files in .externalToolBuilders Revision ChangesPath No revision No revision 1.1.2.1 +1 -0 xml-fop/.externalToolBuilders/Attic/.cvsignore - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/.externalToolBuilders .cvsignore
pbwest 2004/01/14 18:12:05 Modified:.externalToolBuilders Tag: FOP_0-20-0_Alt-Design .cvsignore Log: Revision ChangesPath No revision No revision 1.1.2.2 +3 -1 xml-fop/.externalToolBuilders/Attic/.cvsignore Index: .cvsignore === RCS file: /home/cvs/xml-fop/.externalToolBuilders/Attic/.cvsignore,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- .cvsignore15 Jan 2004 02:06:59 - 1.1.2.1 +++ .cvsignore15 Jan 2004 02:12:05 - 1.1.2.2 @@ -1 +1,3 @@ -[[:alpha:]] \ No newline at end of file +[[:alpha:]] +Alt-Design build.xml.launch +com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder.launch - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: HashMap
On Wed, 2004-01-14 at 21:27, Peter B. West wrote: A friend was watching over my shoulder as I was responding to an earlier message on fop-dev. HashMaps... I won't say what image that conjures up for me. Well? A map of where you have the stash. I never thought of it that way. Those of you in 'foreign climes' won't have heard of Canada's latest drug bust. A former brewery north of Toronto was being used as one of the largest 'grow ops' (hydroponic marijuana factory) ever discovered. The Globe and Mail (http://www.globeandmail.com/) stated that Ontario produces more weed than the entire population could possibly smoke. There's an image of Canada that I want Europeans to have. Of course it would slow hockey down quite a bit (but it would dramatically increase concession sales at NHL games ...) and cut out the fights. And only one of the Cheech and Chong guys is/was Canajun, eh! Anyway ... the former Molson's brewery in Barrie Ontario next to Highway 400 (Interstate/Motorway/Autobahn) ... had everything they needed ... huge metal kettles ... loading docks ... -- John Austin [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/xml FoXMLSerialHandler.java
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/build/classes/conf .cvsignore
pbwest 2004/01/14 18:46:24 Added: build/classes/conf Tag: FOP_0-20-0_Alt-Design .cvsignore Log: Revision ChangesPath No revision No revision 1.1.2.1 +1 -0 xml-fop/build/classes/conf/Attic/.cvsignore - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/pool XMLEventPool.java
pbwest 2004/01/14 18:56:18
Modified:src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
UriLocalName.java XMLEvent.java FoXMLEvent.java
SyncedXmlEventsBuffer.java NameSpaceType.java
FoXmlSerialHandler.java
src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FOAttributes.java FoRoot.java FONode.java
src/java/org/apache/fop/pool Tag: FOP_0-20-0_Alt-Design
XMLEventPool.java
Added: src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
Namespaces.java
Log:
XMLNamespaces renamed to Namespaces
Revision ChangesPath
No revision
No revision
1.1.2.3 +4 -4 xml-fop/src/java/org/apache/fop/xml/Attic/UriLocalName.java
Index: UriLocalName.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/xml/Attic/UriLocalName.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- UriLocalName.java 14 Jan 2004 15:42:29 - 1.1.2.2
+++ UriLocalName.java 15 Jan 2004 02:56:18 - 1.1.2.3
@@ -67,7 +67,7 @@
/**
* @param uriIndex - the index of the namespace URI maintained in
- * the associated ttXMLNamespaces/tt object.
+ * the associated ttNamespaces/tt object.
* @param localName - the local name of the event.
*/
public UriLocalName(int uriIndex, String localName, int sequence) {
@@ -77,7 +77,7 @@
}
public Poolable clear() {
-uriIndex = XMLNamespaces.NO_NAMESPACE;
+uriIndex = Namespaces.NO_NAMESPACE;
localName = ;
return this;
}
1.1.2.5 +14 -14xml-fop/src/java/org/apache/fop/xml/Attic/XMLEvent.java
Index: XMLEvent.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/xml/Attic/XMLEvent.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- XMLEvent.java 14 Jan 2004 16:22:12 - 1.1.2.4
+++ XMLEvent.java 15 Jan 2004 02:56:18 - 1.1.2.5
@@ -106,11 +106,11 @@
// the basic XML events are unlikely to change.
protected int type = NOEVENT;
protected String chars;
-protected int uriIndex = XMLNamespaces.DefAttrNSIndex;
+protected int uriIndex = Namespaces.DefAttrNSIndex;
protected String localName;
protected String qName;
protected AttributesImpl attributes;
-protected XMLNamespaces namespaces;
+protected Namespaces namespaces;
/**
* The one-argument constructor uses the default initialization values:
@@ -121,7 +121,7 @@
* namespace
* @param uriIndex the namespace index
*/
-public XMLEvent (XMLNamespaces namespaces, int sequence, int uriIndex ) {
+public XMLEvent (Namespaces namespaces, int sequence, int uriIndex ) {
super(sequence);
this.namespaces = namespaces;
this.uriIndex = uriIndex;
@@ -140,7 +140,7 @@
* @param attributes the AttributesImpl containing the element
* attributes, if any
*/
-public XMLEvent(XMLNamespaces namespaces, int sequence,
+public XMLEvent(Namespaces namespaces, int sequence,
int type, String chars, int uriIndex,
String localName, String qName,
AttributesImpl attributes)
@@ -179,7 +179,7 @@
* @param chars in this event, if any
* @param namespaces the object maintaing URIs and their indices
*/
-public XMLEvent(XMLNamespaces namespaces, int sequence,
+public XMLEvent(Namespaces namespaces, int sequence,
int uriIndex, int type, String chars) {
super(sequence);
this.namespaces = namespaces;
@@ -341,18 +341,18 @@
}
/**
- * Set the ttXMLNamespaces/tt object associated with this event.
- * @param namespaces the XMLNamespaces
+ * Set the ttNamespaces/tt object associated with this event.
+ * @param namespaces the Namespaces
*/
-public void setNamespaces(XMLNamespaces namespaces) {
+public void setNamespaces(Namespaces namespaces) {
this.namespaces = namespaces;
}
/**
- * Get the ttXMLNamespaces/tt object associated with this event.
- * @return the ttXMLNamespaces/tt object.
+ * Get the ttNamespaces/tt object associated with this event.
+ * @return the ttNamespaces/tt object.
*/
-public XMLNamespaces getNamespaces() { return namespaces; }
+public Namespaces getNamespaces() { return namespaces; }
/**
* Illegal operation in superclass
cvs commit: xml-fop/src/java/org/apache/fop/xml XMLNamespaces.java
pbwest 2004/01/14 18:57:24 Removed: src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design XMLNamespaces.java Log: XMLNamespaces renamed to Namespaces - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo FOTree.java FOAttributes.java FObjects.java FoRoot.java FONode.java
pbwest 2004/01/14 19:01:54 Modified:src/java/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design FoMultiCase.java FoTableBody.java FoListItem.java FoStaticContent.java FoTitle.java FoBasicLink.java FoBidiOverride.java FoTableCell.java FoMultiToggle.java FoTableRow.java FoMultiSwitch.java FoWrapper.java FoListItemBody.java FoBlock.java FoTableCaption.java FoInlineContainer.java FoFootnote.java FoListBlock.java FoTable.java FoPageSequence.java FoFloat.java FoFlow.java FoLeader.java FoBlockContainer.java FoMultiProperties.java FoMarker.java FoTableAndCaption.java FoListItemLabel.java FoTableHeader.java FoFootnoteBody.java FoInline.java FoPcdata.java FoTableFooter.java src/java/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design FoRegionEnd.java FoRegionBody.java FoRegionAfter.java FoLayoutMasterSet.java FoSimplePageMaster.java FoRegionStartEnd.java FoRegionStart.java FoRegionBefore.java FoRegionBeforeAfter.java FoPageSequenceMaster.java src/java/org/apache/fop/pool Tag: FOP_0-20-0_Alt-Design XMLEventPool.java src/java/org/apache/fop/fo/declarations Tag: FOP_0-20-0_Alt-Design FoColorProfile.java FoDeclarations.java src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design SyncedXmlEventsBuffer.java FoXmlSerialHandler.java FoXMLEvent.java Namespaces.java UriLocalName.java src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FOTree.java FOAttributes.java FObjects.java FoRoot.java FONode.java Added: src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design XmlEvent.java Log: XMLEvent renamed to XmlEvent Revision ChangesPath No revision No revision 1.1.2.4 +5 -5 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiCase.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiCase.java.diff?r1=1.1.2.3r2=1.1.2.4 1.1.2.4 +8 -8 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableBody.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableBody.java.diff?r1=1.1.2.3r2=1.1.2.4 1.1.2.4 +8 -8 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListItem.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoListItem.java.diff?r1=1.1.2.3r2=1.1.2.4 1.1.2.4 +5 -5 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoStaticContent.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoStaticContent.java.diff?r1=1.1.2.3r2=1.1.2.4 1.1.2.4 +6 -6 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTitle.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTitle.java.diff?r1=1.1.2.3r2=1.1.2.4 1.1.2.4 +6 -6 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBasicLink.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBasicLink.java.diff?r1=1.1.2.3r2=1.1.2.4 1.1.2.4 +6 -6 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBidiOverride.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoBidiOverride.java.diff?r1=1.1.2.3r2=1.1.2.4 1.1.2.4 +5 -5 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableCell.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableCell.java.diff?r1=1.1.2.3r2=1.1.2.4 1.1.2.4 +5 -5 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiToggle.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiToggle.java.diff?r1=1.1.2.3r2=1.1.2.4 1.1.2.4 +6 -6 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableRow.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoTableRow.java.diff?r1=1.1.2.3r2=1.1.2.4 1.1.2.4 +5 -5 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiSwitch.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoMultiSwitch.java.diff?r1=1.1.2.3r2=1.1.2.4 1.1.2.4 +6 -6 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoWrapper.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoWrapper.java.diff?r1=1.1.2.3r2=1.1.2.4
cvs commit: xml-fop/src/java/org/apache/fop/xml FoXMLEvent.java
pbwest 2004/01/14 19:14:31 Removed: src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design FoXMLEvent.java Log: FoXMLEvent renamed to FoXmlEvent - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/pool XmlEventPool.java
pbwest 2004/01/14 19:16:25
Modified:src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
Namespaces.java
Added: src/java/org/apache/fop/pool Tag: FOP_0-20-0_Alt-Design
XmlEventPool.java
Log:
XMLEventPool renamed to XmlEventPool
Revision ChangesPath
No revision
No revision
1.1.2.4 +10 -10xml-fop/src/java/org/apache/fop/xml/Attic/Namespaces.java
Index: Namespaces.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/xml/Attic/Namespaces.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Namespaces.java 15 Jan 2004 03:10:58 - 1.1.2.3
+++ Namespaces.java 15 Jan 2004 03:16:25 - 1.1.2.4
@@ -58,7 +58,7 @@
* One instance of iNamespaces/i is maintained across all documents
* that may be processed in a single invocation of ttXMLSerialhandler/tt.
* A reference to that instance is kept with every instance of ttXmlEvent/tt.
- * An codeXMLEventPool/code pool of event objects is maintained for every
+ * An codeXmlEventPool/code pool of event objects is maintained for every
* namesapce encountered in parsing. The pool for the
* http://www.w3.org/1999/XSL/Format (XSL_FO) namespace is created immediately;
* other pools are created only as elements from a particular namespace are
@@ -120,12 +120,12 @@
{ DefAttrNSpace, XSLNamespace, FOXNamespace, SVGNamespace };
/**
- * An array of codeXMLEventPool/codes. This ArrayList is indexed by
+ * An array of codeXmlEventPool/codes. This ArrayList is indexed by
* the namespace index used in this codeNamespaces/code object.
* This allows for the maintenance of individual event pools for each
* namespace active in the current document.
*/
-private XMLEventPool[] pools = new XMLEventPool[LAST_NS_INDEX + 1];
+private XmlEventPool[] pools = new XmlEventPool[LAST_NS_INDEX + 1];
/**
* The pool for codeUriLocalName/code objects.
@@ -182,13 +182,13 @@
nsSequences[i] = 0;
}
pools[DefAttrNSIndex] =
-new XMLEventPool(INITIAL_DEF_ATTR_NS_POOL_SIZE);
+new XmlEventPool(INITIAL_DEF_ATTR_NS_POOL_SIZE);
pools[XSLNSpaceIndex] =
-new XMLEventPool(INITIAL_XSL_NS_POOL_SIZE);
+new XmlEventPool(INITIAL_XSL_NS_POOL_SIZE);
pools[FOXNSpaceIndex] =
-new XMLEventPool(INITIAL_FOX_NS_POOL_SIZE);
+new XmlEventPool(INITIAL_FOX_NS_POOL_SIZE);
pools[SVGNSpaceIndex] =
-new XMLEventPool(INITIAL_SVG_NS_POOL_SIZE);
+new XmlEventPool(INITIAL_SVG_NS_POOL_SIZE);
uriLocalNamePool = new UriLocalNamePool(BUFFER_SIZE);
}
No revision
No revision
1.1.2.1 +91 -0 xml-fop/src/java/org/apache/fop/pool/Attic/XmlEventPool.java
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/pool XMLEventPool.java
pbwest 2004/01/14 19:16:55 Removed: src/java/org/apache/fop/pool Tag: FOP_0-20-0_Alt-Design XMLEventPool.java Log: XMLEventPool renamed to XmlEventPool - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/bin fopcomp path.functions fopdevenv fopcompall
pbwest 2004/01/14 19:21:06 Removed: bin Tag: FOP_0-20-0_Alt-Design fopcomp path.functions fopdevenv fopcompall Log: No longer required - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop build.xml
pbwest 2004/01/14 21:37:26
Modified:.Tag: FOP_0-20-0_Alt-Design build.xml
Log:
Attempt to protect .cvsignore files in the build tree.
Revision ChangesPath
No revision
No revision
1.37.2.9 +1 -1 xml-fop/build.xml
Index: build.xml
===
RCS file: /home/cvs/xml-fop/build.xml,v
retrieving revision 1.37.2.8
retrieving revision 1.37.2.9
diff -u -r1.37.2.8 -r1.37.2.9
--- build.xml 3 Jan 2004 13:09:35 - 1.37.2.8
+++ build.xml 15 Jan 2004 05:37:26 - 1.37.2.9
@@ -721,7 +721,7 @@
fileset dir=${build.dir} defaultexcludes=no
exclude name=**/CVS/
exclude name=**CVS/*/
-exclude name=.cvsignore/
+exclude name=**/.cvsignore/
/fileset
/delete
/target
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
