[FOray-commit] SF.net SVN: foray: [7345] trunk/foray/foray-areatree/src/java/org/foray/area
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray: [7345] trunk/foray/foray-areatree/src/java/org/foray/area
|
From: <vic...@us...> - 2006-05-31 19:42:52
|
Revision: 7345 Author: victormote Date: 2006-05-31 12:42:17 -0700 (Wed, 31 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7345&view=rev Log Message: ----------- Consolidate Area type constants in a new Common class. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java trunk/foray/foray-areatree/src/java/org/foray/area/GenericContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableColumnRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -42,47 +42,6 @@ public abstract class AreaNode extends OrderedTreeNode implements org.axsl.areaR.AreaNode, org.axsl.areaW.AreaNode { - public static final byte AREATYPE_BLOCK = 1; - public static final byte AREATYPE_FOREIGN_OBJECT = 2; - public static final byte AREATYPE_BLOCK_CONTAINER = 3; - public static final byte AREATYPE_BODY_AREA_CONTAINER = 4; - public static final byte AREATYPE_DISPLAY_SPACE = 5; - public static final byte AREATYPE_LINE = 6; - public static final byte AREATYPE_IMAGE = 7; - public static final byte AREATYPE_SVG = 8; - public static final byte AREATYPE_INLINE_SPACE = 9; - public static final byte AREATYPE_LEADER = 10; - public static final byte AREATYPE_WORD = 11; - public static final byte AREATYPE_EXTENSION = 12; - public static final byte AREATYPE_PAGE = 13; - public static final byte AREATYPE_PAGE_COLLECTION = 14; - public static final byte AREATYPE_REGION_RA = 15; - public static final byte AREATYPE_MAIN_RA = 16; - public static final byte AREATYPE_FOOTNOTE_RA = 17; - public static final byte AREATYPE_BEFORE_FLOAT_RA = 18; - public static final byte AREATYPE_SPAN_RA = 19; - public static final byte AREATYPE_COLUMN_RA = 20; - public static final byte AREATYPE_TABLE_RA = 21; - public static final byte AREATYPE_GENERIC_CONTAINER = 22; - public static final byte AREATYPE_TABLE_CELL_RA = 23; - public static final byte AREATYPE_AREA_TREE = 24; - public static final byte AREATYPE_TABLE_COLUMN_RA = 25; - public static final byte AREATYPE_TABLE_ROW_RA = 26; - public static final byte AREATYPE_TABLE_BODY_RA = 27; - public static final byte AREATYPE_TABLE_HEADER_RA = 28; - public static final byte AREATYPE_TABLE_FOOTER_RA = 29; - public static final byte AREATYPE_BOOKMARK = 30; - public static final byte AREATYPE_DESTINATION = 31; - public static final byte AREATYPE_BLOCK_GROUP = 32; - public static final byte AREATYPE_TEXT_AREA = 33; - public static final byte AREATYPE_PAGE_NUMBER_CITATION_AREA = 34; - public static final byte AREATYPE_BOOKMARK_TREE = 35; - public static final byte AREATYPE_BOOKMARK_TITLE = 36; - public static final byte AREATYPE_PAGE_NUMBER_AREA = 37; - public static final byte AREATYPE_INLINE = 38; - public static final byte AREATYPE_BASIC_LINK = 39; - public static final byte AREATYPE_TABLE_CONTROL = 40; - protected ArrayList children = new ArrayList(); /* Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -29,6 +29,7 @@ import org.axsl.areaW.AreaTreeListener; import org.axsl.areaW.AreaWException; import org.axsl.areaW.PageArea; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; import org.axsl.foR.fo.Bookmark; import org.axsl.foR.fo.BookmarkTitle; @@ -107,7 +108,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_AREA_TREE; + return ConstantsAreaTree.AREATYPE_AREA_TREE; } /** Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.BasicLink; /** @@ -38,7 +39,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_BASIC_LINK; + return ConstantsAreaTree.AREATYPE_BASIC_LINK; } public int crIPD() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -25,6 +25,7 @@ package org.foray.area; import org.axsl.areaW.AreaWException; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; /** @@ -39,7 +40,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_BEFORE_FLOAT_RA; + return ConstantsAreaTree.AREATYPE_BEFORE_FLOAT_RA; } public int crBPD() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -25,6 +25,7 @@ package org.foray.area; import org.axsl.areaR.BlockContainerArea; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; /** @@ -60,7 +61,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_BLOCK_CONTAINER; + return ConstantsAreaTree.AREATYPE_BLOCK_CONTAINER; } } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -25,6 +25,7 @@ package org.foray.area; import org.axsl.areaR.BookmarkTitleArea; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.Bookmark; /** @@ -38,7 +39,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_BOOKMARK; + return ConstantsAreaTree.AREATYPE_BOOKMARK; } public BookmarkTitleArea getBookmarkTitle() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.BookmarkTitle; /** @@ -37,7 +38,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_BOOKMARK_TITLE; + return ConstantsAreaTree.AREATYPE_BOOKMARK_TITLE; } public String getTitleText() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.BookmarkTree; /** @@ -37,7 +38,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_BOOKMARK_TREE; + return ConstantsAreaTree.AREATYPE_BOOKMARK_TREE; } } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.ExternalGraphic; import org.axsl.graphicR.Graphic; @@ -45,7 +46,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_IMAGE; + return ConstantsAreaTree.AREATYPE_IMAGE; } public void initializeProgressionDimension() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -25,6 +25,7 @@ package org.foray.area; import org.axsl.areaW.AreaWException; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; /** @@ -37,7 +38,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_FOOTNOTE_RA; + return ConstantsAreaTree.AREATYPE_FOOTNOTE_RA; } public int crBPD() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.ForeignXML; import org.axsl.foR.fo.InstreamForeignObject; import org.axsl.foR.svg.SVGElement; @@ -47,7 +48,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_FOREIGN_OBJECT; + return ConstantsAreaTree.AREATYPE_FOREIGN_OBJECT; } public boolean traitIsReferenceArea() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/GenericContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/GenericContainer.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/GenericContainer.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; public class GenericContainer extends ContainerRA @@ -53,7 +54,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_GENERIC_CONTAINER; + return ConstantsAreaTree.AREATYPE_GENERIC_CONTAINER; } } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.Inline; /** @@ -38,7 +39,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_INLINE; + return ConstantsAreaTree.AREATYPE_INLINE; } } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -28,6 +28,7 @@ import org.axsl.foR.fo.Leader; import org.axsl.common.Constants; +import org.axsl.common.ConstantsAreaTree; /** * An Area containing a leader item. @@ -63,7 +64,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_LEADER; + return ConstantsAreaTree.AREATYPE_LEADER; } /** Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -26,6 +26,7 @@ import org.axsl.areaW.AreaWException; import org.axsl.common.Constants; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FONode; import org.axsl.foR.FOText; import org.axsl.foR.FObj; @@ -427,7 +428,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_LINE; + return ConstantsAreaTree.AREATYPE_LINE; } /** Modified: trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -27,6 +27,7 @@ import org.axsl.areaR.MainReferenceArea; import org.axsl.areaW.AreaWException; import org.axsl.common.Constants; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; import org.axsl.foR.fo.Block; import org.axsl.foR.fo.BlockContainer; @@ -48,7 +49,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_MAIN_RA; + return ConstantsAreaTree.AREATYPE_MAIN_RA; } /** Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -25,6 +25,7 @@ package org.foray.area; import org.axsl.areaW.AreaWException; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; import org.axsl.foR.fo.ListItem; import org.axsl.foR.fo.ListItemBody; @@ -74,7 +75,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_BLOCK; + return ConstantsAreaTree.AREATYPE_BLOCK; } public Area getOverflowArea(Area childRequesting) throws AreaWException { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -26,6 +26,7 @@ import org.axsl.areaR.NormalFlowArea; import org.axsl.areaW.AreaWException; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; /** @@ -56,7 +57,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_COLUMN_RA; + return ConstantsAreaTree.AREATYPE_COLUMN_RA; } public SpanRA getParentSpan() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -27,6 +27,7 @@ import org.axsl.areaW.AreaWException; import org.axsl.areaW.PageArea; import org.axsl.common.Constants; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FOTreeException; import org.axsl.foR.FObj; import org.axsl.foR.fo.PageSequence; @@ -303,7 +304,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_PAGE_COLLECTION; + return ConstantsAreaTree.AREATYPE_PAGE_COLLECTION; } public AreaTree getAreaTree() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; /** @@ -46,7 +47,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_PAGE_NUMBER_AREA; + return ConstantsAreaTree.AREATYPE_PAGE_NUMBER_AREA; } } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; public class PageNumberCitationArea extends AbstractInlineArea @@ -49,7 +50,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_PAGE_NUMBER_CITATION_AREA; + return ConstantsAreaTree.AREATYPE_PAGE_NUMBER_CITATION_AREA; } /** Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -29,6 +29,7 @@ import org.axsl.areaR.RegionBodyArea; import org.axsl.areaW.AreaWException; import org.axsl.common.Constants; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; import org.axsl.foR.fo.Marker; import org.axsl.foR.fo.PageSequence; @@ -344,7 +345,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_PAGE; + return ConstantsAreaTree.AREATYPE_PAGE; } public int crIPD() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -25,6 +25,7 @@ package org.foray.area; import org.axsl.areaR.RegionArea; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.Region; import org.axsl.foR.fo.RegionAfter; import org.axsl.foR.fo.RegionBefore; @@ -50,7 +51,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_REGION_RA; + return ConstantsAreaTree.AREATYPE_REGION_RA; } public int crBPD() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -28,6 +28,7 @@ import org.axsl.areaR.RegionBodyArea; import org.axsl.areaW.AreaWException; import org.axsl.common.Constants; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.RegionBody; import org.axsl.foR.fo.SimplePageMaster; @@ -73,7 +74,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_BODY_AREA_CONTAINER; + return ConstantsAreaTree.AREATYPE_BODY_AREA_CONTAINER; } public int crBPD() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -25,6 +25,7 @@ package org.foray.area; import org.axsl.areaW.AreaWException; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.svg.SVGElement; import org.w3c.dom.svg.SVGDocument; @@ -51,7 +52,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_SVG; + return ConstantsAreaTree.AREATYPE_SVG; } public Area getOverflowArea(Area childRequesting) throws AreaWException { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -27,6 +27,7 @@ import org.axsl.areaR.SpanArea; import org.axsl.areaW.AreaWException; import org.axsl.common.Constants; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; import org.axsl.foR.fo.RegionBody; @@ -119,7 +120,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_SPAN_RA; + return ConstantsAreaTree.AREATYPE_SPAN_RA; } public Area getOverflowArea(Area childRequesting) throws AreaWException { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; public class TableBodyContainer extends AbstractTableContainer @@ -51,7 +52,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_TABLE_BODY_RA; + return ConstantsAreaTree.AREATYPE_TABLE_BODY_RA; } } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -27,6 +27,7 @@ import org.axsl.areaR.TableCellArea; import org.axsl.areaW.TableArea; import org.axsl.common.Constants; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.TableCell; public class TableCellRA extends ContainerRA implements TableCellArea, @@ -77,7 +78,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_TABLE_CELL_RA; + return ConstantsAreaTree.AREATYPE_TABLE_CELL_RA; } /** Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableColumnRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableColumnRA.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableColumnRA.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -26,6 +26,7 @@ import org.axsl.areaR.TableColumnArea; import org.axsl.areaW.TableArea; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; import org.axsl.foR.fo.Table; import org.axsl.foR.fo.TableColumn; @@ -38,7 +39,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_TABLE_COLUMN_RA; + return ConstantsAreaTree.AREATYPE_TABLE_COLUMN_RA; } public int getComputedColumnWidth() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; public class TableFooterContainer extends AbstractTableContainer @@ -51,7 +52,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_TABLE_FOOTER_RA; + return ConstantsAreaTree.AREATYPE_TABLE_FOOTER_RA; } } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -24,6 +24,7 @@ package org.foray.area; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObj; public class TableHeaderContainer extends AbstractTableContainer @@ -51,7 +52,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_TABLE_HEADER_RA; + return ConstantsAreaTree.AREATYPE_TABLE_HEADER_RA; } } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -26,6 +26,7 @@ import org.axsl.areaR.TableArea; import org.axsl.areaW.TableColumnArea; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.Table; import org.axsl.foR.fo.TableColumn; @@ -47,7 +48,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_TABLE_RA; + return ConstantsAreaTree.AREATYPE_TABLE_RA; } /** Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -26,6 +26,7 @@ import org.axsl.areaW.TableCellArea; import org.axsl.common.Constants; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.fo.TableCell; import org.axsl.foR.fo.TableRow; @@ -43,7 +44,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_TABLE_ROW_RA; + return ConstantsAreaTree.AREATYPE_TABLE_ROW_RA; } /* Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java 2006-05-31 19:42:06 UTC (rev 7344) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java 2006-05-31 19:42:17 UTC (rev 7345) @@ -27,6 +27,7 @@ import org.foray.common.XMLCharacter; import org.axsl.common.Constants; +import org.axsl.common.ConstantsAreaTree; import org.axsl.foR.FObjMixed; import org.axsl.foR.fo.Character; import org.axsl.fontR.Font; @@ -204,7 +205,7 @@ } public byte getAreaType() { - return AreaNode.AREATYPE_TEXT_AREA; + return ConstantsAreaTree.AREATYPE_TEXT_AREA; } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
