diff options
Diffstat (limited to 'src/java/org/apache/fop/fo')
27 files changed, 3 insertions, 289 deletions
diff --git a/src/java/org/apache/fop/fo/FONode.java b/src/java/org/apache/fop/fo/FONode.java index ed8959813..ec6dc59bb 100644 --- a/src/java/org/apache/fop/fo/FONode.java +++ b/src/java/org/apache/fop/fo/FONode.java @@ -371,14 +371,6 @@ public abstract class FONode implements Cloneable { } /** - * Return a LayoutManager responsible for laying out this FObj's content. - * Must override in subclasses if their content can be laid out. - * @param list the list to which the layout manager(s) should be added - */ - public void addLayoutManager(List list) { - } - - /** * Returns the name of the node * @return the name of this node */ diff --git a/src/java/org/apache/fop/fo/FOText.java b/src/java/org/apache/fop/fo/FOText.java index 7c477dfb6..43ecc76df 100644 --- a/src/java/org/apache/fop/fo/FOText.java +++ b/src/java/org/apache/fop/fo/FOText.java @@ -567,13 +567,4 @@ public class FOText extends FONode { public int getWrapOption() { return wrapOption; } - - /** - * @see org.apache.fop.fo.FONode#addLayoutManager(List) - */ - public void addLayoutManager(List list) { - if (endIndex - startIndex > 0) { - list.add(new TextLayoutManager(this)); - } - } } diff --git a/src/java/org/apache/fop/fo/FObjMixed.java b/src/java/org/apache/fop/fo/FObjMixed.java index 9c338f4ca..37f8724af 100644 --- a/src/java/org/apache/fop/fo/FObjMixed.java +++ b/src/java/org/apache/fop/fo/FObjMixed.java @@ -61,13 +61,6 @@ public class FObjMixed extends FObj { public CharIterator charIterator() { return new RecursiveCharIterator(this); } - - /** - * @see org.apache.fop.fo.FONode#addLayoutManager(List) - */ - public void addLayoutManager(List list) { - // no layout manager - } } diff --git a/src/java/org/apache/fop/fo/flow/BasicLink.java b/src/java/org/apache/fop/fo/flow/BasicLink.java index 4a74cbf2d..9687bfda2 100644 --- a/src/java/org/apache/fop/fo/flow/BasicLink.java +++ b/src/java/org/apache/fop/fo/flow/BasicLink.java @@ -118,14 +118,6 @@ public class BasicLink extends Inline { } /** - * @see org.apache.fop.fo.FONode#addLayoutManager(List) - */ - public void addLayoutManager(List list) { - BasicLinkLayoutManager lm = new BasicLinkLayoutManager(this); - list.add(lm); - } - - /** * Return the "internal-destination" property. */ public String getInternalDestination() { diff --git a/src/java/org/apache/fop/fo/flow/BidiOverride.java b/src/java/org/apache/fop/fo/flow/BidiOverride.java index f7d6219ec..3f3bd4529 100644 --- a/src/java/org/apache/fop/fo/flow/BidiOverride.java +++ b/src/java/org/apache/fop/fo/flow/BidiOverride.java @@ -132,30 +132,6 @@ public class BidiOverride extends FObjMixed { blockOrInlineItemFound = true; } } - - /** - * @see org.apache.fop.fo.FONode#addLayoutManager(List) - * @todo see if can/should move the child iteration logic - * to BidiLayoutManager - */ - public void addLayoutManager(List list) { - if (false) { - super.addLayoutManager(list); - } else { - ArrayList childList = new ArrayList(); - super.addLayoutManager(list); - for (int count = childList.size() - 1; count >= 0; count--) { - LayoutManager lm = (LayoutManager) childList.get(count); - if (lm.generatesInlineAreas()) { - LayoutManager blm = new BidiLayoutManager(this, - (InlineLayoutManager) lm); - list.add(blm); - } else { - list.add(lm); - } - } - } - } /** * @see org.apache.fop.fo.FObj#getName() diff --git a/src/java/org/apache/fop/fo/flow/Block.java b/src/java/org/apache/fop/fo/flow/Block.java index e21fe926a..b99d49c40 100644 --- a/src/java/org/apache/fop/fo/flow/Block.java +++ b/src/java/org/apache/fop/fo/flow/Block.java @@ -473,14 +473,6 @@ public class Block extends FObjMixed { bNextIsLF = false; } } - - /** - * @see org.apache.fop.fo.FONode#addLayoutManager(List) - */ - public void addLayoutManager(List list) { - BlockLayoutManager blm = new BlockLayoutManager(this); - list.add(blm); - } /** * @see org.apache.fop.fo.FONode#getName() diff --git a/src/java/org/apache/fop/fo/flow/BlockContainer.java b/src/java/org/apache/fop/fo/flow/BlockContainer.java index ab0260d92..cc44c9d13 100644 --- a/src/java/org/apache/fop/fo/flow/BlockContainer.java +++ b/src/java/org/apache/fop/fo/flow/BlockContainer.java @@ -190,14 +190,6 @@ public class BlockContainer extends FObj { } /** - * @see org.apache.fop.fo.FONode#addLayoutManager(List) - */ - public void addLayoutManager(List list) { - BlockContainerLayoutManager blm = new BlockContainerLayoutManager(this); - list.add(blm); - } - - /** * @see org.apache.fop.fo.FObj#getName() */ public String getName() { diff --git a/src/java/org/apache/fop/fo/flow/Character.java b/src/java/org/apache/fop/fo/flow/Character.java index 445f9d339..e4f67726a 100644 --- a/src/java/org/apache/fop/fo/flow/Character.java +++ b/src/java/org/apache/fop/fo/flow/Character.java @@ -234,14 +234,6 @@ public class Character extends FObj { } /** - * @see org.apache.fop.fo.FONode#addLayoutManager(List) - */ - public void addLayoutManager(List list) { - CharacterLayoutManager lm = new CharacterLayoutManager(this); - list.add(lm); - } - - /** * @see org.apache.fop.fo.FObj#getName() */ public String getName() { diff --git a/src/java/org/apache/fop/fo/flow/ExternalGraphic.java b/src/java/org/apache/fop/fo/flow/ExternalGraphic.java index 4a9308b13..55c5a567d 100644 --- a/src/java/org/apache/fop/fo/flow/ExternalGraphic.java +++ b/src/java/org/apache/fop/fo/flow/ExternalGraphic.java @@ -241,16 +241,6 @@ public class ExternalGraphic extends FObj { } /** - * @see org.apache.fop.fo.FONode#addLayoutManager(List) - */ - public void addLayoutManager(List list) { - if (!src.equals("")) { - ExternalGraphicLayoutManager lm = new ExternalGraphicLayoutManager(this); - list.add(lm); - } - } - - /** * @see org.apache.fop.fo.FObj#getName() */ public String getName() { diff --git a/src/java/org/apache/fop/fo/flow/Footnote.java b/src/java/org/apache/fop/fo/flow/Footnote.java index 9c40c4fbb..2d161c2c8 100644 --- a/src/java/org/apache/fop/fo/flow/Footnote.java +++ b/src/java/org/apache/fop/fo/flow/Footnote.java @@ -121,17 +121,6 @@ public class Footnote extends FObj { } /** - * @see org.apache.fop.fo.FONode#addLayoutManager(List) - */ - public void addLayoutManager(List list) { - if (getInlineFO() == null) { - getLogger().error("inline required in footnote"); - return; - } - getInlineFO().addLayoutManager(list); - } - - /** * @see org.apache.fop.fo.FObj#getName() */ public String getName() { diff --git a/src/java/org/apache/fop/fo/flow/Inline.java b/src/java/org/apache/fop/fo/flow/Inline.java index e39c2a8b6..477e00e37 100644 --- a/src/java/org/apache/fop/fo/flow/Inline.java +++ b/src/java/org/apache/fop/fo/flow/Inline.java @@ -182,16 +182,6 @@ public class Inline extends InlineLevel { } /** - * @see org.apache.fop.fo.FObj#addLayoutManager(List) - */ - public void addLayoutManager(List list) { - if (getChildNodes() != null) { - InlineLayoutManager lm = new InlineLayoutManager(this); - list.add(lm); - } - } - - /** * @see org.apache.fop.fo.FObj#getName() */ public String getName() { diff --git a/src/java/org/apache/fop/fo/flow/InlineContainer.java b/src/java/org/apache/fop/fo/flow/InlineContainer.java index c90ed0211..6f7d18f01 100644 --- a/src/java/org/apache/fop/fo/flow/InlineContainer.java +++ b/src/java/org/apache/fop/fo/flow/InlineContainer.java @@ -114,16 +114,6 @@ public class InlineContainer extends FObj { } /** - * @see org.apache.fop.fo.FONode#addLayoutManager(List) - */ - public void addLayoutManager(List list) { - ArrayList childList = new ArrayList(); - super.addLayoutManager(childList); - LayoutManager lm = new ICLayoutManager(this, childList); - list.add(lm); - } - - /** * @see org.apache.fop.fo.FONode#getName() */ public String getName() { diff --git a/src/java/org/apache/fop/fo/flow/InlineLevel.java b/src/java/org/apache/fop/fo/flow/InlineLevel.java index 5ce0a611c..ab468f6ad 100644 --- a/src/java/org/apache/fop/fo/flow/InlineLevel.java +++ b/src/java/org/apache/fop/fo/flow/InlineLevel.java @@ -96,17 +96,5 @@ public class InlineLevel extends FObjMixed { public ColorType getColor() { return color; } - - /** - * @see org.apache.fop.fo.FONode#addLayoutManager(List) - */ - public void addLayoutManager(List list) { - if (getChildNodes() != null) { - InlineLayoutManager lm; - lm = new InlineLayoutManager(this); - list.add(lm); - } - } - } diff --git a/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java b/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java index 024ccc0c9..02b73dd76 100644 --- a/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java +++ b/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java @@ -261,14 +261,6 @@ public class InstreamForeignObject extends FObj { } /** - * @see org.apache.fop.fo.FONode#addLayoutManager(List) - */ - public void addLayoutManager(List list) { - InstreamForeignObjectLM lm = new InstreamForeignObjectLM(this); - list.add(lm); - } - - /** * @see org.apache.fop.fo.FObj#getName() */ public String getName() { diff --git a/src/java/org/apache/fop/fo/flow/Leader.java b/src/java/org/apache/fop/fo/flow/Leader.java index 3e245eec7..16387d6a3 100644 --- a/src/java/org/apache/fop/fo/flow/Leader.java +++ b/src/java/org/apache/fop/fo/flow/Leader.java @@ -176,14 +176,6 @@ public class Leader extends InlineLevel { } /** - * @see org.apache.fop.fo.FONode#addLayoutManager(List) - */ - public void addLayoutManager(List list) { - LeaderLayoutManager lm = new LeaderLayoutManager(this); - list.add(lm); - } - - /** * @see org.apache.fop.fo.FObj#getName() */ public String getName() { diff --git a/src/java/org/apache/fop/fo/flow/ListBlock.java b/src/java/org/apache/fop/fo/flow/ListBlock.java index 704e19b82..d0edd4e1b 100644 --- a/src/java/org/apache/fop/fo/flow/ListBlock.java +++ b/src/java/org/apache/fop/fo/flow/ListBlock.java @@ -147,14 +147,6 @@ public class ListBlock extends FObj { } /** - * @see org.apache.fop.fo.FONode#addLayoutManager(List) - */ - public void addLayoutManager(List list) { - ListBlockLayoutManager lm = new ListBlockLayoutManager(this); - list.add(lm); - } - - /** * @see org.apache.fop.fo.FObj#getName() */ public String getName() { diff --git a/src/java/org/apache/fop/fo/flow/ListItem.java b/src/java/org/apache/fop/fo/flow/ListItem.java index 7265dee38..185e074ad 100644 --- a/src/java/org/apache/fop/fo/flow/ListItem.java +++ b/src/java/org/apache/fop/fo/flow/ListItem.java @@ -155,14 +155,6 @@ public class ListItem extends FObj { } /** - * @see org.apache.fop.fo.FONode#addLayoutManager(List) - */ - public void addLayoutManager(List list) { - ListItemLayoutManager blm = new ListItemLayoutManager(this); - list.add(blm); - } - - /** * @return the label of the list item */ public ListItemLabel getLabel() { diff --git a/src/java/org/apache/fop/fo/flow/Marker.java b/src/java/org/apache/fop/fo/flow/Marker.java index b8395d074..feebc64e1 100644 --- a/src/java/org/apache/fop/fo/flow/Marker.java +++ b/src/java/org/apache/fop/fo/flow/Marker.java @@ -123,13 +123,6 @@ public class Marker extends FObjMixed { } /** - * @see org.apache.fop.fo.FONode#addLayoutManager(List) - */ - public void addLayoutManager(List list) { - // no layout manager - } - - /** * Return the "marker-class-name" property. */ public String getMarkerClassName() { diff --git a/src/java/org/apache/fop/fo/flow/PageNumber.java b/src/java/org/apache/fop/fo/flow/PageNumber.java index c6c11fa45..3215113c2 100644 --- a/src/java/org/apache/fop/fo/flow/PageNumber.java +++ b/src/java/org/apache/fop/fo/flow/PageNumber.java @@ -160,14 +160,6 @@ public class PageNumber extends FObj { } /** - * @see org.apache.fop.fo.FONode#addLayoutManager(List) - */ - public void addLayoutManager(List list) { - PageNumberLayoutManager lm = new PageNumberLayoutManager(this); - list.add(lm); - } - - /** * @see org.apache.fop.fo.FONode#getName() */ public String getName() { diff --git a/src/java/org/apache/fop/fo/flow/PageNumberCitation.java b/src/java/org/apache/fop/fo/flow/PageNumberCitation.java index e9d0ed5c2..e423045c1 100644 --- a/src/java/org/apache/fop/fo/flow/PageNumberCitation.java +++ b/src/java/org/apache/fop/fo/flow/PageNumberCitation.java @@ -151,15 +151,6 @@ public class PageNumberCitation extends FObj { public String getRefId() { return refId; } - - /** - * @see org.apache.fop.fo.FONode#addLayoutManager(List) - */ - public void addLayoutManager(List list) { - PageNumberCitationLayoutManager lm = - new PageNumberCitationLayoutManager(this); - list.add(lm); - } /** * @see org.apache.fop.fo.FObj#getName() diff --git a/src/java/org/apache/fop/fo/flow/RetrieveMarker.java b/src/java/org/apache/fop/fo/flow/RetrieveMarker.java index f9d5fd95b..0ad5b3afa 100644 --- a/src/java/org/apache/fop/fo/flow/RetrieveMarker.java +++ b/src/java/org/apache/fop/fo/flow/RetrieveMarker.java @@ -80,21 +80,6 @@ public class RetrieveMarker extends FObjMixed { invalidChildError(loc, nsURI, localName); } - /** - * @see org.apache.fop.fo.FONode#addLayoutManager(List) - * @todo remove null check when vCN() & endOfNode() implemented - */ - public void addLayoutManager(List list) { - Iterator baseIter = getChildNodes(); - if (baseIter == null) { - return; - } - while (baseIter.hasNext()) { - FONode child = (FONode) baseIter.next(); - child.addLayoutManager(list); - } - } - protected PropertyList createPropertyList(PropertyList parent, FOEventHandler foEventHandler) throws FOPException { // TODO: A special RetrieveMarkerPropertyList would be more memory diff --git a/src/java/org/apache/fop/fo/flow/Table.java b/src/java/org/apache/fop/fo/flow/Table.java index 9f62ad578..150739d75 100644 --- a/src/java/org/apache/fop/fo/flow/Table.java +++ b/src/java/org/apache/fop/fo/flow/Table.java @@ -153,15 +153,15 @@ public class Table extends FObj { } } - private ArrayList getColumns() { + public ArrayList getColumns() { return columns; } - private TableBody getTableHeader() { + public TableBody getTableHeader() { return tableHeader; } - private TableBody getTableFooter() { + public TableBody getTableFooter() { return tableFooter; } @@ -187,41 +187,6 @@ public class Table extends FObj { } /** - * @see org.apache.fop.fo.FONode#addLayoutManager(List) - * @todo see if can/should move much of this logic into TableLayoutManager - * and/or TableBody and TableColumn FO subclasses. - */ - public void addLayoutManager(List list) { - TableLayoutManager tlm = new TableLayoutManager(this); - ArrayList columns = getColumns(); - if (columns != null) { - ArrayList columnLMs = new ArrayList(); - ListIterator iter = columns.listIterator(); - while (iter.hasNext()) { - columnLMs.add(getTableColumnLayoutManager((TableColumn)iter.next())); - } - tlm.setColumns(columnLMs); - } - if (getTableHeader() != null) { - tlm.setTableHeader(getTableBodyLayoutManager(getTableHeader())); - } - if (getTableFooter() != null) { - tlm.setTableFooter(getTableBodyLayoutManager(getTableFooter())); - } - list.add(tlm); - } - - public Column getTableColumnLayoutManager(TableColumn node) { - Column clm = new Column(node); - return clm; - } - - public Body getTableBodyLayoutManager(TableBody node) { - Body blm = new Body(node); - return blm; - } - - /** * @see org.apache.fop.fo.FObj#getName() */ public String getName() { diff --git a/src/java/org/apache/fop/fo/flow/TableBody.java b/src/java/org/apache/fop/fo/flow/TableBody.java index 18bc5d631..786bd3148 100644 --- a/src/java/org/apache/fop/fo/flow/TableBody.java +++ b/src/java/org/apache/fop/fo/flow/TableBody.java @@ -92,14 +92,6 @@ public class TableBody extends FObj { } /** - * @see org.apache.fop.fo.FONode#addLayoutManager(List) - */ - public void addLayoutManager(List list) { - Body blm = new Body(this); - list.add(blm); - } - - /** * @see org.apache.fop.fo.FObj#getName() */ public String getName() { diff --git a/src/java/org/apache/fop/fo/flow/TableCell.java b/src/java/org/apache/fop/fo/flow/TableCell.java index 755d943d7..37f35cf33 100644 --- a/src/java/org/apache/fop/fo/flow/TableCell.java +++ b/src/java/org/apache/fop/fo/flow/TableCell.java @@ -315,14 +315,6 @@ public class TableCell extends FObj { public int getNumberRowsSpanned() { return Math.max(numberRowsSpanned.getValue(), 1); } - - /** - * @see org.apache.fop.fo.FONode#addLayoutManager(List) - */ - public void addLayoutManager(List list) { - Cell clm = new Cell(this); - list.add(clm); - } /** * @see org.apache.fop.fo.FObj#getName() diff --git a/src/java/org/apache/fop/fo/flow/TableRow.java b/src/java/org/apache/fop/fo/flow/TableRow.java index 873e82f03..222d7b67a 100644 --- a/src/java/org/apache/fop/fo/flow/TableRow.java +++ b/src/java/org/apache/fop/fo/flow/TableRow.java @@ -163,14 +163,6 @@ public class TableRow extends FObj { public CommonBorderPaddingBackground getCommonBorderPaddingBackground() { return commonBorderPaddingBackground; } - - /** - * @see org.apache.fop.fo.FONode#addLayoutManager(List) - */ - public void addLayoutManager(List list) { - Row rlm = new Row(this); - list.add(rlm); - } /** * @see org.apache.fop.fo.FObj#getName() diff --git a/src/java/org/apache/fop/fo/flow/Wrapper.java b/src/java/org/apache/fop/fo/flow/Wrapper.java index 5a6008ef6..1de4327e2 100644 --- a/src/java/org/apache/fop/fo/flow/Wrapper.java +++ b/src/java/org/apache/fop/fo/flow/Wrapper.java @@ -70,21 +70,6 @@ public class Wrapper extends FObjMixed { } /** - * @see org.apache.fop.fo.FONode#addLayoutManager(List) - * @todo remove null check when vCN() & endOfNode() implemented - */ - public void addLayoutManager(List list) { - ListIterator baseIter = getChildNodes(); - if (baseIter == null) { - return; - } - while (baseIter.hasNext()) { - FONode child = (FONode) baseIter.next(); - child.addLayoutManager(list); - } - } - - /** * @see org.apache.fop.fo.FObj#getName() */ public String getName() { diff --git a/src/java/org/apache/fop/fo/pagination/Flow.java b/src/java/org/apache/fop/fo/pagination/Flow.java index 4b3dc610d..8ffa067fe 100644 --- a/src/java/org/apache/fop/fo/pagination/Flow.java +++ b/src/java/org/apache/fop/fo/pagination/Flow.java @@ -139,14 +139,6 @@ public class Flow extends FObj { } /** - * @see org.apache.fop.fo.FONode#addLayoutManager(List) - */ - public void addLayoutManager(List list) { - FlowLayoutManager lm = new FlowLayoutManager(this); - list.add(lm); - } - - /** * @see org.apache.fop.fo.FObj#getName() */ public String getName() { |