From cd24266733a19cd61bc61e0f463b69154001bd8a Mon Sep 17 00:00:00 2001 From: Jeremias Maerki Date: Mon, 18 Jul 2005 15:46:44 +0000 Subject: [PATCH] Renamed Item to Cell to TableCellLayoutManager. Renamed Caption to TableCaptionLayoutManager. Adjusted SVN properties. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@219519 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/fop/layoutmgr/table/PrimaryGridUnit.java | 6 +++--- .../table/{Caption.java => TableCaptionLayoutManager.java} | 4 ++-- .../table/{Cell.java => TableCellLayoutManager.java} | 4 ++-- .../fop/layoutmgr/table/TableContentLayoutManager.java | 2 +- .../org/apache/fop/layoutmgr/table/TableLayoutManager.java | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) rename src/java/org/apache/fop/layoutmgr/table/{Caption.java => TableCaptionLayoutManager.java} (98%) rename src/java/org/apache/fop/layoutmgr/table/{Cell.java => TableCellLayoutManager.java} (99%) diff --git a/src/java/org/apache/fop/layoutmgr/table/PrimaryGridUnit.java b/src/java/org/apache/fop/layoutmgr/table/PrimaryGridUnit.java index 2695890a7..0657128cf 100644 --- a/src/java/org/apache/fop/layoutmgr/table/PrimaryGridUnit.java +++ b/src/java/org/apache/fop/layoutmgr/table/PrimaryGridUnit.java @@ -31,7 +31,7 @@ import org.apache.fop.fo.properties.LengthRangeProperty; public class PrimaryGridUnit extends GridUnit { /** Cell layout manager. */ - private Cell cellLM; + private TableCellLayoutManager cellLM; /** List of Knuth elements representing the contents of the cell. */ private LinkedList elements; /** Index of row where this cell starts */ @@ -45,11 +45,11 @@ public class PrimaryGridUnit extends GridUnit { super(cell, column, startCol, 0); this.startRow = startRow; if (cell != null) { - cellLM = new Cell(cell, this); + cellLM = new TableCellLayoutManager(cell, this); } } - public Cell getCellLM() { + public TableCellLayoutManager getCellLM() { return cellLM; } diff --git a/src/java/org/apache/fop/layoutmgr/table/Caption.java b/src/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java similarity index 98% rename from src/java/org/apache/fop/layoutmgr/table/Caption.java rename to src/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java index 2101d793f..b0efad7cd 100644 --- a/src/java/org/apache/fop/layoutmgr/table/Caption.java +++ b/src/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java @@ -32,7 +32,7 @@ import org.apache.fop.area.Block; * table. * @todo Implement getNextKnuthElements() */ -public class Caption extends BlockStackingLayoutManager { +public class TableCaptionLayoutManager extends BlockStackingLayoutManager { private TableCaption fobj; private Block curBlockArea; @@ -43,7 +43,7 @@ public class Caption extends BlockStackingLayoutManager { * Create a new Caption layout manager. * @param node table-caption FO */ - public Caption(TableCaption node) { + public TableCaptionLayoutManager(TableCaption node) { super(node); fobj = node; } diff --git a/src/java/org/apache/fop/layoutmgr/table/Cell.java b/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java similarity index 99% rename from src/java/org/apache/fop/layoutmgr/table/Cell.java rename to src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java index 053132ed5..210b55227 100644 --- a/src/java/org/apache/fop/layoutmgr/table/Cell.java +++ b/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java @@ -43,7 +43,7 @@ import org.apache.fop.traits.MinOptMax; * LayoutManager for a table-cell FO. * A cell contains blocks. These blocks fill the cell. */ -public class Cell extends BlockStackingLayoutManager implements BlockLevelLayoutManager { +public class TableCellLayoutManager extends BlockStackingLayoutManager implements BlockLevelLayoutManager { private TableCell fobj; private PrimaryGridUnit gridUnit; @@ -67,7 +67,7 @@ public class Cell extends BlockStackingLayoutManager implements BlockLevelLayout * @param node table-cell FO for which to create the LM * @param pgu primary grid unit for the cell */ - public Cell(TableCell node, PrimaryGridUnit pgu) { + public TableCellLayoutManager(TableCell node, PrimaryGridUnit pgu) { super(node); fobj = node; this.gridUnit = pgu; diff --git a/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java index 72c44f2ad..932e7be28 100644 --- a/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java @@ -851,7 +851,7 @@ public class TableContentLayoutManager { log.debug("start row: " + pgu.getStartRow() + " " + yoffset + " " + effYOffset); log.debug("contentHeight: " + contentHeight + " rowHeight=" + rowHeight + " effCellHeight=" + effCellHeight); - Cell cellLM = pgu.getCellLM(); + TableCellLayoutManager cellLM = pgu.getCellLM(); cellLM.setXOffset(getXOffsetOfGridUnit(pgu)); cellLM.setYOffset(effYOffset); cellLM.setContentHeight(contentHeight); diff --git a/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java index bb9a40a71..cdb1ea781 100644 --- a/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -/* $Id: TableLayoutManager.java,v 1.8 2004/03/21 12:03:08 gmazza Exp $ */ +/* $Id$ */ package org.apache.fop.layoutmgr.table; -- 2.39.5