cvs commit: xml-fop/src/org/apache/fop/fo FObjects.java
pbwest 2002/11/20 22:59:52
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FObjects.java
Log:
Fixed stateFlags arg.
Revision ChangesPath
No revision
No revision
1.1.2.10 +5 -5 xml-fop/src/org/apache/fop/fo/Attic/FObjects.java
Index: FObjects.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FObjects.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FObjects.java 11 Nov 2002 17:17:05 - 1.1.2.9
+++ FObjects.java 21 Nov 2002 06:59:52 - 1.1.2.10
@@ -163,12 +163,12 @@
}
public Object makeFlowObject(FOTree foTree,
- FONode parent, FoXMLEvent event, int attrSet)
+ FONode parent, FoXMLEvent event, int stateFlags)
throws FOPException
{
Class foclass;
Object[] args = new Object[] {
-foTree, parent, event, Ints.consts.get(attrSet)
+foTree, parent, event, new Integer(stateFlags)
};
int foType = event.getFoType();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo FObjects.java
pbwest 2002/11/11 09:17:06 Added: src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FObjects.java Log: Modified and extended material from FOPropertySets. Added foPkgClassNames, foConstructors and makeFlowObject(). Revision ChangesPath No revision No revision 1.1.2.9 +74 -1955 xml-fop/src/org/apache/fop/fo/Attic/FObjects.java - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo FObjects.java
pbwest 2002/11/11 09:10:05 Removed: src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FObjects.java Log: Finalising earlier remove. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo FObjects.java
pbwest 2002/10/02 00:07:20
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FObjects.java
Log:
Added getAttrSetName().
Revision ChangesPath
No revision
No revision
1.1.2.7 +23 -3 xml-fop/src/org/apache/fop/fo/Attic/FObjects.java
Index: FObjects.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FObjects.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- FObjects.java 2 Oct 2002 01:24:22 - 1.1.2.6
+++ FObjects.java 2 Oct 2002 07:07:19 - 1.1.2.7
@@ -58,6 +58,26 @@
,LAST_SET = MARKER_SET
;
+public static String getAttrSetName(int attrSet) throws FOPException {
+switch (attrSet) {
+case ROOT_SET:
+return "ROOT";
+case DECLARATIONS_SET:
+return "DECLARATIONS";
+case LAYOUT_SET:
+return "LAYOUT";
+case PAGESEQ_SET:
+return "PAGESEQ";
+case FLOW_SET:
+return "FLOW";
+case STATIC_SET:
+return "STATIC";
+case MARKER_SET:
+return "MARKER";
+}
+throw new FOPException("Invalid attribute set: " + attrSet);
+}
+
public static ROBitSet getAttrROBitSet(int attrSet)
throws FOPException
{
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo FObjects.java
pbwest 2002/10/01 18:24:23
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FObjects.java
Log:
Moved property set constants from FONode.
Added getAttrBitSet(). Removed getLayoutMasterSet() and getPageFlowSet().
Added markerAllSet. Changed makeup of pageseqset, flowallset &staticallset.
Revision ChangesPath
No revision
No revision
1.1.2.6 +61 -20xml-fop/src/org/apache/fop/fo/Attic/FObjects.java
Index: FObjects.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FObjects.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FObjects.java 3 Sep 2002 03:32:49 - 1.1.2.5
+++ FObjects.java 2 Oct 2002 01:24:22 - 1.1.2.6
@@ -20,6 +20,7 @@
import java.util.BitSet;
import java.util.Iterator;
+import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.PropertySets;
import org.apache.fop.fo.PropNames;
@@ -41,6 +42,44 @@
public static final String packageNamePrefix = "org.apache.fop";
+/**
+ * Constants for the set of attributes of interest with FONodes
+ */
+public static final int
+ NO_SET = 0
+ ,ROOT_SET = 1
+ ,DECLARATIONS_SET = 2
+ ,LAYOUT_SET = 3
+,PAGESEQ_SET = 4
+ ,FLOW_SET = 5
+ ,STATIC_SET = 6
+ ,MARKER_SET = 7
+
+ ,LAST_SET = MARKER_SET
+ ;
+
+public static ROBitSet getAttrROBitSet(int attrSet)
+throws FOPException
+{
+switch (attrSet) {
+case ROOT_SET:
+return allProps;
+case DECLARATIONS_SET:
+return declarationsAll;
+case LAYOUT_SET:
+return layoutMasterSet;
+case PAGESEQ_SET:
+return pageSeqSet;
+case FLOW_SET:
+return flowAllSet;
+case STATIC_SET:
+return staticAllSet;
+case MARKER_SET:
+return flowAllSet;
+}
+throw new FOPException("Invalid attribute set: " + attrSet);
+}
+
public static int getFoIndex(String name) {
return ((Integer)(foToIndex.get(name))).intValue();
}
@@ -53,14 +92,6 @@
return foClasses[foIndex];
}
-public static BitSet getLayoutMasterSet() {
-return (BitSet)(layoutMasterSet.clone());
-}
-
-public static BitSet getPageFlowSet() {
-return (BitSet)(pageSeqSet.clone());
-}
-
/**
* A String[] array of the fo class names. This array is
* effectively 1-based, with the first element being unused.
@@ -80,7 +111,7 @@
* the package name from the common package prefix set in the field
* packageNamePrefix, the package name suffix associated with
* the fo local names in the FObjectNames.foLocalNames array,
- * the the class name whcih has been constructed in the
+ * the the class name which has been constructed in the
* foClassNames array here.
* It can be indexed by the fo name constants defined in the
* FObjectNames class.
@@ -1827,6 +1858,12 @@
public static final ROBitSet flowAllSet;
/**
+ * set of all fo:marker subtree properties - properties which are
+ * usable within the fo:marker subtree.
+ */
+public static final ROBitSet markerAllSet;
+
+/**
* set of all fo:static-content subtree properties - properties which are
* usable within the fo:static-content subtree.
*/
@@ -1838,10 +1875,7 @@
Iterator propertySet;
// fill the BitSet of all properties
BitSet allprops = new BitSet(PropNames.LAST_PROPERTY_INDEX + 1);
-for (int i = 0; i <= PropNames.LAST_PROPERTY_INDEX; i++) {
-allprops.set(i);
-}
-allprops.clear(PropNames.NO_PROPERTY);
+allprops.set(1, PropNames.LAST_PROPERTY_INDEX);
allProps = new ROBitSet(allprops);
@@ -1930,26 +1964,33 @@
staticonlyset.set(PropNames.RETRIEVE_POSITION);
staticonlyset.set(PropNames.RETRIEVE_BOUNDARY);
+// pageseqset may contain any of the exclusive elements of the
+// flow set or the static-content set, which may be accessed by
+// the from-nearest-specified-property() function.
BitSet pageseqset = new BitSet(PropNames.LAST_PROPERTY_INDEX + 1);
pageseqset.or(allprops);
pageseqset.andNot(rootonly);
pageseqset.andNot(declarationsonly);
pageseqset.andNot(layoutmasteronly);
-pageseqset.andNot(flowonlyset);
-pageseqset.andNot(staticonlys
cvs commit: xml-fop/src/org/apache/fop/fo FObjects.java
pbwest 2002/08/19 09:16:51 Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FObjects.java Log: Coverted subtree property sets from BitSets to ROBitSets Revision ChangesPath No revision No revision 1.1.2.3 +73 -60xml-fop/src/org/apache/fop/fo/Attic/FObjects.java Index: FObjects.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FObjects.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- FObjects.java 27 Jun 2002 12:55:18 - 1.1.2.2 +++ FObjects.java 19 Aug 2002 16:16:50 - 1.1.2.3 @@ -25,6 +25,7 @@ import org.apache.fop.fo.PropNames; import org.apache.fop.datatypes.Ints; import org.apache.fop.datastructs.ROIntArray; +import org.apache.fop.datastructs.ROBitSet; /** * Data class relating sets of properties to Flow Objects. @@ -618,7 +619,7 @@ foPropertyLists[FObjectNames.INLINE]. add(Ints.consts.get(PropNames.BASELINE_SHIFT)); foPropertyLists[FObjectNames.INLINE]. -add(Ints.consts.get(PropNames.BLOCK_PROGRESSION_DIMENSION)); +add(Ints.consts.get(PropNames.BLOCK_PROGRESSION_DIMENSION)); foPropertyLists[FObjectNames.INLINE]. add(Ints.consts.get(PropNames.COLOR)); foPropertyLists[FObjectNames.INLINE]. @@ -628,7 +629,7 @@ foPropertyLists[FObjectNames.INLINE]. add(Ints.consts.get(PropNames.ID)); foPropertyLists[FObjectNames.INLINE]. -add(Ints.consts.get(PropNames.INLINE_PROGRESSION_DIMENSION)); +add(Ints.consts.get(PropNames.INLINE_PROGRESSION_DIMENSION)); foPropertyLists[FObjectNames.INLINE]. add(Ints.consts.get(PropNames.KEEP_TOGETHER)); foPropertyLists[FObjectNames.INLINE]. @@ -671,7 +672,7 @@ foPropertyLists[FObjectNames.INLINE_CONTAINER]. add(Ints.consts.get(PropNames.BASELINE_SHIFT)); foPropertyLists[FObjectNames.INLINE_CONTAINER]. -add(Ints.consts.get(PropNames.BLOCK_PROGRESSION_DIMENSION)); +add(Ints.consts.get(PropNames.BLOCK_PROGRESSION_DIMENSION)); foPropertyLists[FObjectNames.INLINE_CONTAINER]. add(Ints.consts.get(PropNames.CLIP)); foPropertyLists[FObjectNames.INLINE_CONTAINER]. @@ -683,7 +684,7 @@ foPropertyLists[FObjectNames.INLINE_CONTAINER]. add(Ints.consts.get(PropNames.ID)); foPropertyLists[FObjectNames.INLINE_CONTAINER]. -add(Ints.consts.get(PropNames.INLINE_PROGRESSION_DIMENSION)); +add(Ints.consts.get(PropNames.INLINE_PROGRESSION_DIMENSION)); foPropertyLists[FObjectNames.INLINE_CONTAINER]. add(Ints.consts.get(PropNames.KEEP_TOGETHER)); foPropertyLists[FObjectNames.INLINE_CONTAINER]. @@ -733,7 +734,7 @@ foPropertyLists[FObjectNames.INSTREAM_FOREIGN_OBJECT]. add(Ints.consts.get(PropNames.BASELINE_SHIFT)); foPropertyLists[FObjectNames.INSTREAM_FOREIGN_OBJECT]. -add(Ints.consts.get(PropNames.BLOCK_PROGRESSION_DIMENSION)); +add(Ints.consts.get(PropNames.BLOCK_PROGRESSION_DIMENSION)); foPropertyLists[FObjectNames.INSTREAM_FOREIGN_OBJECT]. add(Ints.consts.get(PropNames.CLIP)); foPropertyLists[FObjectNames.INSTREAM_FOREIGN_OBJECT]. @@ -751,7 +752,7 @@ foPropertyLists[FObjectNames.INSTREAM_FOREIGN_OBJECT]. add(Ints.consts.get(PropNames.ID)); foPropertyLists[FObjectNames.INSTREAM_FOREIGN_OBJECT]. -add(Ints.consts.get(PropNames.INLINE_PROGRESSION_DIMENSION)); +add(Ints.consts.get(PropNames.INLINE_PROGRESSION_DIMENSION)); foPropertyLists[FObjectNames.INSTREAM_FOREIGN_OBJECT]. add(Ints.consts.get(PropNames.KEEP_WITH_NEXT)); foPropertyLists[FObjectNames.INSTREAM_FOREIGN_OBJECT]. @@ -881,9 +882,9 @@ foPropertyLists[FObjectNames.LIST_BLOCK]. add(Ints.consts.get(PropNames.KEEP_WITH_PREVIOUS)); foPropertyLists[FObjectNames.LIST_BLOCK]. -add(Ints.consts.get(PropNames.PROVISIONAL_DISTANCE_BETWEEN_STARTS)); +add(Ints.consts.get(PropNames.PROVISIONAL_DISTANCE_BETWEEN_STARTS)); foPropertyLists[FObjectNames.LIST_BLOCK]. -add(Ints.consts.get(PropNames.PROVISIONAL_LABEL_SEPARATION)); +add(Ints.consts.get(PropNames.PROVISIONAL_LABEL_SEPARATION)); //list-i
