[FOray-commit] SF.net SVN: foray: [9137] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray: [9137] trunk/foray
|
From: <vic...@us...> - 2007-04-07 19:36:10
|
Revision: 9137
http://svn.sourceforge.net/foray/?rev=9137&view=rev
Author: victormote
Date: 2007-04-07 12:36:02 -0700 (Sat, 07 Apr 2007)
Log Message:
-----------
Conform to axsl changes renaming classes.
Modified Paths:
--------------
trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java
trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.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/PageCollection.java
trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java
trunk/foray/foray-core/src/java/org/foray/core/FOrayDocument.java
trunk/foray/foray-core/src/java/org/foray/core/FOraySession.java
trunk/foray/foray-core/src/java/org/foray/core/FOrayTarget.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineNonText.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FOrayFOTreeServer.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/NamespaceFO.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractFlow.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractPageMaster.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractTablePart.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BidiOverride.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Block.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTree.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ColorProfile.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Float.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/FootnoteBody.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InitialPropertySet.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListBlock.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItem.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemBody.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemLabel.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiCase.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiProperties.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiPropertySet.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiSwitch.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiToggle.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageMasterResolver.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumber.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Region.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBody.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/StaticContent.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SubSequenceSpecifier.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableAndCaption.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCaption.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCell.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableColumn.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableRow.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Title.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Wrapper.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/NamespaceExtensions.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/obj/ContinuedLabel.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/NamespaceSVG.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/SVGElement.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/NamespaceXML.java
trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java
Modified: trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -40,7 +40,7 @@
import org.foray.pioneer.PioneerFactory;
import org.axsl.areaW.AreaTreeFactory;
-import org.axsl.foR.FOTreeFactory;
+import org.axsl.foR.FoTreeFactory;
import org.axsl.fontR.FontException;
import org.axsl.fontR.FontServer;
import org.axsl.graphicR.GraphicServer;
@@ -96,7 +96,7 @@
hyphenServer);
final GraphicServer graphicServer = FOraySpecific.makeGraphicServer(
logger);
- final FOTreeFactory foTreeServer = FOraySpecific.makeFOTreeFactory(
+ final FoTreeFactory foTreeServer = FOraySpecific.makeFOTreeFactory(
logger, sessionConfig, graphicServer, textServer);
final AreaTreeFactory areaTreeFactory =
FOraySpecific.makeAreaTreeFactory(logger, textServer);
@@ -192,7 +192,7 @@
* @return The newly-created FOTreeFactory instance.
* @throws FOrayException For errors creating the server.
*/
- public static FOTreeFactory makeFOTreeFactory(final Log logger,
+ public static FoTreeFactory makeFOTreeFactory(final Log logger,
final SessionConfig configuration,
final GraphicServer graphicServer, final TextServer textServer)
throws FOrayException {
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -35,7 +35,6 @@
import org.axsl.areaW.AreaWException;
import org.axsl.areaW.PageArea;
import org.axsl.foR.FONode;
-import org.axsl.foR.FOTree;
import org.axsl.foR.Fo;
import org.axsl.foR.fo.Bookmark;
import org.axsl.foR.fo.BookmarkTree;
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -32,7 +32,7 @@
import org.axsl.foR.ForeignXML;
import org.axsl.foR.fo.InstreamForeignObject;
import org.axsl.foR.fo.RetrieveMarker;
-import org.axsl.foR.svg.SVGElement;
+import org.axsl.foR.svg.SvgElement;
import java.util.ArrayList;
import java.util.List;
@@ -126,8 +126,8 @@
// Create the reference area for the content.
final ForeignXML foreign = generatedBy.getForeignXML();
- if (foreign instanceof SVGElement) {
- SVGArea.makeSvgArea((SVGElement) foreign, newFoArea,
+ if (foreign instanceof SvgElement) {
+ SVGArea.makeSvgArea((SvgElement) foreign, newFoArea,
retrieveMarker);
}
newFoArea.ancestorLineArea().lineContentChanged();
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -29,7 +29,7 @@
package org.foray.area;
import org.axsl.areaR.RenderVisitor;
-import org.axsl.foR.FOText;
+import org.axsl.foR.FoText;
import org.axsl.foR.fo.ExternalGraphic;
import org.axsl.foR.fo.Inline;
import org.axsl.foR.fo.InstreamForeignObject;
@@ -158,7 +158,7 @@
/**
* {@inheritDoc}
*/
- public TextArea makeTextArea(final FOText foText,
+ public TextArea makeTextArea(final FoText foText,
final int ipd, final int startOffset, final int sizeInChars,
final boolean hasDiscretionaryHyphen,
final boolean hasFauxSmallCaps, final boolean isLastItemOnLine,
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -32,7 +32,7 @@
import org.axsl.foR.fo.FoValue;
import org.axsl.common.LeaderPattern;
import org.axsl.common.RuleStyle;
-import org.axsl.foR.FOText;
+import org.axsl.foR.FoText;
import org.axsl.foR.Fo;
import org.axsl.foR.fo.ExternalGraphic;
import org.axsl.foR.fo.InstreamForeignObject;
@@ -436,7 +436,7 @@
/**
* {@inheritDoc}
*/
- public TextArea makeTextArea(final FOText foText,
+ public TextArea makeTextArea(final FoText foText,
final int ipd, final int startOffset, final int sizeInChars,
final boolean hasDiscretionaryHyphen,
final boolean hasFauxSmallCaps, final boolean isLastItemOnLine,
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -36,8 +36,8 @@
import org.axsl.foR.fo.FoValue;
import org.axsl.common.RelativeAxis;
import org.axsl.foR.FOContext;
-import org.axsl.foR.FOText;
-import org.axsl.foR.FOTextContent;
+import org.axsl.foR.FoText;
+import org.axsl.foR.FoTextContent;
import org.axsl.foR.fo.Block;
import org.axsl.foR.fo.ExternalGraphic;
import org.axsl.foR.fo.InstreamForeignObject;
@@ -950,7 +950,7 @@
* @param context An object that knows how to resolve FO context issues.
* @return True iff a text area should be created for the text item.
*/
- static boolean shouldCreateTextArea(final FOTextContent foText,
+ static boolean shouldCreateTextArea(final FoTextContent foText,
final Area parentArea, final int startOffset, final int sizeInChars,
final boolean isLastItemOnLine, final FOContext context) {
/* If the raw text is empty, don't create the TextArea. */
@@ -1040,7 +1040,7 @@
/**
* {@inheritDoc}
*/
- public TextArea makeTextArea(final FOText foText,
+ public TextArea makeTextArea(final FoText foText,
final int ipd, final int startOffset, final int sizeInChars,
final boolean hasDiscretionaryHyphen,
final boolean hasFauxSmallCaps, final boolean isLastItemOnLine,
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -32,7 +32,7 @@
import org.axsl.areaW.AreaWException;
import org.axsl.areaW.PageArea;
import org.axsl.foR.fo.FoValue;
-import org.axsl.foR.FOTreeException;
+import org.axsl.foR.FoTreeException;
import org.axsl.foR.fo.Marker;
import org.axsl.foR.fo.PageMasterResolver;
import org.axsl.foR.fo.PageSequence;
@@ -211,7 +211,7 @@
SimplePageMaster spm = null;
try {
spm = this.pageMasterResolver.getNextPageMaster(isBlank);
- } catch (final FOTreeException e) {
+ } catch (final FoTreeException e) {
throw new AreaWException(e);
}
final PageRA newPage = PageRA.makePageArea(spm, this);
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -31,7 +31,7 @@
import org.axsl.areaR.RenderVisitor;
import org.axsl.areaW.AreaWException;
import org.axsl.foR.fo.RetrieveMarker;
-import org.axsl.foR.svg.SVGElement;
+import org.axsl.foR.svg.SvgElement;
import org.axsl.graphicR.Graphic;
import org.w3c.dom.svg.SVGDocument;
@@ -66,7 +66,7 @@
* area.
* @return The new instance.
*/
- static SVGArea makeSvgArea(final SVGElement generatedBy,
+ static SVGArea makeSvgArea(final SvgElement generatedBy,
final ForeignObjectArea parentArea,
final RetrieveMarker retrieveMarker) {
final SVGArea newSvgArea = new SVGArea(parentArea);
@@ -81,7 +81,7 @@
*/
public SVGDocument getSVGDocument() {
// Cast verified at construction.
- final SVGElement generatedBy = traitGeneratedBy();
+ final SvgElement generatedBy = traitGeneratedBy();
return generatedBy.getSVGDocument();
}
@@ -139,8 +139,8 @@
/**
* {@inheritDoc}
*/
- public SVGElement traitGeneratedBy() {
- return (SVGElement) this.getLinkage().getFONode();
+ public SvgElement traitGeneratedBy() {
+ return (SvgElement) this.getLinkage().getFONode();
}
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -34,7 +34,7 @@
import org.axsl.areaR.RenderVisitor;
import org.axsl.foR.fo.FoValue;
import org.axsl.foR.FONode;
-import org.axsl.foR.FOTextContent;
+import org.axsl.foR.FoTextContent;
import org.axsl.foR.Fo;
import org.axsl.foR.fo.RetrieveMarker;
import org.axsl.fontR.Font;
@@ -152,7 +152,7 @@
* will be applied.
* @return The newly-created TextArea.
*/
- static TextArea makeTextArea(final FOTextContent generatedBy,
+ static TextArea makeTextArea(final FoTextContent generatedBy,
final LineArea parentArea,
final RetrieveMarker retrieveMarker, final int backingOffset,
final int backingSize, final int progressionDimensionUsed,
@@ -196,7 +196,7 @@
* will be applied.
* @return The newly-created TextArea.
*/
- static TextArea makeTextArea(final FOTextContent generatedBy,
+ static TextArea makeTextArea(final FoTextContent generatedBy,
final AbstractInlineArea parentArea,
final RetrieveMarker retrieveMarker, final int backingOffset,
final int backingSize, final int progressionDimensionUsed,
@@ -322,12 +322,12 @@
* Returns the raw value of the text content backing this area.
* @return The text content backing this area.
*/
- public FOTextContent getTextContent() {
+ public FoTextContent getTextContent() {
/* Do NOT use the traitGeneratedBy() method here, because we need the
* raw value, and this class overrides that method. */
final FONode foNode = this.getLinkage().getFONode();
/* Cast verified at construction. */
- return (FOTextContent) foNode;
+ return (FoTextContent) foNode;
}
/**
Modified: trunk/foray/foray-core/src/java/org/foray/core/FOrayDocument.java
===================================================================
--- trunk/foray/foray-core/src/java/org/foray/core/FOrayDocument.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-core/src/java/org/foray/core/FOrayDocument.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -100,7 +100,7 @@
private List<FOrayTarget> targetList = new ArrayList<FOrayTarget>();
/** The FO tree builder, which handles the SAX events. */
- private org.axsl.foR.FOTree treeBuilder;
+ private org.axsl.foR.FoTree treeBuilder;
/** The current target being processed. */
private FOrayTarget currentTarget;
@@ -417,7 +417,7 @@
* Returns the FOTree for this document.
* @return The FOTree for this document.
*/
- public org.axsl.foR.FOTree getFOTreeBuilder() {
+ public org.axsl.foR.FoTree getFOTreeBuilder() {
return this.treeBuilder;
}
Modified: trunk/foray/foray-core/src/java/org/foray/core/FOraySession.java
===================================================================
--- trunk/foray/foray-core/src/java/org/foray/core/FOraySession.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-core/src/java/org/foray/core/FOraySession.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -30,7 +30,7 @@
import org.axsl.areaW.AreaTreeFactory;
-import org.axsl.foR.FOTreeFactory;
+import org.axsl.foR.FoTreeFactory;
import org.axsl.fontR.FontServer;
import org.axsl.graphicR.GraphicServer;
import org.axsl.hyphenR.HyphenationServer;
@@ -83,7 +83,7 @@
private GraphicServer graphicServer;
/** The FOTree factory for this session. */
- private FOTreeFactory foTreeFactory;
+ private FoTreeFactory foTreeFactory;
/** The AreaTree factory for this session. */
private AreaTreeFactory areaTreeFactory;
@@ -129,7 +129,7 @@
public FOraySession(final Log logger, final SessionConfig configuration,
final FontServer fontServer, final HyphenationServer hyphenServer,
final TextServer textServer, final GraphicServer graphicServer,
- final FOTreeFactory foTreeFactory,
+ final FoTreeFactory foTreeFactory,
final AreaTreeFactory areaTreeFactory,
final LayoutFactory layoutFactory) throws FOrayException {
/* Validate Logger. */
@@ -292,7 +292,7 @@
* Returns the FOTreeFactory.
* @return The FOTreeFactory.
*/
- public FOTreeFactory getFOTreeFactory() {
+ public FoTreeFactory getFOTreeFactory() {
return this.foTreeFactory;
}
Modified: trunk/foray/foray-core/src/java/org/foray/core/FOrayTarget.java
===================================================================
--- trunk/foray/foray-core/src/java/org/foray/core/FOrayTarget.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-core/src/java/org/foray/core/FOrayTarget.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -36,8 +36,8 @@
import org.axsl.areaW.AreaTreeFactory;
import org.axsl.areaW.AreaTreeListener;
import org.axsl.areaW.AreaWException;
-import org.axsl.foR.FOTreeEvent;
-import org.axsl.foR.FOTreeListener;
+import org.axsl.foR.FoTreeEvent;
+import org.axsl.foR.FoTreeListener;
import org.axsl.foR.fo.PageSequence;
import org.axsl.fontR.FontConsumer;
import org.axsl.fontR.FontServer;
@@ -68,7 +68,7 @@
FOTreeBuilder when a PageSequence is created,
and AreaTree when a Page is formatted.<P>
*/
-public class FOrayTarget implements FOTreeListener, AreaTreeListener {
+public class FOrayTarget implements FoTreeListener, AreaTreeListener {
/** Constant indicating whether memory profiling should be performed with
* the Java garbage collector. */
@@ -402,7 +402,7 @@
* do not need to do anything with it, so we ignore it.
* @param event The FOTreeEvent that was fired.
*/
- public void foFObjComplete(final FOTreeEvent event) {
+ public void foFObjComplete(final FoTreeEvent event) {
}
/**
@@ -410,7 +410,7 @@
* FOTreeEvent that is fired when a PageSequence object has been completed.
* @param event the FOTreeEvent that was fired
*/
- public void foPageSequenceComplete(final FOTreeEvent event) {
+ public void foPageSequenceComplete(final FoTreeEvent event) {
try {
final boolean shouldRender = this.getSessionConfig().isModeRender();
if (shouldRender) {
@@ -427,7 +427,7 @@
* is fired when the Document has been completely parsed.
* @param event the FOTreeEvent that was fired
*/
- public void foDocumentComplete(final FOTreeEvent event) {
+ public void foDocumentComplete(final FoTreeEvent event) {
getCreatedAreaTree().createDocumentNodes();
try {
stopRenderer();
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineNonText.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineNonText.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineNonText.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -35,10 +35,10 @@
* Wraps an underlying "real" FOLineNonText along with the context to be used by
* that item for trait resolution.
*/
-public class FOLineNonText implements org.axsl.foR.FOLineNonText {
+public class FOLineNonText implements org.axsl.foR.FoLineNonText {
/** The wrapped non-text item. */
- private org.axsl.foR.FOLineNonText realLineNonText;
+ private org.axsl.foR.FoLineNonText realLineNonText;
/** The FO context for this non-text item. */
private FOContext context;
@@ -48,7 +48,7 @@
* @param realLineNonText The wrapped non-text item.
* @param context The FO context for this non-text item.
*/
- public FOLineNonText(final org.axsl.foR.FOLineNonText realLineNonText,
+ public FOLineNonText(final org.axsl.foR.FoLineNonText realLineNonText,
final FOContext context) {
this.realLineNonText = realLineNonText;
this.context = context;
@@ -109,7 +109,7 @@
/**
* {@inheritDoc}
*/
- public org.axsl.foR.FOLineNonText getContextWrapper(
+ public org.axsl.foR.FoLineNonText getContextWrapper(
final FOContext context) {
/* This *is* the wrapper. */
return this;
@@ -118,7 +118,7 @@
/**
* {@inheritDoc}
*/
- public org.axsl.foR.FOLineNonText getWrapped() {
+ public org.axsl.foR.FoLineNonText getWrapped() {
return this.realLineNonText;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -37,10 +37,10 @@
* Wraps an underlying "real" FOLineText along with the context to be used by
* that item for trait resolution.
*/
-public class FOLineText implements org.axsl.foR.FOLineText {
+public class FOLineText implements org.axsl.foR.FoLineText {
/** The wrapped text item. */
- private org.axsl.foR.FOLineText realLineText;
+ private org.axsl.foR.FoLineText realLineText;
/** The FO context for this text item. */
private FOContext context;
@@ -50,7 +50,7 @@
* @param realLineText The wrapped text item.
* @param context The FO context for this text item.
*/
- public FOLineText(final org.axsl.foR.FOLineText realLineText,
+ public FOLineText(final org.axsl.foR.FoLineText realLineText,
final FOContext context) {
this.realLineText = realLineText;
this.context = context;
@@ -275,7 +275,7 @@
/**
* {@inheritDoc}
*/
- public org.axsl.foR.FOLineText getContextWrapper(final FOContext context) {
+ public org.axsl.foR.FoLineText getContextWrapper(final FOContext context) {
/* This *is* the wrapper. */
return this;
}
@@ -283,7 +283,7 @@
/**
* {@inheritDoc}
*/
- public org.axsl.foR.FOLineText getWrapped() {
+ public org.axsl.foR.FoLineText getWrapped() {
return this.realLineText;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -33,7 +33,7 @@
import org.foray.fotree.fo.obj.Root;
import org.axsl.foR.FOContext;
-import org.axsl.foR.FOTreeException;
+import org.axsl.foR.FoTreeException;
import org.axsl.foR.fo.RetrieveMarker;
import org.apache.commons.logging.Log;
@@ -231,9 +231,9 @@
/**
* Convenience method handling some details of throwing a parsing exception.
* @param message The message indicating the reason for the exception.
- * @throws FOTreeException Always, as that is the purpose of this method.
+ * @throws FoTreeException Always, as that is the purpose of this method.
*/
- public void throwException(final String message) throws FOTreeException {
+ public void throwException(final String message) throws FoTreeException {
throwException(getContextMessage(), message);
}
@@ -241,11 +241,11 @@
* Convenience method handling some details of throwing a parsing exception.
* @param contextMessage The context portion of the exception message.
* @param message The message indicating the reason for the exception.
- * @throws FOTreeException Always, as that is the purpose of this method.
+ * @throws FoTreeException Always, as that is the purpose of this method.
*/
public void throwException(final String contextMessage,
- final String message) throws FOTreeException {
- final FOTreeException exception = new FOTreeException(message);
+ final String message) throws FoTreeException {
+ final FoTreeException exception = new FoTreeException(message);
exception.setContextMessage(contextMessage);
throw exception;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -34,7 +34,7 @@
import org.axsl.foR.fo.FoValue;
import org.axsl.foR.FOContext;
-import org.axsl.foR.FOLineText;
+import org.axsl.foR.FoLineText;
import org.axsl.foR.ProxyFactory;
import org.axsl.foR.fo.Block;
import org.axsl.foR.fo.Leader;
@@ -49,7 +49,7 @@
/**
* A text node in the formatting object tree.
*/
-public class FOText extends FONode implements FOLineText, org.axsl.foR.FOText {
+public class FOText extends FONode implements FoLineText, org.axsl.foR.FoText {
/** Constant indicating that a given character should be discarded. */
public static final char DISCARD_CHAR = 0xFFFF;
@@ -1167,7 +1167,7 @@
/**
* {@inheritDoc}
*/
- public org.axsl.foR.FOLineText getContextWrapper(final FOContext context) {
+ public org.axsl.foR.FoLineText getContextWrapper(final FOContext context) {
final org.axsl.foR.fo.Marker marker = this.ancestorMarker();
if (marker == null) {
return this;
@@ -1178,7 +1178,7 @@
/**
* {@inheritDoc}
*/
- public org.axsl.foR.FOLineText getWrapped() {
+ public org.axsl.foR.FoLineText getWrapped() {
/* This is the wrapped item. */
return this;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -36,9 +36,9 @@
import org.foray.fotree.xml.NamespaceXML;
import org.axsl.foR.PropertyType;
-import org.axsl.foR.FOTreeEvent;
-import org.axsl.foR.FOTreeException;
-import org.axsl.foR.FOTreeListener;
+import org.axsl.foR.FoTreeEvent;
+import org.axsl.foR.FoTreeException;
+import org.axsl.foR.FoTreeListener;
import org.axsl.fontR.FontConsumer;
import org.axsl.graphicR.GraphicServer;
import org.axsl.text.TextServer;
@@ -58,7 +58,7 @@
* SAX Handler that builds the formatting object tree.
*/
public class FOTreeBuilder extends DefaultHandler
- implements org.axsl.foR.FOTree {
+ implements org.axsl.foR.FoTree {
/** The current formatting object being parsed. */
private FObj currentFObj = null;
@@ -71,8 +71,8 @@
/** Collection of objects that have registered to be notified about
* FOTreeEvent firings. */
- private List<FOTreeListener> foTreeListeners
- = new ArrayList<FOTreeListener>();
+ private List<FoTreeListener> foTreeListeners
+ = new ArrayList<FoTreeListener>();
/** Keeps a count of how many FOTreeListeners have requested notification
* of FObj-complete events. */
@@ -133,7 +133,7 @@
currentFObj.addCharacters(data, start, length,
locator.getSystemId(), locator.getLineNumber(),
locator.getColumnNumber());
- } catch (final FOTreeException e) {
+ } catch (final FoTreeException e) {
throw new SAXException(e);
}
}
@@ -156,7 +156,7 @@
try {
currentFObj.end();
currentFObj.validateDescendants();
- } catch (final FOTreeException e) {
+ } catch (final FoTreeException e) {
throw new SAXException(e);
}
notifyFObjComplete(currentFObj);
@@ -232,7 +232,7 @@
rootFObj.addId(fobj);
// Let Root register an unmatched "ref-id", if any.
rootFObj.checkUnmatchedReference(fobj);
- } catch (final FOTreeException e) {
+ } catch (final FoTreeException e) {
throw new SAXException(e);
}
currentFObj = fobj;
@@ -256,16 +256,16 @@
return;
}
if (fobj.getName().equals("root")) {
- final FOTreeException fote = new FOTreeException("Root element is "
+ final FoTreeException fote = new FoTreeException("Root element is "
+ "missing the namespace declaration: "
+ "http://www.w3.org/1999/XSL/Format");
fote.setContextMessage(fobj.getContextMessage());
throw new SAXException(fote);
}
- final FOTreeException fote = new FOTreeException("Root element must be "
+ final FoTreeException fote = new FoTreeException("Root element must be "
+ "root, not " + fobj.getName());
fote.setContextMessage(fobj.getContextMessage());
- throw new SAXException(new FOTreeException(fote));
+ throw new SAXException(new FoTreeException(fote));
}
/**
@@ -320,7 +320,7 @@
* FOTreeEvent firings.
* @param listener the Object which should be notified
*/
- public void registerListener(final FOTreeListener listener) {
+ public void registerListener(final FoTreeListener listener) {
if (listener == null) {
return;
}
@@ -335,7 +335,7 @@
* about FOTreeEvent firings.
* @param listener the Object which should no longer be notified
*/
- public void removeFOTreeListener(final FOTreeListener listener) {
+ public void removeFOTreeListener(final FoTreeListener listener) {
if (listener == null) {
return;
}
@@ -356,9 +356,9 @@
if (this.qtyFObjListeners < 1) {
return;
}
- final FOTreeEvent event = new FOTreeEvent(this, fobj);
+ final FoTreeEvent event = new FoTreeEvent(this, fobj);
for (int i = 0; i < foTreeListeners.size(); i++) {
- final FOTreeListener listener = foTreeListeners.get(i);
+ final FoTreeListener listener = foTreeListeners.get(i);
listener.foFObjComplete(event);
}
}
@@ -369,9 +369,9 @@
* @param pageSequence The PageSequence instance that was just completed.
*/
private void notifyPageSequenceComplete(final PageSequence pageSequence) {
- final FOTreeEvent event = new FOTreeEvent(this, pageSequence);
+ final FoTreeEvent event = new FoTreeEvent(this, pageSequence);
for (int i = 0; i < foTreeListeners.size(); i++) {
- final FOTreeListener listener = foTreeListeners.get(i);
+ final FoTreeListener listener = foTreeListeners.get(i);
listener.foPageSequenceComplete(event);
}
}
@@ -381,9 +381,9 @@
* FOTreeEvent has been fired.
*/
private void notifyDocumentComplete() {
- final FOTreeEvent event = new FOTreeEvent(this);
+ final FoTreeEvent event = new FoTreeEvent(this);
for (int i = 0; i < foTreeListeners.size(); i++) {
- final FOTreeListener listener = foTreeListeners.get(i);
+ final FoTreeListener listener = foTreeListeners.get(i);
listener.foDocumentComplete(event);
}
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -47,7 +47,7 @@
import org.axsl.common.RuleStyle;
import org.axsl.common.Scaling;
import org.axsl.foR.FOContext;
-import org.axsl.foR.FOTreeException;
+import org.axsl.foR.FoTreeException;
import org.axsl.foR.ShadowEffect;
import org.axsl.foR.Shape;
import org.axsl.foR.WritingMode;
@@ -157,12 +157,12 @@
* (used in error messages).
* @param column The columns number of the location of the text being
* added (used in error messages).
- * @throws FOTreeException If the object contains text but is not allowed
+ * @throws FoTreeException If the object contains text but is not allowed
* to.
*/
protected void addCharacters(final char[] data, final int start,
final int length, final String systemId, final int line,
- final int column) throws FOTreeException {
+ final int column) throws FoTreeException {
if (containsText(data, start, length)) {
throwException(getContextMessage(systemId, line, column),
"May not contain non-whitespace text.");
@@ -199,42 +199,42 @@
* validate its ancestry.
* This method is called after object construction, but before any
* properties are parsed.
- * @throws FOTreeException For invalid ancestry.
+ * @throws FoTreeException For invalid ancestry.
*/
- protected abstract void validateAncestry() throws FOTreeException;
+ protected abstract void validateAncestry() throws FoTreeException;
/**
* A hook into the parsing process which allows the subclass instance to
* validate its properties.
* This method is called after all properties have been parsed, but before
* any children have been read.
- * @throws FOTreeException For invalid properties.
+ * @throws FoTreeException For invalid properties.
*/
- protected abstract void validateProperties() throws FOTreeException;
+ protected abstract void validateProperties() throws FoTreeException;
/**
* A hook into the parsing process which allows the subclass instance to
* do some initialization-type work after all of the properties have been
* parsed, but before any of the children have been parsed.
- * @throws FOTreeException For errors during initialization.
+ * @throws FoTreeException For errors during initialization.
*/
- protected abstract void setup() throws FOTreeException;
+ protected abstract void setup() throws FoTreeException;
/**
* A hook into the parsing process which allows the subclass instance to
* validate its descendants.
* This method is called after all children have been parsed.
- * @throws FOTreeException For invalid descendants.
+ * @throws FoTreeException For invalid descendants.
*/
- protected abstract void validateDescendants() throws FOTreeException;
+ protected abstract void validateDescendants() throws FoTreeException;
/**
* This method is a hook into the parsing process, primarily to allow the
* subclass to do some validation or setup work after the object and all of
* its properties have been parsed and all of its children processed.
- * @throws FOTreeException For errors during validation or setup.
+ * @throws FoTreeException For errors during validation or setup.
*/
- protected abstract void end() throws FOTreeException;
+ protected abstract void end() throws FoTreeException;
/**
* Subclasses can set this flag to false if there is a validity problem
@@ -247,9 +247,9 @@
/**
* Ensures that this has no children by throwing an exception if it does.
- * @throws FOTreeException If this has any children.
+ * @throws FoTreeException If this has any children.
*/
- public void validateEmptyContent() throws FOTreeException {
+ public void validateEmptyContent() throws FoTreeException {
if (this.getChildCount() > 0) {
throwException(this.getFullName() + " has NO content.");
}
@@ -258,9 +258,9 @@
/**
* Ensures that this has at least one child by throwing an exception if it
* does not.
- * @throws FOTreeException If this has no children.
+ * @throws FoTreeException If this has no children.
*/
- public void validateAtLeastOneChild() throws FOTreeException {
+ public void validateAtLeastOneChild() throws FoTreeException {
if (this.getChildCount() < 1) {
throwException(this.getFullName() + " must have at least one "
+ "child.");
@@ -271,10 +271,10 @@
* Creates a suitable exception or warning if an object references a
* non-existent page.
* @param invalidReference The page reference that is invalid.
- * @throws FOTreeException If a non-existent page is referenced.
+ * @throws FoTreeException If a non-existent page is referenced.
*/
public void invalidPageReference(final String invalidReference)
- throws FOTreeException {
+ throws FoTreeException {
final String message = this.getFullName() + " references a "
+ "non-existent page: \"" + invalidReference + "\"";
this.throwException(message);
@@ -464,7 +464,7 @@
* @param exception The exception whose location information is to be
* checked.
*/
- public void checkExceptionLocation(final FOTreeException exception) {
+ public void checkExceptionLocation(final FoTreeException exception) {
if (exception.isContextSet()) {
return;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -28,7 +28,7 @@
package org.foray.fotree;
-import org.axsl.foR.FOTreeException;
+import org.axsl.foR.FoTreeException;
/**
* Abstract superclass for mixed content formatting objects.
@@ -111,7 +111,7 @@
/**
* {@inheritDoc}
*/
- protected void end() throws FOTreeException {
+ protected void end() throws FoTreeException {
finalizeText();
textBuffer = null;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOrayFOTreeServer.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOrayFOTreeServer.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOrayFOTreeServer.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -36,7 +36,7 @@
import org.foray.fotree.xml.NamespaceXML;
import org.axsl.foR.PropertyType;
-import org.axsl.foR.FOTreeFactory;
+import org.axsl.foR.FoTreeFactory;
import org.axsl.graphicR.GraphicServer;
import org.axsl.text.TextServer;
@@ -52,7 +52,7 @@
* FOTreeServer encapsulates the FOTree at a high level of abstraction for a
* client application.
*/
-public class FOrayFOTreeServer implements FOTreeFactory {
+public class FOrayFOTreeServer implements FoTreeFactory {
/** The logger. */
private Log logger;
@@ -269,7 +269,7 @@
/**
* {@inheritDoc}
*/
- public org.axsl.foR.FOTree makeFOTree() {
+ public org.axsl.foR.FoTree makeFOTree() {
final FOTreeBuilder foTreeBuilder = new FOTreeBuilder(this,
this.getLogger());
foTreeBuilder.setGraphicServer(this.graphicServer);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -28,7 +28,7 @@
package org.foray.fotree;
-import org.axsl.foR.FOTreeException;
+import org.axsl.foR.FoTreeException;
import org.foray.fotree.fo.obj.InstreamForeignObject;
@@ -100,7 +100,7 @@
/**
* {@inheritDoc}
*/
- protected void validateAncestry() throws FOTreeException {
+ protected void validateAncestry() throws FoTreeException {
if (! (getParent() instanceof InstreamForeignObject)) {
throwException("Foreign XML must be inside "
+ "fo:instream-foreign-object.");
@@ -110,7 +110,7 @@
/**
* {@inheritDoc}
*/
- protected void setup() throws FOTreeException {
+ protected void setup() throws FoTreeException {
return;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -28,7 +28,7 @@
package org.foray.fotree;
-import org.axsl.foR.FOTreeException;
+import org.axsl.foR.FoTreeException;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
@@ -79,12 +79,12 @@
* @param locator The SAX locator.
* @param builder The FO Tree builder.
* @return The newly-created FObj instance.
- * @throws FOTreeException For parsing errors.
+ * @throws FoTreeException For parsing errors.
*/
public FObj parseElement(final String localName,
final FObj currentFObj, final PropertyList list,
final Locator locator,
- final FOTreeBuilder builder) throws FOTreeException {
+ final FOTreeBuilder builder) throws FoTreeException {
final FObj fobj = parseElementForNS(localName, currentFObj,
list, locator);
if (fobj == null) {
@@ -102,11 +102,11 @@
* should be placed.
* @param locator The SAX locator.
* @return The newly-created FObj instance.
- * @throws FOTreeException For parsing errors.
+ * @throws FoTreeException For parsing errors.
*/
protected abstract FObj parseElementForNS(
String localName, FObj currentFObj, PropertyList list,
- Locator locator) throws FOTreeException;
+ Locator locator) throws FoTreeException;
/**
* For the first occurrence of an element that has already been established
@@ -172,11 +172,11 @@
* @param currentFObj The FObj instance to whom the attributes belong.
* @param locator The SAX locator.
* @param builder The FOTree builder.
- * @throws FOTreeException For errors during attribute/property parsing.
+ * @throws FoTreeException For errors during attribute/property parsing.
*/
public abstract void parseAttributes(PropertyList list,
Attributes attlist, FObj currentFObj, Locator locator,
- FOTreeBuilder builder) throws FOTreeException;
+ FOTreeBuilder builder) throws FoTreeException;
/**
* Reads through the list of attributes and returns an array that contains
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/NamespaceFO.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/NamespaceFO.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/NamespaceFO.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -36,7 +36,7 @@
import org.foray.fotree.PropertyList;
import org.foray.fotree.xml.PropertyMakerXML;
-import org.axsl.foR.FOTreeException;
+import org.axsl.foR.FoTreeException;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
@@ -72,7 +72,7 @@
*/
public FObj parseElementForNS(final String localName,
final FObj currentFObj, final PropertyList list,
- final Locator locator) throws FOTreeException {
+ final Locator locator) throws FoTreeException {
return ObjectMakerFO.makeObject(localName, currentFObj, list, locator);
}
@@ -82,7 +82,7 @@
public void parseAttributes(final PropertyList propertyList,
final Attributes attlist, final FObj currentFObj,
final Locator locator, final FOTreeBuilder builder)
- throws FOTreeException {
+ throws FoTreeException {
final int[] attributeSort = sortAttributes(attlist);
try {
makeList(propertyList, attlist, currentFObj, attributeSort, locator,
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractFlow.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractFlow.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractFlow.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -32,7 +32,7 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FOTreeException;
+import org.axsl.foR.FoTreeException;
/**
* Abstract superclass for "flow", and "static-content" objects in XSL-FO.
@@ -56,7 +56,7 @@
/**
* {@inheritDoc}
*/
- protected void validateAncestry() throws FOTreeException {
+ protected void validateAncestry() throws FoTreeException {
if (! (this.getParent() instanceof PageSequence)) {
throwException(getFullName() + " must be child of "
+ "fo:page-sequence.");
@@ -66,7 +66,7 @@
/**
* {@inheritDoc}
*/
- protected void validateProperties() throws FOTreeException {
+ protected void validateProperties() throws FoTreeException {
final String name = traitFlowName();
if (name == null || name.equals("")) {
throwException(getFullName() + "requires a 'flow-name'.");
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractPageMaster.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractPageMaster.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractPageMaster.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -31,7 +31,7 @@
import org.foray.fotree.FObj;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FOTreeException;
+import org.axsl.foR.FoTreeException;
/**
* Abstract superclass for all page master classes.
@@ -56,7 +56,7 @@
/**
* {@inheritDoc}
*/
- protected void validateAncestry() throws FOTreeException {
+ protected void validateAncestry() throws FoTreeException {
if (! (this.getParent() instanceof LayoutMasterSet)) {
throwException(getFullName() + " must be child "
+ "of fo:layout-master-set.");
@@ -66,7 +66,7 @@
/**
* {@inheritDoc}
*/
- protected void validateProperties() throws FOTreeException {
+ protected void validateProperties() throws FoTreeException {
if (traitMasterName() == null) {
logWarning(this.getFullName() + " has no "
+ "master-name, and will be ignored.");
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractTablePart.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractTablePart.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractTablePart.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -33,7 +33,7 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FOTreeException;
+import org.axsl.foR.FoTreeException;
/**
* Abstract superclass for table-body, table-header, and table-footer objects
@@ -70,7 +70,7 @@
/**
* {@inheritDoc}
*/
- protected void validateAncestry() throws FOTreeException {
+ protected void validateAncestry() throws FoTreeException {
if (this.getParent() instanceof Table) {
return;
}
@@ -80,28 +80,28 @@
/**
* {@inheritDoc}
*/
- protected void validateProperties() throws FOTreeException {
+ protected void validateProperties() throws FoTreeException {
return;
}
/**
* {@inheritDoc}
*/
- protected void setup() throws FOTreeException {
+ protected void setup() throws FoTreeException {
return;
}
/**
* {@inheritDoc}
*/
- protected void end() throws FOTreeException {
+ protected void end() throws FoTreeException {
return;
}
/**
* {@inheritDoc}
*/
- protected void validateDescendants() throws FOTreeException {
+ protected void validateDescendants() throws FoTreeException {
this.validateAtLeastOneChild();
validateDescendantTypes();
validateOverlap();
@@ -109,10 +109,10 @@
/**
* Validates that the descendants are all of a correct and consistent type.
- * @throws FOTreeException If the children are not of the correct types, or
+ * @throws FoTreeException If the children are not of the correct types, or
* are not consistent.
*/
- private void validateDescendantTypes() throws FOTreeException {
+ private void validateDescendantTypes() throws FoTreeException {
/* Children must be either all table-rows or all table-cells. */
final FONode firstChild = this.getChildren().get(0);
boolean childIsTableRow = true;
@@ -152,9 +152,9 @@
/**
* Validates that the descendant cells do not overlap each other.
- * @throws FOTreeException If a descendant cell overlaps another cell.
+ * @throws FoTreeException If a descendant cell overlaps another cell.
*/
- private void validateOverlap() throws FOTreeException {
+ private void validateOverlap() throws FoTreeException {
/* Per XSL-FO 1.0, Section 6.7.3, "It is an error if two table-cells
* overlap. Such overlap could be due to the same column-number being
* assigned to two different cells in the same row, or due to column
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -35,7 +35,7 @@
import org.axsl.common.LinkType;
import org.axsl.foR.FOContext;
-import org.axsl.foR.FOTreeException;
+import org.axsl.foR.FoTreeException;
import org.axsl.foR.ProxyFactory;
/**
@@ -60,14 +60,14 @@
/**
* {@inheritDoc}
*/
- protected void validateAncestry() throws FOTreeException {
+ protected void validateAncestry() throws FoTreeException {
return;
}
/**
* {@inheritDoc}
*/
- protected void validateProperties() throws FOTreeException {
+ protected void validateProperties() throws FoTreeException {
if (! isValid()) {
throwException(getFullName() + " must specify internal-destination "
+ "or external-destination.");
@@ -77,14 +77,14 @@
/**
* {@inheritDoc}
*/
- public void setup() throws FOTreeException {
+ public void setup() throws FoTreeException {
return;
}
/**
* {@inheritDoc}
*/
- protected void validateDescendants() throws FOTreeException {
+ protected void validateDescendants() throws FoTreeException {
return;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BidiOverride.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BidiOverride.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BidiOverride.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -32,7 +32,7 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FOTreeException;
+import org.axsl.foR.FoTreeException;
import org.axsl.foR.ProxyFactory;
/**
@@ -58,35 +58,35 @@
/**
* {@inheritDoc}
*/
- protected void validateAncestry() throws FOTreeException {
+ protected void validateAncestry() throws FoTreeException {
return;
}
/**
* {@inheritDoc}
*/
- protected void validateProperties() throws FOTreeException {
+ protected void validateProperties() throws FoTreeException {
return;
}
/**
* {@inheritDoc}
*/
- protected void setup() throws FOTreeException {
+ protected void setup() throws FoTreeException {
return;
}
/**
* {@inheritDoc}
*/
- protected void end() throws FOTreeException {
+ protected void end() throws FoTreeException {
return;
}
/**
* {@inheritDoc}
*/
- protected void validateDescendants() throws FOTreeException {
+ protected void validateDescendants() throws FoTreeException {
return;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Block.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Block.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Block.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -36,7 +36,7 @@
import org.foray.fotree.PropertyList;
import org.axsl.foR.FOContext;
-import org.axsl.foR.FOTreeException;
+import org.axsl.foR.FoTreeException;
import org.axsl.foR.ProxyFactory;
import java.util.ArrayList;
@@ -65,28 +65,28 @@
/**
* {@inheritDoc}
*/
- protected void validateAncestry() throws FOTreeException {
+ protected void validateAncestry() throws FoTreeException {
return;
}
/**
* {@inheritDoc}
*/
- protected void validateProperties() throws FOTreeException {
+ protected void validateProperties() throws FoTreeException {
return;
}
/**
* {@inheritDoc}
*/
- protected void setup() throws FOTreeException {
+ protected void setup() throws FoTreeException {
return;
}
/**
* {@inheritDoc}
*/
- protected void validateDescendants() throws FOTreeException {
+ protected void validateDescendants() throws FoTreeException {
return;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java 2007-04-07 18:51:18 UTC (rev 9136)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java 2007-04-07 19:36:02 UTC (rev 9137)
@@ -32,7 +32,7 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FOTreeException;
+import org.axsl.foR.FoTreeException;
import org.axsl.foR.ProxyFactory;
/**
@@ -58,35 +58,35 @@
/**
* {@inheritDoc}
*/
- protected void validateAncestry() throws FOTreeException {
+ protected void validateAncestry() throws FoTreeException {
return;
}
/**
* {@inheritDoc}
*/
- ...
[truncated message content] |
