pbwest 2002/11/20 23:06:07
Modified: src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FOPropertySets.java
Log:
attrSet -> ancestry.
Revision Changes Path
No revision
No revision
1.1.2.9 +37 -41 xml-fop/src/org/apache/fop/fo/Attic/FOPropertySets.java
Index: FOPropertySets.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FOPropertySets.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FOPropertySets.java 13 Nov 2002 04:07:39 -0000 1.1.2.8
+++ FOPropertySets.java 21 Nov 2002 07:06:07 -0000 1.1.2.9
@@ -40,54 +40,50 @@
public static final String packageNamePrefix = "org.apache.fop";
- public static String getAttrSetName(int attrSet) throws FOPException {
- switch (attrSet) {
- case FONode.ROOT_SET:
- return "ROOT";
- case FONode.DECLARATIONS_SET:
- return "DECLARATIONS";
- case FONode.LAYOUT_SET:
- return "LAYOUT";
- case FONode.SEQ_MASTER_SET:
- return "SEQ_MASTER";
- case FONode.PAGESEQ_SET:
- return "PAGESEQ";
- case FONode.FLOW_SET:
+ public static String getAttrSetName(int ancestry) throws FOPException {
+ if ((ancestry & FONode.MC_MARKER) != 0)
+ return "MARKER";
+ if ((ancestry & FONode.FLOW) != 0)
return "FLOW";
- case FONode.STATIC_SET:
+ if ((ancestry & FONode.STATIC) != 0)
return "STATIC";
- case FONode.TITLE_SET:
+ if ((ancestry & FONode.TITLE) != 0)
return "TITLE";
- case FONode.MARKER_SET:
- return "MARKER";
- }
- throw new FOPException("Invalid attribute set: " + attrSet);
+ if ((ancestry & FONode.PAGESEQ) != 0)
+ return "PAGESEQ";
+ if ((ancestry & FONode.SEQ_MASTER) != 0)
+ return "SEQ_MASTER";
+ if ((ancestry & FONode.LAYOUT) != 0)
+ return "LAYOUT_MASTER";
+ if ((ancestry & FONode.DECLARATIONS) != 0)
+ return "DECLARATIONS";
+ if ((ancestry & FONode.ROOT) != 0)
+ return "ROOT";
+ throw new FOPException("Invalid attribute set: " + ancestry);
}
- public static ROBitSet getAttrROBitSet(int attrSet)
+ public static ROBitSet getAttrROBitSet(int ancestry)
throws FOPException
{
- switch (attrSet) {
- case FONode.ROOT_SET:
- return allProps;
- case FONode.DECLARATIONS_SET:
- return declarationsAll;
- case FONode.LAYOUT_SET:
- return layoutMasterSet;
- case FONode.SEQ_MASTER_SET:
- return seqMasterSet;
- case FONode.PAGESEQ_SET:
- return pageSeqSet;
- case FONode.FLOW_SET:
+ if ((ancestry & FONode.MC_MARKER) != 0)
+ return markerAllSet;
+ if ((ancestry & FONode.FLOW) != 0)
return flowAllSet;
- case FONode.STATIC_SET:
+ if ((ancestry & FONode.STATIC) != 0)
return staticAllSet;
- case FONode.TITLE_SET:
+ if ((ancestry & FONode.TITLE) != 0)
return titleAllSet;
- case FONode.MARKER_SET:
- return markerAllSet;
- }
- throw new FOPException("Invalid attribute set: " + attrSet);
+ if ((ancestry & FONode.PAGESEQ) != 0)
+ return pageSeqSet;
+ if ((ancestry & FONode.SEQ_MASTER) != 0)
+ return seqMasterSet;
+ if ((ancestry & FONode.LAYOUT) != 0)
+ return layoutMasterSet;
+ if ((ancestry & FONode.DECLARATIONS) != 0)
+ return declarationsAll;
+ if ((ancestry & FONode.ROOT) != 0)
+ return allProps;
+ throw new FOPException("Invalid attribute set: " + ancestry);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
