|
From: <vic...@us...> - 2022-01-06 12:22:31
|
Revision: 12347
http://sourceforge.net/p/foray/code/12347
Author: victormote
Date: 2022-01-06 12:22:28 +0000 (Thu, 06 Jan 2022)
Log Message:
-----------
Conform to aXSL changes: Fix areatree/galley inheritance in some table-related interfaces.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractTablePartContainer.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java
Added Paths:
-----------
trunk/foray/foray-areatree/src/main/java/org/foray/area/TableBodyContainer4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer4a.java
Removed Paths:
-------------
trunk/foray/foray-areatree/src/main/java/org/foray/area/TableBodyContainer.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractTablePartContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractTablePartContainer.java 2022-01-05 20:44:20 UTC (rev 12346)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractTablePartContainer.java 2022-01-06 12:22:28 UTC (rev 12347)
@@ -47,8 +47,8 @@
private TableRa parent;
/** The children of this node. */
- private List<TableRowContainer> children
- = new ArrayList<TableRowContainer>();
+ private List<TableRowContainer4a> children
+ = new ArrayList<TableRowContainer4a>();
/** See {@link #getProgressionDimension()} for a description of
* "progression dimension". */
@@ -63,8 +63,8 @@
}
@Override
- public TableRowContainer makeTableRowContainer(final TableRow node) {
- final TableRowContainer newRow = TableRowContainer.makeTableRowContainer(node, this);
+ public TableRowContainer4a makeTableRowContainer(final TableRow node) {
+ final TableRowContainer4a newRow = TableRowContainer4a.makeTableRowContainer(node, this);
this.children.add(newRow);
return newRow;
}
@@ -95,7 +95,7 @@
}
@Override
- public List<TableRowContainer> getChildren() {
+ public List<TableRowContainer4a> getChildren() {
return this.children;
}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java 2022-01-05 20:44:20 UTC (rev 12346)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java 2022-01-06 12:22:28 UTC (rev 12347)
@@ -846,7 +846,7 @@
/* LineArea children grow in the IPD, LineArea grows in the BPD. */
return false;
}
- if (parent instanceof TableRowContainer) {
+ if (parent instanceof TableRowContainer4a) {
/* TableRowContainer children grow in the IPD, LineArea grows in the
* BPD. */
return false;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemArea.java 2022-01-05 20:44:20 UTC (rev 12346)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemArea.java 2022-01-06 12:22:28 UTC (rev 12347)
@@ -228,7 +228,7 @@
/**
* Resets the progression dimension for this row by polling the "cells" to
* see whether their content BPD has changed.
- * @see TableRowContainer#resetProgressionDimension()
+ * @see TableRowContainer4a#resetProgressionDimension()
*/
public void resetProgressionDimension() {
int maxCellBPD = 0;
Deleted: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableBodyContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableBodyContainer.java 2022-01-05 20:44:20 UTC (rev 12346)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableBodyContainer.java 2022-01-06 12:22:28 UTC (rev 12347)
@@ -1,176 +0,0 @@
-/*
- * Copyright 2004 The FOray Project.
- * http://www.foray.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- * Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.area;
-
-import org.foray.area.link.Link;
-
-import org.axsl.area.AreaTreeException;
-import org.axsl.common.value.BackgroundRepeat;
-import org.axsl.fotree.fo.GraftingPoint;
-import org.axsl.fotree.fo.TableBody;
-import org.axsl.galley.BackgroundAreaG5;
-import org.axsl.galley.GalleyVisitor;
-import org.axsl.galley.GalleyVisitorException;
-import org.axsl.graphic.Graphic;
-
-import java.awt.Color;
-
-/**
- * Area containing all or part of a table-body.
- */
-public final class TableBodyContainer extends AbstractTablePartContainer implements BackgroundAreaG5,
- org.axsl.area.TableBodyContainer {
-
- /** The link to the FO tree. */
- private Link<TableBody> foLink;
-
- /**
- * Private Constructor.
- * Use {@link TableRa#makeTableBodyContainer(org.axsl.fotree.fo.TableBody,
- * GraftingPoint)} to create an instance.
- * @param parentArea The parent area.
- */
- private TableBodyContainer(final TableRa parentArea) {
- super(parentArea);
- }
-
- /**
- * Package-visible factory method.
- * @param generatedBy The FO node generating this area.
- * @param parentArea The parent area.
- * @return The newly-created instance.
- */
- static TableBodyContainer makeTableBodyContainer(final TableBody generatedBy, final TableRa parentArea) {
- final TableBodyContainer bodyContainer = new TableBodyContainer(parentArea);
- bodyContainer.foLink = bodyContainer.getLink(generatedBy);
- bodyContainer.registerLink(generatedBy);
- final int initialPD = bodyContainer.computeInitialPD();
- bodyContainer.setProgressionDimension(initialPD);
- bodyContainer.initializeAnteriorSpace();
- return bodyContainer;
- }
-
- @Override
- public String getAreaName() {
- return "table-body";
- }
-
- @Override
- public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
- return visitor.visit(this);
- }
-
- @Override
- public int crIpd() {
- return crIPDBlockArea();
- }
-
- @Override
- public int crBpd() {
- return getProgressionDimension();
- }
-
- @Override
- public Area4a getOverflowArea(final Area4a childRequesting)
- throws AreaTreeException {
- return ancestorArea().getOverflowArea(this);
- }
-
- @Override
- protected boolean optimize() {
- this.optimizeChildren();
- return false;
- }
-
- @Override
- public Link<TableBody> getFoLink() {
- return this.foLink;
- }
-
- @Override
- public TableBody traitGeneratedBy() {
- return this.getFoLink().getGenerator();
- }
-
- @Override
- public Graphic traitBackgroundImage() {
- return this.traitGeneratedBy().traitBackgroundImage(this);
- }
-
- @Override
- public Color traitBackgroundColor() {
- return traitGeneratedBy().traitBackgroundColor(this);
- }
-
- @Override
- public BackgroundRepeat traitBackgroundRepeat() {
- return traitGeneratedBy().traitBackgroundRepeat(this);
- }
-
- @Override
- public int traitBorderStartWidth() {
- return 0;
- }
-
- @Override
- public int traitBorderEndWidth() {
- return 0;
- }
-
- @Override
- public int traitBorderBeforeWidth() {
- return 0;
- }
-
- @Override
- public int traitBorderAfterWidth() {
- return 0;
- }
-
- @Override
- public int traitPaddingStart() {
- return 0;
- }
-
- @Override
- public int traitPaddingEnd() {
- return 0;
- }
-
- @Override
- public int traitPaddingBefore() {
- return 0;
- }
-
- @Override
- public int traitPaddingAfter() {
- return 0;
- }
-
-}
Copied: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableBodyContainer4a.java (from rev 12325, trunk/foray/foray-areatree/src/main/java/org/foray/area/TableBodyContainer.java)
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableBodyContainer4a.java (rev 0)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableBodyContainer4a.java 2022-01-06 12:22:28 UTC (rev 12347)
@@ -0,0 +1,175 @@
+/*
+ * Copyright 2004 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.area;
+
+import org.foray.area.link.Link;
+
+import org.axsl.area.AreaTreeException;
+import org.axsl.area.TableBodyContainer;
+import org.axsl.common.value.BackgroundRepeat;
+import org.axsl.fotree.fo.GraftingPoint;
+import org.axsl.fotree.fo.TableBody;
+import org.axsl.galley.GalleyVisitor;
+import org.axsl.galley.GalleyVisitorException;
+import org.axsl.graphic.Graphic;
+
+import java.awt.Color;
+
+/**
+ * Area containing all or part of a table-body.
+ */
+public final class TableBodyContainer4a extends AbstractTablePartContainer implements TableBodyContainer {
+
+ /** The link to the FO tree. */
+ private Link<TableBody> foLink;
+
+ /**
+ * Private Constructor.
+ * Use {@link TableRa#makeTableBodyContainer(org.axsl.fotree.fo.TableBody,
+ * GraftingPoint)} to create an instance.
+ * @param parentArea The parent area.
+ */
+ private TableBodyContainer4a(final TableRa parentArea) {
+ super(parentArea);
+ }
+
+ /**
+ * Package-visible factory method.
+ * @param generatedBy The FO node generating this area.
+ * @param parentArea The parent area.
+ * @return The newly-created instance.
+ */
+ static TableBodyContainer4a makeTableBodyContainer(final TableBody generatedBy, final TableRa parentArea) {
+ final TableBodyContainer4a bodyContainer = new TableBodyContainer4a(parentArea);
+ bodyContainer.foLink = bodyContainer.getLink(generatedBy);
+ bodyContainer.registerLink(generatedBy);
+ final int initialPD = bodyContainer.computeInitialPD();
+ bodyContainer.setProgressionDimension(initialPD);
+ bodyContainer.initializeAnteriorSpace();
+ return bodyContainer;
+ }
+
+ @Override
+ public String getAreaName() {
+ return "table-body";
+ }
+
+ @Override
+ public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+ return visitor.visit(this);
+ }
+
+ @Override
+ public int crIpd() {
+ return crIPDBlockArea();
+ }
+
+ @Override
+ public int crBpd() {
+ return getProgressionDimension();
+ }
+
+ @Override
+ public Area4a getOverflowArea(final Area4a childRequesting)
+ throws AreaTreeException {
+ return ancestorArea().getOverflowArea(this);
+ }
+
+ @Override
+ protected boolean optimize() {
+ this.optimizeChildren();
+ return false;
+ }
+
+ @Override
+ public Link<TableBody> getFoLink() {
+ return this.foLink;
+ }
+
+ @Override
+ public TableBody traitGeneratedBy() {
+ return this.getFoLink().getGenerator();
+ }
+
+ @Override
+ public Graphic traitBackgroundImage() {
+ return this.traitGeneratedBy().traitBackgroundImage(this);
+ }
+
+ @Override
+ public Color traitBackgroundColor() {
+ return traitGeneratedBy().traitBackgroundColor(this);
+ }
+
+ @Override
+ public BackgroundRepeat traitBackgroundRepeat() {
+ return traitGeneratedBy().traitBackgroundRepeat(this);
+ }
+
+ @Override
+ public int traitBorderStartWidth() {
+ return 0;
+ }
+
+ @Override
+ public int traitBorderEndWidth() {
+ return 0;
+ }
+
+ @Override
+ public int traitBorderBeforeWidth() {
+ return 0;
+ }
+
+ @Override
+ public int traitBorderAfterWidth() {
+ return 0;
+ }
+
+ @Override
+ public int traitPaddingStart() {
+ return 0;
+ }
+
+ @Override
+ public int traitPaddingEnd() {
+ return 0;
+ }
+
+ @Override
+ public int traitPaddingBefore() {
+ return 0;
+ }
+
+ @Override
+ public int traitPaddingAfter() {
+ return 0;
+ }
+
+}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java 2022-01-05 20:44:20 UTC (rev 12346)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java 2022-01-06 12:22:28 UTC (rev 12347)
@@ -47,7 +47,6 @@
import org.axsl.fotree.fo.TableCell;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.TableCellAreaG5;
import org.axsl.graphic.Graphic;
import java.awt.Color;
@@ -57,13 +56,13 @@
/**
* Area containing all or part of a table-cell.
*/
-public final class TableCellRa extends ContainerRa implements TableCellAreaG5, org.axsl.area.TableCellArea {
+public final class TableCellRa extends ContainerRa implements org.axsl.area.TableCellArea {
/** The link to the FO tree. */
private Link<TableCell> foLink;
/** The parent of this node. */
- private TableRowContainer parent;
+ private TableRowContainer4a parent;
/** The children of this node. */
private List<AreaNode4a> children = new ArrayList<AreaNode4a>();
@@ -91,11 +90,11 @@
/**
* Private Constructor.
- * Use {@link TableRowContainer#makeTableCellArea(TableCell,
+ * Use {@link TableRowContainer4a#makeTableCellArea(TableCell,
* GraftingPoint)} to create a new cell instance.
* @param parentArea The parent area.
*/
- private TableCellRa(final TableRowContainer parentArea) {
+ private TableCellRa(final TableRowContainer4a parentArea) {
this.parent = parentArea;
}
@@ -105,7 +104,7 @@
* @param parentArea The parent area.
* @return The new instance.
*/
- static TableCellRa makeTableCellRA(final TableCell generatedBy, final TableRowContainer parentArea) {
+ static TableCellRa makeTableCellRA(final TableCell generatedBy, final TableRowContainer4a parentArea) {
final TableCellRa newCell = new TableCellRa(parentArea);
newCell.foLink = newCell.getLink(generatedBy);
newCell.registerLink(generatedBy);
@@ -290,11 +289,11 @@
* for all (non-spanning) cells in the row. */
int bpd = 0;
/* TODO: This computation needs to consider borders and padding. */
- TableRowContainer rowArea = this.getParent();
+ TableRowContainer4a rowArea = this.getParent();
bpd += rowArea.getProgressionDimension();
int rowsRemaining = this.traitNumberRowsSpanned() - 1;
while (rowsRemaining > 0) {
- final TableRowContainer nextRow = (TableRowContainer)
+ final TableRowContainer4a nextRow = (TableRowContainer4a)
rowArea.getNextSibling();
if (nextRow == null) {
rowsRemaining = 0;
@@ -369,14 +368,14 @@
}
@Override
- public TableRowContainer getParent() {
+ public TableRowContainer4a getParent() {
return this.parent;
}
@Override
public void setParent(final AreaNode4a node) throws AreaTreeException {
- if (node instanceof TableRowContainer) {
- this.parent = (TableRowContainer) node;
+ if (node instanceof TableRowContainer4a) {
+ this.parent = (TableRowContainer4a) node;
} else {
throw new AreaTreeException("Parent of TableCellRa must be a "
+ "TableRowContainer");
Deleted: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer.java 2022-01-05 20:44:20 UTC (rev 12346)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer.java 2022-01-06 12:22:28 UTC (rev 12347)
@@ -1,190 +0,0 @@
-/*
- * Copyright 2004 The FOray Project.
- * http://www.foray.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- * Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.area;
-
-import org.foray.area.link.Link;
-
-import org.axsl.area.AreaTreeException;
-import org.axsl.area.RetrieveTableMarkerNode;
-import org.axsl.common.value.BackgroundRepeat;
-import org.axsl.fotree.fo.GraftingPoint;
-import org.axsl.fotree.fo.Marker;
-import org.axsl.fotree.fo.RetrieveTableMarker;
-import org.axsl.fotree.fo.TableFooter;
-import org.axsl.galley.BackgroundAreaG5;
-import org.axsl.galley.GalleyVisitor;
-import org.axsl.galley.GalleyVisitorException;
-import org.axsl.graphic.Graphic;
-
-import java.awt.Color;
-
-/**
- * Area containing all or part of a table-footer.
- */
-public final class TableFooterContainer extends AbstractTablePartContainer implements BackgroundAreaG5,
- org.axsl.area.TableFooterContainer {
-
- /** The link to the FO tree. */
- private Link<TableFooter> foLink;
-
- /**
- * Private Constructor.
- * Use {@link TableRa#makeTableFooterContainer(org.axsl.fotree.fo.TableFooter, GraftingPoint)} to create an
- * instance.
- * @param parentArea The parent area.
- */
- private TableFooterContainer(final TableRa parentArea) {
- super(parentArea);
- }
-
- /**
- * Package-visible factory method.
- * @param generatedBy The FO node generating this area.
- * @param parentArea The parent area.
- * @return The newly-created instance.
- */
- static TableFooterContainer makeTableFooterContainer(final TableFooter generatedBy, final TableRa parentArea) {
- final TableFooterContainer footerContainer = new TableFooterContainer(parentArea);
- footerContainer.foLink = footerContainer.getLink(generatedBy);
- footerContainer.registerLink(generatedBy);
- final int initialPD = footerContainer.computeInitialPD();
- footerContainer.setProgressionDimension(initialPD);
- footerContainer.initializeAnteriorSpace();
- return footerContainer;
- }
-
- @Override
- public String getAreaName() {
- return "table-footer";
- }
-
- @Override
- public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
- return visitor.visit(this);
- }
-
- @Override
- public int crIpd() {
- return crIPDBlockArea();
- }
-
- @Override
- public int crBpd() {
- return getProgressionDimension();
- }
-
- @Override
- public Area4a getOverflowArea(final Area4a childRequesting)
- throws AreaTreeException {
- return ancestorArea().getOverflowArea(this);
- }
-
- @Override
- protected boolean optimize() {
- this.optimizeChildren();
- return false;
- }
-
- @Override
- public Link<TableFooter> getFoLink() {
- return this.foLink;
- }
-
- @Override
- public TableFooter traitGeneratedBy() {
- return this.getFoLink().getGenerator();
- }
-
- @Override
- public Graphic traitBackgroundImage() {
- return this.traitGeneratedBy().traitBackgroundImage(this);
- }
-
- @Override
- public Color traitBackgroundColor() {
- return traitGeneratedBy().traitBackgroundColor(this);
- }
-
- @Override
- public BackgroundRepeat traitBackgroundRepeat() {
- return traitGeneratedBy().traitBackgroundRepeat(this);
- }
-
- @Override
- public int traitBorderStartWidth() {
- return 0;
- }
-
- @Override
- public int traitBorderEndWidth() {
- return 0;
- }
-
- @Override
- public int traitBorderBeforeWidth() {
- return 0;
- }
-
- @Override
- public int traitBorderAfterWidth() {
- return 0;
- }
-
- @Override
- public int traitPaddingStart() {
- return 0;
- }
-
- @Override
- public int traitPaddingEnd() {
- return 0;
- }
-
- @Override
- public int traitPaddingBefore() {
- return 0;
- }
-
- @Override
- public int traitPaddingAfter() {
- return 0;
- }
-
- @Override
- public RetrieveTableMarkerNode makeRetrieveTableMarkerNode(final RetrieveTableMarker retrieveTableMarker,
- final Marker selectedMarker) {
-// final RetrieveTableMarkerNode4a newRtmNode =
-// RetrieveTableMarkerNode4a.makeRetrieveTableMarkerNode(retrieveTableMarker, this, selectedMarker);
-// this.children.add(newRtmNode);
-// return newRtmNode;
- return null;
- }
-
-
-}
Copied: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer4a.java (from rev 12325, trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer.java)
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer4a.java (rev 0)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer4a.java 2022-01-06 12:22:28 UTC (rev 12347)
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2004 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.area;
+
+import org.foray.area.link.Link;
+
+import org.axsl.area.AreaTreeException;
+import org.axsl.area.RetrieveTableMarkerNode;
+import org.axsl.area.TableFooterContainer;
+import org.axsl.common.value.BackgroundRepeat;
+import org.axsl.fotree.fo.GraftingPoint;
+import org.axsl.fotree.fo.Marker;
+import org.axsl.fotree.fo.RetrieveTableMarker;
+import org.axsl.fotree.fo.TableFooter;
+import org.axsl.galley.GalleyVisitor;
+import org.axsl.galley.GalleyVisitorException;
+import org.axsl.graphic.Graphic;
+
+import java.awt.Color;
+
+/**
+ * Area containing all or part of a table-footer.
+ */
+public final class TableFooterContainer4a extends AbstractTablePartContainer implements TableFooterContainer {
+
+ /** The link to the FO tree. */
+ private Link<TableFooter> foLink;
+
+ /**
+ * Private Constructor.
+ * Use {@link TableRa#makeTableFooterContainer(org.axsl.fotree.fo.TableFooter, GraftingPoint)} to create an
+ * instance.
+ * @param parentArea The parent area.
+ */
+ private TableFooterContainer4a(final TableRa parentArea) {
+ super(parentArea);
+ }
+
+ /**
+ * Package-visible factory method.
+ * @param generatedBy The FO node generating this area.
+ * @param parentArea The parent area.
+ * @return The newly-created instance.
+ */
+ static TableFooterContainer4a makeTableFooterContainer(final TableFooter generatedBy, final TableRa parentArea) {
+ final TableFooterContainer4a footerContainer = new TableFooterContainer4a(parentArea);
+ footerContainer.foLink = footerContainer.getLink(generatedBy);
+ footerContainer.registerLink(generatedBy);
+ final int initialPD = footerContainer.computeInitialPD();
+ footerContainer.setProgressionDimension(initialPD);
+ footerContainer.initializeAnteriorSpace();
+ return footerContainer;
+ }
+
+ @Override
+ public String getAreaName() {
+ return "table-footer";
+ }
+
+ @Override
+ public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+ return visitor.visit(this);
+ }
+
+ @Override
+ public int crIpd() {
+ return crIPDBlockArea();
+ }
+
+ @Override
+ public int crBpd() {
+ return getProgressionDimension();
+ }
+
+ @Override
+ public Area4a getOverflowArea(final Area4a childRequesting)
+ throws AreaTreeException {
+ return ancestorArea().getOverflowArea(this);
+ }
+
+ @Override
+ protected boolean optimize() {
+ this.optimizeChildren();
+ return false;
+ }
+
+ @Override
+ public Link<TableFooter> getFoLink() {
+ return this.foLink;
+ }
+
+ @Override
+ public TableFooter traitGeneratedBy() {
+ return this.getFoLink().getGenerator();
+ }
+
+ @Override
+ public Graphic traitBackgroundImage() {
+ return this.traitGeneratedBy().traitBackgroundImage(this);
+ }
+
+ @Override
+ public Color traitBackgroundColor() {
+ return traitGeneratedBy().traitBackgroundColor(this);
+ }
+
+ @Override
+ public BackgroundRepeat traitBackgroundRepeat() {
+ return traitGeneratedBy().traitBackgroundRepeat(this);
+ }
+
+ @Override
+ public int traitBorderStartWidth() {
+ return 0;
+ }
+
+ @Override
+ public int traitBorderEndWidth() {
+ return 0;
+ }
+
+ @Override
+ public int traitBorderBeforeWidth() {
+ return 0;
+ }
+
+ @Override
+ public int traitBorderAfterWidth() {
+ return 0;
+ }
+
+ @Override
+ public int traitPaddingStart() {
+ return 0;
+ }
+
+ @Override
+ public int traitPaddingEnd() {
+ return 0;
+ }
+
+ @Override
+ public int traitPaddingBefore() {
+ return 0;
+ }
+
+ @Override
+ public int traitPaddingAfter() {
+ return 0;
+ }
+
+ @Override
+ public RetrieveTableMarkerNode makeRetrieveTableMarkerNode(final RetrieveTableMarker retrieveTableMarker,
+ final Marker selectedMarker) {
+// final RetrieveTableMarkerNode4a newRtmNode =
+// RetrieveTableMarkerNode4a.makeRetrieveTableMarkerNode(retrieveTableMarker, this, selectedMarker);
+// this.children.add(newRtmNode);
+// return newRtmNode;
+ return null;
+ }
+
+
+}
Deleted: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer.java 2022-01-05 20:44:20 UTC (rev 12346)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer.java 2022-01-06 12:22:28 UTC (rev 12347)
@@ -1,190 +0,0 @@
-/*
- * Copyright 2004 The FOray Project.
- * http://www.foray.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- * Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.area;
-
-import org.foray.area.link.Link;
-
-import org.axsl.area.AreaTreeException;
-import org.axsl.area.RetrieveTableMarkerNode;
-import org.axsl.common.value.BackgroundRepeat;
-import org.axsl.fotree.fo.GraftingPoint;
-import org.axsl.fotree.fo.Marker;
-import org.axsl.fotree.fo.RetrieveTableMarker;
-import org.axsl.fotree.fo.TableHeader;
-import org.axsl.galley.BackgroundAreaG5;
-import org.axsl.galley.GalleyVisitor;
-import org.axsl.galley.GalleyVisitorException;
-import org.axsl.graphic.Graphic;
-
-import java.awt.Color;
-
-/**
- * Area containing all or part of a table-header.
- */
-public final class TableHeaderContainer extends AbstractTablePartContainer implements BackgroundAreaG5,
- org.axsl.area.TableHeaderContainer {
-
- /** The link to the FO tree. */
- private Link<TableHeader> foLink;
-
- /**
- * Private Constructor.
- * Use {@link TableRa#makeTableHeaderContainer(org.axsl.fotree.fo.TableHeader,
- * GraftingPoint)} to create an instance.
- * @param parentArea The parent area.
- */
- private TableHeaderContainer(final TableRa parentArea) {
- super(parentArea);
- }
-
- /**
- * Package-visible factory method.
- * @param generatedBy The FO node generating this area.
- * @param parentArea The parent area.
- * @return The newly-created instance.
- */
- static TableHeaderContainer makeTableHeaderContainer(final TableHeader generatedBy, final TableRa parentArea) {
- final TableHeaderContainer headerContainer = new TableHeaderContainer(parentArea);
- headerContainer.foLink = headerContainer.getLink(generatedBy);
- headerContainer.registerLink(generatedBy);
- final int initialPD = headerContainer.computeInitialPD();
- headerContainer.setProgressionDimension(initialPD);
- headerContainer.initializeAnteriorSpace();
- return headerContainer;
- }
-
- @Override
- public String getAreaName() {
- return "table-header";
- }
-
- @Override
- public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
- return visitor.visit(this);
- }
-
- @Override
- public int crIpd() {
- return crIPDBlockArea();
- }
-
- @Override
- public int crBpd() {
- return getProgressionDimension();
- }
-
- @Override
- public Area4a getOverflowArea(final Area4a childRequesting)
- throws AreaTreeException {
- return ancestorArea().getOverflowArea(this);
- }
-
- @Override
- protected boolean optimize() {
- this.optimizeChildren();
- return false;
- }
-
- @Override
- public Link<TableHeader> getFoLink() {
- return this.foLink;
- }
-
- @Override
- public TableHeader traitGeneratedBy() {
- return this.getFoLink().getGenerator();
- }
-
- @Override
- public Graphic traitBackgroundImage() {
- return this.traitGeneratedBy().traitBackgroundImage(this);
- }
-
- @Override
- public Color traitBackgroundColor() {
- return traitGeneratedBy().traitBackgroundColor(this);
- }
-
- @Override
- public BackgroundRepeat traitBackgroundRepeat() {
- return traitGeneratedBy().traitBackgroundRepeat(this);
- }
-
- @Override
- public int traitBorderStartWidth() {
- return 0;
- }
-
- @Override
- public int traitBorderEndWidth() {
- return 0;
- }
-
- @Override
- public int traitBorderBeforeWidth() {
- return 0;
- }
-
- @Override
- public int traitBorderAfterWidth() {
- return 0;
- }
-
- @Override
- public int traitPaddingStart() {
- return 0;
- }
-
- @Override
- public int traitPaddingEnd() {
- return 0;
- }
-
- @Override
- public int traitPaddingBefore() {
- return 0;
- }
-
- @Override
- public int traitPaddingAfter() {
- return 0;
- }
-
- @Override
- public RetrieveTableMarkerNode makeRetrieveTableMarkerNode(final RetrieveTableMarker retrieveTableMarker,
- final Marker selectedMarker) {
-// final RetrieveTableMarkerNode4a newRtmNode =
-// RetrieveTableMarkerNode4a.makeRetrieveTableMarkerNode(retrieveTableMarker, this, selectedMarker);
-// this.children.add(newRtmNode);
-// return newRtmNode;
- return null;
- }
-
-
-}
Copied: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer4a.java (from rev 12325, trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer.java)
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer4a.java (rev 0)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer4a.java 2022-01-06 12:22:28 UTC (rev 12347)
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2004 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.area;
+
+import org.foray.area.link.Link;
+
+import org.axsl.area.AreaTreeException;
+import org.axsl.area.RetrieveTableMarkerNode;
+import org.axsl.area.TableHeaderContainer;
+import org.axsl.common.value.BackgroundRepeat;
+import org.axsl.fotree.fo.GraftingPoint;
+import org.axsl.fotree.fo.Marker;
+import org.axsl.fotree.fo.RetrieveTableMarker;
+import org.axsl.fotree.fo.TableHeader;
+import org.axsl.galley.GalleyVisitor;
+import org.axsl.galley.GalleyVisitorException;
+import org.axsl.graphic.Graphic;
+
+import java.awt.Color;
+
+/**
+ * Area containing all or part of a table-header.
+ */
+public final class TableHeaderContainer4a extends AbstractTablePartContainer implements TableHeaderContainer {
+
+ /** The link to the FO tree. */
+ private Link<TableHeader> foLink;
+
+ /**
+ * Private Constructor.
+ * Use {@link TableRa#makeTableHeaderContainer(org.axsl.fotree.fo.TableHeader,
+ * GraftingPoint)} to create an instance.
+ * @param parentArea The parent area.
+ */
+ private TableHeaderContainer4a(final TableRa parentArea) {
+ super(parentArea);
+ }
+
+ /**
+ * Package-visible factory method.
+ * @param generatedBy The FO node generating this area.
+ * @param parentArea The parent area.
+ * @return The newly-created instance.
+ */
+ static TableHeaderContainer4a makeTableHeaderContainer(final TableHeader generatedBy, final TableRa parentArea) {
+ final TableHeaderContainer4a headerContainer = new TableHeaderContainer4a(parentArea);
+ headerContainer.foLink = headerContainer.getLink(generatedBy);
+ headerContainer.registerLink(generatedBy);
+ final int initialPD = headerContainer.computeInitialPD();
+ headerContainer.setProgressionDimension(initialPD);
+ headerContainer.initializeAnteriorSpace();
+ return headerContainer;
+ }
+
+ @Override
+ public String getAreaName() {
+ return "table-header";
+ }
+
+ @Override
+ public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+ return visitor.visit(this);
+ }
+
+ @Override
+ public int crIpd() {
+ return crIPDBlockArea();
+ }
+
+ @Override
+ public int crBpd() {
+ return getProgressionDimension();
+ }
+
+ @Override
+ public Area4a getOverflowArea(final Area4a childRequesting)
+ throws AreaTreeException {
+ return ancestorArea().getOverflowArea(this);
+ }
+
+ @Override
+ protected boolean optimize() {
+ this.optimizeChildren();
+ return false;
+ }
+
+ @Override
+ public Link<TableHeader> getFoLink() {
+ return this.foLink;
+ }
+
+ @Override
+ public TableHeader traitGeneratedBy() {
+ return this.getFoLink().getGenerator();
+ }
+
+ @Override
+ public Graphic traitBackgroundImage() {
+ return this.traitGeneratedBy().traitBackgroundImage(this);
+ }
+
+ @Override
+ public Color traitBackgroundColor() {
+ return traitGeneratedBy().traitBackgroundColor(this);
+ }
+
+ @Override
+ public BackgroundRepeat traitBackgroundRepeat() {
+ return traitGeneratedBy().traitBackgroundRepeat(this);
+ }
+
+ @Override
+ public int traitBorderStartWidth() {
+ return 0;
+ }
+
+ @Override
+ public int traitBorderEndWidth() {
+ return 0;
+ }
+
+ @Override
+ public int traitBorderBeforeWidth() {
+ return 0;
+ }
+
+ @Override
+ public int traitBorderAfterWidth() {
+ return 0;
+ }
+
+ @Override
+ public int traitPaddingStart() {
+ return 0;
+ }
+
+ @Override
+ public int traitPaddingEnd() {
+ return 0;
+ }
+
+ @Override
+ public int traitPaddingBefore() {
+ return 0;
+ }
+
+ @Override
+ public int traitPaddingAfter() {
+ return 0;
+ }
+
+ @Override
+ public RetrieveTableMarkerNode makeRetrieveTableMarkerNode(final RetrieveTableMarker retrieveTableMarker,
+ final Marker selectedMarker) {
+// final RetrieveTableMarkerNode4a newRtmNode =
+// RetrieveTableMarkerNode4a.makeRetrieveTableMarkerNode(retrieveTableMarker, this, selectedMarker);
+// this.children.add(newRtmNode);
+// return newRtmNode;
+ return null;
+ }
+
+
+}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java 2022-01-05 20:44:20 UTC (rev 12346)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java 2022-01-06 12:22:28 UTC (rev 12347)
@@ -32,6 +32,7 @@
import org.axsl.area.AreaTreeException;
import org.axsl.area.RetrieveTableMarkerNode;
+import org.axsl.area.TableArea;
import org.axsl.common.value.BackgroundRepeat;
import org.axsl.common.value.BorderModel;
import org.axsl.common.value.BorderStyle;
@@ -47,7 +48,6 @@
import org.axsl.galley.BackgroundAreaG5;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.TableAreaG5;
import org.axsl.graphic.Graphic;
import java.awt.Color;
@@ -57,7 +57,7 @@
/**
* Area containing part or all of a {@link Table}.
*/
-public final class TableRa extends ContainerRa implements TableAreaG5, org.axsl.area.TableArea {
+public final class TableRa extends ContainerRa implements TableArea {
/** Constant indicating the minimum column width (10 points), expressed in
* millipoints, that is, 10,000. */
@@ -182,9 +182,9 @@
}
@Override
- public TableBodyContainer makeTableBodyContainer(final TableBody tableBody) {
- final TableBodyContainer bodyContainer
- = TableBodyContainer.makeTableBodyContainer(tableBody, this);
+ public TableBodyContainer4a makeTableBodyContainer(final TableBody tableBody) {
+ final TableBodyContainer4a bodyContainer
+ = TableBodyContainer4a.makeTableBodyContainer(tableBody, this);
if (this.getTableFooterContainer() == null) {
/* If there is not yet a footer area, add it to the end. */
this.children.add(bodyContainer);
@@ -198,17 +198,17 @@
}
@Override
- public TableHeaderContainer makeTableHeaderContainer(final TableHeader tableHeader) {
- final TableHeaderContainer headerContainer
- = TableHeaderContainer.makeTableHeaderContainer(tableHeader, this);
+ public TableHeaderContainer4a makeTableHeaderContainer(final TableHeader tableHeader) {
+ final TableHeaderContainer4a headerContainer
+ = TableHeaderContainer4a.makeTableHeaderContainer(tableHeader, this);
this.children.add(headerContainer);
return headerContainer;
}
@Override
- public TableFooterContainer makeTableFooterContainer(final TableFooter tableFooter) {
- final TableFooterContainer footerContainer
- = TableFooterContainer.makeTableFooterContainer(tableFooter, this);
+ public TableFooterContainer4a makeTableFooterContainer(final TableFooter tableFooter) {
+ final TableFooterContainer4a footerContainer
+ = TableFooterContainer4a.makeTableFooterContainer(tableFooter, this);
this.children.add(footerContainer);
return footerContainer;
}
@@ -439,7 +439,7 @@
/* TODO: We don't know how to do this yet. */
/* 5. Rows. */
for (AbstractTablePartContainer tableSegment : this.children) {
- for (TableRowContainer row : tableSegment.getChildren()) {
+ for (TableRowContainer4a row : tableSegment.getChildren()) {
if (this.hasBackground(row)) {
backgroundAreas.add(row);
}
@@ -547,7 +547,7 @@
}
@Override
- public TableBodyContainer getTableBodyContainer() {
+ public TableBodyContainer4a getTableBodyContainer() {
if (this.children == null) {
return null;
}
@@ -555,8 +555,8 @@
return null;
}
for (AbstractTablePartContainer container : this.children) {
- if (container instanceof TableHeaderContainer) {
- return (TableBodyContainer) container;
+ if (container instanceof TableHeaderContainer4a) {
+ return (TableBodyContainer4a) container;
}
}
return null;
@@ -563,7 +563,7 @@
}
@Override
- public TableHeaderContainer getTableHeaderContainer() {
+ public TableHeaderContainer4a getTableHeaderContainer() {
if (this.children == null) {
return null;
}
@@ -571,14 +571,14 @@
return null;
}
/* If there is one, it must the first child. */
- if (this.children.get(0) instanceof TableHeaderContainer) {
- return (TableHeaderContainer) this.children.get(0);
+ if (this.children.get(0) instanceof TableHeaderContainer4a) {
+ return (TableHeaderContainer4a) this.children.get(0);
}
return null;
}
@Override
- public TableFooterContainer getTableFooterContainer() {
+ public TableFooterContainer4a getTableFooterContainer() {
if (this.children == null) {
return null;
}
@@ -587,8 +587,8 @@
}
/* If there is one, it must the last child. */
final int lastIndex = this.children.size() - 1;
- if (this.children.get(lastIndex) instanceof TableFooterContainer) {
- return (TableFooterContainer) this.children.get(lastIndex);
+ if (this.children.get(lastIndex) instanceof TableFooterContainer4a) {
+ return (TableFooterContainer4a) this.children.get(lastIndex);
}
return null;
}
Deleted: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java 2022-01-05 20:44:20 UTC (rev 12346)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java 2022-01-06 12:22:28 UTC (rev 12347)
@@ -1,309 +0,0 @@
-/*
- * Copyright 2004 The FOray Project.
- * http://www.foray.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- * Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.area;
-
-import org.foray.area.link.Link;
-
-import org.axsl.area.AreaTreeException;
-import org.axsl.common.value.BackgroundRepeat;
-import org.axsl.common.value.FoPropertyConstants;
-import org.axsl.common.value.RelativeAxis;
-import org.axsl.fotree.fo.GraftingPoint;
-import org.axsl.fotree.fo.TableCell;
-import org.axsl.fotree.fo.TableRow;
-import org.axsl.galley.BackgroundAreaG5;
-import org.axsl.galley.GalleyVisitor;
-import org.axsl.galley.GalleyVisitorException;
-import org.axsl.graphic.Graphic;
-
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * Class representing the areas <em>returned by</em> an fo:table-row object.
- * Note that fo:table-row does not really generate any areas.
- */
-public final class TableRowContainer extends ContainerRa
- implements org.axsl.area.TableRowContainer,
- BackgroundAreaG5 {
-
- /** The link to the FO tree. */
- private Link<TableRow> foLink;
-
- /** The parent of this node. */
- private AbstractTablePartContainer parent;
-
- /** The children of this node. */
- private List<TableCellRa> children = new ArrayList<TableCellRa>();
-
- /** See {@link #getProgressionDimension()} for a description of
- * "progression dimension". */
- private int progressionDimension = 0;
-
- /**
- * Private Constructor.
- * Use {@link AbstractTablePartContainer#makeTableRowContainer(TableRow,
- * GraftingPoint)} to create an instance.
- * @param parentArea The parent area.
- */
- private TableRowContainer(final AbstractTablePartContainer parentArea) {
- this.parent = parentArea;
- }
-
- /**
- * Package-visible factory method.
- * @param generatedBy The FO node generating this area.
- * @param parentArea The parent area.
- * @return The new instance.
- */
- static TableRowContainer makeTableRowContainer(final TableRow generatedBy,
- final AbstractTablePartContainer parentArea) {
- final TableRowContainer newRow = new TableRowContainer(parentArea);
- newRow.foLink = newRow.getLink(generatedBy);
- newRow.registerLink(generatedBy);
-
- /* Non-standard initialization of progression dimension. */
- int startingPD = generatedBy.traitBpDimensionMin(newRow);
- if (startingPD == FoPropertyConstants.DIMENSION_AUTO) {
- startingPD = 0;
- }
- newRow.setProgressionDimension(startingPD);
-
- newRow.initializeAnteriorSpace();
- return newRow;
- }
-
- /**
- * {@inheritDoc}
- * Overrides superclass method because TableRowContainer contents stack in
- * the IPD.
- */
- @Override
- public RelativeAxis contentStackingAxis() {
- return RelativeAxis.INLINE_PROGRESSION;
- }
-
- @Override
- public TableCellRa makeTableCellArea(final TableCell node) {
- final TableCellRa newCell = TableCellRa.makeTableCellRA(node, this);
- this.children.add(newCell);
- return newCell;
- }
-
- @Override
- public String getAreaName() {
- return "table-row";
- }
-
- @Override
- public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
- return visitor.visit(this);
- }
-
- @Override
- public int crIpd() {
- return crIPDBlockArea();
- }
-
- @Override
- public int crBpd() {
- return this.getProgressionDimension();
- }
-
- @Override
- public AbstractTablePartContainer getParent() {
- return this.parent;
- }
-
- @Override
- public void setParent(final AreaNode4a node) throws AreaTreeException {
- if (node instanceof AbstractTablePartContainer) {
- this.parent = (AbstractTablePartContainer) node;
- } else {
- throw new AreaTreeException("Parent of TableRowContainer must "
- + "be an AbstractTableContainer");
- }
- }
-
- @Override
- public List<TableCellRa> getChildren() {
- return this.children;
- }
-
- @Override
- public Area4a getOverflowArea(final Area4a childRequesting)
- throws AreaTreeException {
- return ancestorArea().getOverflowArea(this);
- }
-
- @Override
- public void setProgressionDimension(final int progressionDimension) {
- setParentPD(progressionDimension);
- this.progressionDimension = progressionDimension;
- }
-
- @Override
- public void incrementProgressionDimension(final int incrementAmount) {
- incrementParentPD(incrementAmount);
- this.progressionDimension += incrementAmount;
- }
-
- @Override
- public int getProgressionDimension() {
- return this.progressionDimension;
- }
-
- /**
- * Resets the progression dimension for this row by polling the cells to
- * see whether their content BPD has changed.
- * @see ListItemArea#resetProgressionDimension()
- */
- public void resetProgressionDimension() {
- int maxCellBPD = 0;
- for (TableCellRa cell : this.children) {
- final int cellHeight = cell.getContentBPD();
- if (cellHeight > maxCellBPD) {
- maxCellBPD = cellHeight;
- }
- }
- if (maxCellBPD != this.progressionDimension) {
- this.incrementProgressionDimension(maxCellBPD
- - this.progressionDimension);
- }
- }
-
- @Override
- public Graphic getGraphic() {
- return this.traitBackgroundImage();
- }
-
- @Override
- protected boolean optimize() {
- this.optimizeChildren();
- return false;
- }
-
- @Override
- public Link<TableRow> getFoLink() {
- return this.foLink;
- }
-
- @Override
- public TableRow traitGeneratedBy() {
- return (TableRow) this.getFoLink().getGenerator();
- }
-
- @Override
- public boolean isAbsolutelyPositioned() {
- return false;
- }
-
- @Override
- public Graphic traitBackgroundImage() {
- return this.traitGeneratedBy().traitBackgroundImage(this);
- }
-
- @Override
- public Color traitBackgroundColor() {
- return traitGeneratedBy().traitBackgroundColor(this);
- }
-
- @Override
- public BackgroundRepeat traitBackgroundRepeat() {
- return traitGeneratedBy().traitBackgroundRepeat(this);
- }
-
- @Override
- public int traitBorderStartWidth() {
- return 0;
- }
-
- @Override
- public int traitBorderEndWidth() {
- return 0;
- }
-
- @Override
- public int traitBorderBeforeWidth() {
- return 0;
- }
-
- @Override
- public int traitBorderAfterWidth() {
- return 0;
- }
-
- @Override
- public int traitPaddingStart() {
- return 0;
- }
-
- @Override
- public int traitPaddingEnd() {
- return 0;
- }
-
- @Override
- public int traitPaddingBefore() {
- return 0;
- }
-
- @Override
- public int traitPaddingAfter() {
- return 0;
- }
-
- @Override
- public int traitSpaceBeforeOptimum() {
- return 0;
- }
-
- @Override
- public int traitSpaceAfterOptimum() {
- return 0;
- }
-
- @Override
- public int traitEndIndent() {
- return 0;
- }
-
- @Override
- public int traitStartIndent() {
- return 0;
- }
-
- @Override
- public int traitIPDimensionOpt() {
- return -1;
- }
-
-}
Copied: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer4a.java (from rev 12325, trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer.java)
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer4a.java (rev 0)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer4a.java 2022-01-06 12:22:28 UTC (rev 12347)
@@ -0,0 +1,307 @@
+/*
+ * Copyright 2004 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.area;
+
+import org.foray.area.link.Link;
+
+import org.axsl.area.AreaTreeException;
+import org.axsl.area.TableRowContainer;
+import org.axsl.common.value.BackgroundRepeat;
+import org.axsl.common.value.FoPropertyConstants;
+import org.axsl.common.value.RelativeAxis;
+import org.axsl.fotree.fo.GraftingPoint;
+import org.axsl.fotree.fo.TableCell;
+import org.axsl.fotree.fo.TableRow;
+import org.axsl.galley.GalleyVisitor;
+import org.axsl.galley.GalleyVisitorException;
+import org.axsl.graphic.Graphic;
+
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * Class representing the areas <em>returned by</em> an fo:table-row object.
+ * Note that fo:table-row does not really generate any areas.
+ */
+public final class TableRowContainer4a extends ContainerRa implements TableRowContainer {
+
+ /** The link to the FO tree. */
+ private Link<TableRow> foLink;
+
+ /** The parent of this node. */
+ private AbstractTablePartContainer parent;
+
+ /** The children of this node. */
+ private List<TableCellRa> children = new ArrayList<TableCellRa>();
+
+ /** See {@link #getProgressionDimension()} for a description of
+ * "progression dimension". */
+ private int progressionDimension = 0;
+
+ /**
+ * Private Constructor.
+ * Use {@link AbstractTablePartContainer#makeTableRowContainer(TableRow,
+ * GraftingPoint)} to create an instance.
+ * @param parentArea The parent area.
+ */
+ private TableRowContainer4a(final AbstractTablePartContainer parentArea) {
+ this.parent = parentArea;
+ }
+
+ /**
+ * Package-visible factory method.
+ * @param generatedBy The FO node generating this area.
+ * @param parentArea The parent area.
+ * @return The new instance.
+ */
+ static TableRowContainer4a makeTableRowContainer(final TableRow generatedBy,
+ final AbstractTablePartContainer parentArea) {
+ final TableRowContainer4a newRow = new TableRowContainer4a(parentArea);
+ newRow.foLink = newRow.getLink(generatedBy);
+ newRow.registerLink(generatedBy);
+
+ /* Non-standard initialization of progression dimension. */
+ int startingPD = generatedBy.traitBpDimensionMin(newRow);
+ if (startingPD == FoPropertyConstants.DIMENSION_AUTO) {
+ startingPD = 0;
+ }
+ newRow.setProgressionDimension(startingPD);
+
+ newRow.initializeAnteriorSpace();
+ return newRow;
+ }
+
+ /**
+ * {@inheritDoc}
+ * Overrides superclass method because TableRowContainer contents stack in
+ * the IPD.
+ */
+ @Override
+ public RelativeAxis contentStackingAxis() {
+ return RelativeAxis.INLINE_PROGRESSION;
+ }
+
+ @Override
+ public TableCellRa makeTableCellArea(final TableCell node) {
+ final TableCellRa newCell = TableCellRa.makeTableCellRA(node, this);
+ this.children.add(newCell);
+ return newCell;
+ }
+
+ @Override
+ public String getAreaName() {
+ return "table-row";
+ }
+
+ @Override
+ public <T> T acceptVisitor(final GalleyVisitor<T> visitor) throws GalleyVisitorException {
+ return visitor.visit(this);
+ }
+
+ @Override
+ public int crIpd() {
+ return crIPDBlockArea();
+ }
+
+ @Override
+ public int crBpd() {
+ return this.getProgressionDimension();
+ }
+
+ @Override
+ public AbstractTablePartContainer getParent() {
+ return this.parent;
+ }
+
+ @Override
+ public void setParent(final AreaNode4a node) throws AreaTreeException {
+ if (node instanceof AbstractTablePartContainer) {
+ this.parent = (AbstractTablePartContainer) node;
+ } else {
+ throw new AreaTreeException("Parent of TableRowContainer must "
+ + "be an Abstract...
[truncated message content] |
