You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by bc...@apache.org on 2004/10/19 15:45:39 UTC
cvs commit: xml-fop/src/java/org/apache/fop/fo/pagination ConditionalPageMasterReference.java Flow.java LayoutMasterSet.java PageSequence.java PageSequenceMaster.java Region.java RegionAfter.java RegionBA.java RegionBefore.java RegionEnd.java RegionSE.java RegionStart.java RepeatablePageMasterAlternatives.java RepeatablePageMasterReference.java SimplePageMaster.java SinglePageMasterReference.java
bckfnn 2004/10/19 06:45:39
Modified: src/java/org/apache/fop/fo/flow BasicLink.java
BidiOverride.java Block.java BlockContainer.java
Character.java ExternalGraphic.java Footnote.java
FootnoteBody.java Inline.java InlineContainer.java
Leader.java ListBlock.java ListItem.java
ListItemBody.java ListItemLabel.java Marker.java
PageNumber.java PageNumberCitation.java
RetrieveMarker.java Table.java TableBody.java
TableCell.java TableColumn.java TableRow.java
src/java/org/apache/fop/fo/pagination
ConditionalPageMasterReference.java Flow.java
LayoutMasterSet.java PageSequence.java
PageSequenceMaster.java Region.java
RegionAfter.java RegionBA.java RegionBefore.java
RegionEnd.java RegionSE.java RegionStart.java
RepeatablePageMasterAlternatives.java
RepeatablePageMasterReference.java
SimplePageMaster.java
SinglePageMasterReference.java
Log:
Second phase of performance improvement.
- Removed addProperties() method and misc old property fields.
PR: 31699
Revision Changes Path
1.32 +0 -46 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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- BasicLink.java 19 Oct 2004 08:53:49 -0000 1.31
+++ BasicLink.java 19 Oct 2004 13:45:36 -0000 1.32
@@ -22,7 +22,6 @@
import java.util.List;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
@@ -51,12 +50,6 @@
// private ToBeImplementedProperty targetStylesheet;
// End of property values
- // link represented by this FO
- private String link = null;
-
- // indicator of whether link is internal or external
- private boolean isExternalLink = false;
-
// used only for FO validation
private boolean blockOrInlineItemFound = false;
@@ -109,31 +102,6 @@
}
/**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
-
- // This logic is for determining the link represented by this FO.
- String ext = propertyList.get(PR_EXTERNAL_DESTINATION).getString();
- String internal = propertyList.get(PR_INTERNAL_DESTINATION).getString();
-
- // per spec, internal takes precedence if both specified
- if (internal.length() > 0) {
- link = internal;
- } else if (ext.length() > 0) {
- link = ext;
- isExternalLink = true;
- } else {
- // slightly stronger than spec "should be specified"
- attributeError("Missing attribute: Either external-destination or " +
- "internal-destination must be specified.");
- }
-
- getFOEventHandler().startLink(this);
- }
-
- /**
* @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
* XSL Content Model: marker* (#PCDATA|%inline;|%block;)*
*/
@@ -156,20 +124,6 @@
public void addLayoutManager(List list) {
BasicLinkLayoutManager lm = new BasicLinkLayoutManager(this);
list.add(lm);
- }
-
- /**
- * @return link represented by this fo:basic-link
- */
- public String getLink() {
- return link;
- }
-
- /**
- * @return true if link is external, false if internal
- */
- public boolean isExternalLink() {
- return isExternalLink;
}
/**
1.22 +0 -10 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- BidiOverride.java 19 Oct 2004 08:53:49 -0000 1.21
+++ BidiOverride.java 19 Oct 2004 13:45:36 -0000 1.22
@@ -23,7 +23,6 @@
import java.util.List;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
@@ -105,15 +104,6 @@
// prScoreSpaces = pList.get(PR_SCORE_SPACES);
// prUnicodeBidi = pList.get(PR_UNICODE_BIDI);
prWordSpacing = pList.get(PR_WORD_SPACING).getSpace();
- }
-
- /**
- * @see org.apache.fop.fo.FObj#addProperties
- * @todo see if can use a BitSet to determine if an FO should
- * have its ID setup; then move setupID() instances to FObj.
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
}
/**
1.46 +5 -50 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.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- Block.java 19 Oct 2004 08:53:49 -0000 1.45
+++ Block.java 19 Oct 2004 13:45:36 -0000 1.46
@@ -22,7 +22,6 @@
import java.util.List;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
@@ -110,23 +109,6 @@
private int wrapOption;
// End of property values
- private int align;
- private int alignLast;
- private int _lineHeight;
- private int startIndent;
- private int endIndent;
- private int spaceBefore;
- private int spaceAfter;
- private int _textIndent;
- private int _keepWithNext;
- private ColorType backgroundColor;
- private int blockWidows;
- private int blockOrphans;
-
- private int wsTreatment; //ENUMERATION
- private int lfTreatment; //ENUMERATION
- private boolean bWScollapse; //true if white-space-collapse=true
-
// this may be helpful on other FOs too
private boolean anythingLaidOut = false;
@@ -293,33 +275,6 @@
}
/**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
- this.span = getPropEnum(PR_SPAN);
- this.wsTreatment = getPropEnum(PR_WHITE_SPACE_TREATMENT);
- this.bWScollapse = (getPropEnum(PR_WHITE_SPACE_COLLAPSE) == Constants.TRUE);
- this.lfTreatment = getPropEnum(PR_LINEFEED_TREATMENT);
- this.align = getPropEnum(PR_TEXT_ALIGN);
- this.alignLast = getPropEnum(PR_TEXT_ALIGN_LAST);
- this.breakAfter = getPropEnum(PR_BREAK_AFTER);
- this._lineHeight = getPropLength(PR_LINE_HEIGHT);
- this.startIndent = getPropLength(PR_START_INDENT);
- this.endIndent = getPropLength(PR_END_INDENT);
- this.spaceBefore = getPropLength(PR_SPACE_BEFORE | CP_OPTIMUM);
- this.spaceAfter = getPropLength(PR_SPACE_AFTER | CP_OPTIMUM);
- this._textIndent = getPropLength(PR_TEXT_INDENT);
- this._keepWithNext = getPropEnum(PR_KEEP_WITH_NEXT);
- this.blockWidows =
- this.propertyList.get(PR_WIDOWS).getNumber().intValue();
- this.blockOrphans =
- this.propertyList.get(PR_ORPHANS).getNumber().intValue();
-
- getFOEventHandler().startBlock(this);
- }
-
- /**
* @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
* XSL Content Model: marker* initial-property-set? (#PCDATA|%inline;|%block;)*
* Additionally: "An fo:bidi-override that is a descendant of an fo:leader
@@ -391,7 +346,7 @@
/* Some kind of whitespace character, except linefeed. */
boolean bIgnore = false;
- switch (wsTreatment) {
+ switch (whiteSpaceTreatment) {
case Constants.IGNORE:
bIgnore = true;
break;
@@ -412,8 +367,8 @@
// Handle ignore and replacement
if (bIgnore) {
charIter.remove();
- } else if (bWScollapse) {
- if (bInWS || (lfTreatment == Constants.PRESERVE
+ } else if (whiteSpaceCollapse == TRUE) {
+ if (bInWS || (linefeedTreatment == Constants.PRESERVE
&& (bPrevWasLF || lfCheck.nextIsLF()))) {
charIter.remove();
} else {
@@ -442,7 +397,7 @@
lfCheck.reset();
bPrevWasLF = true; // for following whitespace
- switch (lfTreatment) {
+ switch (linefeedTreatment) {
case Constants.IGNORE:
charIter.remove();
break;
@@ -451,7 +406,7 @@
// only if bWScollapse=true
charIter.remove();
} else {
- if (bWScollapse) {
+ if (whiteSpaceCollapse == TRUE) {
bInWS = true;
// remove the linefeed if no word in block
// encountered yet
1.28 +0 -27 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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- BlockContainer.java 19 Oct 2004 08:53:50 -0000 1.27
+++ BlockContainer.java 19 Oct 2004 13:45:36 -0000 1.28
@@ -22,7 +22,6 @@
import java.util.List;
// FOP
-import org.apache.fop.datatypes.ColorType;
import org.apache.fop.datatypes.Length;
import org.apache.fop.datatypes.Numeric;
import org.apache.fop.fo.FONode;
@@ -35,7 +34,6 @@
import org.apache.fop.fo.properties.LengthRangeProperty;
import org.apache.fop.layoutmgr.BlockContainerLayoutManager;
-import org.xml.sax.Attributes;
import org.xml.sax.SAXParseException;
/**
@@ -67,17 +65,6 @@
// private ToBeImplementedProperty zIndex;
// End of property values
- private ColorType backgroundColor;
- private int position;
-
- private int top;
- private int bottom;
- private int left;
- private int right;
- private int _width;
- private int _height;
-
-
/**
* @param parent FONode that is the parent of this object
*/
@@ -120,20 +107,6 @@
getFOEventHandler().startBlockContainer(this);
}
- /**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
- this.span = getPropEnum(PR_SPAN);
- this.backgroundColor =
- this.propertyList.get(PR_BACKGROUND_COLOR).getColorType();
-
- this._width = getPropLength(PR_WIDTH);
- this._height = getPropLength(PR_HEIGHT);
- getFOEventHandler().startBlockContainer(this);
- }
-
/**
* @see org.apache.fop.fo.FONode#endOfNode
*/
1.25 +1 -14 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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Character.java 19 Oct 2004 08:53:50 -0000 1.24
+++ Character.java 19 Oct 2004 13:45:36 -0000 1.25
@@ -22,7 +22,6 @@
import java.util.List;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
@@ -95,8 +94,6 @@
/** constant indicating that the character does not fit */
public static final int DOESNOT_FIT = 1;
- private char characterValue;
-
/**
* @param parent FONode that is the parent of this object
*/
@@ -157,21 +154,11 @@
invalidChildError(loc, nsURI, localName);
}
-
- /**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
- characterValue = propertyList.get(PR_CHARACTER).getCharacter();
- getFOEventHandler().character(this);
- }
-
/**
* @see org.apache.fop.fo.FObj#charIterator
*/
public CharIterator charIterator() {
- return new OneCharIterator(characterValue);
+ return new OneCharIterator(character);
// But what if the character is ignored due to white space handling?
}
1.44 +0 -10 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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ExternalGraphic.java 19 Oct 2004 08:53:50 -0000 1.43
+++ ExternalGraphic.java 19 Oct 2004 13:45:36 -0000 1.44
@@ -22,7 +22,6 @@
import java.util.List;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
@@ -135,15 +134,6 @@
protected void validateChildNode(Locator loc, String nsURI, String localName)
throws SAXParseException {
invalidChildError(loc, nsURI, localName);
- }
-
- /**
- * @see org.apache.fop.fo.FObj#addProperties
- * @todo switch method from image() to startImage()?
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
- getFOEventHandler().image(this);
}
/**
1.29 +0 -9 xml-fop/src/java/org/apache/fop/fo/flow/Footnote.java
Index: Footnote.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Footnote.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Footnote.java 19 Oct 2004 08:53:50 -0000 1.28
+++ Footnote.java 19 Oct 2004 13:45:36 -0000 1.29
@@ -22,7 +22,6 @@
import java.util.List;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
@@ -57,14 +56,6 @@
commonAccessibility = pList.getAccessibilityProps();
}
- /**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
- getFOEventHandler().startFootnote(this);
- }
-
/**
* @see org.apache.fop.fo.FONode#startOfNode
*/
1.23 +0 -9 xml-fop/src/java/org/apache/fop/fo/flow/FootnoteBody.java
Index: FootnoteBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/FootnoteBody.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- FootnoteBody.java 19 Oct 2004 08:53:50 -0000 1.22
+++ FootnoteBody.java 19 Oct 2004 13:45:37 -0000 1.23
@@ -19,7 +19,6 @@
package org.apache.fop.fo.flow;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
@@ -67,14 +66,6 @@
* @see org.apache.fop.fo.FONode#startOfNode
*/
protected void startOfNode() throws SAXParseException {
- getFOEventHandler().startFootnoteBody(this);
- }
-
- /**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
getFOEventHandler().startFootnoteBody(this);
}
1.30 +0 -28 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Inline.java 19 Oct 2004 08:53:50 -0000 1.29
+++ Inline.java 19 Oct 2004 13:45:37 -0000 1.30
@@ -19,7 +19,6 @@
package org.apache.fop.fo.flow;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
@@ -141,33 +140,6 @@
*/
protected void endOfNode() throws SAXParseException {
getFOEventHandler().endInline(this);
- }
-
- /**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
-
- /* Check to see if this node can have block-level children.
- * See validateChildNode() below.
- */
- int lvlLeader = findAncestor(FO_LEADER);
- int lvlFootnote = findAncestor(FO_FOOTNOTE);
- int lvlInCntr = findAncestor(FO_INLINE_CONTAINER);
-
- if (lvlLeader > 0) {
- if (lvlInCntr < 0 ||
- (lvlInCntr > 0 && lvlInCntr > lvlLeader)) {
- canHaveBlockLevelChildren = false;
- }
- } else if (lvlFootnote > 0) {
- if (lvlInCntr < 0 || lvlInCntr > lvlFootnote) {
- canHaveBlockLevelChildren = false;
- }
- }
-
- getFOEventHandler().startInline(this);
}
/**
1.22 +0 -8 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- InlineContainer.java 19 Oct 2004 08:53:50 -0000 1.21
+++ InlineContainer.java 19 Oct 2004 13:45:37 -0000 1.22
@@ -23,7 +23,6 @@
import java.util.ArrayList;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.SAXParseException;
// FOP
@@ -108,13 +107,6 @@
*/
protected void startOfNode() throws SAXParseException {
checkId(id);
- }
-
- /**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
}
/**
1.40 +4 -49 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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- Leader.java 19 Oct 2004 08:53:50 -0000 1.39
+++ Leader.java 19 Oct 2004 13:45:37 -0000 1.40
@@ -80,11 +80,6 @@
private SpaceProperty wordSpacing;
// End of property values
- private int _ruleThickness;
- private int patternWidth;
- /** FontState for this object */
- protected Font fontState;
-
/**
* @param parent FONode that is the parent of this object
*/
@@ -146,51 +141,12 @@
protected void startOfNode() throws SAXParseException {
checkId(id);
}
-
- /**
- * @todo convert to addProperties()
- */
- private void setup() {
- // Common Font Properties
- this.fontState = propMgr.getFontState(getFOEventHandler().getFontInfo());
-
- // color properties
- ColorType c = this.propertyList.get(PR_COLOR).getColorType();
- float red = c.getRed();
- float green = c.getGreen();
- float blue = c.getBlue();
-
- // fo:leader specific properties
- // determines the pattern of leader; allowed values: space, rule,dots, use-content
- leaderPattern = getPropEnum(PR_LEADER_PATTERN);
- switch(leaderPattern) {
- case LeaderPattern.SPACE:
- // use Space
- break;
- case LeaderPattern.RULE:
- // the following properties only apply
- // for leader-pattern = "rule"
- _ruleThickness = getPropLength(PR_RULE_THICKNESS);
- ruleStyle = getPropEnum(PR_RULE_STYLE);
- break;
- case LeaderPattern.DOTS:
- break;
- case LeaderPattern.USECONTENT:
- // use inline layout manager to create inline areas
- // add the inline parent multiple times until leader full
- break;
- }
-
- // if leaderPatternWidth = 0 = default = use-font-metric
- patternWidth = getPropLength(PR_LEADER_PATTERN_WIDTH);
- }
/**
* @todo check need for each of these accessors (should be LM instead?)
*/
- public int getLength(int propId, int dim) {
+ public int getLength(Length maxlength, int dim) {
int length;
- Length maxlength = propertyList.get(propId).getLength();
if (maxlength instanceof PercentLength) {
length = (int)(((PercentLength)maxlength).value() * dim);
} else {
@@ -200,15 +156,15 @@
}
public int getRuleThickness() {
- return _ruleThickness;
+ return ruleThickness.getValue();
}
public Font getFontState() {
- return fontState;
+ return propMgr.getFontState(getFOEventHandler().getFontInfo());
}
public int getPatternWidth() {
- return patternWidth;
+ return leaderPatternWidth.getValue();
}
/**
@@ -272,7 +228,6 @@
* @see org.apache.fop.fo.FONode#addLayoutManager(List)
*/
public void addLayoutManager(List list) {
- setup();
LeaderLayoutManager lm = new LeaderLayoutManager(this);
list.add(lm);
}
1.33 +0 -9 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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ListBlock.java 19 Oct 2004 08:53:50 -0000 1.32
+++ ListBlock.java 19 Oct 2004 13:45:37 -0000 1.33
@@ -22,7 +22,6 @@
import java.util.List;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
@@ -108,14 +107,6 @@
missingChildElementError("marker* (list-item)+");
}
getFOEventHandler().endList(this);
- }
-
- /**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
- getFOEventHandler().startList(this);
}
/**
1.32 +0 -9 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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ListItem.java 19 Oct 2004 08:53:50 -0000 1.31
+++ ListItem.java 19 Oct 2004 13:45:37 -0000 1.32
@@ -22,7 +22,6 @@
import java.util.List;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
@@ -105,14 +104,6 @@
missingChildElementError("marker* (list-item-label,list-item-body)");
}
getFOEventHandler().endListItem(this);
- }
-
- /**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
- getFOEventHandler().startListItem(this);
}
/**
1.20 +0 -12 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ListItemBody.java 19 Oct 2004 08:53:50 -0000 1.19
+++ ListItemBody.java 19 Oct 2004 13:45:37 -0000 1.20
@@ -71,18 +71,6 @@
}
/**
- * @todo convert to addProperties()
- */
- private void setup() {
- /*
- * 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.
- */
- }
-
- /**
* Return the "id" property.
*/
public String getId() {
1.29 +0 -15 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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ListItemLabel.java 19 Oct 2004 08:53:50 -0000 1.28
+++ ListItemLabel.java 19 Oct 2004 13:45:37 -0000 1.29
@@ -19,7 +19,6 @@
package org.apache.fop.fo.flow;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.SAXParseException;
// FOP
@@ -69,20 +68,6 @@
*/
protected void endOfNode() throws SAXParseException {
getFOEventHandler().endListLabel();
- }
-
- /**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
- getFOEventHandler().startListLabel();
- /*
- * 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.
- */
}
/**
1.17 +0 -8 xml-fop/src/java/org/apache/fop/fo/flow/Marker.java
Index: Marker.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Marker.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Marker.java 19 Oct 2004 08:53:50 -0000 1.16
+++ Marker.java 19 Oct 2004 13:45:37 -0000 1.17
@@ -19,7 +19,6 @@
package org.apache.fop.fo.flow;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
@@ -49,13 +48,6 @@
*/
public void bind(PropertyList pList) throws SAXParseException {
markerClassName = pList.get(PR_MARKER_CLASS_NAME).getString();
- }
-
- /**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
}
/**
1.41 +2 -28 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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- PageNumber.java 19 Oct 2004 08:53:50 -0000 1.40
+++ PageNumber.java 19 Oct 2004 13:45:37 -0000 1.41
@@ -22,12 +22,10 @@
import java.util.List;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
// FOP
-import org.apache.fop.datatypes.ColorType;
import org.apache.fop.datatypes.Length;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
@@ -74,13 +72,6 @@
private int wrapOption;
// End of property values
- /** FontState for this object */
- protected Font fontState;
-
- private float red;
- private float green;
- private float blue;
-
/**
* @param parent FONode that is the parent of this object
*/
@@ -143,28 +134,11 @@
}
/**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
-
- // Common Font Properties
- this.fontState = propMgr.getFontState(getFOEventHandler().getFontInfo());
-
- ColorType c = this.propertyList.get(PR_COLOR).getColorType();
- this.red = c.getRed();
- this.green = c.getGreen();
- this.blue = c.getBlue();
-
- this.wrapOption = getPropEnum(PR_WRAP_OPTION);
- getFOEventHandler().startPageNumber(this);
- }
-
- /**
* @return the FontState object for this PageNumber
*/
public Font getFontState() {
- return fontState;
+ return propMgr.getFontState(getFOEventHandler().getFontInfo());
+
}
/**
1.40 +0 -12 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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- PageNumberCitation.java 19 Oct 2004 08:53:50 -0000 1.39
+++ PageNumberCitation.java 19 Oct 2004 13:45:37 -0000 1.40
@@ -22,7 +22,6 @@
import java.util.List;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
@@ -131,17 +130,6 @@
protected void validateChildNode(Locator loc, String nsURI, String localName)
throws SAXParseException {
invalidChildError(loc, nsURI, localName);
- }
-
- /**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
-
- if (getPropString(PR_REF_ID) == null || getPropString(PR_REF_ID).equals("")) {
- missingPropertyError("ref-id");
- }
}
/**
1.21 +0 -11 xml-fop/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
Index: RetrieveMarker.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/RetrieveMarker.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- RetrieveMarker.java 19 Oct 2004 08:53:50 -0000 1.20
+++ RetrieveMarker.java 19 Oct 2004 13:45:37 -0000 1.21
@@ -22,7 +22,6 @@
import java.util.List;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
@@ -63,16 +62,6 @@
retrieveBoundary = pList.get(PR_RETRIEVE_BOUNDARY).getEnum();
}
- /**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
- this.retrieveClassName = getPropString(PR_RETRIEVE_CLASS_NAME);
- this.retrievePosition = getPropEnum(PR_RETRIEVE_POSITION);
- this.retrieveBoundary = getPropEnum(PR_RETRIEVE_BOUNDARY);
- }
-
/**
* @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
* XSL Content Model: empty
1.39 +0 -42 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.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Table.java 19 Oct 2004 08:53:50 -0000 1.38
+++ Table.java 19 Oct 2004 13:45:37 -0000 1.39
@@ -24,11 +24,9 @@
import java.util.ArrayList;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.SAXParseException;
// FOP
-import org.apache.fop.datatypes.ColorType;
import org.apache.fop.datatypes.Length;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
@@ -84,23 +82,6 @@
protected ArrayList columns = null;
private TableBody tableHeader = null;
private TableBody tableFooter = null;
- private boolean omitHeaderAtBreak = false;
- private boolean omitFooterAtBreak = false;
-
- private int spaceBefore;
- private int spaceAfter;
- private ColorType backgroundColor;
- private LengthRangeProperty ipd;
- private int _height;
-
- private boolean bAutoLayout = false;
- private int contentWidth = 0; // Sum of column widths
- /** Optimum inline-progression-dimension */
- private int optIPD;
- /** Minimum inline-progression-dimension */
- private int minIPD;
- /** Maximum inline-progression-dimension */
- private int maxIPD;
/**
* @param parent FONode that is the parent of this object
@@ -154,29 +135,6 @@
*/
protected void endOfNode() throws SAXParseException {
getFOEventHandler().endTable(this);
- }
-
- /**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
- this.breakBefore = getPropEnum(PR_BREAK_BEFORE);
- this.breakAfter = getPropEnum(PR_BREAK_AFTER);
- this.spaceBefore = getPropLength(PR_SPACE_BEFORE | CP_OPTIMUM);
- this.spaceAfter = getPropLength(PR_SPACE_AFTER | CP_OPTIMUM);
- this.backgroundColor =
- this.propertyList.get(PR_BACKGROUND_COLOR).getColorType();
- this.ipd = this.propertyList.get(
- PR_INLINE_PROGRESSION_DIMENSION).getLengthRange();
- this._height = getPropLength(PR_HEIGHT);
- this.bAutoLayout = (getPropEnum(PR_TABLE_LAYOUT) == TableLayout.AUTO);
-
- this.omitHeaderAtBreak = getPropEnum(PR_TABLE_OMIT_HEADER_AT_BREAK)
- == TableOmitHeaderAtBreak.TRUE;
- this.omitFooterAtBreak = getPropEnum(PR_TABLE_OMIT_FOOTER_AT_BREAK)
- == TableOmitFooterAtBreak.TRUE;
- getFOEventHandler().startTable(this);
}
/**
1.32 +0 -18 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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- TableBody.java 19 Oct 2004 08:53:50 -0000 1.31
+++ TableBody.java 19 Oct 2004 13:45:37 -0000 1.32
@@ -22,11 +22,9 @@
import java.util.List;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.SAXParseException;
// FOP
-import org.apache.fop.datatypes.ColorType;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
@@ -53,10 +51,6 @@
// private ToBeImplementedProperty visibility;
// End of property values
- private int spaceBefore;
- private int spaceAfter;
- private ColorType backgroundColor;
-
/**
* @param parent FONode that is the parent of the object
*/
@@ -91,18 +85,6 @@
*/
protected void endOfNode() throws SAXParseException {
getFOEventHandler().endBody(this);
- }
-
- /**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
- this.spaceBefore = getPropLength(PR_SPACE_BEFORE | CP_OPTIMUM);
- this.spaceAfter = getPropLength(PR_SPACE_AFTER | CP_OPTIMUM);
- this.backgroundColor =
- this.propertyList.get(PR_BACKGROUND_COLOR).getColorType();
- getFOEventHandler().startBody(this);
}
/**
1.36 +10 -121 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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- TableCell.java 19 Oct 2004 08:53:50 -0000 1.35
+++ TableCell.java 19 Oct 2004 13:45:37 -0000 1.36
@@ -22,12 +22,10 @@
import java.util.List;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
// FOP
-import org.apache.fop.datatypes.ColorType;
import org.apache.fop.datatypes.Length;
import org.apache.fop.datatypes.Numeric;
import org.apache.fop.fo.FONode;
@@ -73,14 +71,6 @@
private Length width;
// End of property values
- // private int spaceBefore;
- // private int spaceAfter;
- private ColorType backgroundColor;
-
- private int numColumnsSpanned;
- private int numRowsSpanned;
- private int iColNumber = -1; // uninitialized
-
/** used for FO validation */
private boolean blockItemFound = false;
@@ -91,12 +81,6 @@
protected int startOffset;
/**
- * Dimension of allocation rectangle in inline-progression-direction,
- * determined by the width of the column(s) occupied by the cell
- */
- protected int _width;
-
- /**
* Offset of content rectangle, in block-progression-direction,
* relative to the row.
*/
@@ -117,36 +101,15 @@
/** For collapsed border style */
protected int borderHeight = 0;
- /** Minimum content height of cell. */
- protected int minCellHeight = 0;
-
- /** Height of cell */
- protected int _height = 0;
-
/** Ypos of cell ??? */
protected int top;
- /** corresponds to display-align property */
- protected int verticalAlign;
-
- /** is this cell relatively aligned? */
- protected boolean bRelativeAlign = false;
-
- // boolean setup = false;
- private boolean bSepBorders = true;
-
/**
* Set to true if all content completely laid out.
*/
private boolean bDone = false;
/**
- * Border separation value in the block-progression dimension.
- * Used in calculating cells height.
- */
- private int _borderSeparation = 0;
-
- /**
* @param parent FONode that is the parent of this object
*/
public TableCell(FONode parent) {
@@ -203,48 +166,6 @@
}
/**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
- this.iColNumber =
- propertyList.get(PR_COLUMN_NUMBER).getNumber().intValue();
- if (iColNumber < 0) {
- iColNumber = 0;
- }
- this.numColumnsSpanned =
- this.propertyList.get(PR_NUMBER_COLUMNS_SPANNED).getNumber().intValue();
- if (numColumnsSpanned < 1) {
- numColumnsSpanned = 1;
- }
- this.numRowsSpanned =
- this.propertyList.get(PR_NUMBER_ROWS_SPANNED).getNumber().intValue();
- if (numRowsSpanned < 1) {
- numRowsSpanned = 1;
- }
-
- this.backgroundColor =
- this.propertyList.get(PR_BACKGROUND_COLOR).getColorType();
-
- bSepBorders = (getPropEnum(PR_BORDER_COLLAPSE) == BorderCollapse.SEPARATE);
-
- calcBorders(propMgr.getBorderAndPadding());
-
- // Vertical cell alignment
- verticalAlign = getPropEnum(PR_DISPLAY_ALIGN);
- if (verticalAlign == DisplayAlign.AUTO) {
- // Depends on all cells starting in row
- bRelativeAlign = true;
- verticalAlign = getPropEnum(PR_RELATIVE_ALIGN);
- } else {
- bRelativeAlign = false; // Align on a per-cell basis
- }
-
- this.minCellHeight = getPropLength(PR_HEIGHT);
- getFOEventHandler().startCell(this);
- }
-
- /**
* @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
* XSL Content Model: marker* (%block;)+
*/
@@ -269,42 +190,11 @@
}
/**
- * Sets the width of the cell. Initially this width is the same as the
- * width of the column containing this cell, or the sum of the spanned
- * columns if numColumnsSpanned > 1
- * @param width the width of the cell (in millipoints ??)
- */
- public void setWidth(int width) {
- this._width = width;
- }
-
- /**
- * @return number of the column containing this cell
- */
- public int getColumnNumber() {
- return iColNumber;
- }
-
- /**
- * @return the number of columns spanned by this cell
- */
- public int getNumColumnsSpanned() {
- return numColumnsSpanned;
- }
-
- /**
- * @return the number of rows spanned by this cell
- */
- public int getNumRowsSpanned() {
- return numRowsSpanned;
- }
-
- /**
* Calculate cell border and padding, including offset of content
* rectangle from the theoretical grid position.
*/
private void calcBorders(CommonBorderAndPadding bp) {
- if (this.bSepBorders) {
+ if (this.borderCollapse == BorderCollapse.SEPARATE) {
/*
* Easy case.
* Cell border is the property specified directly on cell.
@@ -323,9 +213,9 @@
+ bp.getPaddingEnd(false);
// Offset of content rectangle in the block-progression direction
- _borderSeparation = getPropLength(PR_BORDER_SEPARATION |
+ int bSep = getPropLength(PR_BORDER_SEPARATION |
CP_BLOCK_PROGRESSION_DIRECTION);
- this.beforeOffset = _borderSeparation / 2
+ this.beforeOffset = bSep / 2
+ bp.getBorderBeforeWidth(false)
+ bp.getPaddingBefore(false);
@@ -403,11 +293,10 @@
}
/**
- * @return number of the column containing this cell
- * TODO 31699
+ * Return the "column-number" property.
*/
- public int ___getColumnNumber() {
- return columnNumber.getValue();
+ public int getColumnNumber() {
+ return Math.max(columnNumber.getValue(), 0);
}
/**
@@ -418,17 +307,17 @@
}
/**
- * @return the number of columns spanned by this cell
+ * Return the "number-columns-spanned" property.
*/
public int getNumberColumnsSpanned() {
- return numberColumnsSpanned.getValue();
+ return Math.max(numberColumnsSpanned.getValue(), 1);
}
/**
- * @return the number of rows spanned by this cell
+ * Return the "number-rows-spanned" property.
*/
public int getNumberRowsSpanned() {
- return numberRowsSpanned.getValue();
+ return Math.max(numberRowsSpanned.getValue(), 1);
}
/**
1.32 +0 -30 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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- TableColumn.java 19 Oct 2004 08:53:50 -0000 1.31
+++ TableColumn.java 19 Oct 2004 13:45:37 -0000 1.32
@@ -19,12 +19,10 @@
package org.apache.fop.fo.flow;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
// FOP
-import org.apache.fop.datatypes.ColorType;
import org.apache.fop.datatypes.Length;
import org.apache.fop.datatypes.Numeric;
import org.apache.fop.fo.FONode;
@@ -49,11 +47,6 @@
// private ToBeImplementedProperty visibility;
// End of property values
- private ColorType backgroundColor;
- private int columnOffset;
- private int numColumnsRepeated;
- private int iColumnNumber;
-
/**
* @param parent FONode that is the parent of this object
*/
@@ -98,29 +91,6 @@
protected void validateChildNode(Locator loc, String nsURI, String localName)
throws SAXParseException {
invalidChildError(loc, nsURI, localName);
- }
-
- /**
- * @see org.apache.fop.fo.FObj#addProperties(Attributes)
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
-
- iColumnNumber = propertyList.get(PR_COLUMN_NUMBER).getNumber().intValue();
- numColumnsRepeated =
- propertyList.get(PR_NUMBER_COLUMNS_REPEATED).getNumber().intValue();
- this.backgroundColor =
- this.propertyList.get(PR_BACKGROUND_COLOR).getColorType();
- columnWidth = this.propertyList.get(PR_COLUMN_WIDTH).getLength();
-
- getFOEventHandler().startColumn(this);
- }
-
- /**
- * @return value for number of columns repeated
- */
- public int getNumColumnsRepeated() {
- return numColumnsRepeated;
}
/**
1.38 +0 -42 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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- TableRow.java 19 Oct 2004 08:53:50 -0000 1.37
+++ TableRow.java 19 Oct 2004 13:45:37 -0000 1.38
@@ -22,12 +22,10 @@
import java.util.List;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
// FOP
-import org.apache.fop.datatypes.ColorType;
import org.apache.fop.datatypes.KeepValue;
import org.apache.fop.datatypes.Length;
import org.apache.fop.fo.FONode;
@@ -70,14 +68,6 @@
private boolean setup = false;
- private ColorType backgroundColor;
-
- private KeepValue _keepWithNext;
- private KeepValue _keepWithPrevious;
- private KeepValue _keepTogether;
-
- private int minHeight = 0; // force row height
-
/**
* @param parent FONode that is the parent of this object
*/
@@ -127,14 +117,6 @@
}
/**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
- getFOEventHandler().startRow(this);
- }
-
- /**
* @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
* XSL Content Model: (table-cell+)
*/
@@ -143,30 +125,6 @@
if (!(nsURI == FO_URI && localName.equals("table-cell"))) {
invalidChildError(loc, nsURI, localName);
}
- }
-
- /**
- * @return keepWithPrevious
- */
- public KeepValue getKeepWithPrevious() {
- return _keepWithPrevious;
- }
-
- /**
- * @todo see if should remove, or move code to addProperties()
- */
- private void doSetup() {
- this.breakAfter = getPropEnum(PR_BREAK_AFTER);
- this.backgroundColor =
- this.propertyList.get(PR_BACKGROUND_COLOR).getColorType();
-
- this._keepTogether = getKeepValue(PR_KEEP_TOGETHER | CP_WITHIN_COLUMN);
- this._keepWithNext = getKeepValue(PR_KEEP_WITH_NEXT | CP_WITHIN_COLUMN);
- this._keepWithPrevious =
- getKeepValue(PR_KEEP_WITH_PREVIOUS | CP_WITHIN_COLUMN);
-
- this.minHeight = getPropLength(PR_HEIGHT);
- setup = true;
}
private KeepValue getKeepValue(int propId) {
1.21 +1 -36 xml-fop/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
Index: ConditionalPageMasterReference.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ConditionalPageMasterReference.java 19 Oct 2004 08:53:51 -0000 1.20
+++ ConditionalPageMasterReference.java 19 Oct 2004 13:45:37 -0000 1.21
@@ -19,7 +19,6 @@
package org.apache.fop.fo.pagination;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
@@ -46,8 +45,6 @@
private RepeatablePageMasterAlternatives repeatablePageMasterAlternatives;
- private String masterName;
-
/**
* @see org.apache.fop.fo.FONode#FONode(FONode)
*/
@@ -82,38 +79,6 @@
}
/**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
- if (getProperty(PR_MASTER_REFERENCE) != null) {
- setMasterName(getProperty(PR_MASTER_REFERENCE).getString());
- }
-
- validateParent(parent);
-
- this.pagePosition = getPropEnum(PR_PAGE_POSITION);
- this.oddOrEven = getPropEnum(PR_ODD_OR_EVEN);
- this.blankOrNotBlank = getPropEnum(PR_BLANK_OR_NOT_BLANK);
- }
-
- /**
- * Sets the master name.
- * @param masterName name for the master
- */
- protected void setMasterName(String masterName) {
- this.masterName = masterName;
- }
-
- /**
- * Returns the "master-name" attribute of this page master reference
- * @return the master name
- */
- public String getMasterName() {
- return masterName;
- }
-
- /**
* Check if the conditions for this reference are met.
* checks the page number and emptyness to determine if this
* matches.
@@ -179,7 +144,7 @@
this.repeatablePageMasterAlternatives =
(RepeatablePageMasterAlternatives)parent;
- if (getMasterName() == null) {
+ if (getMasterReference() == null) {
getLogger().warn("single-page-master-reference"
+ "does not have a master-name and so is being ignored");
} else {
1.36 +2 -39 xml-fop/src/java/org/apache/fop/fo/pagination/Flow.java
Index: Flow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Flow.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Flow.java 19 Oct 2004 08:53:51 -0000 1.35
+++ Flow.java 19 Oct 2004 13:45:37 -0000 1.36
@@ -23,7 +23,6 @@
import java.util.List;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
@@ -47,11 +46,6 @@
*/
private ArrayList markerSnapshot;
- /**
- * Content-width of current column area during layout
- */
- private int contentWidth;
-
/** used for FO validation */
private boolean blockItemFound = false;
@@ -115,22 +109,6 @@
}
/**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
-
- // check flow_name property
- String flowName = getPropString(PR_FLOW_NAME);
-
- if (flowName == null || flowName.equals("")) {
- missingPropertyError("flow-name");
- }
-
- getFOEventHandler().startFlow(this);
- }
-
- /**
* @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
* XSL Content Model: marker* (%block;)+
*/
@@ -148,21 +126,6 @@
}
/**
- * @param contentWidth content width of this flow, in millipoints (??)
- */
- protected void setContentWidth(int contentWidth) {
- this.contentWidth = contentWidth;
- }
-
- /**
- * @return the content width of this flow (really of the region
- * in which it is flowing), in millipoints (??).
- */
- public int getContentWidth() {
- return this.contentWidth;
- }
-
- /**
* @return true (Flow can generate reference areas)
*/
public boolean generatesReferenceAreas() {
@@ -170,7 +133,7 @@
}
/**
- * @return the name of this flow
+ * Return "flow-name" property.
*/
public String getFlowName() {
return flowName;
1.26 +2 -19 xml-fop/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java
Index: LayoutMasterSet.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- LayoutMasterSet.java 19 Oct 2004 08:53:51 -0000 1.25
+++ LayoutMasterSet.java 19 Oct 2004 13:45:37 -0000 1.26
@@ -23,7 +23,6 @@
import java.util.Map;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
@@ -71,6 +70,8 @@
throw new SAXParseException("fo:layout-master-set must be child of fo:root, not "
+ parent.getName(), locator);
}
+ simplePageMasters = new java.util.HashMap();
+ pageSequenceMasters = new java.util.HashMap();
}
/**
@@ -81,24 +82,6 @@
missingChildElementError("(simple-page-master|page-sequence-master)+");
}
checkRegionNames();
- }
-
- /**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
-
- if (parent.getName().equals("fo:root")) {
- Root root = (Root)parent;
- root.setLayoutMasterSet(this);
- } else {
- throw new SAXParseException("fo:layout-master-set must be child of fo:root, not "
- + parent.getName(), locator);
- }
-
- this.simplePageMasters = new java.util.HashMap();
- this.pageSequenceMasters = new java.util.HashMap();
}
/**
1.49 +0 -53 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.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- PageSequence.java 19 Oct 2004 08:53:51 -0000 1.48
+++ PageSequence.java 19 Oct 2004 13:45:37 -0000 1.49
@@ -22,7 +22,6 @@
import java.util.HashMap;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
@@ -202,58 +201,6 @@
}
getFOEventHandler().endPageSequence(this);
- }
-
- /**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
- this.root = (Root) parent;
- layoutMasterSet = root.getLayoutMasterSet();
- flowMap = new HashMap();
-
- // we are now on the first page of the page sequence
- thisIsFirstPage = true;
- Property ipnValue = getProperty(PR_INITIAL_PAGE_NUMBER);
-
- if (ipnValue.getEnum() != 0) {
- // auto | auto-odd | auto-even.
- pageNumberType = ipnValue.getEnum();
- } else {
- pageNumberType = EXPLICIT;
- int pageStart = ipnValue.getNumber().intValue();
- this.explicitFirstNumber = (pageStart > 0) ? pageStart : 1;
- }
-
- String masterName = getPropString(PR_MASTER_REFERENCE);
- this.simplePageMaster =
- this.layoutMasterSet.getSimplePageMaster(masterName);
- if (this.simplePageMaster == null) {
- this.pageSequenceMaster =
- this.layoutMasterSet.getPageSequenceMaster(masterName);
- if (this.pageSequenceMaster == null) {
- throw new SAXParseException("master-reference '" + masterName
- + "' for fo:page-sequence matches no"
- + " simple-page-master or page-sequence-master", locator);
- }
- }
-
- // get the 'format' properties
- this.pageNumberGenerator =
- new PageNumberGenerator(getPropString(PR_FORMAT),
- this.propertyList.get(PR_GROUPING_SEPARATOR).getCharacter(),
- this.propertyList.get(PR_GROUPING_SIZE).getNumber().intValue(),
- getPropEnum(PR_LETTER_VALUE));
-
- this.forcePageCount = getPropEnum(PR_FORCE_PAGE_COUNT);
-
- // this.propertyList.get("country");
- // this.propertyList.get("language");
-
- //call startStructuredPageSequence to ensure, that startPageSequence is called
- //before startFlow.
- startStructuredPageSequence();
}
/**
1.25 +0 -23 xml-fop/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
Index: PageSequenceMaster.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- PageSequenceMaster.java 19 Oct 2004 08:53:51 -0000 1.24
+++ PageSequenceMaster.java 19 Oct 2004 13:45:37 -0000 1.25
@@ -22,7 +22,6 @@
import java.util.List;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
@@ -95,28 +94,6 @@
if (childNodes == null) {
missingChildElementError("(single-page-master-reference|" +
"repeatable-page-master-reference|repeatable-page-master-alternatives)+");
- }
- }
-
- /**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
- subSequenceSpecifiers = new java.util.ArrayList();
- if (parent.getName().equals("fo:layout-master-set")) {
- this.layoutMasterSet = (LayoutMasterSet)parent;
- masterName = getPropString(PR_MASTER_NAME);
- if (masterName == null) {
- getLogger().warn("page-sequence-master does not have "
- + "a master-name and so is being ignored");
- } else {
- this.layoutMasterSet.addPageSequenceMaster(masterName, this);
- }
- } else {
- throw new SAXParseException("fo:page-sequence-master must be child "
- + "of fo:layout-master-set, not "
- + parent.getName(), locator);
}
}
1.33 +0 -30 xml-fop/src/java/org/apache/fop/fo/pagination/Region.java
Index: Region.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Region.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Region.java 19 Oct 2004 08:53:51 -0000 1.32
+++ Region.java 19 Oct 2004 13:45:37 -0000 1.33
@@ -21,7 +21,6 @@
import java.awt.Rectangle;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
@@ -49,9 +48,6 @@
private SimplePageMaster layoutMaster;
- /** Holds the writing mode */
- protected int wm;
-
/**
* @see org.apache.fop.fo.FONode#FONode(FONode)
*/
@@ -87,32 +83,6 @@
+ " is not permitted.", locator);
}
}
- }
-
- /**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
-
- // regions may have name, or default
- if (null == this.propertyList.get(PR_REGION_NAME)) {
- setRegionName(getDefaultRegionName());
- } else if (getPropString(PR_REGION_NAME).equals("")) {
- setRegionName(getDefaultRegionName());
- } else {
- setRegionName(getPropString(PR_REGION_NAME));
- // check that name is OK. Not very pretty.
- if (isReserved(getRegionName())
- && !getRegionName().equals(getDefaultRegionName())) {
- throw new SAXParseException("region-name '" + regionName
- + "' for " + this.getName()
- + " is not permitted.", locator);
- }
- }
-
- this.wm = getPropEnum(PR_WRITING_MODE);
- this.overflow = getPropEnum(PR_OVERFLOW);
}
/**
1.17 +5 -29 xml-fop/src/java/org/apache/fop/fo/pagination/RegionAfter.java
Index: RegionAfter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionAfter.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- RegionAfter.java 30 Aug 2004 12:00:53 -0000 1.16
+++ RegionAfter.java 19 Oct 2004 13:45:37 -0000 1.17
@@ -21,10 +21,6 @@
// Java
import java.awt.Rectangle;
-// XML
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXParseException;
-
// FOP
import org.apache.fop.fo.FONode;
import org.apache.fop.datatypes.FODimension;
@@ -34,9 +30,6 @@
*/
public class RegionAfter extends RegionBA {
- private int extent = 0;
- private boolean precedence = false;
-
/**
* @see org.apache.fop.fo.FONode#FONode(FONode)
*/
@@ -45,35 +38,18 @@
}
/**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
- extent = getPropLength(PR_EXTENT);
- precedence = (getPropEnum(PR_PRECEDENCE) == Precedence.TRUE);
- }
-
- /**
- * Indicates if this region gets precedence.
- * @return True if it gets precedence
- */
- public boolean getPrecedence() {
- return precedence;
- }
-
- /**
* @see org.apache.fop.fo.pagination.Region#getViewportRectangle(FODimension)
*/
public Rectangle getViewportRectangle (FODimension reldims) {
// Depends on extent, precedence ans writing mode
Rectangle vpRect;
- if (this.wm == WritingMode.LR_TB || this.wm == WritingMode.RL_TB) {
- vpRect = new Rectangle(0, reldims.bpd - extent, reldims.ipd, extent);
+ if (this.getWritingMode() == WritingMode.LR_TB || this.getWritingMode() == WritingMode.RL_TB) {
+ vpRect = new Rectangle(0, reldims.bpd - getExtent().getValue(), reldims.ipd, getExtent().getValue());
} else {
- vpRect = new Rectangle(0, reldims.bpd - extent, extent, reldims.ipd);
+ vpRect = new Rectangle(0, reldims.bpd - getExtent().getValue(), getExtent().getValue(), reldims.ipd);
}
- if (precedence == false) {
- adjustIPD(vpRect, this.wm);
+ if (getPrecedence() == FALSE) {
+ adjustIPD(vpRect, this.getWritingMode());
}
return vpRect;
}
1.22 +1 -10 xml-fop/src/java/org/apache/fop/fo/pagination/RegionBA.java
Index: RegionBA.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionBA.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- RegionBA.java 19 Oct 2004 08:53:51 -0000 1.21
+++ RegionBA.java 19 Oct 2004 13:45:37 -0000 1.22
@@ -22,7 +22,6 @@
import java.awt.Rectangle;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.SAXParseException;
// FOP
@@ -56,13 +55,6 @@
}
/**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
- }
-
- /**
* Return the "extent" property.
*/
public Length getExtent() {
@@ -71,9 +63,8 @@
/**
* Return the "precedence" property.
- * TODO: 31699
*/
- public int ___getPrecedence() {
+ public int getPrecedence() {
return precedence;
}
1.18 +5 -30 xml-fop/src/java/org/apache/fop/fo/pagination/RegionBefore.java
Index: RegionBefore.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionBefore.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- RegionBefore.java 30 Aug 2004 12:00:53 -0000 1.17
+++ RegionBefore.java 19 Oct 2004 13:45:37 -0000 1.18
@@ -21,10 +21,6 @@
// Java
import java.awt.Rectangle;
-// XML
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXParseException;
-
// FOP
import org.apache.fop.datatypes.FODimension;
import org.apache.fop.fo.FONode;
@@ -33,10 +29,6 @@
* The fo:region-before element.
*/
public class RegionBefore extends RegionBA {
-
- private int extent = 0;
- private boolean precedence = false;
-
/**
* @see org.apache.fop.fo.FONode#FONode(FONode)
*/
@@ -45,23 +37,6 @@
}
/**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
- extent = getPropLength(PR_EXTENT);
- precedence = (getPropEnum(PR_PRECEDENCE) == Precedence.TRUE);
- }
-
- /**
- * Indicates if this region gets precedence.
- * @return True if it gets precedence
- */
- public boolean getPrecedence() {
- return precedence;
- }
-
- /**
* @see org.apache.fop.fo.pagination.Region#getDefaultRegionName()
*/
protected String getDefaultRegionName() {
@@ -79,13 +54,13 @@
// Before is always 0, start depends on extent
// ipd depends on precedence, bpd=extent
Rectangle vpRect;
- if (this.wm == WritingMode.LR_TB || this.wm == WritingMode.RL_TB) {
- vpRect = new Rectangle(0, 0, reldims.ipd, extent);
+ if (this.getWritingMode() == WritingMode.LR_TB || this.getWritingMode() == WritingMode.RL_TB) {
+ vpRect = new Rectangle(0, 0, reldims.ipd, getExtent().getValue());
} else {
- vpRect = new Rectangle(0, 0, extent, reldims.ipd);
+ vpRect = new Rectangle(0, 0, getExtent().getValue(), reldims.ipd);
}
- if (precedence == false) {
- adjustIPD(vpRect, this.wm);
+ if (getPrecedence() == FALSE) {
+ adjustIPD(vpRect, this.getWritingMode());
}
return vpRect;
}
1.18 +6 -21 xml-fop/src/java/org/apache/fop/fo/pagination/RegionEnd.java
Index: RegionEnd.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionEnd.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- RegionEnd.java 5 Sep 2004 04:00:52 -0000 1.17
+++ RegionEnd.java 19 Oct 2004 13:45:37 -0000 1.18
@@ -21,10 +21,6 @@
// Java
import java.awt.Rectangle;
-// XML
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXParseException;
-
// FOP
import org.apache.fop.fo.FONode;
import org.apache.fop.datatypes.FODimension;
@@ -33,9 +29,6 @@
* The fo:region-end element.
*/
public class RegionEnd extends RegionSE {
-
- private int extent = 0;
-
/**
* @see org.apache.fop.fo.FONode#FONode(FONode)
*/
@@ -44,29 +37,21 @@
}
/**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
- extent = getPropLength(PR_EXTENT);
- }
-
- /**
* @see org.apache.fop.fo.pagination.Region#getViewportRectangle(FODimension)
*/
public Rectangle getViewportRectangle (FODimension reldims) {
// Depends on extent, precedence and writing mode
Rectangle vpRect;
- if (this.wm == WritingMode.LR_TB || this.wm == WritingMode.RL_TB) {
+ if (this.getWritingMode() == WritingMode.LR_TB || this.getWritingMode() == WritingMode.RL_TB) {
// Rectangle: x , y (of top left point), width, height
- vpRect = new Rectangle(reldims.ipd - extent, 0,
- extent, reldims.bpd);
+ vpRect = new Rectangle(reldims.ipd - getExtent().getValue(), 0,
+ getExtent().getValue(), reldims.bpd);
} else {
// Rectangle: x , y (of top left point), width, height
- vpRect = new Rectangle(reldims.ipd - extent, 0,
- reldims.bpd, extent);
+ vpRect = new Rectangle(reldims.ipd - getExtent().getValue(), 0,
+ reldims.bpd, getExtent().getValue());
}
- adjustIPD(vpRect, this.wm);
+ adjustIPD(vpRect, this.getWritingMode());
return vpRect;
}
1.16 +2 -10 xml-fop/src/java/org/apache/fop/fo/pagination/RegionSE.java
Index: RegionSE.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionSE.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- RegionSE.java 19 Oct 2004 08:53:51 -0000 1.15
+++ RegionSE.java 19 Oct 2004 13:45:37 -0000 1.16
@@ -22,7 +22,6 @@
import java.awt.Rectangle;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.SAXParseException;
// FOP
@@ -54,13 +53,6 @@
}
/**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
- }
-
- /**
* Return the "extent" property.
*/
public Length getExtent() {
@@ -80,12 +72,12 @@
protected void adjustIPD(Rectangle vpRefRect, int wm) {
int offset = 0;
RegionBefore before = (RegionBefore) getSiblingRegion(FO_REGION_BEFORE);
- if (before != null && before.getPrecedence()) {
+ if (before != null && before.getPrecedence() == TRUE) {
offset = before.getPropLength(PR_EXTENT);
vpRefRect.translate(0, offset);
}
RegionAfter after = (RegionAfter) getSiblingRegion(FO_REGION_AFTER);
- if (after != null && after.getPrecedence()) {
+ if (after != null && after.getPrecedence() == TRUE) {
offset += after.getPropLength(PR_EXTENT);
}
if (offset > 0) {
1.17 +4 -19 xml-fop/src/java/org/apache/fop/fo/pagination/RegionStart.java
Index: RegionStart.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionStart.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- RegionStart.java 30 Aug 2004 12:00:54 -0000 1.16
+++ RegionStart.java 19 Oct 2004 13:45:37 -0000 1.17
@@ -21,10 +21,6 @@
// Java
import java.awt.Rectangle;
-// XML
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXParseException;
-
// FOP
import org.apache.fop.fo.FONode;
import org.apache.fop.datatypes.FODimension;
@@ -33,9 +29,6 @@
* The fo:region-start element.
*/
public class RegionStart extends RegionSE {
-
- private int extent = 0;
-
/**
* @see org.apache.fop.fo.FONode#FONode(FONode)
*/
@@ -44,14 +37,6 @@
}
/**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
- extent = getPropLength(PR_EXTENT);
- }
-
- /**
* @see org.apache.fop.fo.pagination.Region#getViewportRectangle(FODimension)
*/
public Rectangle getViewportRectangle (FODimension reldims) {
@@ -59,12 +44,12 @@
// This is the rectangle relative to the page-reference area in
// writing-mode relative coordinates
Rectangle vpRect;
- if (this.wm == WritingMode.LR_TB || this.wm == WritingMode.RL_TB) {
- vpRect = new Rectangle(0, 0, extent, reldims.bpd);
+ if (this.getWritingMode() == WritingMode.LR_TB || this.getWritingMode() == WritingMode.RL_TB) {
+ vpRect = new Rectangle(0, 0, getExtent().getValue(), reldims.bpd);
} else {
- vpRect = new Rectangle(0, 0, reldims.bpd, extent);
+ vpRect = new Rectangle(0, 0, reldims.bpd, getExtent().getValue());
}
- adjustIPD(vpRect, this.wm);
+ adjustIPD(vpRect, this.getWritingMode());
return vpRect;
}
1.20 +1 -32 xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java
Index: RepeatablePageMasterAlternatives.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- RepeatablePageMasterAlternatives.java 19 Oct 2004 08:53:51 -0000 1.19
+++ RepeatablePageMasterAlternatives.java 19 Oct 2004 13:45:37 -0000 1.20
@@ -22,7 +22,6 @@
import java.util.ArrayList;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
@@ -124,36 +123,6 @@
}
/**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
- conditionalPageMasterRefs = new ArrayList();
-
- if (parent.getName().equals("fo:page-sequence-master")) {
- PageSequenceMaster pageSequenceMaster = (PageSequenceMaster)parent;
- pageSequenceMaster.addSubsequenceSpecifier(this);
- } else {
- throw new SAXParseException("fo:repeatable-page-master-alternatives "
- + "must be child of fo:page-sequence-master, not "
- + parent.getName(), locator);
- }
-
- Property mr = getProperty(PR_MAXIMUM_REPEATS);
-
- if (mr.getEnum() == NO_LIMIT) {
- this._maximumRepeats = INFINITE;
- } else {
- this._maximumRepeats = mr.getNumber().intValue();
- if (this._maximumRepeats < 0) {
- getLogger().debug("negative maximum-repeats: "
- + this.maximumRepeats);
- this._maximumRepeats = 0;
- }
- }
- }
-
- /**
* Get the next matching page master from the conditional
* page master references.
* @see org.apache.fop.fo.pagination.SubSequenceSpecifier
@@ -173,7 +142,7 @@
ConditionalPageMasterReference cpmr =
(ConditionalPageMasterReference)conditionalPageMasterRefs.get(i);
if (cpmr.isValid(isOddPage, isFirstPage, isBlankPage)) {
- return cpmr.getMasterName();
+ return cpmr.getMasterReference();
}
}
return null;
1.21 +3 -33 xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java
Index: RepeatablePageMasterReference.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- RepeatablePageMasterReference.java 19 Oct 2004 08:53:51 -0000 1.20
+++ RepeatablePageMasterReference.java 19 Oct 2004 13:45:37 -0000 1.21
@@ -19,7 +19,6 @@
package org.apache.fop.fo.pagination;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
@@ -45,7 +44,6 @@
private static final int INFINITE = -1;
private PageSequenceMaster pageSequenceMaster;
- private int _maximumRepeats;
private int numberConsumed = 0;
/**
@@ -75,35 +73,7 @@
pageSequenceMaster.addSubsequenceSpecifier(this);
}
}
-
- /**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
-
- PageSequenceMaster pageSequenceMaster = (PageSequenceMaster) parent;
-
- if (getPropString(PR_MASTER_REFERENCE) == null) {
- missingPropertyError("master-reference");
- } else {
- pageSequenceMaster.addSubsequenceSpecifier(this);
- }
-
- Property mr = getProperty(PR_MAXIMUM_REPEATS);
-
- if (mr.getEnum() == NO_LIMIT) {
- this._maximumRepeats = INFINITE;
- } else {
- this._maximumRepeats = mr.getNumber().intValue();
- if (this._maximumRepeats < 0) {
- getLogger().debug("negative maximum-repeats: "
- + this.maximumRepeats);
- this._maximumRepeats = 0;
- }
- }
- }
-
+
/**
* @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
* XSL Content Model: empty
@@ -119,8 +89,8 @@
public String getNextPageMasterName(boolean isOddPage,
boolean isFirstPage,
boolean isEmptyPage) {
- if (_maximumRepeats != INFINITE) {
- if (numberConsumed < _maximumRepeats) {
+ if (getMaximumRepeats() != INFINITE) {
+ if (numberConsumed < getMaximumRepeats()) {
numberConsumed++;
} else {
return null;
1.28 +0 -19 xml-fop/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java
Index: SimplePageMaster.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- SimplePageMaster.java 19 Oct 2004 08:53:51 -0000 1.27
+++ SimplePageMaster.java 19 Oct 2004 13:45:38 -0000 1.28
@@ -24,7 +24,6 @@
import java.util.Map;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
@@ -107,24 +106,6 @@
missingChildElementError("(region-body, region-before?," +
" region-after?, region-start?, region-end?)");
}
- }
-
- /**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
-
- LayoutMasterSet layoutMasterSet = (LayoutMasterSet) parent;
-
- if (getPropString(PR_MASTER_NAME) == null) {
- missingPropertyError("master-name");
- } else {
- layoutMasterSet.addSimplePageMaster(this);
- }
-
- //Well, there are only 5 regions so we can save a bit of memory here
- regions = new HashMap(5);
}
/**
1.15 +0 -15 xml-fop/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java
Index: SinglePageMasterReference.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SinglePageMasterReference.java 19 Oct 2004 08:53:51 -0000 1.14
+++ SinglePageMasterReference.java 19 Oct 2004 13:45:38 -0000 1.15
@@ -19,7 +19,6 @@
package org.apache.fop.fo.pagination;
// XML
-import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
@@ -72,20 +71,6 @@
}
}
- /**
- * @see org.apache.fop.fo.FObj#addProperties
- */
- protected void addProperties(Attributes attlist) throws SAXParseException {
- super.addProperties(attlist);
-
- PageSequenceMaster pageSequenceMaster = (PageSequenceMaster) parent;
- if (getPropString(PR_MASTER_REFERENCE) == null) {
- missingPropertyError("master-reference");
- } else {
- pageSequenceMaster.addSubsequenceSpecifier(this);
- }
- }
-
/**
* @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
* XSL Content Model: empty
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org