cvs commit: xml-fop/src/org/apache/fop/fo/flow FoBasicLink.java FoBidiOverride.java FoBlockContainer.java FoBlock.java FoCharacter.java FoExternalGraphic.java FoFloat.java FoFlow.java FoFootnoteBody.java FoFootnote.java FoInitialPropertySet.java FoInlineContainer.java FoInline.java FoInstreamForeignObject.java FoLeader.java FoListBlock.java FoListItemBody.java FoListItem.java FoListItemLabel.java FoMarker.java FoMultiCase.java FoMultiProperties.java FoMultiPropertySet.java FoMultiSwitch.java FoMultiToggle.java FoNoFo.java FoPageNumberCitation.java FoPageNumber.java FoPageSequence.java FoPcdata.java FoRetrieveMarker.java FoStaticContent.java FoTableAndCaption.java FoTableBody.java FoTableCaption.java FoTableCell.java FoTableColumn.java FoTableFooter.java FoTableHeader.java FoTable.java FoTableRow.java FoTitle.java FoWrapper.java
pbwest 2002/12/02 23:41:05
Modified:src/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design
FoBasicLink.java FoBidiOverride.java
FoBlockContainer.java FoBlock.java FoCharacter.java
FoExternalGraphic.java FoFloat.java FoFlow.java
FoFootnoteBody.java FoFootnote.java
FoInitialPropertySet.java FoInlineContainer.java
FoInline.java FoInstreamForeignObject.java
FoLeader.java FoListBlock.java FoListItemBody.java
FoListItem.java FoListItemLabel.java FoMarker.java
FoMultiCase.java FoMultiProperties.java
FoMultiPropertySet.java FoMultiSwitch.java
FoMultiToggle.java FoNoFo.java
FoPageNumberCitation.java FoPageNumber.java
FoPageSequence.java FoPcdata.java
FoRetrieveMarker.java FoStaticContent.java
FoTableAndCaption.java FoTableBody.java
FoTableCaption.java FoTableCell.java
FoTableColumn.java FoTableFooter.java
FoTableHeader.java FoTable.java FoTableRow.java
FoTitle.java FoWrapper.java
Log:
sparsePropsMap changed from HashMap to int[].
Revision ChangesPath
No revision
No revision
1.1.2.11 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java
Index: FoBasicLink.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoBasicLink.java 1 Dec 2002 14:40:52 - 1.1.2.10
+++ FoBasicLink.java 3 Dec 2002 07:41:02 - 1.1.2.11
@@ -25,6 +25,7 @@
import org.apache.fop.datatypes.Ints;
import org.apache.fop.messaging.MessageHandler;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -41,7 +42,7 @@
position in the sparsePropsSet array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
-private static final HashMap sparsePropsMap;
+private static final int[] sparsePropsMap;
/** An int array of of the applicable property indices, in
property index order. */
@@ -83,7 +84,8 @@
// sparsePropsSet is a HashMap containing the indicies of the
// sparsePropsSet array, indexed by the FO index of the FO slot
// in sparsePropsSet.
-sparsePropsMap = new HashMap();
+sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -91,8 +93,7 @@
next >= 0;
next = propsets.nextSetBit(next + 1)) {
sparseIndices[propx] = next;
-sparsePropsMap.put
-(Ints.consts.get(next), Ints.consts.get(propx++));
+sparsePropsMap[next] = propx++;
}
}
1.1.2.11 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBidiOverride.java
Index: FoBidiOverride.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBidiOverride.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoBidiOverride.java 1 Dec 2002 14:40:52 - 1.1.2.10
+++ FoBidiOverride.java 3 Dec 2002 07:41:03 - 1.1.2.11
@@ -25,6 +25,7 @@
import org.apache.fop.datatypes.Ints;
import org.apache.fop.messaging.MessageHandler;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.BitSet;
@@ -41,7 +42,7 @@
position in the sparsePropsSet array. See
{@link org.apache.fop.fo.FONode#sparsePropsSet FONode.sparsePropsSet}.
*/
-private static final HashMap sparsePropsMap;
+private static final int[] sparsePropsMap;
/** An int array of of the applicable property indices, in
property index order. */
@@ -70,7 +71,8 @@
// sparsePropsSet is a HashMap containing the indicies of the
// sparsePropsSet array, indexed by the FO index of the FO slot
// in sparsePropsSet.
-sparsePropsMap = new HashMap();
+sparsePropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
+Arrays.fill(sparsePropsMap, -1);
numProps = propsets.cardinality();
sparseIndices = new int[numProps];
int propx = 0;
@@ -78,8 +80,7 @@
cvs commit: xml-fop/src/org/apache/fop/fo/flow FoBasicLink.java FoBidiOverride.java FoBlockContainer.java FoBlock.java FoFloat.java FoFlow.java FoFootnoteBody.java FoFootnote.java FoInlineContainer.java FoInline.java FoLeader.java FoListBlock.java FoListItem.java FoListItemBody.java FoListItemLabel.java FoMarker.java FoMultiCase.java FoMultiProperties.java FoMultiSwitch.java FoMultiToggle.java FoPageSequence.java FoStaticContent.java FoTableBody.java FoTableAndCaption.java FoTableCaption.java FoTableCell.java FoTableFooter.java FoTableHeader.java FoTable.java FoTableRow.java FoTitle.java FoWrapper.java
pbwest 2002/12/01 06:40:53
Modified:src/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design
FoBasicLink.java FoBidiOverride.java
FoBlockContainer.java FoBlock.java FoFloat.java
FoFlow.java FoFootnoteBody.java FoFootnote.java
FoInlineContainer.java FoInline.java FoLeader.java
FoListBlock.java FoListItem.java
FoListItemBody.java FoListItemLabel.java
FoMarker.java FoMultiCase.java
FoMultiProperties.java FoMultiSwitch.java
FoMultiToggle.java FoPageSequence.java
FoStaticContent.java FoTableBody.java
FoTableAndCaption.java FoTableCaption.java
FoTableCell.java FoTableFooter.java
FoTableHeader.java FoTable.java FoTableRow.java
FoTitle.java FoWrapper.java
Log:
Used pool.surrendeEvent().
Revision ChangesPath
No revision
No revision
1.1.2.10 +6 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java
Index: FoBasicLink.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoBasicLink.java 29 Nov 2002 16:19:50 - 1.1.2.9
+++ FoBasicLink.java 1 Dec 2002 14:40:52 - 1.1.2.10
@@ -126,14 +126,16 @@
FObjects.fobjects.makeFlowObject
(foTree, this, ev, stateFlags);
if (ev.getFoType() != FObjectNames.PCDATA)
-ev = xmlevents.getEndElement(ev);
+ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+pool.surrenderEvent(ev);
}
} catch(UnexpectedStartElementException e) {
ev = xmlevents.getStartElement();
MessageHandler.logln
("Ignoring unexpected Start Element: "
+ ev.getQName());
-ev = xmlevents.getEndElement(ev);
+ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+pool.surrenderEvent(ev);
}
} while (ev != null);
1.1.2.10 +6 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBidiOverride.java
Index: FoBidiOverride.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBidiOverride.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoBidiOverride.java 29 Nov 2002 16:19:50 - 1.1.2.9
+++ FoBidiOverride.java 1 Dec 2002 14:40:52 - 1.1.2.10
@@ -112,14 +112,16 @@
FObjects.fobjects.makeFlowObject
(foTree, this, ev, stateFlags);
if (ev.getFoType() != FObjectNames.PCDATA)
-ev = xmlevents.getEndElement(ev);
+ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+pool.surrenderEvent(ev);
}
} catch(UnexpectedStartElementException e) {
ev = xmlevents.getStartElement();
MessageHandler.logln
("Ignoring unexpected Start Element: "
+ ev.getQName());
-ev = xmlevents.getEndElement(ev);
+ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+pool.surrenderEvent(ev);
}
} while (ev != null);
1.1.2.10 +6 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlockContainer.java
Index: FoBlockContainer.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlockContainer.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoBlockContainer.java 29 Nov 2002 16:19:50 - 1.1.2.9
+++ FoBlockContainer.java 1 Dec 2002 14:40:52 - 1.1.2.10
@@ -129,7 +129,8 @@
// Generate the flow object
FObjects.fobjects.makeFlowObject(foTree, this, ev, stateFlags);
// Clear the blockage
-ev = xmlevents.getEndElement(ev);
+ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev);
+pool.surrenderEvent(ev);
// Get the rest of the %block;s
do {
if ((st
cvs commit: xml-fop/src/org/apache/fop/fo/flow FoBasicLink.java FoBidiOverride.java FoBlockContainer.java FoBlock.java FoFloat.java FoFlow.java FoFootnoteBody.java FoFootnote.java FoInlineContainer.java FoInline.java FoLeader.java FoListBlock.java FoListItemBody.java FoListItemLabel.java FoMarker.java FoMultiCase.java FoMultiProperties.java FoMultiSwitch.java FoMultiToggle.java FoStaticContent.java FoTableBody.java FoTableCaption.java FoTableCell.java FoTableFooter.java FoTableHeader.java FoTable.java FoTableRow.java FoTitle.java FoWrapper.java
pbwest 2002/11/29 08:19:52
Modified:src/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design
FoBasicLink.java FoBidiOverride.java
FoBlockContainer.java FoBlock.java FoFloat.java
FoFlow.java FoFootnoteBody.java FoFootnote.java
FoInlineContainer.java FoInline.java FoLeader.java
FoListBlock.java FoListItemBody.java
FoListItemLabel.java FoMarker.java FoMultiCase.java
FoMultiProperties.java FoMultiSwitch.java
FoMultiToggle.java FoStaticContent.java
FoTableBody.java FoTableCaption.java
FoTableCell.java FoTableFooter.java
FoTableHeader.java FoTable.java FoTableRow.java
FoTitle.java FoWrapper.java
Log:
Removed redundant getXmlevents() call.
Revision ChangesPath
No revision
No revision
1.1.2.9 +2 -3 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java
Index: FoBasicLink.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FoBasicLink.java 21 Nov 2002 10:29:59 - 1.1.2.8
+++ FoBasicLink.java 29 Nov 2002 16:19:50 - 1.1.2.9
@@ -113,7 +113,6 @@
{
super(foTree, FObjectNames.BASIC_LINK, parent, event,
stateFlags, sparsePropsMap, sparseIndices);
-xmlevents = foTree.getXmlevents();
FoXMLEvent ev = null;
do {
try {
1.1.2.9 +2 -3 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBidiOverride.java
Index: FoBidiOverride.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBidiOverride.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FoBidiOverride.java 21 Nov 2002 10:34:37 - 1.1.2.8
+++ FoBidiOverride.java 29 Nov 2002 16:19:50 - 1.1.2.9
@@ -100,7 +100,6 @@
{
super(foTree, FObjectNames.BIDI_OVERRIDE, parent, event,
stateFlags, sparsePropsMap, sparseIndices);
-xmlevents = foTree.getXmlevents();
FoXMLEvent ev = null;
do {
try {
1.1.2.9 +2 -3 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlockContainer.java
Index: FoBlockContainer.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlockContainer.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FoBlockContainer.java 21 Nov 2002 10:45:08 - 1.1.2.8
+++ FoBlockContainer.java 29 Nov 2002 16:19:50 - 1.1.2.9
@@ -116,7 +116,6 @@
// absolutely positioned areas. They are not allowed as descendents
// of fo:title, fo:float or fo:footnote. They are not allowed to
// have any fo:marker children.
-xmlevents = foTree.getXmlevents();
FoXMLEvent ev = null;
try {
// Get at least one %block;
1.1.2.9 +2 -3 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlock.java
Index: FoBlock.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlock.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FoBlock.java 21 Nov 2002 10:49:11 - 1.1.2.8
+++ FoBlock.java 29 Nov 2002 16:19:50 - 1.1.2.9
@@ -125,7 +125,6 @@
{
super(foTree, FObjectNames.BLOCK, parent, event,
stateFlags, sparsePropsMap, sparseIndices);
-xmlevents = foTree.getXmlevents();
FoXMLEvent ev = null;
do {
try {
1.1.2.8 +2 -3 xml-fop/src/org/apache/fop/fo/flow/Attic/FoFloat.java
Index: FoFloat.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoFloat.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FoFloat.java 21 Nov 2002 10:53:08 - 1.1.2.7
+++ FoFloat.java 29 Nov 2002 16:19:50 - 1.1.2.8
@@ -89,7 +89,6 @@
{
super(foTree, FObjectNames.FLOAT, parent, event,
stateFlags, sparsePropsMap, sparseIndices);
-xmlevents = foTree.getXmlevents();
FoXMLEvent ev = null;
if ((stateFlags
cvs commit: xml-fop/src/org/apache/fop/fo/flow FoBasicLink.java
pbwest 2002/11/21 02:29:59 Modified:src/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design FoBasicLink.java Log: Adjusting for rcs errors. Revision ChangesPath No revision No revision 1.1.2.8 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java Index: FoBasicLink.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -u -r1.1.2.7 -r1.1.2.8 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/flow FoBasicLink.java
pbwest 2002/11/21 02:01:47 Modified:src/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design FoBasicLink.java Log: Subtree processing. Revision ChangesPath No revision No revision 1.1.2.7 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java Index: FoBasicLink.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -r1.1.2.6 -r1.1.2.7 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/flow FoBasicLink.java FoBlockContainer.java FoFloat.java FoFootnoteBody.java FoFootnote.java FoInlineContainer.java FoInline.java FoLeader.java FoListBlock.java FoListItemBody.java FoListItem.java FoListItemLabel.java FoMarker.java FoMultiCase.java FoMultiProperties.java FoMultiPropertySet.java FoMultiSwitch.java FoMultiToggle.java FoRetrieveMarker.java FoTableAndCaption.java FoTableBody.java FoTableCaption.java FoTableCell.java FoTableFooter.java FoTableHeader.java FoTable.java FoTableRow.java FoWrapper.java
pbwest 2002/11/20 23:49:34
Modified:src/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design
FoBasicLink.java FoBlockContainer.java FoFloat.java
FoFootnoteBody.java FoFootnote.java
FoInlineContainer.java FoInline.java FoLeader.java
FoListBlock.java FoListItemBody.java
FoListItem.java FoListItemLabel.java FoMarker.java
FoMultiCase.java FoMultiProperties.java
FoMultiPropertySet.java FoMultiSwitch.java
FoMultiToggle.java FoRetrieveMarker.java
FoTableAndCaption.java FoTableBody.java
FoTableCaption.java FoTableCell.java
FoTableFooter.java FoTableHeader.java FoTable.java
FoTableRow.java FoWrapper.java
Log:
Added subtree processing.
Revision ChangesPath
No revision
No revision
1.1.2.6 +3 -3 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java
Index: FoBasicLink.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoBasicLink.java 17 Nov 2002 09:50:08 - 1.1.2.5
+++ FoBasicLink.java 21 Nov 2002 07:49:33 - 1.1.2.6
@@ -130,10 +130,10 @@
ev = xmlevents.getEndElement(ev);
}
} catch(UnexpectedStartElementException e) {
+ev = xmlevents.getStartElement();
MessageHandler.logln
("Ignoring unexpected Start Element: "
+ ev.getQName());
-ev = xmlevents.getStartElement();
ev = xmlevents.getEndElement(ev);
}
} while (ev != null);
1.1.2.7 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlockContainer.java
Index: FoBlockContainer.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlockContainer.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
1.1.2.6 +4 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoFloat.java
Index: FoFloat.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoFloat.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoFloat.java 17 Nov 2002 09:50:08 - 1.1.2.5
+++ FoFloat.java 21 Nov 2002 07:49:33 - 1.1.2.6
@@ -102,7 +102,7 @@
ev = xmlevents.expectOutOfLineBlock();
if (ev == null)
throw new FOPException
-("%block; not found in fo:table-cell");
+("%block; not found in fo:float");
// Generate the flow object
FObjects.fobjects.makeFlowObject
(foTree, this, ev, stateFlags | FONode.MC_FLOAT);
@@ -123,7 +123,7 @@
} while (ev != null);
} catch(UnexpectedStartElementException e) {
throw new FOPException
-("Block not found or unexpected non-block in fo:table-cell");
+("Block not found or unexpected non-block in fo:float");
}
makeSparsePropsSet();
1.1.2.6 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Attic/FoFootnoteBody.java
Index: FoFootnoteBody.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoFootnoteBody.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
1.1.2.6 +18 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoFootnote.java
Index: FoFootnote.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoFootnote.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoFootnote.java 17 Nov 2002 09:50:08 - 1.1.2.5
+++ FoFootnote.java 21 Nov 2002 07:49:33 - 1.1.2.6
@@ -28,6 +28,17 @@
/**
* Implements the fo:footnote flow object.
+ * Footnote is an extremely messy flow object. The only absolute
+ * prohibition seem sto be that it may not be a descendant of another
+ * fo:footnote. 6.10.3 fo:footnote Constraints states:
+* "It is an error if the fo:footnote occurs as a
+ * descendant of a flow that is not assigned to a region-body, or of an
+ *
cvs commit: xml-fop/src/org/apache/fop/fo/flow FoBasicLink.java FoBidiOverride.java FoBlockContainer.java FoBlock.java FoCharacter.java FoExternalGraphic.java FoFloat.java FoFlow.java FoFootnoteBody.java FoFootnote.java FoInitialPropertySet.java FoInlineContainer.java FoInline.java FoInstreamForeignObject.java FoLeader.java FoListBlock.java FoListItemBody.java FoListItem.java FoListItemLabel.java FoMarker.java FoMultiCase.java FoMultiProperties.java FoMultiPropertySet.java FoMultiSwitch.java FoMultiToggle.java FoNoFo.java FoPageNumberCitation.java FoPageNumber.java FoPageSequence.java FoPcdata.java FoRetrieveMarker.java FoStaticContent.java FoTableAndCaption.java FoTableBody.java FoTableCaption.java FoTableCell.java FoTableColumn.java FoTableFooter.java FoTableHeader.java FoTable.java FoTableRow.java FoTitle.java FoWrapper.java
pbwest 2002/11/12 20:13:06
Modified:src/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design
FoBasicLink.java FoBidiOverride.java
FoBlockContainer.java FoBlock.java FoCharacter.java
FoExternalGraphic.java FoFloat.java FoFlow.java
FoFootnoteBody.java FoFootnote.java
FoInitialPropertySet.java FoInlineContainer.java
FoInline.java FoInstreamForeignObject.java
FoLeader.java FoListBlock.java FoListItemBody.java
FoListItem.java FoListItemLabel.java FoMarker.java
FoMultiCase.java FoMultiProperties.java
FoMultiPropertySet.java FoMultiSwitch.java
FoMultiToggle.java FoNoFo.java
FoPageNumberCitation.java FoPageNumber.java
FoPageSequence.java FoPcdata.java
FoRetrieveMarker.java FoStaticContent.java
FoTableAndCaption.java FoTableBody.java
FoTableCaption.java FoTableCell.java
FoTableColumn.java FoTableFooter.java
FoTableHeader.java FoTable.java FoTableRow.java
FoTitle.java FoWrapper.java
Log:
Attribute set constants moved from FOPropertySets to FONode.
numProps arg to FONode constructor removed.
Revision ChangesPath
No revision
No revision
1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java
Index: FoBasicLink.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- FoBasicLink.java 8 Nov 2002 14:18:24 - 1.1.2.3
+++ FoBasicLink.java 13 Nov 2002 04:13:04 - 1.1.2.4
@@ -11,7 +11,6 @@
// FOP
import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
import org.apache.fop.fo.PropertySets;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FONode;
@@ -106,7 +105,7 @@
throws TreeException, FOPException
{
super(foTree, FObjectNames.BASIC_LINK, parent, event,
- attrSet, sparsePropsMap, sparseIndices, numProps);
+ attrSet, sparsePropsMap, sparseIndices);
FoXMLEvent ev;
String nowProcessing;
1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBidiOverride.java
Index: FoBidiOverride.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBidiOverride.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- FoBidiOverride.java 8 Nov 2002 14:18:24 - 1.1.2.3
+++ FoBidiOverride.java 13 Nov 2002 04:13:04 - 1.1.2.4
@@ -11,7 +11,6 @@
// FOP
import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
import org.apache.fop.fo.PropertySets;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FONode;
@@ -93,7 +92,7 @@
throws TreeException, FOPException
{
super(foTree, FObjectNames.BIDI_OVERRIDE, parent, event,
- attrSet, sparsePropsMap, sparseIndices, numProps);
+ attrSet, sparsePropsMap, sparseIndices);
FoXMLEvent ev;
String nowProcessing;
1.1.2.4 +3 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlockContainer.java
Index: FoBlockContainer.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlockContainer.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- FoBlockContainer.java 8 Nov 2002 14:18:24 - 1.1.2.3
+++ FoBlockContainer.java 13 Nov 2002 04:13:04 - 1.1.2.4
@@ -11,7 +11,6 @@
// FOP
import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
import org.apache.fop.fo.PropertySets;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FONode;
@@ -105,7 +104,7 @@
throws TreeException, FOPException
{
super(foTree, FObjectNames.BLOCK_CONTAINER, parent, event,
- attrSet, sparsePropsMap, sparseIndices, numProps);
+ attrSet, sparsePropsMap, sparseIndices);
FoXMLEvent ev;
String nowProcessing;
1.1.2.4 +6 -4 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlock.java
Index: FoBlock.java
cvs commit: xml-fop/src/org/apache/fop/fo/flow FoBasicLink.java FoBidiOverride.java FoBlockContainer.java FoBlock.java FoCharacter.java FoExternalGraphic.java FoFloat.java FoFootnoteBody.java FoFootnote.java FoInitialPropertySet.java FoInlineContainer.java FoInline.java FoInstreamForeignObject.java FoLeader.java FoListBlock.java FoListItemBody.java FoListItem.java FoListItemLabel.java FoMarker.java FoMultiCase.java FoMultiProperties.java FoMultiPropertySet.java FoMultiSwitch.java FoMultiToggle.java FoNoFo.java FoPageNumberCitation.java FoPageNumber.java FoRetrieveMarker.java FoTableAndCaption.java FoTableBody.java FoTableCaption.java FoTableCell.java FoTableColumn.java FoTableFooter.java FoTableHeader.java FoTable.java FoTableRow.java FoWrapper.java
pbwest 2002/11/08 06:18:25 Modified:src/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design FoBasicLink.java FoBidiOverride.java FoBlockContainer.java FoBlock.java FoCharacter.java FoExternalGraphic.java FoFloat.java FoFootnoteBody.java FoFootnote.java FoInitialPropertySet.java FoInlineContainer.java FoInline.java FoInstreamForeignObject.java FoLeader.java FoListBlock.java FoListItemBody.java FoListItem.java FoListItemLabel.java FoMarker.java FoMultiCase.java FoMultiProperties.java FoMultiPropertySet.java FoMultiSwitch.java FoMultiToggle.java FoNoFo.java FoPageNumberCitation.java FoPageNumber.java FoRetrieveMarker.java FoTableAndCaption.java FoTableBody.java FoTableCaption.java FoTableCell.java FoTableColumn.java FoTableFooter.java FoTableHeader.java FoTable.java FoTableRow.java FoWrapper.java Log: Added @param attrSet to constructor Javadoc comment. Revision ChangesPath No revision No revision 1.1.2.3 +3 -2 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java Index: FoBasicLink.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- FoBasicLink.java 8 Nov 2002 13:39:22 - 1.1.2.2 +++ FoBasicLink.java 8 Nov 2002 14:18:24 - 1.1.2.3 @@ -99,6 +99,7 @@ * @param parent the parent FONode of this node * @param event the FoXMLEvent that triggered the creation of * this node + * @param attrSet the index of the attribute set applying to the node. */ public FoBasicLink (FOTree foTree, FONode parent, FoXMLEvent event, int attrSet) 1.1.2.3 +3 -2 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBidiOverride.java Index: FoBidiOverride.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBidiOverride.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- FoBidiOverride.java 8 Nov 2002 13:39:22 - 1.1.2.2 +++ FoBidiOverride.java 8 Nov 2002 14:18:24 - 1.1.2.3 @@ -86,6 +86,7 @@ * @param parent the parent FONode of this node * @param event the FoXMLEvent that triggered the creation of * this node + * @param attrSet the index of the attribute set applying to the node. */ public FoBidiOverride (FOTree foTree, FONode parent, FoXMLEvent event, int attrSet) 1.1.2.3 +3 -2 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlockContainer.java Index: FoBlockContainer.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlockContainer.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- FoBlockContainer.java 8 Nov 2002 13:39:22 - 1.1.2.2 +++ FoBlockContainer.java 8 Nov 2002 14:18:24 - 1.1.2.3 @@ -98,6 +98,7 @@ * @param parent the parent FONode of this node * @param event the FoXMLEvent that triggered the creation of * this node + * @param attrSet the index of the attribute set applying to the node. */ public FoBlockContainer (FOTree foTree, FONode parent, FoXMLEvent event, int attrSet) 1.1.2.3 +3 -2 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlock.java Index: FoBlock.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlock.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- FoBlock.java 8 Nov 2002 13:39:22 - 1.1.2.2 +++ FoBlock.java 8 Nov 2002 14:18:24 - 1.1.2.3 @@ -112,6 +112,7 @@ * @param parent the parent FONode of this node * @param event the FoXMLEvent that triggered the creation of * this node + * @param attrSet the index of the attribute set applying to the node. */ public FoBlock (FOTree foTree, FONode parent, FoXMLEvent event, int attrSet) 1.1.2.3 +3 -2 xml-fop/src/org/apache/fop/fo/flow/Attic/FoCharacter.java Index: FoCharacter.java =
cvs commit: xml-fop/src/org/apache/fop/fo/flow FoBasicLink.java FoBidiOverride.java FoBlockContainer.java FoBlock.java FoCharacter.java FoExternalGraphic.java FoFloat.java FoFootnoteBody.java FoFootnote.java FoInitialPropertySet.java FoInlineContainer.java FoInline.java FoInstreamForeignObject.java FoLeader.java FoListBlock.java FoListItemBody.java FoListItem.java FoListItemLabel.java FoMarker.java FoMultiCase.java FoMultiProperties.java FoMultiPropertySet.java FoMultiSwitch.java FoMultiToggle.java FoNoFo.java FoPageNumberCitation.java FoPageNumber.java FoRetrieveMarker.java FoTableAndCaption.java FoTableBody.java FoTableCaption.java FoTableCell.java FoTableColumn.java FoTableFooter.java FoTableHeader.java FoTable.java FoTableRow.java FoWrapper.java
pbwest 2002/11/08 05:39:24
Modified:src/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design
FoBasicLink.java FoBidiOverride.java
FoBlockContainer.java FoBlock.java FoCharacter.java
FoExternalGraphic.java FoFloat.java
FoFootnoteBody.java FoFootnote.java
FoInitialPropertySet.java FoInlineContainer.java
FoInline.java FoInstreamForeignObject.java
FoLeader.java FoListBlock.java FoListItemBody.java
FoListItem.java FoListItemLabel.java FoMarker.java
FoMultiCase.java FoMultiProperties.java
FoMultiPropertySet.java FoMultiSwitch.java
FoMultiToggle.java FoNoFo.java
FoPageNumberCitation.java FoPageNumber.java
FoRetrieveMarker.java FoTableAndCaption.java
FoTableBody.java FoTableCaption.java
FoTableCell.java FoTableColumn.java
FoTableFooter.java FoTableHeader.java FoTable.java
FoTableRow.java FoWrapper.java
Log:
Javadoc class comment fix.
Revision ChangesPath
No revision
No revision
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java
Index: FoBasicLink.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FoBasicLink.java 8 Nov 2002 11:33:46 - 1.1.2.1
+++ FoBasicLink.java 8 Nov 2002 13:39:22 - 1.1.2.2
@@ -27,7 +27,7 @@
import java.util.BitSet;
/**
- * Implements the fo:simple-page-master flow object
+ * Implements the fo:basic-link flow object.
*/
public class FoBasicLink extends FONode {
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBidiOverride.java
Index: FoBidiOverride.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBidiOverride.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FoBidiOverride.java 8 Nov 2002 11:33:46 - 1.1.2.1
+++ FoBidiOverride.java 8 Nov 2002 13:39:22 - 1.1.2.2
@@ -27,7 +27,7 @@
import java.util.BitSet;
/**
- * Implements the fo:simple-page-master flow object
+ * Implements the fo:bidi-override flow object.
*/
public class FoBidiOverride extends FONode {
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlockContainer.java
Index: FoBlockContainer.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlockContainer.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FoBlockContainer.java 8 Nov 2002 11:33:46 - 1.1.2.1
+++ FoBlockContainer.java 8 Nov 2002 13:39:22 - 1.1.2.2
@@ -27,7 +27,7 @@
import java.util.BitSet;
/**
- * Implements the fo:simple-page-master flow object
+ * Implements the fo:block-container flow object.
*/
public class FoBlockContainer extends FONode {
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlock.java
Index: FoBlock.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlock.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FoBlock.java 8 Nov 2002 11:33:46 - 1.1.2.1
+++ FoBlock.java 8 Nov 2002 13:39:22 - 1.1.2.2
@@ -27,7 +27,7 @@
import java.util.BitSet;
/**
- * Implements the fo:simple-page-master flow object
+ * Implements the fo:block flow object.
*/
public class FoBlock extends FONode {
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/flow/Attic/FoCharacter.java
Index: FoCharacter.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoCharacter.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FoCharacter.java 8 Nov 2002 11:33:46 - 1.1.2.1
+++ FoCharacter.java 8 Nov 2002 13:39:22 - 1.1.2.2
@@ -27,7 +27,7 @@
import java.util.BitSet;
/**
- * Implements the fo:simple-page-master flow object
+ * Implements the fo:character flow object.
*/
public class FoCharacter extends FONode {
1.1.2.2 +3 -3 xml-fop/src/org/apache/fo
cvs commit: xml-fop/src/org/apache/fop/fo/flow FoBasicLink.java FoBidiOverride.java FoBlockContainer.java FoBlock.java FoCharacter.java FoExternalGraphic.java FoFloat.java FoFootnoteBody.java FoFootnote.java FoInitialPropertySet.java FoInlineContainer.java FoInline.java FoInstreamForeignObject.java FoLeader.java FoListBlock.java FoListItemBody.java FoListItem.java FoListItemLabel.java FoMarker.java FoMultiCase.java FoMultiProperties.java FoMultiPropertySet.java FoMultiSwitch.java FoMultiToggle.java FoNoFo.java FoPageNumberCitation.java FoPageNumber.java FoRetrieveMarker.java FoTableAndCaption.java FoTableBody.java FoTableCaption.java FoTableCell.java FoTableColumn.java FoTableFooter.java FoTableHeader.java FoTable.java FoTableRow.java FoWrapper.java
pbwest 2002/11/08 03:33:48 Added: src/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design FoBasicLink.java FoBidiOverride.java FoBlockContainer.java FoBlock.java FoCharacter.java FoExternalGraphic.java FoFloat.java FoFootnoteBody.java FoFootnote.java FoInitialPropertySet.java FoInlineContainer.java FoInline.java FoInstreamForeignObject.java FoLeader.java FoListBlock.java FoListItemBody.java FoListItem.java FoListItemLabel.java FoMarker.java FoMultiCase.java FoMultiProperties.java FoMultiPropertySet.java FoMultiSwitch.java FoMultiToggle.java FoNoFo.java FoPageNumberCitation.java FoPageNumber.java FoRetrieveMarker.java FoTableAndCaption.java FoTableBody.java FoTableCaption.java FoTableCell.java FoTableColumn.java FoTableFooter.java FoTableHeader.java FoTable.java FoTableRow.java FoWrapper.java Log: Initial FOs as holders for properties. Revision ChangesPath No revision No revision 1.1.2.1 +115 -0xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java 1.1.2.1 +102 -0xml-fop/src/org/apache/fop/fo/flow/Attic/FoBidiOverride.java 1.1.2.1 +114 -0xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlockContainer.java 1.1.2.1 +128 -0xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlock.java 1.1.2.1 +122 -0xml-fop/src/org/apache/fop/fo/flow/Attic/FoCharacter.java 1.1.2.1 +120 -0xml-fop/src/org/apache/fop/fo/flow/Attic/FoExternalGraphic.java 1.1.2.1 +93 -0 xml-fop/src/org/apache/fop/fo/flow/Attic/FoFloat.java 1.1.2.1 +92 -0 xml-fop/src/org/apache/fop/fo/flow/Attic/FoFootnoteBody.java 1.1.2.1 +92 -0 xml-fop/src/org/apache/fop/fo/flow/Attic/FoFootnote.java 1.1.2.1 +107 -0 xml-fop/src/org/apache/fop/fo/flow/Attic/FoInitialPropertySet.java 1.1.2.1 +114 -0xml-fop/src/org/apache/fop/fo/flow/Attic/FoInlineContainer.java 1.1.2.1 +117 -0xml-fop/src/org/apache/fop/fo/flow/Attic/FoInline.java 1.1.2.1 +119 -0 xml-fop/src/org/apache/fop/fo/flow/Attic/FoInstreamForeignObject.java 1.1.2.1 +120 -0xml-fop/src/org/apache/fop/fo/flow/Attic/FoLeader.java 1.1.2.1 +107 -0xml-fop/src/org/apache/fop/fo/flow/Attic/FoListBlock.java 1.1.2.1 +94 -0 xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItemBody.java 1.1.2.1 +106 -0xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItem.java 1.1.2.1 +94 -0 xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItemLabel.java 1.1.2.1 +85 -0 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMarker.java 1.1.2.1 +96 -0 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiCase.java 1.1.2.1 +93 -0 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiProperties.java 1.1.2.1 +93 -0 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiPropertySet.java 1.1.2.1 +94 -0 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiSwitch.java 1.1.2.1 +94 -0 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiToggle.java 1.1.2.1 +85 -0 xml-fop/src/org/apache/fop/fo/flow/Attic/FoNoFo.java 1.1.2.1 +119 -0 xml-fop/src/org/apache/fop/fo/flow/Attic/FoPageNumberCitation.java 1.1.2.1 +118 -0xml-fop/src/org/apache/fop/fo/flow/Attic/FoPageNumber.java 1.1.2.1 +94 -0 xml-fop/src/org/apache/fop/fo/flow/Attic/FoRetrieveMarker.java 1.1.2.1 +107 -0xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableAndCaption.java 1.1.2.1 +102 -0xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableBody.java 1.1.2.1 +104 -0xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableCaption.java 1.1.2.1 +114 -0xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableCell.java 1.1.2.1 +102 -0xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableColumn.java 1.1.2.1 +102 -0xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableFooter.java 1.1.2.1 +102 -0xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableHeader.java 1.1.2.1 +119 -0xml-fop/src/org/apache/fop/fo/flow/Attic/FoTable.java 1.1.2.1 +109 -0xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableRow.java 1.1.2.1 +85 -0 xml-fop/src/org/apache/fop/fo/flow/Attic/FoWrapper.java
