git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197842 13f79535-47bb-0310-9956-ffa450edef68tags/Root_Temp_KnuthStylePageBreaking
@@ -160,7 +160,7 @@ public abstract class FONode { | |||
/** | |||
* | |||
*/ | |||
protected void end() { | |||
protected void endOfNode() { | |||
// do nothing by default | |||
} | |||
@@ -289,7 +289,7 @@ public class FOTreeBuilder extends DefaultHandler { | |||
public void endElement(String uri, String localName, String rawName) | |||
throws SAXException { | |||
try { | |||
currentFObj.end(); | |||
currentFObj.endOfNode(); | |||
} catch (IllegalArgumentException e) { | |||
throw new SAXException(e); | |||
} |
@@ -57,7 +57,7 @@ public class Bookmarks extends ExtensionObj { | |||
* the bookmark data from the child elements and add | |||
* the extension to the area tree. | |||
*/ | |||
protected void end() { | |||
protected void endOfNode() { | |||
((Root) parent).setBookmarks(this); | |||
} | |||
@@ -140,8 +140,8 @@ public class BasicLink extends Inline { | |||
/** | |||
* @see org.apache.fop.fo.FONode#end | |||
*/ | |||
protected void end() { | |||
super.end(); | |||
protected void endOfNode() { | |||
super.endOfNode(); | |||
getFOInputHandler().endLink(); | |||
} | |||
@@ -237,7 +237,7 @@ public class Block extends FObjMixed { | |||
/** | |||
* @see org.apache.fop.fo.FONode#end | |||
*/ | |||
protected void end() { | |||
protected void endOfNode() { | |||
handleWhiteSpace(); | |||
getFOInputHandler().endBlock(this); | |||
} |
@@ -78,8 +78,8 @@ public class Footnote extends FObj { | |||
fotv.serveFootnote(this); | |||
} | |||
protected void end() { | |||
super.end(); | |||
protected void endOfNode() { | |||
super.endOfNode(); | |||
getFOInputHandler().endFootnote(this); | |||
} | |||
@@ -60,8 +60,8 @@ public class FootnoteBody extends FObj { | |||
fotv.serveFootnoteBody(this); | |||
} | |||
protected void end() { | |||
super.end(); | |||
protected void endOfNode() { | |||
super.endOfNode(); | |||
getFOInputHandler().endFootnoteBody(this); | |||
} | |||
@@ -138,7 +138,7 @@ public class Inline extends FObjMixed { | |||
/** | |||
* @see org.apache.fop.fo.FONode#end | |||
*/ | |||
protected void end() { | |||
protected void endOfNode() { | |||
getFOInputHandler().endInline(this); | |||
} | |||
@@ -136,8 +136,8 @@ public class ListBlock extends FObj { | |||
fotv.serveListBlock(this); | |||
} | |||
protected void end() { | |||
super.end(); | |||
protected void endOfNode() { | |||
super.endOfNode(); | |||
getFOInputHandler().endList(this); | |||
} | |||
@@ -145,8 +145,8 @@ public class ListItem extends FObj { | |||
fotv.serveListItem(this); | |||
} | |||
protected void end() { | |||
super.end(); | |||
protected void endOfNode() { | |||
super.endOfNode(); | |||
getFOInputHandler().endListItem(this); | |||
} | |||
@@ -83,8 +83,8 @@ public class ListItemLabel extends FObj { | |||
fotv.serveListItemLabel(this); | |||
} | |||
protected void end() { | |||
super.end(); | |||
protected void endOfNode() { | |||
super.endOfNode(); | |||
getFOInputHandler().endListLabel(); | |||
} | |||
@@ -128,7 +128,7 @@ public class PageNumber extends FObj { | |||
fotv.servePageNumber(this); | |||
} | |||
protected void end() { | |||
protected void endOfNode() { | |||
getFOInputHandler().endPageNumber(this); | |||
} | |||
@@ -201,7 +201,7 @@ public class Table extends FObj { | |||
fotv.serveTable(this); | |||
} | |||
protected void end() { | |||
protected void endOfNode() { | |||
getFOInputHandler().endTable(this); | |||
} | |||
@@ -104,7 +104,7 @@ public class TableBody extends FObj { | |||
fotv.serveTableBody(this); | |||
} | |||
protected void end() { | |||
protected void endOfNode() { | |||
getFOInputHandler().endBody(this); | |||
} | |||
@@ -348,7 +348,7 @@ public class TableCell extends FObj { | |||
fotv.serveTableCell(this); | |||
} | |||
protected void end() { | |||
protected void endOfNode() { | |||
getFOInputHandler().endCell(this); | |||
} | |||
@@ -123,7 +123,7 @@ public class TableColumn extends FObj { | |||
fotv.serveTableColumn(this); | |||
} | |||
protected void end() { | |||
protected void endOfNode() { | |||
getFOInputHandler().endColumn(this); | |||
} | |||
@@ -144,7 +144,7 @@ public class TableRow extends FObj { | |||
fotv.serveTableRow(this); | |||
} | |||
protected void end() { | |||
protected void endOfNode() { | |||
getFOInputHandler().endRow(this); | |||
} | |||
@@ -65,7 +65,7 @@ public class ColorProfile extends FObj { | |||
* Extract instance variables from the collection of properties for this | |||
* object. | |||
*/ | |||
protected void end() { | |||
protected void endOfNode() { | |||
src = this.propertyList.get(PR_SRC).getString(); | |||
profileName = this.propertyList.get(PR_COLOR_PROFILE_NAME).getString(); | |||
intent = this.propertyList.get(PR_RENDERING_INTENT).getEnum(); |
@@ -72,7 +72,7 @@ public class Declarations extends FObj { | |||
* At the end of this element sort out the child into | |||
* a hashmap of color profiles and a list of external xml. | |||
*/ | |||
protected void end() { | |||
protected void endOfNode() { | |||
if (childNodes != null) { | |||
for (Iterator iter = childNodes.iterator(); iter.hasNext();) { | |||
FONode node = (FONode)iter.next(); |
@@ -90,7 +90,7 @@ public class Flow extends FObj { | |||
* StructureRenderer that we are at the end of the flow. | |||
* @see org.apache.fop.fo.FONode#end | |||
*/ | |||
protected void end() { | |||
protected void endOfNode() { | |||
if (!blockItemFound) { | |||
missingChildElementError("marker* (%block;)+"); | |||
} |
@@ -72,7 +72,7 @@ public class LayoutMasterSet extends FObj { | |||
/** | |||
* @see org.apache.fop.fo.FONode#end | |||
*/ | |||
protected void end() { | |||
protected void endOfNode() { | |||
if (childNodes == null) { | |||
missingChildElementError("(simple-page-master|page-sequence-master)+"); | |||
} |
@@ -167,14 +167,14 @@ public class PageSequence extends FObj { | |||
* This passes the end page sequence to the structure handler | |||
* so it can act upon that. | |||
*/ | |||
protected void end() { | |||
protected void endOfNode() { | |||
if (mainFlow == null) { | |||
missingChildElementError("(title?,static-content*,flow)"); | |||
} | |||
try { | |||
getFOInputHandler().endPageSequence(this); | |||
} catch (FOPException fopex) { | |||
getLogger().error("Error in PageSequence.end(): " | |||
getLogger().error("Error in PageSequence.endOfNode(): " | |||
+ fopex.getMessage(), fopex); | |||
} | |||
} |
@@ -79,7 +79,7 @@ public class PageSequenceMaster extends FObj { | |||
} | |||
} | |||
protected void end() { | |||
protected void endOfNode() { | |||
if (childNodes == null) { | |||
missingChildElementError("(single-page-master-reference|" + | |||
"repeatable-page-master-reference|repeatable-page-master-alternatives)+"); |
@@ -48,10 +48,10 @@ public abstract class RegionBA extends RegionBASE { | |||
} | |||
/** | |||
* @see org.apache.fop.fo.FONode#end() | |||
* @see org.apache.fop.fo.FONode#endOfNode() | |||
*/ | |||
protected void end() { | |||
super.end(); | |||
protected void endOfNode() { | |||
super.endOfNode(); | |||
bPrecedence = | |||
(this.propertyList.get(PR_PRECEDENCE).getEnum() == Precedence.TRUE); | |||
} |
@@ -41,9 +41,9 @@ public abstract class RegionBASE extends Region { | |||
} | |||
/** | |||
* @see org.apache.fop.fo.FONode#end() | |||
* @see org.apache.fop.fo.FONode#endOfNode() | |||
*/ | |||
protected void end() { | |||
protected void endOfNode() { | |||
// The problem with this is that it might not be known yet.... | |||
// Supposing extent is calculated in terms of percentage | |||
this.extent = this.propertyList.get(PR_EXTENT).getLength().getValue(); |
@@ -73,7 +73,7 @@ public class RepeatablePageMasterAlternatives extends FObj | |||
/** | |||
* @see org.apache.fop.fo.FONode#end | |||
*/ | |||
protected void end() { | |||
protected void endOfNode() { | |||
if (childNodes == null) { | |||
missingChildElementError("(conditional-page-master-reference+)"); | |||
} |
@@ -59,7 +59,7 @@ public class StaticContent extends Flow { | |||
* StructureRenderer that we are at the end of the flow. | |||
* @see org.apache.fop.fo.FONode#end | |||
*/ | |||
protected void end() { | |||
protected void endOfNode() { | |||
if (childNodes == null) { | |||
missingChildElementError("(%block;)+"); | |||
} |