gmazza 2004/08/10 21:15:29
Modified: src/java/org/apache/fop/fo FObj.java FObjMixed.java
PropertySets.java
src/java/org/apache/fop/fo/flow BasicLink.java
BidiOverride.java Block.java BlockContainer.java
Character.java ExternalGraphic.java
InitialPropertySet.java Inline.java
InlineContainer.java Leader.java ListBlock.java
ListItem.java ListItemBody.java ListItemLabel.java
MultiCase.java MultiProperties.java
MultiPropertySet.java MultiSwitch.java
MultiToggle.java PageNumber.java
PageNumberCitation.java Table.java
TableAndCaption.java TableBody.java
TableCaption.java TableCell.java TableColumn.java
TableRow.java
src/java/org/apache/fop/fo/pagination PageSequence.java
Log:
1. For maintenance and accuracy, centralized the setupID() functionality
from the various FO's to the FObj base class.
2. Created a lookup bitset in PropertySets to help accomplish the above.
3. Generally moved initialization code from the setup() methods to the
addProperties() methods in the various FO subclasses.
Revision Changes Path
1.65 +27 -22 xml-fop/src/java/org/apache/fop/fo/FObj.java
Index: FObj.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FObj.java,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- FObj.java 10 Aug 2004 05:33:15 -0000 1.64
+++ FObj.java 11 Aug 2004 04:15:25 -0000 1.65
@@ -121,6 +121,33 @@
propertyList.addAttributesToList(attlist);
propMgr = new PropertyManager(propertyList);
setWritingMode();
+
+ // if this FO can have a PR_ID, make sure it is unique
+ if (PropertySets.canHaveId(getNameId())) {
+ setupID();
+ }
+ }
+
+ /**
+ * Setup the id for this formatting object.
+ * Most formatting objects can have an id that can be referenced.
+ * This methods checks that the id isn't already used by another
+ * fo and sets the id attribute of this object.
+ */
+ private void setupID() {
+ Property prop = this.propertyList.get(PR_ID);
+ if (prop != null) {
+ String str = prop.getString();
+ if (str != null && !str.equals("")) {
+ Set idrefs = getFOInputHandler().getIDReferences();
+ if (!idrefs.contains(str)) {
+ id = str;
+ idrefs.add(id);
+ } else {
+ getLogger().warn("duplicate id:" + str + " ignored");
+ }
+ }
+ }
}
/**
@@ -283,28 +310,6 @@
return ((FObj) parent).getLayoutDimension(key);
}
return new Integer(0);
- }
-
- /**
- * Setup the id for this formatting object.
- * Most formatting objects can have an id that can be referenced.
- * This methods checks that the id isn't already used by another
- * fo and sets the id attribute of this object.
- */
- public void setupID() {
- Property prop = this.propertyList.get(PR_ID);
- if (prop != null) {
- String str = prop.getString();
- if (str != null && !str.equals("")) {
- Set idrefs = getFOInputHandler().getIDReferences();
- if (!idrefs.contains(str)) {
- id = str;
- idrefs.add(id);
- } else {
- getLogger().warn("duplicate id:" + str + " ignored");
- }
- }
- }
}
/**
1.32 +0 -6 xml-fop/src/java/org/apache/fop/fo/FObjMixed.java
Index: FObjMixed.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FObjMixed.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- FObjMixed.java 6 Aug 2004 15:41:10 -0000 1.31
+++ FObjMixed.java 11 Aug 2004 04:15:25 -0000 1.32
@@ -62,12 +62,6 @@
addChildNode(ft);
}
- private void setup() {
- if (this.propertyList != null) {
- setupID();
- }
- }
-
/**
* @return iterator for this object
*/
1.10 +49 -3 xml-fop/src/java/org/apache/fop/fo/PropertySets.java
Index: PropertySets.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/PropertySets.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PropertySets.java 8 Aug 2004 19:04:48 -0000 1.9
+++ PropertySets.java 11 Aug 2004 04:15:25 -0000 1.10
@@ -26,6 +26,7 @@
public class PropertySets {
private static short[][] mapping = null;
private static BitSet can_have_markers = null;
+ private static BitSet can_have_id = null;
private Element[] elements = new Element[Constants.ELEMENT_COUNT+1];
private BitSet block_elems = new BitSet();
@@ -968,8 +969,6 @@
elem.addProperty(Constants.PR_RETRIEVE_POSITION);
elem.addProperty(Constants.PR_RETRIEVE_BOUNDARY);
-
-
// Merge the attributes from the children into the parent.
for (boolean dirty = true; dirty; ) {
dirty = false;
@@ -1039,6 +1038,53 @@
return can_have_markers.get(elementId);
}
+ /**
+ * Determines if the XSL "id" property is applicable for this FO
+ * @param elementId Constants enumeration ID of the FO (e.g., FO_ROOT)
+ * @return true if id property is applicable, false otherwise
+ * @todo see if we can stop merging properties applicable for the children
+ * of an FO into the FO in the mapping[] array above. If so, we can
+ * rely on getPropertySet() instead of this method.
+ */
+ public static boolean canHaveId(int elementId) {
+ if (can_have_id == null) {
+ can_have_id = new BitSet();
+ can_have_id.set(Constants.FO_BASIC_LINK);
+ can_have_id.set(Constants.FO_BIDI_OVERRIDE);
+ can_have_id.set(Constants.FO_BLOCK);
+ can_have_id.set(Constants.FO_BLOCK_CONTAINER);
+ can_have_id.set(Constants.FO_CHARACTER);
+ can_have_id.set(Constants.FO_EXTERNAL_GRAPHIC);
+ can_have_id.set(Constants.FO_INITIAL_PROPERTY_SET);
+ can_have_id.set(Constants.FO_INLINE);
+ can_have_id.set(Constants.FO_INLINE_CONTAINER);
+ can_have_id.set(Constants.FO_INSTREAM_FOREIGN_OBJECT);
+ can_have_id.set(Constants.FO_LEADER);
+ can_have_id.set(Constants.FO_LIST_BLOCK);
+ can_have_id.set(Constants.FO_LIST_ITEM);
+ can_have_id.set(Constants.FO_LIST_ITEM_BODY);
+ can_have_id.set(Constants.FO_LIST_ITEM_LABEL);
+ can_have_id.set(Constants.FO_MULTI_CASE);
+ can_have_id.set(Constants.FO_MULTI_PROPERTIES);
+ can_have_id.set(Constants.FO_MULTI_PROPERTY_SET);
+ can_have_id.set(Constants.FO_MULTI_SWITCH);
+ can_have_id.set(Constants.FO_MULTI_TOGGLE);
+ can_have_id.set(Constants.FO_PAGE_NUMBER);
+ can_have_id.set(Constants.FO_PAGE_NUMBER_CITATION);
+ can_have_id.set(Constants.FO_PAGE_SEQUENCE);
+ can_have_id.set(Constants.FO_TABLE_AND_CAPTION);
+ can_have_id.set(Constants.FO_TABLE);
+ can_have_id.set(Constants.FO_TABLE_BODY);
+ can_have_id.set(Constants.FO_TABLE_CAPTION);
+ can_have_id.set(Constants.FO_TABLE_CELL);
+ can_have_id.set(Constants.FO_TABLE_FOOTER);
+ can_have_id.set(Constants.FO_TABLE_HEADER);
+ can_have_id.set(Constants.FO_TABLE_ROW);
+ can_have_id.set(Constants.FO_WRAPPER);
+ }
+ return can_have_id.get(elementId);
+ }
+
/**
* An object that represent the properties and contents of a fo element
*/
1.26 +0 -1 xml-fop/src/java/org/apache/fop/fo/flow/BasicLink.java
Index: BasicLink.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/BasicLink.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- BasicLink.java 8 Aug 2004 19:04:48 -0000 1.25
+++ BasicLink.java 11 Aug 2004 04:15:25 -0000 1.26
@@ -60,7 +60,6 @@
*/
protected void addProperties(Attributes attlist) throws SAXParseException {
super.addProperties(attlist);
- setupID();
// This logic is for determining the link represented by this FO.
String ext = propertyList.get(PR_EXTERNAL_DESTINATION).getString();
1.17 +0 -1 xml-fop/src/java/org/apache/fop/fo/flow/BidiOverride.java
Index: BidiOverride.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/BidiOverride.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- BidiOverride.java 8 Aug 2004 19:04:49 -0000 1.16
+++ BidiOverride.java 11 Aug 2004 04:15:25 -0000 1.17
@@ -78,7 +78,6 @@
*/
protected void addProperties(Attributes attlist) throws SAXParseException {
super.addProperties(attlist);
- setupID();
}
/**
1.33 +0 -1 xml-fop/src/java/org/apache/fop/fo/flow/Block.java
Index: Block.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Block.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Block.java 10 Aug 2004 05:33:15 -0000 1.32
+++ Block.java 11 Aug 2004 04:15:25 -0000 1.33
@@ -110,7 +110,6 @@
this.lfTreatment =
this.propertyList.get(PR_LINEFEED_TREATMENT).getEnum();
- setupID();
this.align = this.propertyList.get(PR_TEXT_ALIGN).getEnum();
this.alignLast =
this.propertyList.get(PR_TEXT_ALIGN_LAST).getEnum();
1.18 +4 -41 xml-fop/src/java/org/apache/fop/fo/flow/BlockContainer.java
Index: BlockContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/BlockContainer.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- BlockContainer.java 8 Aug 2004 19:04:49 -0000 1.17
+++ BlockContainer.java 11 Aug 2004 04:15:25 -0000 1.18
@@ -25,10 +25,6 @@
import org.apache.fop.datatypes.ColorType;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.properties.CommonAbsolutePosition;
-import org.apache.fop.fo.properties.CommonBackground;
-import org.apache.fop.fo.properties.CommonBorderAndPadding;
-import org.apache.fop.fo.properties.CommonMarginBlock;
import org.apache.fop.layoutmgr.BlockContainerLayoutManager;
import org.xml.sax.Attributes;
@@ -65,44 +61,11 @@
protected void addProperties(Attributes attlist) throws SAXParseException {
super.addProperties(attlist);
this.span = this.propertyList.get(PR_SPAN).getEnum();
- setupID();
- }
-
- private void setup() {
-
- // Common Accessibility Properties
- CommonAbsolutePosition mAbsProps = propMgr.getAbsolutePositionProps();
-
- // Common Border, Padding, and Background Properties
- CommonBorderAndPadding bap = propMgr.getBorderAndPadding();
- CommonBackground bProps = propMgr.getBackgroundProps();
-
- // Common Margin-Block Properties
- CommonMarginBlock mProps = propMgr.getMarginProps();
-
- // this.propertyList.get("block-progression-dimension");
- // this.propertyList.get("break-after");
- // this.propertyList.get("break-before");
- // this.propertyList.get("clip");
- // this.propertyList.get("display-align");
- // this.propertyList.get("height");
- setupID();
- // this.propertyList.get("keep-together");
- // this.propertyList.get("keep-with-next");
- // this.propertyList.get("keep-with-previous");
- // this.propertyList.get("overflow");
- // this.propertyList.get("reference-orientation");
- // this.propertyList.get("span");
- // this.propertyList.get("width");
- // this.propertyList.get("writing-mode");
-
- this.backgroundColor =
- this.propertyList.get(PR_BACKGROUND_COLOR).getColorType();
-
- this.width = this.propertyList.get(PR_WIDTH).getLength().getValue();
- this.height = this.propertyList.get(PR_HEIGHT).getLength().getValue();
- span = this.propertyList.get(PR_SPAN).getEnum();
+ this.backgroundColor =
+ this.propertyList.get(PR_BACKGROUND_COLOR).getColorType();
+ this.width = this.propertyList.get(PR_WIDTH).getLength().getValue();
+ this.height = this.propertyList.get(PR_HEIGHT).getLength().getValue();
}
/**
1.16 +0 -54 xml-fop/src/java/org/apache/fop/fo/flow/Character.java
Index: Character.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Character.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Character.java 8 Aug 2004 18:39:22 -0000 1.15
+++ Character.java 11 Aug 2004 04:15:25 -0000 1.16
@@ -29,13 +29,6 @@
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.OneCharIterator;
import org.apache.fop.layoutmgr.AddLMVisitor;
-import org.apache.fop.fo.properties.CommonAural;
-import org.apache.fop.fo.properties.CommonBorderAndPadding;
-import org.apache.fop.fo.properties.CommonBackground;
-import org.apache.fop.fo.properties.CommonHyphenation;
-import org.apache.fop.fo.properties.CommonMarginInline;
-import org.apache.fop.fo.properties.CommonRelativePosition;
-import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.LMVisited;
/**
@@ -74,53 +67,6 @@
protected void validateChildNode(Locator loc, String nsURI, String localName)
throws SAXParseException {
invalidChildError(loc, nsURI, localName);
- }
-
- private void setup() throws FOPException {
-
- // Common Aural Properties
- CommonAural mAurProps = propMgr.getAuralProps();
-
- // Common Border, Padding, and Background Properties
- CommonBorderAndPadding bap = propMgr.getBorderAndPadding();
- CommonBackground bProps = propMgr.getBackgroundProps();
-
- // Common Font Properties
- //this.fontState = propMgr.getFontState(area.getFontInfo());
-
- // Common Hyphenation Properties
- CommonHyphenation mHyphProps = propMgr.getHyphenationProps();
-
- // Common Margin Properties-Inline
- CommonMarginInline mProps = propMgr.getMarginInlineProps();
-
- // Common Relative Position Properties
- CommonRelativePosition mRelProps =
- propMgr.getRelativePositionProps();
-
- // this.propertyList.get("alignment-adjust");
- // this.propertyList.get("treat-as-word-space");
- // this.propertyList.get("alignment-baseline");
- // this.propertyList.get("baseline-shift");
- // this.propertyList.get("character");
- // this.propertyList.get("color");
- // this.propertyList.get("dominant-baseline");
- // this.propertyList.get("text-depth");
- // this.propertyList.get("text-altitude");
- // this.propertyList.get("glyph-orientation-horizontal");
- // this.propertyList.get("glyph-orientation-vertical");
- setupID();
- // this.propertyList.get("keep-with-next");
- // this.propertyList.get("keep-with-previous");
- // this.propertyList.get("letter-spacing");
- // this.propertyList.get("line-height");
- // this.propertyList.get("line-height-shift-adjustment");
- // this.propertyList.get("score-spaces");
- // this.propertyList.get("suppress-at-line-break");
- // this.propertyList.get("text-decoration");
- // this.propertyList.get("text-shadow");
- // this.propertyList.get("text-transform");
- // this.propertyList.get("word-spacing");
}
/**
1.35 +0 -1 xml-fop/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
Index: ExternalGraphic.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ExternalGraphic.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ExternalGraphic.java 8 Aug 2004 18:39:22 -0000 1.34
+++ ExternalGraphic.java 11 Aug 2004 04:15:25 -0000 1.35
@@ -90,7 +90,6 @@
* This gets the sizes for the image and the dimensions and clipping.
*/
private void setup() {
- setupID();
url = this.propertyList.get(PR_SRC).getString();
if (url == null) {
return;
1.13 +0 -36 xml-fop/src/java/org/apache/fop/fo/flow/InitialPropertySet.java
Index: InitialPropertySet.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/InitialPropertySet.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- InitialPropertySet.java 8 Aug 2004 18:39:22 -0000 1.12
+++ InitialPropertySet.java 11 Aug 2004 04:15:25 -0000 1.13
@@ -26,11 +26,6 @@
// FOP
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.ToBeImplementedElement;
-import org.apache.fop.fo.properties.CommonAccessibility;
-import org.apache.fop.fo.properties.CommonAural;
-import org.apache.fop.fo.properties.CommonBackground;
-import org.apache.fop.fo.properties.CommonBorderAndPadding;
-import org.apache.fop.fo.properties.CommonRelativePosition;
/**
* Class modelling the fo:initial-property-set object. See Sec. 6.6.4 of the
@@ -52,37 +47,6 @@
protected void validateChildNode(Locator loc, String nsURI, String localName)
throws SAXParseException {
invalidChildError(loc, nsURI, localName);
- }
-
- private void setup() {
-
- // Common Accessibility Properties
- CommonAccessibility mAccProps = propMgr.getAccessibilityProps();
-
- // Common Aural Properties
- CommonAural mAurProps = propMgr.getAuralProps();
-
- // Common Border, Padding, and Background Properties
- CommonBorderAndPadding bap = propMgr.getBorderAndPadding();
- CommonBackground bProps = propMgr.getBackgroundProps();
-
- // Common Font Properties
- //this.fontState = propMgr.getFontState(area.getFontInfo());
-
- // Common Relative Position Properties
- CommonRelativePosition mRelProps = propMgr.getRelativePositionProps();
-
- // this.propertyList.get("color");
- setupID();
- // this.propertyList.get("letter-spacing");
- // this.propertyList.get("line-height");
- // this.propertyList.get("line-height-shift-adjustment");
- // this.propertyList.get("score-spaces");
- // this.propertyList.get("text-decoration");
- // this.propertyList.get("text-shadow");
- // this.propertyList.get("text-transform");
- // this.propertyList.get("word-spacing");
-
}
public String getName() {
1.24 +0 -2 xml-fop/src/java/org/apache/fop/fo/flow/Inline.java
Index: Inline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Inline.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Inline.java 8 Aug 2004 19:04:49 -0000 1.23
+++ Inline.java 11 Aug 2004 04:15:25 -0000 1.24
@@ -67,8 +67,6 @@
+ " be directly under flow", locator);
}
- setupID();
-
int textDecoration = this.propertyList.get(PR_TEXT_DECORATION).getEnum();
if (textDecoration == TextDecoration.UNDERLINE) {
1.17 +0 -34 xml-fop/src/java/org/apache/fop/fo/flow/InlineContainer.java
Index: InlineContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/InlineContainer.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- InlineContainer.java 8 Aug 2004 19:04:49 -0000 1.16
+++ InlineContainer.java 11 Aug 2004 04:15:25 -0000 1.17
@@ -31,10 +31,6 @@
import org.apache.fop.layoutmgr.ICLayoutManager;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.properties.CommonBackground;
-import org.apache.fop.fo.properties.CommonBorderAndPadding;
-import org.apache.fop.fo.properties.CommonMarginInline;
-import org.apache.fop.fo.properties.CommonRelativePosition;
/**
* Class modelling the fo:inline-container object. See Sec. 6.6.8 of the XSL-FO
@@ -54,36 +50,6 @@
*/
protected void addProperties(Attributes attlist) throws SAXParseException {
super.addProperties(attlist);
- // Common Border, Padding, and Background Properties
- CommonBorderAndPadding bap = propMgr.getBorderAndPadding();
- CommonBackground bProps = propMgr.getBackgroundProps();
-
- // Common Margin Properties-Inline
- CommonMarginInline mProps = propMgr.getMarginInlineProps();
-
- // Common Relative Position Properties
- CommonRelativePosition mRelProps =
- propMgr.getRelativePositionProps();
-
- // this.propertyList.get("alignment-adjust");
- // this.propertyList.get("alignment-baseline");
- // this.propertyList.get("baseline-shift");
- // this.propertyList.get("block-progression-dimension");
- // this.propertyList.get("clip");
- // this.propertyList.get("display-align");
- // this.propertyList.get("dominant-baseline");
- // this.propertyList.get("height");
- setupID();
- // this.propertyList.get("inline-progression-dimension");
- // this.propertyList.get("keep-together");
- // this.propertyList.get("keep-with-next");
- // this.propertyList.get("keep-with-previous");
- // this.propertyList.get("line-height");
- // this.propertyList.get("line-height-shift-adjustment");
- // this.propertyList.get("overflow");
- // this.propertyList.get("reference-orientation");
- // this.propertyList.get("width");
- // this.propertyList.get("writing-mode");
}
/**
1.32 +3 -45 xml-fop/src/java/org/apache/fop/fo/flow/Leader.java
Index: Leader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Leader.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Leader.java 8 Aug 2004 18:39:23 -0000 1.31
+++ Leader.java 11 Aug 2004 04:15:25 -0000 1.32
@@ -23,12 +23,6 @@
import org.apache.fop.fo.FONode;
import org.apache.fop.layoutmgr.AddLMVisitor;
import org.apache.fop.fo.FObjMixed;
-import org.apache.fop.fo.properties.CommonAccessibility;
-import org.apache.fop.fo.properties.CommonAural;
-import org.apache.fop.fo.properties.CommonBackground;
-import org.apache.fop.fo.properties.CommonBorderAndPadding;
-import org.apache.fop.fo.properties.CommonMarginInline;
-import org.apache.fop.fo.properties.CommonRelativePosition;
import org.apache.fop.fo.properties.PercentLength;
import org.apache.fop.fonts.Font;
import org.apache.fop.fo.LMVisited;
@@ -54,48 +48,12 @@
super(parent);
}
+ /**
+ * @todo convert to addProperties()
+ */
private void setup() {
-
- // Common Accessibility Properties
- CommonAccessibility mAccProps = propMgr.getAccessibilityProps();
-
- // Common Aural Properties
- CommonAural mAurProps = propMgr.getAuralProps();
-
- // Common Border, Padding, and Background Properties
- CommonBorderAndPadding bap = propMgr.getBorderAndPadding();
- CommonBackground bProps = propMgr.getBackgroundProps();
-
// Common Font Properties
this.fontState = propMgr.getFontState(getFOInputHandler().getFontInfo());
-
- // Common Margin Properties-Inline
- CommonMarginInline mProps = propMgr.getMarginInlineProps();
-
- // Common Relative Position Properties
- CommonRelativePosition mRelProps = propMgr.getRelativePositionProps();
-
- // this.propertyList.get("alignment-adjust");
- // this.propertyList.get("alignment-baseline");
- // this.propertyList.get("baseline-shift");
- // this.propertyList.get("color");
- // this.propertyList.get("dominant-baseline");
- // this.propertyList.get("text-depth");
- // this.propertyList.get("text-altitude");
- setupID();
- // this.propertyList.get("leader-alignment");
- // this.propertyList.get("leader-length");
- // this.propertyList.get("leader-pattern");
- // this.propertyList.get("leader-pattern-width");
- // this.propertyList.get("rule-style");
- // this.propertyList.get("rule-thickness");
- // this.propertyList.get("letter-spacing");
- // this.propertyList.get("line-height");
- // this.propertyList.get("line-height-shift-adjustment");
- // this.propertyList.get("text-shadow");
- // this.propertyList.get("visibility");
- // this.propertyList.get("word-spacing");
- // this.propertyList.get("z-index");
// color properties
ColorType c = this.propertyList.get(PR_COLOR).getColorType();
1.23 +0 -1 xml-fop/src/java/org/apache/fop/fo/flow/ListBlock.java
Index: ListBlock.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListBlock.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ListBlock.java 8 Aug 2004 19:04:49 -0000 1.22
+++ ListBlock.java 11 Aug 2004 04:15:25 -0000 1.23
@@ -67,7 +67,6 @@
*/
protected void addProperties(Attributes attlist) throws SAXParseException {
super.addProperties(attlist);
- setupID();
this.align = this.propertyList.get(PR_TEXT_ALIGN).getEnum();
this.alignLast = this.propertyList.get(PR_TEXT_ALIGN_LAST).getEnum();
1.25 +0 -4 xml-fop/src/java/org/apache/fop/fo/flow/ListItem.java
Index: ListItem.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListItem.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ListItem.java 8 Aug 2004 19:04:49 -0000 1.24
+++ ListItem.java 11 Aug 2004 04:15:25 -0000 1.25
@@ -62,10 +62,6 @@
protected void addProperties(Attributes attlist) throws SAXParseException {
super.addProperties(attlist);
getFOInputHandler().startListItem(this);
- }
-
- private void setup() {
- setupID();
this.align = this.propertyList.get(PR_TEXT_ALIGN).getEnum();
this.alignLast = this.propertyList.get(PR_TEXT_ALIGN_LAST).getEnum();
this.lineHeight =
1.17 +3 -9 xml-fop/src/java/org/apache/fop/fo/flow/ListItemBody.java
Index: ListItemBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListItemBody.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ListItemBody.java 8 Aug 2004 19:04:49 -0000 1.16
+++ ListItemBody.java 11 Aug 2004 04:15:25 -0000 1.17
@@ -21,7 +21,6 @@
// FOP
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.properties.CommonAccessibility;
/**
* Class modelling the fo:list-item-body object. See Sec. 6.8.4 of the XSL-FO
@@ -36,21 +35,16 @@
super(parent);
}
+ /**
+ * @todo convert to addProperties()
+ */
private void setup() {
-
- // Common Accessibility Properties
- CommonAccessibility mAccProps = propMgr.getAccessibilityProps();
-
- setupID();
- // this.propertyList.get("keep-together");
-
/*
* For calculating the lineage - The fo:list-item-body formatting object
* does not generate any areas. The fo:list-item-body formatting object
* returns the sequence of areas created by concatenating the sequences
* of areas returned by each of the child nodes of the fo:list-item-body.
*/
-
}
public String getName() {
1.25 +0 -12 xml-fop/src/java/org/apache/fop/fo/flow/ListItemLabel.java
Index: ListItemLabel.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListItemLabel.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ListItemLabel.java 8 Aug 2004 19:04:49 -0000 1.24
+++ ListItemLabel.java 11 Aug 2004 04:15:25 -0000 1.25
@@ -25,7 +25,6 @@
// FOP
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.properties.CommonAccessibility;
/**
* Class modelling the fo:list-item-label object. See Sec. 6.8.5 of the XSL-FO
@@ -46,23 +45,12 @@
protected void addProperties(Attributes attlist) throws SAXParseException {
super.addProperties(attlist);
getFOInputHandler().startListLabel();
- }
-
- private void setup() {
-
- // Common Accessibility Properties
- CommonAccessibility mAccProps = propMgr.getAccessibilityProps();
-
- setupID();
- // this.propertyList.get("keep-together");
-
/*
* For calculating the lineage - The fo:list-item-label formatting object
* does not generate any areas. The fo:list-item-label formatting object
* returns the sequence of areas created by concatenating the sequences
* of areas returned by each of the child nodes of the fo:list-item-label.
*/
-
}
protected void endOfNode() throws SAXParseException {
1.12 +0 -13 xml-fop/src/java/org/apache/fop/fo/flow/MultiCase.java
Index: MultiCase.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/MultiCase.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- MultiCase.java 8 Aug 2004 18:39:23 -0000 1.11
+++ MultiCase.java 11 Aug 2004 04:15:25 -0000 1.12
@@ -21,7 +21,6 @@
// FOP
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.ToBeImplementedElement;
-import org.apache.fop.fo.properties.CommonAccessibility;
/**
* Class modelling the fo:multi-case object. See Sec. 6.9.4 of the XSL-FO
@@ -34,18 +33,6 @@
*/
public MultiCase(FONode parent) {
super(parent);
- }
-
- private void setup() {
-
- // Common Accessibility Properties
- CommonAccessibility mAccProps = propMgr.getAccessibilityProps();
-
- setupID();
- // this.propertyList.get("starting-state");
- // this.propertyList.get("case-name");
- // this.propertyList.get("case-title");
-
}
public String getName() {
1.11 +0 -10 xml-fop/src/java/org/apache/fop/fo/flow/MultiProperties.java
Index: MultiProperties.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/MultiProperties.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MultiProperties.java 8 Aug 2004 18:39:23 -0000 1.10
+++ MultiProperties.java 11 Aug 2004 04:15:25 -0000 1.11
@@ -21,7 +21,6 @@
// FOP
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.ToBeImplementedElement;
-import org.apache.fop.fo.properties.CommonAccessibility;
/**
* Class modelling the fo:multi-properties object. See Sec. 6.9.6 of the XSL-FO
@@ -34,15 +33,6 @@
*/
public MultiProperties(FONode parent) {
super(parent);
- }
-
- private void setup() {
-
- // Common Accessibility Properties
- CommonAccessibility mAccProps = propMgr.getAccessibilityProps();
-
- setupID();
-
}
public String getName() {
1.12 +3 -5 xml-fop/src/java/org/apache/fop/fo/flow/MultiPropertySet.java
Index: MultiPropertySet.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/MultiPropertySet.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- MultiPropertySet.java 8 Aug 2004 18:39:23 -0000 1.11
+++ MultiPropertySet.java 11 Aug 2004 04:15:26 -0000 1.12
@@ -49,11 +49,9 @@
invalidChildError(loc, nsURI, localName);
}
- private void setup() {
- setupID();
- // this.propertyList.get("active-state");
- }
-
+ /**
+ * @see org.apache.fop.fo.FObj#getName()
+ */
public String getName() {
return "fo:multi-property-set";
}
1.12 +0 -11 xml-fop/src/java/org/apache/fop/fo/flow/MultiSwitch.java
Index: MultiSwitch.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/MultiSwitch.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- MultiSwitch.java 8 Aug 2004 18:39:23 -0000 1.11
+++ MultiSwitch.java 11 Aug 2004 04:15:26 -0000 1.12
@@ -21,7 +21,6 @@
// FOP
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.ToBeImplementedElement;
-import org.apache.fop.fo.properties.CommonAccessibility;
/**
* Class modelling the fo:multi-switch object. See Sec. 6.9.3 of the XSL-FO
@@ -34,16 +33,6 @@
*/
public MultiSwitch(FONode parent) {
super(parent);
- }
-
- private void setup() {
-
- // Common Accessibility Properties
- CommonAccessibility mAccProps = propMgr.getAccessibilityProps();
-
- // this.propertyList.get("auto-restore");
- setupID();
-
}
public String getName() {
1.12 +3 -11 xml-fop/src/java/org/apache/fop/fo/flow/MultiToggle.java
Index: MultiToggle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/MultiToggle.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- MultiToggle.java 8 Aug 2004 18:39:23 -0000 1.11
+++ MultiToggle.java 11 Aug 2004 04:15:26 -0000 1.12
@@ -21,7 +21,6 @@
// FOP
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.ToBeImplementedElement;
-import org.apache.fop.fo.properties.CommonAccessibility;
/**
* Class modelling the fo:multi-toggle property. See Sec. 6.9.5 of the XSL-FO
@@ -36,16 +35,9 @@
super(parent);
}
- private void setup() {
-
- // Common Accessibility Properties
- CommonAccessibility mAccProps = propMgr.getAccessibilityProps();
-
- setupID();
- // this.propertyList.get("switch-to");
-
- }
-
+ /**
+ * @see org.apache.fop.fo.FObj#getName()
+ */
public String getName() {
return "fo:multi-toggle";
}
1.34 +2 -6 xml-fop/src/java/org/apache/fop/fo/flow/PageNumber.java
Index: PageNumber.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/PageNumber.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- PageNumber.java 8 Aug 2004 18:39:23 -0000 1.33
+++ PageNumber.java 11 Aug 2004 04:15:26 -0000 1.34
@@ -67,22 +67,18 @@
*/
protected void addProperties(Attributes attlist) throws SAXParseException {
super.addProperties(attlist);
- setup();
- getFOInputHandler().startPageNumber(this);
- }
- private void setup() {
// Common Font Properties
this.fontState = propMgr.getFontState(getFOInputHandler().getFontInfo());
- setupID();
-
ColorType c = this.propertyList.get(PR_COLOR).getColorType();
this.red = c.getRed();
this.green = c.getGreen();
this.blue = c.getBlue();
this.wrapOption = this.propertyList.get(PR_WRAP_OPTION).getEnum();
+
+ getFOInputHandler().startPageNumber(this);
}
/**
1.32 +0 -2 xml-fop/src/java/org/apache/fop/fo/flow/PageNumberCitation.java
Index: PageNumberCitation.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/PageNumberCitation.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- PageNumberCitation.java 10 Aug 2004 05:33:15 -0000 1.31
+++ PageNumberCitation.java 11 Aug 2004 04:15:26 -0000 1.32
@@ -75,8 +75,6 @@
// Common Font Properties
this.fontState = propMgr.getFontState(getFOInputHandler().getFontInfo());
- setupID();
-
ColorType c = this.propertyList.get(PR_COLOR).getColorType();
this.red = c.getRed();
this.green = c.getGreen();
1.27 +19 -62 xml-fop/src/java/org/apache/fop/fo/flow/Table.java
Index: Table.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Table.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Table.java 8 Aug 2004 19:04:49 -0000 1.26
+++ Table.java 11 Aug 2004 04:15:26 -0000 1.27
@@ -81,68 +81,6 @@
*/
protected void addProperties(Attributes attlist) throws SAXParseException {
super.addProperties(attlist);
- setupID();
- getFOInputHandler().startTable(this);
- }
-
- /**
- * @see org.apache.fop.fo.FONode#addChildNode(FONode)
- */
- protected void addChildNode(FONode child) {
- if (child.getName().equals("fo:table-column")) {
- if (columns == null) {
- columns = new ArrayList();
- }
- columns.add(((TableColumn)child));
- } else if (child.getName().equals("fo:table-footer")) {
- tableFooter = (TableBody)child;
- } else if (child.getName().equals("fo:table-header")) {
- tableHeader = (TableBody)child;
- } else {
- // add bodies
- super.addChildNode(child);
- }
- }
-
- private void setup() {
- // Common Accessibility Properties
- CommonAccessibility mAccProps = propMgr.getAccessibilityProps();
-
- // Common Aural Properties
- CommonAural mAurProps = propMgr.getAuralProps();
-
- // Common Border, Padding, and Background Properties
- CommonBorderAndPadding bap = propMgr.getBorderAndPadding();
- CommonBackground bProps = propMgr.getBackgroundProps();
-
- // Common Margin Properties-Block
- CommonMarginBlock mProps = propMgr.getMarginProps();
-
- // Common Relative Position Properties
- CommonRelativePosition mRelProps =
- propMgr.getRelativePositionProps();
-
- // this.propertyList.get("block-progression-dimension");
- // this.propertyList.get("border-after-precendence");
- // this.propertyList.get("border-before-precedence");
- // this.propertyList.get("border-collapse");
- // this.propertyList.get("border-end-precendence");
- // this.propertyList.get("border-separation");
- // this.propertyList.get("border-start-precendence");
- // this.propertyList.get("break-after");
- // this.propertyList.get("break-before");
- setupID();
- // this.propertyList.get("inline-progression-dimension");
- // this.propertyList.get("height");
- // this.propertyList.get("keep-together");
- // this.propertyList.get("keep-with-next");
- // this.propertyList.get("keep-with-previous");
- // this.propertyList.get("table-layout");
- // this.propertyList.get("table-omit-footer-at-break");
- // this.propertyList.get("table-omit-header-at-break");
- // this.propertyList.get("width");
- // this.propertyList.get("writing-mode");
-
this.breakBefore = this.propertyList.get(PR_BREAK_BEFORE).getEnum();
this.breakAfter = this.propertyList.get(PR_BREAK_AFTER).getEnum();
this.spaceBefore = this.propertyList.get(
@@ -163,7 +101,26 @@
this.omitFooterAtBreak = this.propertyList.get(
PR_TABLE_OMIT_FOOTER_AT_BREAK).getEnum()
== TableOmitFooterAtBreak.TRUE;
+ getFOInputHandler().startTable(this);
+ }
+ /**
+ * @see org.apache.fop.fo.FONode#addChildNode(FONode)
+ */
+ protected void addChildNode(FONode child) {
+ if (child.getName().equals("fo:table-column")) {
+ if (columns == null) {
+ columns = new ArrayList();
+ }
+ columns.add(((TableColumn)child));
+ } else if (child.getName().equals("fo:table-footer")) {
+ tableFooter = (TableBody)child;
+ } else if (child.getName().equals("fo:table-header")) {
+ tableHeader = (TableBody)child;
+ } else {
+ // add bodies
+ super.addChildNode(child);
+ }
}
/**
1.13 +0 -32 xml-fop/src/java/org/apache/fop/fo/flow/TableAndCaption.java
Index: TableAndCaption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableAndCaption.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TableAndCaption.java 8 Aug 2004 19:04:49 -0000 1.12
+++ TableAndCaption.java 11 Aug 2004 04:15:26 -0000 1.13
@@ -21,12 +21,6 @@
// FOP
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.ToBeImplementedElement;
-import org.apache.fop.fo.properties.CommonAccessibility;
-import org.apache.fop.fo.properties.CommonAural;
-import org.apache.fop.fo.properties.CommonBackground;
-import org.apache.fop.fo.properties.CommonBorderAndPadding;
-import org.apache.fop.fo.properties.CommonMarginBlock;
-import org.apache.fop.fo.properties.CommonRelativePosition;
/**
* Class modelling the fo:table-and-caption property. See Sec. 6.7.2 of the
@@ -39,32 +33,6 @@
*/
public TableAndCaption(FONode parent) {
super(parent);
- }
-
- private void setup() {
-
- // Common Accessibility Properties
- CommonAccessibility mAccProps = propMgr.getAccessibilityProps();
-
- // Common Aural Properties
- CommonAural mAurProps = propMgr.getAuralProps();
-
- // Common Border, Padding, and Background Properties
- CommonBorderAndPadding bap = propMgr.getBorderAndPadding();
- CommonBackground bProps = propMgr.getBackgroundProps();
-
- // Common Margin Properties-Block
- CommonMarginBlock mProps = propMgr.getMarginProps();
-
- // Common Relative Position Properties
- CommonRelativePosition mRelProps = propMgr.getRelativePositionProps();
-
- // this.propertyList.get("caption-side");
- setupID();
- // this.propertyList.get("keep-together");
- // this.propertyList.get("keep-with-next");
- // this.propertyList.get("keep-with-previous");
-
}
/**
1.23 +1 -29 xml-fop/src/java/org/apache/fop/fo/flow/TableBody.java
Index: TableBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableBody.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- TableBody.java 8 Aug 2004 19:04:49 -0000 1.22
+++ TableBody.java 11 Aug 2004 04:15:26 -0000 1.23
@@ -28,15 +28,8 @@
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
import org.apache.fop.layoutmgr.AddLMVisitor;
-
-import org.apache.fop.fo.properties.CommonAccessibility;
-import org.apache.fop.fo.properties.CommonAural;
-import org.apache.fop.fo.properties.CommonBackground;
-import org.apache.fop.fo.properties.CommonBorderAndPadding;
-import org.apache.fop.fo.properties.CommonRelativePosition;
import org.apache.fop.fo.LMVisited;
-
/**
* Class modelling the fo:table-body object. See Sec. 6.7.8 of the XSL-FO
* Standard.
@@ -59,34 +52,13 @@
*/
protected void addProperties(Attributes attlist) throws SAXParseException {
super.addProperties(attlist);
- setupID();
- getFOInputHandler().startBody(this);
- }
-
- private void setup() {
- // Common Accessibility Properties
- CommonAccessibility mAccProps = propMgr.getAccessibilityProps();
-
- // Common Aural Properties
- CommonAural mAurProps = propMgr.getAuralProps();
-
- // Common Border, Padding, and Background Properties
- CommonBorderAndPadding bap = propMgr.getBorderAndPadding();
- CommonBackground bProps = propMgr.getBackgroundProps();
-
- // Common Relative Position Properties
- CommonRelativePosition mRelProps =
- propMgr.getRelativePositionProps();
-
- setupID();
-
this.spaceBefore = this.propertyList.get(
PR_SPACE_BEFORE | CP_OPTIMUM).getLength().getValue();
this.spaceAfter = this.propertyList.get(
PR_SPACE_AFTER | CP_OPTIMUM).getLength().getValue();
this.backgroundColor =
this.propertyList.get(PR_BACKGROUND_COLOR).getColorType();
-
+ getFOInputHandler().startBody(this);
}
/**
1.14 +0 -32 xml-fop/src/java/org/apache/fop/fo/flow/TableCaption.java
Index: TableCaption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableCaption.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TableCaption.java 8 Aug 2004 19:04:49 -0000 1.13
+++ TableCaption.java 11 Aug 2004 04:15:26 -0000 1.14
@@ -21,11 +21,6 @@
// FOP
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.ToBeImplementedElement;
-import org.apache.fop.fo.properties.CommonAccessibility;
-import org.apache.fop.fo.properties.CommonAural;
-import org.apache.fop.fo.properties.CommonBackground;
-import org.apache.fop.fo.properties.CommonBorderAndPadding;
-import org.apache.fop.fo.properties.CommonRelativePosition;
/**
* Class modelling the fo:table-caption object. See Sec. 6.7.5 of the XSL-FO
@@ -38,33 +33,6 @@
*/
public TableCaption(FONode parent) {
super(parent);
- }
-
- /**
- * Initialize property values.
- */
- private void setup() {
-
- // Common Accessibility Properties
- CommonAccessibility mAccProps = propMgr.getAccessibilityProps();
-
- // Common Aural Properties
- CommonAural mAurProps = propMgr.getAuralProps();
-
- // Common Border, Padding, and Background Properties
- CommonBorderAndPadding bap = propMgr.getBorderAndPadding();
- CommonBackground bProps = propMgr.getBackgroundProps();
-
- // Common Relative Position Properties
- CommonRelativePosition mRelProps = propMgr.getRelativePositionProps();
-
- // this.propertyList.get("block-progression-dimension");
- // this.propertyList.get("height");
- setupID();
- // this.propertyList.get("inline-progression-dimension");
- // this.propertyList.get("keep-togethe");
- // this.propertyList.get("width");
-
}
public String getName() {
1.26 +3 -34 xml-fop/src/java/org/apache/fop/fo/flow/TableCell.java
Index: TableCell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableCell.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- TableCell.java 8 Aug 2004 19:04:49 -0000 1.25
+++ TableCell.java 11 Aug 2004 04:15:26 -0000 1.26
@@ -31,12 +31,7 @@
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
import org.apache.fop.layoutmgr.table.Cell;
-
-import org.apache.fop.fo.properties.CommonAccessibility;
-import org.apache.fop.fo.properties.CommonAural;
-import org.apache.fop.fo.properties.CommonBackground;
import org.apache.fop.fo.properties.CommonBorderAndPadding;
-import org.apache.fop.fo.properties.CommonRelativePosition;
/**
* Class modelling the fo:table-cell object. See Sec. 6.7.10 of the XSL-FO
@@ -168,36 +163,10 @@
return numRowsSpanned;
}
+ /**
+ * @todo convert to addProperties()
+ */
private void doSetup() {
- // Common Accessibility Properties
- CommonAccessibility mAccProps = propMgr.getAccessibilityProps();
-
- // Common Aural Properties
- CommonAural mAurProps = propMgr.getAuralProps();
-
- // Common Border, Padding, and Background Properties
- CommonBorderAndPadding bap = propMgr.getBorderAndPadding();
- CommonBackground bProps = propMgr.getBackgroundProps();
-
- // Common Relative Position Properties
- CommonRelativePosition mRelProps = propMgr.getRelativePositionProps();
-
- // this.propertyList.get("border-after-precedence");
- // this.propertyList.get("border-before-precendence");
- // this.propertyList.get("border-end-precendence");
- // this.propertyList.get("border-start-precendence");
- // this.propertyList.get("block-progression-dimension");
- // this.propertyList.get("column-number");
- // this.propertyList.get("display-align");
- // this.propertyList.get("relative-align");
- // this.propertyList.get("empty-cells");
- // this.propertyList.get("ends-row");
- // this.propertyList.get("height");
- setupID();
- // this.propertyList.get("number-columns-spanned");
- // this.propertyList.get("number-rows-spanned");
- // this.propertyList.get("starts-row");
- // this.propertyList.get("width");
this.iColNumber =
propertyList.get(PR_COLUMN_NUMBER).getNumber().intValue();
1.27 +3 -18 xml-fop/src/java/org/apache/fop/fo/flow/TableColumn.java
Index: TableColumn.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableColumn.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- TableColumn.java 8 Aug 2004 18:39:23 -0000 1.26
+++ TableColumn.java 11 Aug 2004 04:15:27 -0000 1.27
@@ -29,9 +29,6 @@
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.properties.CommonBackground;
-import org.apache.fop.fo.properties.CommonBorderAndPadding;
-
/**
* Class modelling the fo:table-column object. See Sec. 6.7.4 of the XSL-FO
* Standard.
@@ -93,19 +90,10 @@
return numColumnsRepeated;
}
+ /**
+ * @todo convert to addProperties()
+ */
public void initialize() {
-
- // Common Border, Padding, and Background Properties
- // only background apply, border apply if border-collapse
- // is collapse.
- CommonBorderAndPadding bap = propMgr.getBorderAndPadding();
- CommonBackground bProps = propMgr.getBackgroundProps();
-
- // this.propertyList.get("column-width");
- // this.propertyList.get("number-columns-repeated");
- // this.propertyList.get("number-columns-spanned");
- // this.propertyList.get("visibility");
-
iColumnNumber = propertyList.get(PR_COLUMN_NUMBER).getNumber().intValue();
numColumnsRepeated =
@@ -115,9 +103,6 @@
this.propertyList.get(PR_BACKGROUND_COLOR).getColorType();
columnWidth = this.propertyList.get(PR_COLUMN_WIDTH).getLength();
-
- // initialize id
- setupID();
initialized = true;
}
1.27 +0 -34 xml-fop/src/java/org/apache/fop/fo/flow/TableRow.java
Index: TableRow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableRow.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- TableRow.java 8 Aug 2004 18:39:23 -0000 1.26
+++ TableRow.java 11 Aug 2004 04:15:27 -0000 1.27
@@ -32,12 +32,6 @@
import org.apache.fop.fo.FObj;
import org.apache.fop.layoutmgr.table.Row;
import org.apache.fop.fo.Constants;
-
-import org.apache.fop.fo.properties.CommonAccessibility;
-import org.apache.fop.fo.properties.CommonAural;
-import org.apache.fop.fo.properties.CommonBackground;
-import org.apache.fop.fo.properties.CommonBorderAndPadding;
-import org.apache.fop.fo.properties.CommonRelativePosition;
import org.apache.fop.fo.properties.Property;
@@ -70,7 +64,6 @@
*/
protected void addProperties(Attributes attlist) throws SAXParseException {
super.addProperties(attlist);
- setupID();
getFOInputHandler().startRow(this);
}
@@ -82,33 +75,6 @@
}
private void doSetup() {
-
- // Common Accessibility Properties
- CommonAccessibility mAccProps = propMgr.getAccessibilityProps();
-
- // this.propertyList.get("block-progression-dimension");
-
- // Common Aural Properties
- CommonAural mAurProps = propMgr.getAuralProps();
-
- // Common Border, Padding, and Background Properties
- // only background apply, border apply if border-collapse
- // is collapse.
- CommonBorderAndPadding bap = propMgr.getBorderAndPadding();
- CommonBackground bProps = propMgr.getBackgroundProps();
-
- // Common Relative Position Properties
- CommonRelativePosition mRelProps = propMgr.getRelativePositionProps();
-
- // this.propertyList.get("break-before");
- // this.propertyList.get("break-after");
- setupID();
- // this.propertyList.get("height");
- // this.propertyList.get("keep-together");
- // this.propertyList.get("keep-with-next");
- // this.propertyList.get("keep-with-previous");
-
-
this.breakAfter = this.propertyList.get(PR_BREAK_AFTER).getEnum();
this.backgroundColor =
this.propertyList.get(PR_BACKGROUND_COLOR).getColorType();
1.37 +0 -1 xml-fop/src/java/org/apache/fop/fo/pagination/PageSequence.java
Index: PageSequence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/PageSequence.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- PageSequence.java 8 Aug 2004 18:39:25 -0000 1.36
+++ PageSequence.java 11 Aug 2004 04:15:28 -0000 1.37
@@ -287,7 +287,6 @@
// this.propertyList.get("country");
// this.propertyList.get("language");
- setupID();
//call startStructuredPageSequence to ensure, that startPageSequence is
called
//before startFlow.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
