[FOray-commit] SF.net SVN: foray:[12276] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray:[12276] trunk/foray
|
From: <vic...@us...> - 2021-12-25 18:21:11
|
Revision: 12276
http://sourceforge.net/p/foray/code/12276
Author: victormote
Date: 2021-12-25 18:21:08 +0000 (Sat, 25 Dec 2021)
Log Message:
-----------
Conform to aXSL changes: Rename remaining types to conform to new Galley naming convention.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/main/java/org/foray/area/ExternalGraphicArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/ListBlockArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/MainRa.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRa.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRaBody.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
trunk/foray/foray-render/src/main/java/org/foray/render/PrintRenderer.java
trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java
trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java
trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java
trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java
trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java
trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java
trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java
trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/ExternalGraphicArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/ExternalGraphicArea.java 2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ExternalGraphicArea.java 2021-12-25 18:21:08 UTC (rev 12276)
@@ -33,6 +33,7 @@
import org.axsl.area.AreaTreeException;
import org.axsl.fotree.fo.ExternalGraphic;
import org.axsl.fotree.fo.GraftingPoint;
+import org.axsl.galley.ExternalGraphicAreaG5;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
import org.axsl.graphic.Graphic;
@@ -44,8 +45,7 @@
/**
* Area containing an external-graphic.
*/
-public final class ExternalGraphicArea extends AbstractInlineArea
- implements org.axsl.galley.ExternalGraphicArea,
+public final class ExternalGraphicArea extends AbstractInlineArea implements ExternalGraphicAreaG5,
org.axsl.area.NormalInlineArea {
/** The parent of this node. The parent can be either a {@link LineArea4a}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineArea.java 2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineArea.java 2021-12-25 18:21:08 UTC (rev 12276)
@@ -37,6 +37,7 @@
import org.axsl.fotree.fo.Inline;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.InlineAreaG5;
import org.axsl.graphic.Graphic;
import java.awt.Color;
@@ -44,8 +45,7 @@
/**
* Areas generated by the fo:inline object.
*/
-public final class InlineArea extends AbstractAncestralInlineArea
- implements org.axsl.galley.InlineArea,
+public final class InlineArea extends AbstractAncestralInlineArea implements InlineAreaG5,
org.axsl.area.AncestralNormalInlineArea {
/** The parent of this node. The parent can be either a {@link LineArea4a}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.java 2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.java 2021-12-25 18:21:08 UTC (rev 12276)
@@ -42,6 +42,7 @@
import org.axsl.fotree.fo.prop.LeaderPatternWidthPa;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.LeaderAreaG5;
import java.awt.Color;
@@ -68,8 +69,7 @@
* {@link #dotLeaderText()} for dot leaders.</li>
* </ul>
*/
-public final class LeaderArea extends AbstractAncestralInlineArea
- implements org.axsl.galley.LeaderArea,
+public final class LeaderArea extends AbstractAncestralInlineArea implements LeaderAreaG5,
org.axsl.area.AncestralNormalInlineArea {
/** The parent of this node. The parent can be either a {@link LineArea4a}
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/ListBlockArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/ListBlockArea.java 2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListBlockArea.java 2021-12-25 18:21:08 UTC (rev 12276)
@@ -37,6 +37,7 @@
import org.axsl.fotree.fo.ListItem;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
+import org.axsl.galley.ListBlockAreaG5;
import java.util.ArrayList;
import java.util.List;
@@ -44,8 +45,7 @@
/**
* Area containing all or part of a list-block.
*/
-public final class ListBlockArea extends ContainerRa
- implements org.axsl.galley.ListBlockArea, org.axsl.area.ListBlockArea {
+public final class ListBlockArea extends ContainerRa implements ListBlockAreaG5, org.axsl.area.ListBlockArea {
/** The "generated-by" trait, as defined in Section 6.1.1. */
private Linkage generatedBy;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/MainRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/MainRa.java 2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/MainRa.java 2021-12-25 18:21:08 UTC (rev 12276)
@@ -39,7 +39,7 @@
import org.axsl.fotree.fo.RegionBody;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.MainReferenceArea;
+import org.axsl.galley.MainReferenceAreaG5;
import java.util.ArrayList;
import java.util.List;
@@ -48,7 +48,7 @@
* Manages the main-reference-area. Its parent should always be an instance of
* RegionRaBody, and its children should always be instances of SpanRa.
*/
-public final class MainRa extends AreaFixed implements MainReferenceArea,
+public final class MainRa extends AreaFixed implements MainReferenceAreaG5,
org.axsl.area.MainRefArea {
/** A definitely-not-sacred legacy span safety factor. It appears to be
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRa.java 2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRa.java 2021-12-25 18:21:08 UTC (rev 12276)
@@ -46,7 +46,7 @@
import org.axsl.fotree.fo.Table;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.RegionArea;
+import org.axsl.galley.RegionAreaG5;
import org.axsl.graphic.Graphic;
import java.awt.Color;
@@ -56,8 +56,7 @@
/**
* This class is used to manage a region-reference-area.
*/
-public final class RegionRa extends AreaFixed implements RegionArea,
- org.axsl.area.RegionRefArea {
+public final class RegionRa extends AreaFixed implements RegionAreaG5, org.axsl.area.RegionRefArea {
/** The "generated-by" trait, as defined in Section 6.1.1. */
private Linkage generatedBy;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRaBody.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRaBody.java 2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionRaBody.java 2021-12-25 18:21:08 UTC (rev 12276)
@@ -38,7 +38,7 @@
import org.axsl.fotree.fo.SimplePageMaster;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.RegionArea;
+import org.axsl.galley.RegionAreaG5;
import org.axsl.graphic.Graphic;
import java.awt.Color;
@@ -48,8 +48,7 @@
/**
* Area containing a region-body.
*/
-public final class RegionRaBody extends AreaFixed implements RegionArea,
- org.axsl.area.RegionBodyRefArea {
+public final class RegionRaBody extends AreaFixed implements RegionAreaG5, org.axsl.area.RegionBodyRefArea {
/* TODO: Why doesn't this class extend RegionRa? */
/** The "generated-by" trait, as defined in Section 6.1.1. */
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 2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java 2021-12-25 18:21:08 UTC (rev 12276)
@@ -45,7 +45,7 @@
import org.axsl.fotree.fo.TableCell;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.TableCellArea;
+import org.axsl.galley.TableCellAreaG5;
import org.axsl.graphic.Graphic;
import java.awt.Color;
@@ -55,8 +55,7 @@
/**
* Area containing all or part of a table-cell.
*/
-public final class TableCellRa extends ContainerRa implements TableCellArea,
- org.axsl.area.TableCellArea {
+public final class TableCellRa extends ContainerRa implements TableCellAreaG5, org.axsl.area.TableCellArea {
/** The "generated-by" trait, as defined in Section 6.1.1. */
private Linkage generatedBy;
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 2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java 2021-12-25 18:21:08 UTC (rev 12276)
@@ -45,7 +45,7 @@
import org.axsl.galley.BackgroundAreaG5;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
-import org.axsl.galley.TableArea;
+import org.axsl.galley.TableAreaG5;
import org.axsl.graphic.Graphic;
import java.awt.Color;
@@ -55,8 +55,7 @@
/**
* Area containing part or all of a {@link Table}.
*/
-public final class TableRa extends ContainerRa implements TableArea,
- org.axsl.area.TableArea {
+public final class TableRa extends ContainerRa implements TableAreaG5, org.axsl.area.TableArea {
/** Constant indicating the minimum column width (10 points), expressed in
* millipoints, that is, 10,000. */
Modified: trunk/foray/foray-render/src/main/java/org/foray/render/PrintRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/PrintRenderer.java 2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/PrintRenderer.java 2021-12-25 18:21:08 UTC (rev 12276)
@@ -34,7 +34,7 @@
import org.axsl.galley.BorderPaddingAreaG5;
import org.axsl.galley.GalleyVisitorException;
import org.axsl.galley.GlyphAreaSequenceG5;
-import org.axsl.galley.LeaderArea;
+import org.axsl.galley.LeaderAreaG5;
import org.axsl.output.DocumentConfiguration;
import java.awt.Color;
@@ -170,7 +170,7 @@
}
@Override
- public Void visit(final LeaderArea area) throws GalleyVisitorException {
+ public Void visit(final LeaderAreaG5 area) throws GalleyVisitorException {
// Handle text decoration.
renderGenericSpace(area);
Modified: trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java 2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java 2021-12-25 18:21:08 UTC (rev 12276)
@@ -45,7 +45,7 @@
import org.axsl.galley.BlockContainerAreaG5;
import org.axsl.galley.BookmarkTreeG5;
import org.axsl.galley.BorderPaddingAreaG5;
-import org.axsl.galley.ExternalGraphicArea;
+import org.axsl.galley.ExternalGraphicAreaG5;
import org.axsl.galley.FootnoteAreaG5;
import org.axsl.galley.ForeignContentG5;
import org.axsl.galley.ForeignContentMathG5;
@@ -55,16 +55,16 @@
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
import org.axsl.galley.GlyphAreaSequenceG5;
-import org.axsl.galley.GraphicArea;
-import org.axsl.galley.InlineArea;
-import org.axsl.galley.LineArea;
-import org.axsl.galley.MainReferenceArea;
-import org.axsl.galley.NormalBlockArea;
+import org.axsl.galley.GraphicAreaG5;
+import org.axsl.galley.InlineAreaG5;
+import org.axsl.galley.LineAreaG5;
+import org.axsl.galley.MainReferenceAreaG5;
+import org.axsl.galley.NormalBlockAreaG5;
import org.axsl.galley.PageCollectionG5;
import org.axsl.galley.PageG5;
-import org.axsl.galley.RegionArea;
-import org.axsl.galley.TableArea;
-import org.axsl.galley.TableCellArea;
+import org.axsl.galley.RegionAreaG5;
+import org.axsl.galley.TableAreaG5;
+import org.axsl.galley.TableCellAreaG5;
import org.axsl.graphic.Graphic;
import org.axsl.graphic.GraphicException;
@@ -306,10 +306,10 @@
* scaled during drawing.
* @param clipRectangle The rectangle to which the content should be clipped
* after any scaling.
- * @see #drawGraphic(GraphicArea, Graphic, Rectangle, Rectangle)
+ * @see #drawGraphic(GraphicAreaG5, Graphic, Rectangle, Rectangle)
* @throws GalleyVisitorException For errors during rendering.
*/
- protected abstract void drawGraphic(GraphicArea area, Graphic image,
+ protected abstract void drawGraphic(GraphicAreaG5 area, Graphic image,
Rectangle contentRectangle, Rectangle clipRectangle) throws GalleyVisitorException;
@Override
@@ -330,7 +330,7 @@
* @throws GalleyVisitorException For errors during rendering.
*/
protected void renderRegions(final PageG5 page) throws GalleyVisitorException {
- for (RegionArea regionBody : page.getRegionBodies()) {
+ for (RegionAreaG5 regionBody : page.getRegionBodies()) {
visit(regionBody);
}
if (page.getRegionBefore() != null) {
@@ -356,7 +356,7 @@
}
@Override
- public Void visit(final RegionArea area) throws GalleyVisitorException {
+ public Void visit(final RegionAreaG5 area) throws GalleyVisitorException {
markBackground(area);
renderChildren(area);
return null;
@@ -377,7 +377,7 @@
}
@Override
- public Void visit(final NormalBlockArea area) throws GalleyVisitorException {
+ public Void visit(final NormalBlockAreaG5 area) throws GalleyVisitorException {
markBorder(area);
markBackground(area);
renderChildren(area);
@@ -422,7 +422,7 @@
}
@Override
- public Void visit(final ExternalGraphicArea area) throws GalleyVisitorException {
+ public Void visit(final ExternalGraphicAreaG5 area) throws GalleyVisitorException {
final Graphic graphic = area.getGraphic();
if (graphic == null) {
throw new NullPointerException("Null graphic.");
@@ -436,7 +436,7 @@
}
@Override
- public Void visit(final TableArea area) throws GalleyVisitorException {
+ public Void visit(final TableAreaG5 area) throws GalleyVisitorException {
/* Render background Areas for the table-related background-only
* areas. */
final BackgroundAreaG5[] backgroundAreas = area.getBackgroundAreas();
@@ -455,7 +455,7 @@
}
@Override
- public Void visit(final TableCellArea area) throws GalleyVisitorException {
+ public Void visit(final TableCellAreaG5 area) throws GalleyVisitorException {
markBorder(area);
markBackground(area);
renderChildren(area);
@@ -475,7 +475,7 @@
throws GalleyVisitorException;
@Override
- public Void visit(final LineArea area) throws GalleyVisitorException {
+ public Void visit(final LineAreaG5 area) throws GalleyVisitorException {
renderChildren(area);
return null;
}
@@ -499,13 +499,13 @@
}
@Override
- public Void visit(final MainReferenceArea area) throws GalleyVisitorException {
+ public Void visit(final MainReferenceAreaG5 area) throws GalleyVisitorException {
renderChildren(area);
return null;
}
@Override
- public Void visit(final InlineArea area) throws GalleyVisitorException {
+ public Void visit(final InlineAreaG5 area) throws GalleyVisitorException {
markBorder(area);
markBackground(area);
renderChildren(area);
Modified: trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java 2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java 2021-12-25 18:21:08 UTC (rev 12276)
@@ -49,14 +49,14 @@
import org.axsl.font.FontUse;
import org.axsl.galley.BookmarkTreeG5;
import org.axsl.galley.BorderPaddingAreaG5;
-import org.axsl.galley.ExternalGraphicArea;
+import org.axsl.galley.ExternalGraphicAreaG5;
import org.axsl.galley.ForeignContentMathG5;
import org.axsl.galley.ForeignContentSvgG5;
import org.axsl.galley.ForeignObjectAreaG5;
import org.axsl.galley.GalleyVisitorException;
import org.axsl.galley.GlyphAreaSequenceG5;
-import org.axsl.galley.GraphicArea;
-import org.axsl.galley.LeaderArea;
+import org.axsl.galley.GraphicAreaG5;
+import org.axsl.galley.LeaderAreaG5;
import org.axsl.galley.PageG5;
import org.axsl.graphic.Graphic;
import org.axsl.graphic.GraphicException;
@@ -466,13 +466,13 @@
@Override
- protected void drawGraphic(final GraphicArea area, final Graphic image,
+ protected void drawGraphic(final GraphicAreaG5 area, final Graphic image,
final Rectangle contentRectangle, final Rectangle clipRectangle) {
// TODO: implement this
}
@Override
- public Void visit(final ExternalGraphicArea area) {
+ public Void visit(final ExternalGraphicAreaG5 area) {
final int x = area.crOriginX();
final int y = area.crOriginY();
final int w = area.crIpd();
@@ -675,7 +675,7 @@
@Override
- public Void visit(final LeaderArea area) {
+ public Void visit(final LeaderAreaG5 area) {
final int rx = area.crOriginX();
final int ry = area.crOriginY();
final int w = area.crIpd();
Modified: trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java 2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java 2021-12-25 18:21:08 UTC (rev 12276)
@@ -44,12 +44,12 @@
import org.axsl.common.value.RuleStyle;
import org.axsl.font.Font;
import org.axsl.galley.BookmarkTreeG5;
-import org.axsl.galley.ExternalGraphicArea;
+import org.axsl.galley.ExternalGraphicAreaG5;
import org.axsl.galley.ForeignContentMathG5;
import org.axsl.galley.ForeignContentSvgG5;
import org.axsl.galley.GalleyVisitorException;
import org.axsl.galley.GlyphAreaSequenceG5;
-import org.axsl.galley.GraphicArea;
+import org.axsl.galley.GraphicAreaG5;
import org.axsl.galley.PageG5;
import org.axsl.graphic.Graphic;
import org.axsl.graphic.GraphicException;
@@ -369,7 +369,7 @@
}
@Override
- protected void drawGraphic(final GraphicArea area, final Graphic image,
+ protected void drawGraphic(final GraphicAreaG5 area, final Graphic image,
final Rectangle contentRectangle, final Rectangle clipRectangle) {
// TODO: implement this
}
@@ -519,7 +519,7 @@
}
@Override
- public Void visit(final ExternalGraphicArea area) {
+ public Void visit(final ExternalGraphicAreaG5 area) {
final int x = area.crOriginX();
final int y = area.crOriginY();
final int w = area.crIpd();
Modified: trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java 2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java 2021-12-25 18:21:08 UTC (rev 12276)
@@ -53,7 +53,7 @@
import org.axsl.galley.Galley;
import org.axsl.galley.GalleyVisitorException;
import org.axsl.galley.GlyphAreaSequenceG5;
-import org.axsl.galley.GraphicArea;
+import org.axsl.galley.GraphicAreaG5;
import org.axsl.galley.PageCollectionG5;
import org.axsl.galley.PageG5;
import org.axsl.graphic.Graphic;
@@ -296,7 +296,7 @@
}
@Override
- protected void drawGraphic(final GraphicArea area, final Graphic image,
+ protected void drawGraphic(final GraphicAreaG5 area, final Graphic image,
final Rectangle contentRectangle, final Rectangle clipRectangle)
throws GalleyVisitorException {
final Rectangle2D.Float pdfContentRectangle =
Modified: trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java 2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java 2021-12-25 18:21:08 UTC (rev 12276)
@@ -57,8 +57,8 @@
import org.axsl.galley.ForeignObjectAreaG5;
import org.axsl.galley.GalleyVisitorException;
import org.axsl.galley.GlyphAreaSequenceG5;
-import org.axsl.galley.GraphicArea;
-import org.axsl.galley.LeaderArea;
+import org.axsl.galley.GraphicAreaG5;
+import org.axsl.galley.LeaderAreaG5;
import org.axsl.galley.PageG5;
import org.axsl.graphic.EpsGraphic;
import org.axsl.graphic.Graphic;
@@ -571,7 +571,7 @@
}
@Override
- protected void drawGraphic(final GraphicArea area, final Graphic image,
+ protected void drawGraphic(final GraphicAreaG5 area, final Graphic image,
final Rectangle contentRectangle, final Rectangle clipRectangle)
throws GalleyVisitorException {
if (clipRectangle.width > 0 || clipRectangle.height > 0) {
@@ -611,7 +611,7 @@
* @param clipH The height to which the image should be clipped.
* @throws GalleyVisitorException For errors during rendering.
*/
- protected void drawImageClipped(final GraphicArea area, final Graphic image,
+ protected void drawImageClipped(final GraphicAreaG5 area, final Graphic image,
final int x, final int y, final int clipW,
final int clipH) throws GalleyVisitorException {
try {
@@ -984,7 +984,7 @@
// }
@Override
- public Void visit(final LeaderArea area) throws GalleyVisitorException {
+ public Void visit(final LeaderAreaG5 area) throws GalleyVisitorException {
try {
writeLeaderArea(area);
} catch (final IOException e) {
@@ -998,7 +998,7 @@
* @param area The leader area to be written.
* @throws IOException For errors writing to output.
*/
- private void writeLeaderArea(final LeaderArea area) throws IOException {
+ private void writeLeaderArea(final LeaderAreaG5 area) throws IOException {
final int rx = area.crOriginX();
final int ry = area.crOriginY();
final int w = area.crIpd();
Modified: trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java 2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java 2021-12-25 18:21:08 UTC (rev 12276)
@@ -38,14 +38,14 @@
import org.axsl.galley.AreaG5;
import org.axsl.galley.BookmarkTreeG5;
import org.axsl.galley.BorderPaddingAreaG5;
-import org.axsl.galley.ExternalGraphicArea;
+import org.axsl.galley.ExternalGraphicAreaG5;
import org.axsl.galley.ForeignContentMathG5;
import org.axsl.galley.ForeignContentSvgG5;
import org.axsl.galley.ForeignObjectAreaG5;
import org.axsl.galley.GalleyVisitorException;
import org.axsl.galley.GlyphAreaSequenceG5;
-import org.axsl.galley.GraphicArea;
-import org.axsl.galley.LeaderArea;
+import org.axsl.galley.GraphicAreaG5;
+import org.axsl.galley.LeaderAreaG5;
import org.axsl.galley.PageG5;
import org.axsl.graphic.Graphic;
import org.axsl.graphic.GraphicException;
@@ -371,13 +371,13 @@
}
@Override
- protected void drawGraphic(final GraphicArea area, final Graphic image,
+ protected void drawGraphic(final GraphicAreaG5 area, final Graphic image,
final Rectangle contentRectangle, final Rectangle clipRectangle) {
// TODO: implement this
}
@Override
- public Void visit(final ExternalGraphicArea area) {
+ public Void visit(final ExternalGraphicAreaG5 area) {
final int x = area.crOriginX();
final int y = area.crOriginY();
final int w = area.crIpd();
@@ -516,7 +516,7 @@
}
@Override
- public Void visit(final LeaderArea area) {
+ public Void visit(final LeaderAreaG5 area) {
final int rx = area.crOriginX();
final int ry = area.crOriginY();
final int w = area.crIpd();
Modified: trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java 2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java 2021-12-25 18:21:08 UTC (rev 12276)
@@ -34,12 +34,12 @@
import org.axsl.common.value.RuleStyle;
import org.axsl.galley.BookmarkTreeG5;
-import org.axsl.galley.ExternalGraphicArea;
+import org.axsl.galley.ExternalGraphicAreaG5;
import org.axsl.galley.ForeignContentMathG5;
import org.axsl.galley.ForeignContentSvgG5;
import org.axsl.galley.GalleyVisitorException;
import org.axsl.galley.GlyphAreaSequenceG5;
-import org.axsl.galley.GraphicArea;
+import org.axsl.galley.GraphicAreaG5;
import org.axsl.galley.PageG5;
import org.axsl.graphic.Graphic;
import org.axsl.graphic.GraphicException;
@@ -424,7 +424,7 @@
}
@Override
- protected void drawGraphic(final GraphicArea area, final Graphic image,
+ protected void drawGraphic(final GraphicAreaG5 area, final Graphic image,
final Rectangle contentRectangle, final Rectangle clipRectangle) {
// TODO: implement this
}
@@ -473,7 +473,7 @@
}
@Override
- public Void visit(final ExternalGraphicArea area) {
+ public Void visit(final ExternalGraphicAreaG5 area) {
final int x = area.crOriginX();
final int y = area.crOriginY();
final int w = area.crIpd();
Modified: trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java 2021-12-25 17:59:39 UTC (rev 12275)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java 2021-12-25 18:21:08 UTC (rev 12276)
@@ -46,7 +46,7 @@
import org.axsl.galley.BlockContainerAreaG5;
import org.axsl.galley.BookmarkTreeG5;
import org.axsl.galley.BorderPaddingAreaG5;
-import org.axsl.galley.ExternalGraphicArea;
+import org.axsl.galley.ExternalGraphicAreaG5;
import org.axsl.galley.FootnoteAreaG5;
import org.axsl.galley.ForeignContentMathG5;
import org.axsl.galley.ForeignContentSvgG5;
@@ -54,16 +54,16 @@
import org.axsl.galley.GalleyVisitorException;
import org.axsl.galley.GeneralInlineAreaG5;
import org.axsl.galley.GlyphAreaSequenceG5;
-import org.axsl.galley.GraphicArea;
-import org.axsl.galley.InlineArea;
-import org.axsl.galley.LeaderArea;
-import org.axsl.galley.LineArea;
-import org.axsl.galley.MainReferenceArea;
-import org.axsl.galley.NormalBlockArea;
+import org.axsl.galley.GraphicAreaG5;
+import org.axsl.galley.InlineAreaG5;
+import org.axsl.galley.LeaderAreaG5;
+import org.axsl.galley.LineAreaG5;
+import org.axsl.galley.MainReferenceAreaG5;
+import org.axsl.galley.NormalBlockAreaG5;
import org.axsl.galley.PageG5;
-import org.axsl.galley.RegionArea;
-import org.axsl.galley.TableArea;
-import org.axsl.galley.TableCellArea;
+import org.axsl.galley.RegionAreaG5;
+import org.axsl.galley.TableAreaG5;
+import org.axsl.galley.TableCellAreaG5;
import org.axsl.graphic.Graphic;
import org.axsl.output.DocumentAreaConfiguration;
@@ -109,10 +109,10 @@
@Override
public void render(final PageG5 page) throws GalleyVisitorException {
- final RegionArea before = page.getRegionBefore();
- final RegionArea after = page.getRegionAfter();
- final RegionArea start = page.getRegionStart();
- final RegionArea end = page.getRegionEnd();
+ final RegionAreaG5 before = page.getRegionBefore();
+ final RegionAreaG5 after = page.getRegionAfter();
+ final RegionAreaG5 start = page.getRegionStart();
+ final RegionAreaG5 end = page.getRegionEnd();
final StringBuilder buffer = new StringBuilder();
outputAttribute(buffer, "number", page.getFormattedNumber());
this.writeStartTag(page, buffer);
@@ -128,7 +128,7 @@
if (end != null) {
visit(end);
}
- for (RegionArea regionBody : page.getRegionBodies()) {
+ for (RegionAreaG5 regionBody : page.getRegionBodies()) {
visit(regionBody);
}
this.writeEndTag(page);
@@ -217,7 +217,7 @@
}
@Override
- protected void drawGraphic(final GraphicArea area, final Graphic image,
+ protected void drawGraphic(final GraphicAreaG5 area, final Graphic image,
final Rectangle contentRectangle, final Rectangle clipRectangle) {
/* There is nothing to do here. */
}
@@ -234,7 +234,7 @@
}
@Override
- public Void visit(final MainReferenceArea area) throws GalleyVisitorException {
+ public Void visit(final MainReferenceAreaG5 area) throws GalleyVisitorException {
final StringBuilder buffer = new StringBuilder();
outputCommonAttributes(area, buffer);
writeStartTag(area, buffer);
@@ -245,7 +245,7 @@
}
@Override
- public Void visit(final RegionArea area) throws GalleyVisitorException {
+ public Void visit(final RegionAreaG5 area) throws GalleyVisitorException {
final StringBuilder buffer = new StringBuilder();
outputCommonAttributes(area, buffer);
writeStartTag(area, buffer);
@@ -286,7 +286,7 @@
}
@Override
- public Void visit(final NormalBlockArea area) throws GalleyVisitorException {
+ public Void visit(final NormalBlockAreaG5 area) throws GalleyVisitorException {
final StringBuilder buffer = new StringBuilder();
outputCommonAttributes(area, buffer);
writeStartTag(area, buffer);
@@ -329,7 +329,7 @@
}
@Override
- public Void visit(final ExternalGraphicArea area) {
+ public Void visit(final ExternalGraphicAreaG5 area) {
final StringBuilder attributes = new StringBuilder();
outputCommonAttributes(area, attributes);
final URL url = area.getGraphic().getUrl();
@@ -348,7 +348,7 @@
}
@Override
- public Void visit(final LineArea area) throws GalleyVisitorException {
+ public Void visit(final LineAreaG5 area) throws GalleyVisitorException {
if (isCoarseXml()) {
return null;
}
@@ -370,7 +370,7 @@
}
@Override
- public Void visit(final LeaderArea area) {
+ public Void visit(final LeaderAreaG5 area) {
if (isCoarseXml()) {
return null;
}
@@ -420,7 +420,7 @@
}
@Override
- public Void visit(final InlineArea area) throws GalleyVisitorException {
+ public Void visit(final InlineAreaG5 area) throws GalleyVisitorException {
final StringBuilder buffer = new StringBuilder();
outputCommonAttributes(area, buffer);
writeStartTag(area, buffer);
@@ -431,7 +431,7 @@
}
@Override
- public Void visit(final TableArea area) throws GalleyVisitorException {
+ public Void visit(final TableAreaG5 area) throws GalleyVisitorException {
final StringBuilder buffer = new StringBuilder();
outputCommonAttributes(area, buffer);
writeStartTag(area, buffer);
@@ -442,7 +442,7 @@
}
@Override
- public Void visit(final TableCellArea area) throws GalleyVisitorException {
+ public Void visit(final TableCellAreaG5 area) throws GalleyVisitorException {
final StringBuilder buffer = new StringBuilder();
outputCommonAttributes(area, buffer);
writeStartTag(area, buffer);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
