pietsch 2002/07/27 13:08:29 Modified: src/org/apache/fop/fo Tag: fop-0_20_2-maintain FONode.java src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain Block.java Table.java Log: Removed some unused code Revision Changes Path No revision No revision 1.21.2.4 +1 -12 xml-fop/src/org/apache/fop/fo/FONode.java Index: FONode.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FONode.java,v retrieving revision 1.21.2.3 retrieving revision 1.21.2.4 diff -u -r1.21.2.3 -r1.21.2.4 --- FONode.java 19 Jul 2002 20:41:00 -0000 1.21.2.3 +++ FONode.java 27 Jul 2002 20:08:28 -0000 1.21.2.4 @@ -61,9 +61,6 @@ protected int forcedStartOffset = 0; protected int forcedWidth = 0; - protected int widows = 0; - protected int orphans = 0; - protected LinkSet linkSet; // count of areas generated-by/returned-by @@ -117,14 +114,6 @@ for (int i = 0; i < numChildren; i++) { ((FONode)children.elementAt(i)).resetMarker(); } - } - - public void setWidows(int wid) { - widows = wid; - } - - public void setOrphans(int orph) { - orphans = orph; } public void removeAreas() { No revision No revision 1.41.2.6 +1 -68 xml-fop/src/org/apache/fop/fo/flow/Block.java Index: Block.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Block.java,v retrieving revision 1.41.2.5 retrieving revision 1.41.2.6 diff -u -r1.41.2.5 -r1.41.2.6 --- Block.java 24 Jul 2002 01:06:22 -0000 1.41.2.5 +++ Block.java 27 Jul 2002 20:08:28 -0000 1.41.2.6 @@ -53,8 +53,6 @@ int spaceAfter; int textIndent; int keepWithNext; - int blockWidows; - int blockOrphans; int areaHeight = 0; int contentWidth = 0; @@ -111,34 +109,6 @@ // Common Relative Position Properties RelativePositionProps mRelProps = propMgr.getRelativePositionProps(); - // this.properties.get("break-after"); - // this.properties.get("break-before"); - // this.properties.get("color"); - // this.properties.get("text-depth"); - // this.properties.get("text-altitude"); - // this.properties.get("hyphenation-keep"); - // this.properties.get("hyphenation-ladder-count"); - // this.properties.get("id"); - // this.properties.get("keep-together"); - // this.properties.get("keep-with-next"); - // this.properties.get("keep-with-previous"); - // this.properties.get("last-line-end-indent"); - // this.properties.get("linefeed-treatment"); - // this.properties.get("line-height"); - // this.properties.get("line-height-shift-adjustment"); - // this.properties.get("line-stacking-strategy"); - // this.properties.get("orphans"); - // this.properties.get("white-space-treatment"); - // this.properties.get("span"); - // this.properties.get("text-align"); - // this.properties.get("text-align-last"); - // this.properties.get("text-indent"); - // this.properties.get("visibility"); - // this.properties.get("white-space-collapse"); - // this.properties.get("widows"); - // this.properties.get("wrap-option"); - // this.properties.get("z-index"); - this.align = this.properties.get("text-align").getEnum(); this.alignLast = this.properties.get("text-align-last").getEnum(); this.breakAfter = this.properties.get("break-after").getEnum(); @@ -157,13 +127,6 @@ this.keepWithNext = this.properties.get("keep-with-next").getEnum(); - this.blockWidows = - this.properties.get("widows").getNumber().intValue(); - this.blockOrphans = - this.properties.get("orphans").getNumber().intValue(); - - - this.id = this.properties.get("id").getString(); if (area instanceof BlockArea) { @@ -182,36 +145,6 @@ return new Status(breakBeforeStatus); } - int numChildren = this.children.size(); - for (int i = 0; i < numChildren; i++) { - FONode fo = (FONode)children.elementAt(i); - if (fo instanceof FOText) { - if (((FOText)fo).willCreateArea()) { - fo.setWidows(blockWidows); - break; - } else { - children.removeElementAt(i); - numChildren = this.children.size(); - i--; - } - } else { - fo.setWidows(blockWidows); - break; - } - } - - for (int i = numChildren - 1; i >= 0; i--) { - FONode fo = (FONode)children.elementAt(i); - if (fo instanceof FOText) { - if (((FOText)fo).willCreateArea()) { - fo.setOrphans(blockOrphans); - break; - } - } else { - fo.setOrphans(blockOrphans); - break; - } - } } if ((spaceBefore != 0) && (this.marker == 0)) { 1.39.2.3 +1 -3 xml-fop/src/org/apache/fop/fo/flow/Table.java Index: Table.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Table.java,v retrieving revision 1.39.2.2 retrieving revision 1.39.2.3 diff -u -r1.39.2.2 -r1.39.2.3 --- Table.java 24 Jul 2002 01:06:23 -0000 1.39.2.2 +++ Table.java 27 Jul 2002 20:08:28 -0000 1.39.2.3 @@ -240,8 +240,6 @@ addedFooter = true; tableFooter.resetMarker(); } - fo.setWidows(widows); - fo.setOrphans(orphans); ((TableBody)fo).setColumns(columns); if ((status = fo.layout(areaContainer)).isIncomplete()) {
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]