|
From: <vic...@us...> - 2006-06-09 17:35:35
|
Revision: 7478 Author: victormote Date: 2006-06-09 10:35:28 -0700 (Fri, 09 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7478&view=rev Log Message: ----------- Conform to axsl changes: Move document context methods up from FObj to FONode, so that error reporting on text items is more feasible. Modified Paths: -------------- 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/FObj.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2006-06-09 01:22:15 UTC (rev 7477) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2006-06-09 17:35:28 UTC (rev 7478) @@ -145,4 +145,17 @@ return (FONode) super.getChildAt(childIndex); } + /** + * {@inheritDoc} + */ + public String getContextMessage() { + return getContextMessage(this.getSystemId(), this.getLine(), + this.getColumn()); + } + + public String getContextMessage(String systemId, int line, int column) { + return " Context: " + systemId + "\n" + + " (Line " + line + ", Column " + column + ")"; + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2006-06-09 01:22:15 UTC (rev 7477) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2006-06-09 17:35:28 UTC (rev 7478) @@ -930,4 +930,16 @@ return returnArray; } + public String getSystemId() { + return this.parentFO().getSystemId(); + } + + public int getLine() { + return this.parentFO().getLine(); + } + + public int getColumn() { + return this.parentFO().getColumn(); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-09 01:22:15 UTC (rev 7477) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-09 17:35:28 UTC (rev 7478) @@ -348,18 +348,6 @@ getLogger().warn(message + "\n" + getContextMessage()); } - /** - * {@inheritDoc} - */ - public String getContextMessage() { - return getContextMessage(this.systemId, this.line, this.column); - } - - public String getContextMessage(String systemId, int line, int column) { - return " Context: " + systemId + "\n" - + " (Line " + line + ", Column " + column + ")"; - } - public FontConsumer getFontConsumer() { return getFOTreeBuilder().getFontConsumer(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-09 18:41:34
|
Revision: 7481 Author: victormote Date: 2006-06-09 11:41:22 -0700 (Fri, 09 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7481&view=rev Log Message: ----------- 1. Before creating FOText, make sure its heritage is valid. 2. Ignore ignorable whitespace. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.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/BookmarkTitle.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/Leader.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/Wrapper.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java 2006-06-09 17:46:41 UTC (rev 7480) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java 2006-06-09 18:41:22 UTC (rev 7481) @@ -24,6 +24,8 @@ package org.foray.fotree; +import org.foray.common.XMLCharacter; + import org.axsl.foR.FOContext; import org.axsl.foR.FOTreeException; @@ -49,14 +51,47 @@ } protected void finalizeText() throws FOTreeException { - if (textBuffer != null && textBuffer.length() > 0) { - char[] charArray = textBuffer.toString().toCharArray(); - FOText ft = new FOText(this, charArray); - super.addChild(ft); - textBuffer.setLength(0); + if (! this.shouldCreateFOText()) { + return; } + char[] charArray = textBuffer.toString().toCharArray(); + FOText ft = new FOText(this, charArray); + super.addChild(ft); + textBuffer.setLength(0); } + private boolean shouldCreateFOText() throws FOTreeException { + if (textBuffer == null) { + return false; + } + if (textBuffer.length() < 1) { + return false; + } + if (! this.blockMustEnclosePCDATA()) { + return true; + } + if (this.getContainingBlock(null) != null) { + return true; + } + /* We are not inside a block. If it is ignorable whitespace, + * we will ignore it by not creating an FOText. Otherwise, it + * should be reported as an error. */ + char[] charArray = this.textBuffer.toString().toCharArray(); + if (XMLCharacter.isXMLWhitespace(charArray)) { + return false; + } + this.throwException("PCDATA content must be inside an fo:block"); + return false; + } + + /** + * Indicates whether any PCDATA (text) found in this element must have an + * ancestor block element. + * @return True iff PCDATA in this element must have an ancestor block + * element. + */ + public abstract boolean blockMustEnclosePCDATA() ; + protected void end() throws FOTreeException { finalizeText(); textBuffer = null; 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 2006-06-09 17:46:41 UTC (rev 7480) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Block.java 2006-06-09 18:41:22 UTC (rev 7481) @@ -146,4 +146,11 @@ return outsideList; } + /** + * {@inheritDoc} + */ + public boolean blockMustEnclosePCDATA() { + return true; + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java 2006-06-09 17:46:41 UTC (rev 7480) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java 2006-06-09 18:41:22 UTC (rev 7481) @@ -59,4 +59,11 @@ return this.getFOTreeBuilder().getFONamespace(); } + /** + * {@inheritDoc} + */ + public boolean blockMustEnclosePCDATA() { + return false; + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java 2006-06-09 17:46:41 UTC (rev 7480) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java 2006-06-09 18:41:22 UTC (rev 7481) @@ -59,4 +59,11 @@ return true; } + /** + * {@inheritDoc} + */ + public boolean blockMustEnclosePCDATA() { + return true; + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java 2006-06-09 17:46:41 UTC (rev 7480) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java 2006-06-09 18:41:22 UTC (rev 7481) @@ -109,4 +109,11 @@ return this.getNextSibling() == null; } + /** + * {@inheritDoc} + */ + public boolean blockMustEnclosePCDATA() { + return true; + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java 2006-06-09 17:46:41 UTC (rev 7480) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java 2006-06-09 18:41:22 UTC (rev 7481) @@ -97,4 +97,11 @@ return this.getFOTreeBuilder().getFONamespace(); } + /** + * {@inheritDoc} + */ + public boolean blockMustEnclosePCDATA() { + return true; + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Wrapper.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Wrapper.java 2006-06-09 17:46:41 UTC (rev 7480) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Wrapper.java 2006-06-09 18:41:22 UTC (rev 7481) @@ -103,4 +103,11 @@ } } + /** + * {@inheritDoc} + */ + public boolean blockMustEnclosePCDATA() { + return true; + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-10 02:39:19
|
Revision: 7505 Author: victormote Date: 2006-06-09 19:39:08 -0700 (Fri, 09 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7505&view=rev Log Message: ----------- Conform to axsl changes: Move three methods from FObj to TableCell. Two of these can conceivably be used by TableColumn, but probably will not be. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-10 02:38:58 UTC (rev 7504) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-10 02:39:08 UTC (rev 7505) @@ -553,23 +553,14 @@ return propertyList.getRetrieveBoundary(context); } - /** - * {@inheritDoc} - */ public int traitColumnNumber(FOContext context) { return propertyList.getColumnNumber(context); } - /** - * {@inheritDoc} - */ public int traitNumberColumnsSpanned() { return propertyList.getNumberColumnsSpanned(); } - /** - * {@inheritDoc} - */ public int traitNumberRowsSpanned() { return propertyList.getNumberRowsSpanned(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java 2006-06-10 02:38:58 UTC (rev 7504) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java 2006-06-10 02:39:08 UTC (rev 7505) @@ -31,7 +31,6 @@ import org.axsl.foR.FOContext; import org.axsl.foR.FOTreeException; -import org.axsl.foR.fo.TableColumn; import java.util.ArrayList; @@ -184,7 +183,7 @@ return (TableColumn) this.columns[index]; } - public TableColumn[] getTableColumns() { + public org.axsl.foR.fo.TableColumn[] getTableColumns() { return this.columns; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-10 17:39:50
|
Revision: 7515 Author: victormote Date: 2006-06-10 10:39:45 -0700 (Sat, 10 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7515&view=rev Log Message: ----------- Conform to axsl change: Remove methods for setting a list of unsupported elements and attributes. Warnings about such items should come downstream, unless the limitations are internal to FOTree itself, in which case no interface items are required. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java 2006-06-10 17:32:41 UTC (rev 7514) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java 2006-06-10 17:39:45 UTC (rev 7515) @@ -54,9 +54,6 @@ public class FOTreeBuilder extends DefaultHandler implements org.axsl.foR.FOTree { - byte[] unsupportedObjectsFO; - short[] unsupportedPropertiesFO; - /** * current formatting object being handled */ @@ -369,22 +366,6 @@ return this.server; } - public void setUnsupportedObjectsFO(byte[] unsupportedObjectsFO) { - this.unsupportedObjectsFO = unsupportedObjectsFO; - } - - public byte[] getUnsupportedObjectsFO() { - return this.unsupportedObjectsFO; - } - - public void setUnsupportedPropertiesFO(short[] unsupportedPropertiesFO) { - this.unsupportedPropertiesFO = unsupportedPropertiesFO; - } - - public short[] getUnsupportedPropertiesFO() { - return this.unsupportedPropertiesFO; - } - public void setGraphicServer(GraphicServer graphicServer) { this.graphicServer = graphicServer; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java 2006-06-10 17:32:41 UTC (rev 7514) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java 2006-06-10 17:39:45 UTC (rev 7515) @@ -68,8 +68,6 @@ list, locator); if (fobj == null) { checkUnknownElement(builder, localName, locator); - } else { - checkSupportedElement(builder, localName, locator); } return fobj; } @@ -186,9 +184,6 @@ throws PropertyException { Property property = parseAttributeForNS(attributes, attributeName, attributeValue, propertyList, locator); - if (property != null) { - checkSupportedAttribute(builder, attributeName, locator); - } return property; } @@ -251,36 +246,4 @@ */ public abstract String getPropertyName(short propertyType) ; - public void checkSupportedElement(FOTreeBuilder builder, - String localName, Locator locator) { - byte[] unsupportedObjects = builder.getUnsupportedObjectsFO(); - if (unsupportedObjects == null) { - return; - } - byte enumerated = enumerateElement(localName); - for (int i = 0; i < unsupportedObjects.length; i++) { - if (enumerated == unsupportedObjects[i]) { - builder.getLogger().info("Unsupported element: " - + getTypicalPrefix() + ":" + localName - + " at " + formatLocator(locator) + "."); - } - } - } - - public void checkSupportedAttribute(FOTreeBuilder builder, - String attributeName, Locator locator) { - short[] unsupportedProperties = builder.getUnsupportedPropertiesFO(); - if (unsupportedProperties == null) { - return; - } - short enumerated = enumerateAttribute(attributeName); - for (int i = 0; i < unsupportedProperties.length; i++) { - if (enumerated == unsupportedProperties[i]) { - builder.getLogger().info("Unsupported attribute: " - + attributeName + " at " - + formatLocator(locator) + "."); - } - } - } - } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-10 17:04:17
|
Revision: 7511 Author: victormote Date: 2006-06-10 10:03:25 -0700 (Sat, 10 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7511&view=rev Log Message: ----------- Conform to axsl change: Add interface for an abstract proxy factory. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.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/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/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/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/TableBody.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/TableFooter.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableHeader.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/obj/ContinuedLabel.java trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/SVGElement.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -28,6 +28,8 @@ import org.axsl.common.Constants; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; +import org.axsl.foR.ProxyFactory; import org.axsl.foR.fo.Block; import org.axsl.foR.fo.Leader; import org.axsl.fontR.FontUse; @@ -941,5 +943,9 @@ public int getColumn() { return this.parentFO().getColumn(); } - + + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } 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 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BidiOverride.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** */ @@ -57,4 +59,8 @@ return true; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } 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 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Block.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -32,7 +32,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; import java.util.ArrayList; import java.util.List; @@ -153,4 +155,8 @@ return true; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } 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 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class BlockContainer extends FObj implements org.axsl.foR.fo.BlockContainer { @@ -64,4 +66,8 @@ return true; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -30,7 +30,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** * An fo:bookmark object in XSL-FO. @@ -119,4 +121,8 @@ return traitInternalDestination(); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -30,7 +30,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** * An fo:bookmark-title object in XSL-FO. @@ -66,4 +68,8 @@ return false; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTree.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTree.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTree.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** * An fo:bookmark-tree object in XSL-FO. @@ -69,4 +71,8 @@ return this.getFOTreeBuilder().getFONamespace(); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -31,7 +31,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** * Represents the flow object 'fo:character'. @@ -79,4 +81,8 @@ return text.getAreaTreeText(context); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ColorProfile.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ColorProfile.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ColorProfile.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class ColorProfile extends FObj @@ -53,4 +55,8 @@ return this.getFOTreeBuilder().getFONamespace(); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -33,7 +33,9 @@ import org.axsl.common.Constants; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** @@ -128,4 +130,8 @@ return this.getFOTreeBuilder().getFONamespace(); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class Declarations extends FObj @@ -52,4 +54,8 @@ return this.getFOTreeBuilder().getFONamespace(); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -32,7 +32,9 @@ import org.axsl.common.Constants; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; import org.axsl.graphicR.Graphic; import org.axsl.graphicR.GraphicException; import org.axsl.text.line.LineNonText; @@ -141,4 +143,8 @@ return this.getNextSibling() == null; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Float.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Float.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Float.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** */ @@ -64,4 +66,8 @@ return true; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class Flow extends AbstractFlow implements org.axsl.foR.fo.Flow { @@ -86,4 +88,8 @@ return FONode.NODE_FLOW; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class Footnote extends FObj implements org.axsl.foR.fo.Footnote { @@ -82,4 +84,8 @@ return (FootnoteBody) this.children.get(1); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/FootnoteBody.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/FootnoteBody.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/FootnoteBody.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class FootnoteBody extends FObj @@ -52,4 +54,8 @@ return this.getFOTreeBuilder().getFONamespace(); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InitialPropertySet.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InitialPropertySet.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InitialPropertySet.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** */ @@ -53,4 +55,8 @@ return this.getFOTreeBuilder().getFONamespace(); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -30,7 +30,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class Inline extends FObjMixed implements org.axsl.foR.fo.Inline { @@ -66,4 +68,8 @@ return true; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** */ @@ -62,4 +64,8 @@ return true; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -31,7 +31,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class InstreamForeignObject extends FObjScaled implements org.axsl.foR.fo.InstreamForeignObject { @@ -93,4 +95,8 @@ return this.getNextSibling() == null; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -30,7 +30,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; import java.util.HashMap; import java.util.Map; @@ -150,4 +152,8 @@ regionMap.put(region.traitRegionName(), region.getName()); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -31,7 +31,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; import org.axsl.text.line.LineNonText; /** @@ -116,4 +118,8 @@ return true; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListBlock.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListBlock.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListBlock.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class ListBlock extends FObj implements org.axsl.foR.fo.ListBlock { @@ -67,4 +69,8 @@ } } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItem.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItem.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItem.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -30,7 +30,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class ListItem extends FObj implements org.axsl.foR.fo.ListItem { @@ -72,4 +74,8 @@ return this.getFOTreeBuilder().getFONamespace(); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemBody.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemBody.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemBody.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -30,7 +30,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class ListItemBody extends FObj implements org.axsl.foR.fo.ListItemBody { @@ -60,4 +62,8 @@ return this; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemLabel.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemLabel.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemLabel.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -30,7 +30,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; public class ListItemLabel extends FObj @@ -61,4 +63,8 @@ return this; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -32,7 +32,9 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; import java.util.List; @@ -104,4 +106,8 @@ return true; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiCase.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiCase.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiCase.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** @@ -53,4 +55,8 @@ return this.getFOTreeBuilder().getFONamespace(); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiProperties.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiProperties.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiProperties.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** */ @@ -65,4 +67,8 @@ return true; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiPropertySet.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiPropertySet.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiPropertySet.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** */ @@ -53,4 +55,8 @@ return this.getFOTreeBuilder().getFONamespace(); } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiSwitch.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiSwitch.java 2006-06-10 14:28:33 UTC (rev 7510) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiSwitch.java 2006-06-10 17:03:25 UTC (rev 7511) @@ -29,7 +29,9 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; +import org.axsl.foR.ProxyFactory; /** */ @@ -65,4 +67,8 @@ return true; } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiTog... [truncated message content] |
|
From: <vic...@us...> - 2006-06-10 17:30:52
|
Revision: 7513 Author: victormote Date: 2006-06-10 10:29:41 -0700 (Sat, 10 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7513&view=rev Log Message: ----------- Modified Paths: -------------- 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/FObj.java trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractTableBody.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/PageMasterReference.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/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/TableBody.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/TableFooter.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableHeader.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/obj/ContinuedLabel.java trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/SVGElement.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -93,11 +93,6 @@ /** * {@inheritDoc} */ - public abstract byte getNodeType() ; - - /** - * {@inheritDoc} - */ public void setProxy(FONodeProxy proxy) { this.proxy = proxy; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -109,10 +109,6 @@ return true; } - public byte getNodeType() { - return FONode.NODE_TEXT; - } - /** * <p>Filters the raw text as needed to present the text that should appear * in the "refined FO tree". Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -319,13 +319,6 @@ /** * {@inheritDoc} */ - public byte getNodeType() { - return FONode.NODE_FOBJ; - } - - /** - * {@inheritDoc} - */ public void throwException(String message) throws FOTreeException { throwException(getContextMessage(), message); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -133,10 +133,6 @@ return text.getAreaTreeText(context); } - public byte getNodeType() { - return FONode.NODE_FOBJ_MIXED; - } - public boolean canContainBlock() { return true; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -99,10 +99,6 @@ */ protected abstract Document createDOMDocument(); - public byte getNodeType() { - return FONode.NODE_XML_OBJ; - } - public Document getDocument() { return domDocument; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractTableBody.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractTableBody.java 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractTableBody.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -24,7 +24,6 @@ package org.foray.fotree.fo.obj; -import org.foray.fotree.FONode; import org.foray.fotree.FObj; import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; @@ -42,10 +41,6 @@ } } - public byte getNodeType() { - return FONode.NODE_ABSTRACT_TABLE_BODY; - } - public Namespace getNamespace() { return this.getFOTreeBuilder().getFONamespace(); } 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 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -24,7 +24,6 @@ package org.foray.fotree.fo.obj; -import org.foray.fotree.FONode; import org.foray.fotree.FObj; import org.foray.fotree.PropertyList; @@ -64,10 +63,6 @@ return "basic-link"; } - public byte getNodeType() { - return FONode.NODE_BASIC_LINK; - } - /** * Override the FONode method, because "this" is the object being sought. */ 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 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BidiOverride.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -24,7 +24,6 @@ package org.foray.fotree.fo.obj; -import org.foray.fotree.FONode; import org.foray.fotree.FObj; import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; @@ -47,10 +46,6 @@ return "bidi-override"; } - public byte getNodeType() { - return FONode.NODE_BIDI_OVERRIDE; - } - public Namespace getNamespace() { return this.getFOTreeBuilder().getFONamespace(); } 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 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Block.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -62,10 +62,6 @@ return this; } - public byte getNodeType() { - return FONode.NODE_BLOCK; - } - public Namespace getNamespace() { return this.getFOTreeBuilder().getFONamespace(); } 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 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -24,7 +24,6 @@ package org.foray.fotree.fo.obj; -import org.foray.fotree.FONode; import org.foray.fotree.FObj; import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; @@ -54,10 +53,6 @@ return true; } - public byte getNodeType() { - return FONode.NODE_BLOCK_CONTAINER; - } - public Namespace getNamespace() { return this.getFOTreeBuilder().getFONamespace(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -106,10 +106,6 @@ return "bookmark"; } - public byte getNodeType() { - return FONode.NODE_BOOKMARK; - } - public Namespace getNamespace() { return this.getFOTreeBuilder().getFONamespace(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -24,7 +24,6 @@ package org.foray.fotree.fo.obj; -import org.foray.fotree.FONode; import org.foray.fotree.FObj; import org.foray.fotree.FObjMixed; import org.foray.fotree.Namespace; @@ -53,10 +52,6 @@ return "bookmark-title"; } - public byte getNodeType() { - return FONode.NODE_BOOKMARK_TITLE; - } - public Namespace getNamespace() { return this.getFOTreeBuilder().getFONamespace(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTree.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTree.java 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTree.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -24,7 +24,6 @@ package org.foray.fotree.fo.obj; -import org.foray.fotree.FONode; import org.foray.fotree.FObj; import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; @@ -63,10 +62,6 @@ return "bookmark-tree"; } - public byte getNodeType() { - return FONode.NODE_BOOKMARK_TREE; - } - public Namespace getNamespace() { return this.getFOTreeBuilder().getFONamespace(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -24,7 +24,6 @@ package org.foray.fotree.fo.obj; -import org.foray.fotree.FONode; import org.foray.fotree.FOText; import org.foray.fotree.FObj; import org.foray.fotree.Namespace; @@ -49,10 +48,6 @@ return "character"; } - public byte getNodeType() { - return FONode.NODE_CHARACTER; - } - public Namespace getNamespace() { return this.getFOTreeBuilder().getFONamespace(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ColorProfile.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ColorProfile.java 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ColorProfile.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -24,7 +24,6 @@ package org.foray.fotree.fo.obj; -import org.foray.fotree.FONode; import org.foray.fotree.FObj; import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; @@ -47,10 +46,6 @@ return "color-profile"; } - public byte getNodeType() { - return FONode.NODE_COLOR_PROFILE; - } - public Namespace getNamespace() { return this.getFOTreeBuilder().getFONamespace(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -26,7 +26,6 @@ package org.foray.fotree.fo.obj; -import org.foray.fotree.FONode; import org.foray.fotree.FObj; import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; @@ -122,10 +121,6 @@ return true; } - public byte getNodeType() { - return FONode.NODE_COND_PAGE_MASTER_REF; - } - public Namespace getNamespace() { return this.getFOTreeBuilder().getFONamespace(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -24,7 +24,6 @@ package org.foray.fotree.fo.obj; -import org.foray.fotree.FONode; import org.foray.fotree.FObj; import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; @@ -46,10 +45,6 @@ return "declarations"; } - public byte getNodeType() { - return FONode.NODE_DECLARATIONS; - } - public Namespace getNamespace() { return this.getFOTreeBuilder().getFONamespace(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -24,7 +24,6 @@ package org.foray.fotree.fo.obj; -import org.foray.fotree.FONode; import org.foray.fotree.FObj; import org.foray.fotree.FObjScaled; import org.foray.fotree.Namespace; @@ -67,10 +66,6 @@ return "external-graphic"; } - public byte getNodeType() { - return FONode.NODE_EXTERNAL_GRAPHIC; - } - public Namespace getNamespace() { return this.getFOTreeBuilder().getFONamespace(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Float.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Float.java 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Float.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -24,7 +24,6 @@ package org.foray.fotree.fo.obj; -import org.foray.fotree.FONode; import org.foray.fotree.FObj; import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; @@ -46,10 +45,6 @@ return "float"; } - public byte getNodeType() { - return FONode.NODE_FLOAT; - } - public Namespace getNamespace() { return this.getFOTreeBuilder().getFONamespace(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -24,7 +24,6 @@ package org.foray.fotree.fo.obj; -import org.foray.fotree.FONode; import org.foray.fotree.FObj; import org.foray.fotree.PropertyList; @@ -84,10 +83,6 @@ return this; } - public byte getNodeType() { - return FONode.NODE_FLOW; - } - public FONodeProxy makeProxy(ProxyFactory factory) { return factory.makeProxy(this); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -24,7 +24,6 @@ package org.foray.fotree.fo.obj; -import org.foray.fotree.FONode; import org.foray.fotree.FObj; import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; @@ -45,10 +44,6 @@ return "footnote"; } - public byte getNodeType() { - return FONode.NODE_FOOTNOTE; - } - public Namespace getNamespace() { return this.getFOTreeBuilder().getFONamespace(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/FootnoteBody.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/FootnoteBody.java 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/FootnoteBody.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -24,7 +24,6 @@ package org.foray.fotree.fo.obj; -import org.foray.fotree.FONode; import org.foray.fotree.FObj; import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; @@ -46,10 +45,6 @@ return "footnote-body"; } - public byte getNodeType() { - return FONode.NODE_FOOTNOTE_BODY; - } - public Namespace getNamespace() { return this.getFOTreeBuilder().getFONamespace(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InitialPropertySet.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InitialPropertySet.java 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InitialPropertySet.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -24,7 +24,6 @@ package org.foray.fotree.fo.obj; -import org.foray.fotree.FONode; import org.foray.fotree.FObj; import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; @@ -47,10 +46,6 @@ return "initial-property-set"; } - public byte getNodeType() { - return FONode.NODE_INITIAL_PROPERTY_SET; - } - public Namespace getNamespace() { return this.getFOTreeBuilder().getFONamespace(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -24,7 +24,6 @@ package org.foray.fotree.fo.obj; -import org.foray.fotree.FONode; import org.foray.fotree.FObj; import org.foray.fotree.FObjMixed; import org.foray.fotree.Namespace; @@ -49,10 +48,6 @@ return "inline"; } - public byte getNodeType() { - return FONode.NODE_INLINE; - } - public Namespace getNamespace() { return this.getFOTreeBuilder().getFONamespace(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -24,7 +24,6 @@ package org.foray.fotree.fo.obj; -import org.foray.fotree.FONode; import org.foray.fotree.FObj; import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; @@ -47,10 +46,6 @@ return "inline-container"; } - public byte getNodeType() { - return FONode.NODE_INLINE_CONTAINER; - } - public Namespace getNamespace() { return this.getFOTreeBuilder().getFONamespace(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -24,7 +24,6 @@ package org.foray.fotree.fo.obj; -import org.foray.fotree.FONode; import org.foray.fotree.FObj; import org.foray.fotree.FObjScaled; import org.foray.fotree.ForeignXML; @@ -60,10 +59,6 @@ return "instream-foreign-object"; } - public byte getNodeType() { - return FONode.NODE_INSTREAM_FOREIGN_OBJECT; - } - public Namespace getNamespace() { return this.getFOTreeBuilder().getFONamespace(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -24,7 +24,6 @@ package org.foray.fotree.fo.obj; -import org.foray.fotree.FONode; import org.foray.fotree.FObj; import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; @@ -121,10 +120,6 @@ return (regionClass != null); } - public byte getNodeType() { - return FONode.NODE_LAYOUT_MASTER_SET; - } - public Namespace getNamespace() { return this.getFOTreeBuilder().getFONamespace(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -24,7 +24,6 @@ package org.foray.fotree.fo.obj; -import org.foray.fotree.FONode; import org.foray.fotree.FObj; import org.foray.fotree.FObjMixed; import org.foray.fotree.Namespace; @@ -70,10 +69,6 @@ return "leader"; } - public byte getNodeType() { - return FONode.NODE_LEADER; - } - public Namespace getNamespace() { return this.getFOTreeBuilder().getFONamespace(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListBlock.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListBlock.java 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListBlock.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -24,7 +24,6 @@ package org.foray.fotree.fo.obj; -import org.foray.fotree.FONode; import org.foray.fotree.FObj; import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; @@ -44,10 +43,6 @@ return "list-block"; } - public byte getNodeType() { - return FONode.NODE_LIST_BLOCK; - } - public Namespace getNamespace() { return this.getFOTreeBuilder().getFONamespace(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItem.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItem.java 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItem.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -24,7 +24,6 @@ package org.foray.fotree.fo.obj; -import org.foray.fotree.FONode; import org.foray.fotree.FObj; import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; @@ -66,10 +65,6 @@ return "list-item"; } - public byte getNodeType() { - return FONode.NODE_LIST_ITEM; - } - public Namespace getNamespace() { return this.getFOTreeBuilder().getFONamespace(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemBody.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemBody.java 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemBody.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -24,7 +24,6 @@ package org.foray.fotree.fo.obj; -import org.foray.fotree.FONode; import org.foray.fotree.FObj; import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; @@ -46,10 +45,6 @@ return "list-item-body"; } - public byte getNodeType() { - return FONode.NODE_LIST_ITEM_BODY; - } - public Namespace getNamespace() { return this.getFOTreeBuilder().getFONamespace(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemLabel.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemLabel.java 2006-06-10 17:05:00 UTC (rev 7512) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemLabel.java 2006-06-10 17:29:41 UTC (rev 7513) @@ -24,7 +24,6 @@ package org.foray.fotree.fo.obj; -import org.foray.fotree.FONode; import org.foray.fotree.FObj; import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; @@ -47,10 +46,6 @@ return "list-item-label"; } - public byte getNod... [truncated message content] |
|
From: <vic...@us...> - 2006-06-13 19:01:14
|
Revision: 7560 Author: victormote Date: 2006-06-13 11:47:30 -0700 (Tue, 13 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7560&view=rev Log Message: ----------- Add wrapper implementation of new axsl FOLineText interface, and make FOText conform to it as well, so that it can be wrapped. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java Added Paths: ----------- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java Added: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java (rev 0) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java 2006-06-13 18:47:30 UTC (rev 7560) @@ -0,0 +1,270 @@ +/* + * Copyright 2006 The FOray Project. + * http://www.foray.org + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * This work is in part derived from the following work(s), used with the + * permission of the licensor: + * Apache FOP, licensed by the Apache Software Foundation + * + */ + +/* $Id$ */ + +package org.foray.fotree; + +import org.axsl.foR.FOContext; +import org.axsl.fontR.FontUse; +import org.axsl.text.line.LineText; + +/** + * 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 { + + private org.axsl.foR.FOLineText realLineText; + private FOContext context; + + public FOLineText(org.axsl.foR.FOLineText realLineText, FOContext context) { + this.realLineText = realLineText; + this.context = context; + } + + /** + * {@inheritDoc} + */ + public char[] inlineText() { + return realLineText.inlineText(context); + } + + /** + * {@inheritDoc} + */ + public char[] inlineText(FOContext context) { + return realLineText.inlineText(context); + } + + /** + * {@inheritDoc} + */ + public FontUse inlinePrimaryFont() { + return realLineText.inlinePrimaryFont(context); + + } + + /** + * {@inheritDoc} + */ + public FontUse inlinePrimaryFont(FOContext context) { + return realLineText.inlinePrimaryFont(context); + } + + /** + * {@inheritDoc} + */ + public FontUse inlineSecondaryFont(char c) { + return realLineText.inlineSecondaryFont(context, c); + } + + /** + * {@inheritDoc} + */ + public FontUse inlineSecondaryFont(FOContext context, char c) { + return realLineText.inlineSecondaryFont(context, c); + } + + /** + * {@inheritDoc} + */ + public int inlineFontSize() { + return realLineText.inlineFontSize(context); + } + + /** + * {@inheritDoc} + */ + public int inlineFontSize(FOContext context) { + return realLineText.inlineFontSize(context); + } + + /** + * {@inheritDoc} + */ + public int inlineLetterSpacingOptimum() { + return realLineText.inlineLetterSpacingOptimum(context); + } + + /** + * {@inheritDoc} + */ + public int inlineLetterSpacingOptimum(FOContext context) { + return realLineText.inlineLetterSpacingOptimum(context); + } + + /** + * {@inheritDoc} + */ + public boolean inlineWrapOption() { + return realLineText.inlineWrapOption(context); + } + + /** + * {@inheritDoc} + */ + public boolean inlineWrapOption(FOContext context) { + return realLineText.inlineWrapOption(context); + } + + /** + * {@inheritDoc} + */ + public boolean inlineHyphenate() { + return realLineText.inlineHyphenate(context); + } + + /** + * {@inheritDoc} + */ + public boolean inlineHyphenate(FOContext context) { + return realLineText.inlineHyphenate(context); + } + + /** + * {@inheritDoc} + */ + public String inlineLanguage() { + return realLineText.inlineLanguage(context); + } + + /** + * {@inheritDoc} + */ + public String inlineLanguage(FOContext context) { + return realLineText.inlineLanguage(context); + } + + /** + * {@inheritDoc} + */ + public String inlineCountry() { + return realLineText.inlineCountry(context); + } + + /** + * {@inheritDoc} + */ + public String inlineCountry(FOContext context) { + return realLineText.inlineCountry(context); + } + + /** + * {@inheritDoc} + */ + public int inlineHyphenationRemainCount() { + return realLineText.inlineHyphenationRemainCount(context); + } + + /** + * {@inheritDoc} + */ + public int inlineHyphenationRemainCount(FOContext context) { + return realLineText.inlineHyphenationRemainCount(context); + } + + /** + * {@inheritDoc} + */ + public int inlineHyphenationPushCount() { + return realLineText.inlineHyphenationPushCount(context); + } + + /** + * {@inheritDoc} + */ + public int inlineHyphenationPushCount(FOContext context) { + return realLineText.inlineHyphenationPushCount(context); + } + + /** + * {@inheritDoc} + */ + public char inlineHyphenationCharacter() { + return realLineText.inlineHyphenationCharacter(context); + } + + /** + * {@inheritDoc} + */ + public char inlineHyphenationCharacter(FOContext context) { + return realLineText.inlineHyphenationCharacter(context); + } + /** + * {@inheritDoc} + */ + public boolean inlineIsFauxSmallCaps() { + return realLineText.inlineIsFauxSmallCaps(context); + } + + /** + * {@inheritDoc} + */ + public boolean inlineIsFauxSmallCaps(FOContext context) { + return realLineText.inlineIsFauxSmallCaps(context); + } + + /** + * {@inheritDoc} + */ + public int inlineFauxSmallCapsFontSize() { + return realLineText.inlineFauxSmallCapsFontSize(context); + } + + /** + * {@inheritDoc} + */ + public int inlineFauxSmallCapsFontSize(FOContext context) { + return realLineText.inlineFauxSmallCapsFontSize(context); + } + + /** + * {@inheritDoc} + */ + public LineText nextContiguousLineText() { + return realLineText.nextContiguousLineText(); + } + + /** + * {@inheritDoc} + */ + public LineText previousContiguousLineText() { + return realLineText.previousContiguousLineText(); + } + + /** + * {@inheritDoc} + */ + public boolean isLastItemInBlock() { + return realLineText.isLastItemInBlock(); + } + + /** + * {@inheritDoc} + */ + public org.axsl.foR.FOLineText getContextWrapper(FOContext context) { + /* This *is* the wrapper. */ + return this; + } + +} Property changes on: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2006-06-13 14:57:18 UTC (rev 7559) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2006-06-13 18:47:30 UTC (rev 7560) @@ -28,6 +28,7 @@ import org.axsl.common.Constants; import org.axsl.foR.FOContext; +import org.axsl.foR.FOLineText; import org.axsl.foR.FONodeProxy; import org.axsl.foR.ProxyFactory; import org.axsl.foR.fo.Block; @@ -41,7 +42,7 @@ * a text node in the formatting object tree * */ -public class FOText extends FONode implements LineText, org.axsl.foR.FOText { +public class FOText extends FONode implements FOLineText, org.axsl.foR.FOText { private static final int IS_WORD_CHAR_FALSE = 0; private static final int IS_WORD_CHAR_TRUE = 1; @@ -506,86 +507,121 @@ } public char[] inlineText() { - /* TODO: Handle context better. */ - FOContext context = null; + return this.inlineText(null); + } + + public char[] inlineText(FOContext context) { return getAreaTreeText(context); } public FontUse inlinePrimaryFont() { - /* TODO: Handle context better. */ - FOContext context = null; - return effectiveParent(null).getPrimaryFont(context); + return this.inlinePrimaryFont(null); } + public FontUse inlinePrimaryFont(FOContext context) { + FObj effectiveParent = effectiveParent(context); + return effectiveParent.getPrimaryFont(context); + } + public FontUse inlineSecondaryFont(char c) { - /* TODO: Handle context better. */ - FOContext context = null; - return effectiveParent(null).getSecondaryFont(context, c); + return this.inlineSecondaryFont(null, c); } + public FontUse inlineSecondaryFont(FOContext context, char c) { + FObj effectiveParent = effectiveParent(context); + return effectiveParent.getSecondaryFont(context, c); + } + public int inlineFontSize() { - /* TODO: Handle context better. */ - FOContext context = null; - return effectiveParent(null).traitFontSize(context); + return this.inlineFontSize(null); } + public int inlineFontSize(FOContext context) { + FObj effectiveParent = effectiveParent(context); + return effectiveParent.traitFontSize(context); + } + public int inlineLetterSpacingOptimum() { - /* TODO: Handle context better. */ - FOContext context = null; - return effectiveParent(null).traitLetterSpacingOpt(context); + return this.inlineLetterSpacingOptimum(null); } + public int inlineLetterSpacingOptimum(FOContext context) { + FObj effectiveParent = effectiveParent(context); + return effectiveParent.traitLetterSpacingOpt(context); + } + public boolean inlineWrapOption() { - /* TODO: Handle context better. */ - FOContext context = null; - return (effectiveParent(null).traitWrapOption(context) + return this.inlineWrapOption(null); + } + + public boolean inlineWrapOption(FOContext context) { + FObj effectiveParent = effectiveParent(context); + return (effectiveParent.traitWrapOption(context) == Constants.FOVAL_WRAP); } public boolean inlineHyphenate() { - /* TODO: Handle context better. */ - FOContext context = null; - return effectiveParent(null).traitHyphenate(context); + return this.inlineHyphenate(null); } + public boolean inlineHyphenate(FOContext context) { + FObj effectiveParent = effectiveParent(context); + return effectiveParent.traitHyphenate(context); + } + public String inlineLanguage() { - /* TODO: Handle context better. */ - FOContext context = null; - return effectiveParent(null).traitLanguage(context); + return this.inlineLanguage(null); } + public String inlineLanguage(FOContext context) { + FObj effectiveParent = effectiveParent(context); + return effectiveParent.traitLanguage(context); + } + public String inlineCountry() { - /* TODO: Handle context better. */ - FOContext context = null; - return effectiveParent(null).traitCountry(context); + return this.inlineCountry(null); } + public String inlineCountry(FOContext context) { + FObj effectiveParent = effectiveParent(context); + return effectiveParent.traitCountry(context); + } + public int inlineHyphenationRemainCount() { - /* TODO: Handle context better. */ - FOContext context = null; - return effectiveParent(null).traitHyphenationRemainCharacterCount( - context); + return this.inlineHyphenationRemainCount(null); } + public int inlineHyphenationRemainCount(FOContext context) { + FObj effectiveParent = effectiveParent(context); + return effectiveParent.traitHyphenationRemainCharacterCount(context); + } + public int inlineHyphenationPushCount() { - /* TODO: Handle context better. */ - FOContext context = null; - return effectiveParent(null).traitHyphenationPushCharacterCount( - context); + return this.inlineHyphenationPushCount(null); } + public int inlineHyphenationPushCount(FOContext context) { + FObj effectiveParent = effectiveParent(context); + return effectiveParent.traitHyphenationPushCharacterCount(context); + } + public char inlineHyphenationCharacter() { - /* TODO: Handle context better. */ - FOContext context = null; - return effectiveParent(null).traitHyphenationCharacter( - context); + return this.inlineHyphenationCharacter(null); } + public char inlineHyphenationCharacter(FOContext context) { + FObj effectiveParent = effectiveParent(context); + return effectiveParent.traitHyphenationCharacter(context); + } + public boolean inlineIsFauxSmallCaps() { - /* TODO: Handle context better. */ - FOContext context = null; - FObj parent = this.effectiveParent(context); - if (parent.traitFontVariant(context) != Constants.FOVAL_SMALL_CAPS) { + return this.inlineIsFauxSmallCaps(null); + } + + public boolean inlineIsFauxSmallCaps(FOContext context) { + FObj effectiveParent = effectiveParent(context); + if (effectiveParent.traitFontVariant(context) + != Constants.FOVAL_SMALL_CAPS) { return false; } /* @@ -599,11 +635,14 @@ } public int inlineFauxSmallCapsFontSize() { - /* TODO: Handle context better. */ - FOContext context = null; - return this.effectiveParent(null).getFauxSmallCapFontSize(context); + return this.inlineFauxSmallCapsFontSize(null); } + public int inlineFauxSmallCapsFontSize(FOContext context) { + FObj effectiveParent = effectiveParent(context); + return effectiveParent.getFauxSmallCapFontSize(context); + } + public LineText nextContiguousLineText() { return getNextContiguousTextInBlock(); } @@ -944,4 +983,12 @@ return factory.makeProxy(this); } + public org.axsl.foR.FOLineText getContextWrapper(FOContext context) { + org.axsl.foR.fo.Marker marker = this.ancestorMarker(); + if (marker == null) { + return this; + } + return new org.foray.fotree.FOLineText(this, context); + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-13 20:18:40
|
Revision: 7562 Author: victormote Date: 2006-06-13 13:18:30 -0700 (Tue, 13 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7562&view=rev Log Message: ----------- 1. Implement new axsl methods: Add methods to return the underlying wrapped item, if any. 2. Make RetrieveMarker implement FOContext. This may be a temporary fix. Modified Paths: -------------- 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/FOText.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineNonText.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineNonText.java 2006-06-13 19:02:28 UTC (rev 7561) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineNonText.java 2006-06-13 20:18:30 UTC (rev 7562) @@ -98,4 +98,8 @@ return this; } + 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 2006-06-13 19:02:28 UTC (rev 7561) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java 2006-06-13 20:18:30 UTC (rev 7562) @@ -46,7 +46,7 @@ * {@inheritDoc} */ public char[] inlineText() { - return realLineText.inlineText(context); + return realLineText.inlineText(this.context); } /** @@ -60,8 +60,7 @@ * {@inheritDoc} */ public FontUse inlinePrimaryFont() { - return realLineText.inlinePrimaryFont(context); - + return realLineText.inlinePrimaryFont(this.context); } /** @@ -75,7 +74,7 @@ * {@inheritDoc} */ public FontUse inlineSecondaryFont(char c) { - return realLineText.inlineSecondaryFont(context, c); + return realLineText.inlineSecondaryFont(this.context, c); } /** @@ -89,7 +88,7 @@ * {@inheritDoc} */ public int inlineFontSize() { - return realLineText.inlineFontSize(context); + return realLineText.inlineFontSize(this.context); } /** @@ -103,7 +102,7 @@ * {@inheritDoc} */ public int inlineLetterSpacingOptimum() { - return realLineText.inlineLetterSpacingOptimum(context); + return realLineText.inlineLetterSpacingOptimum(this.context); } /** @@ -117,7 +116,7 @@ * {@inheritDoc} */ public boolean inlineWrapOption() { - return realLineText.inlineWrapOption(context); + return realLineText.inlineWrapOption(this.context); } /** @@ -131,7 +130,7 @@ * {@inheritDoc} */ public boolean inlineHyphenate() { - return realLineText.inlineHyphenate(context); + return realLineText.inlineHyphenate(this.context); } /** @@ -145,7 +144,7 @@ * {@inheritDoc} */ public String inlineLanguage() { - return realLineText.inlineLanguage(context); + return realLineText.inlineLanguage(this.context); } /** @@ -159,7 +158,7 @@ * {@inheritDoc} */ public String inlineCountry() { - return realLineText.inlineCountry(context); + return realLineText.inlineCountry(this.context); } /** @@ -173,7 +172,7 @@ * {@inheritDoc} */ public int inlineHyphenationRemainCount() { - return realLineText.inlineHyphenationRemainCount(context); + return realLineText.inlineHyphenationRemainCount(this.context); } /** @@ -187,7 +186,7 @@ * {@inheritDoc} */ public int inlineHyphenationPushCount() { - return realLineText.inlineHyphenationPushCount(context); + return realLineText.inlineHyphenationPushCount(this.context); } /** @@ -201,7 +200,7 @@ * {@inheritDoc} */ public char inlineHyphenationCharacter() { - return realLineText.inlineHyphenationCharacter(context); + return realLineText.inlineHyphenationCharacter(this.context); } /** @@ -214,7 +213,7 @@ * {@inheritDoc} */ public boolean inlineIsFauxSmallCaps() { - return realLineText.inlineIsFauxSmallCaps(context); + return realLineText.inlineIsFauxSmallCaps(this.context); } /** @@ -228,7 +227,7 @@ * {@inheritDoc} */ public int inlineFauxSmallCapsFontSize() { - return realLineText.inlineFauxSmallCapsFontSize(context); + return realLineText.inlineFauxSmallCapsFontSize(this.context); } /** @@ -267,4 +266,8 @@ return this; } + public org.axsl.foR.FOLineText getWrapped() { + return this.realLineText; + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2006-06-13 19:02:28 UTC (rev 7561) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2006-06-13 20:18:30 UTC (rev 7562) @@ -991,4 +991,9 @@ return new org.foray.fotree.FOLineText(this, context); } + public org.axsl.foR.FOLineText getWrapped() { + /* This is the wrapped item. */ + return this; + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java 2006-06-13 19:02:28 UTC (rev 7561) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java 2006-06-13 20:18:30 UTC (rev 7562) @@ -65,4 +65,8 @@ return factory.makeProxy(this); } + public org.axsl.foR.fo.RetrieveMarker getRetrieveMarker() { + return this; + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-13 20:51:37
|
Revision: 7565 Author: victormote Date: 2006-06-13 13:51:25 -0700 (Tue, 13 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7565&view=rev Log Message: ----------- Conform to axsl changes: Get inline content items to implement FOLineNonText. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjScaled.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/InstreamForeignObject.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/PageNumber.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjScaled.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjScaled.java 2006-06-13 20:21:40 UTC (rev 7564) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjScaled.java 2006-06-13 20:51:25 UTC (rev 7565) @@ -27,14 +27,13 @@ import org.axsl.common.Constants; import org.axsl.foR.FOContext; import org.axsl.foR.FOTreeException; -import org.axsl.text.line.LineNonText; /** * Abstract base class for inline FOs that are scaleable. This currently * includes external-graphic and instream-foreign-object. */ -public abstract class FObjScaled extends FObj implements LineNonText, - org.axsl.foR.FObjScaled { +public abstract class FObjScaled extends FObj + implements org.axsl.foR.FObjScaled { public FObjScaled(FObj parent, PropertyList propertyList, String systemId, int line, int column) throws FOTreeException { @@ -97,22 +96,4 @@ return pixels * 72000 / pixelsPerInch; } - public int inlineSizeOptimum(int lineLength) { - /* TODO: Handle context better. */ - FOContext context = null; - return this.viewportIPD(context, lineLength); - } - - public int inlineSizeMinimum(int lineLength) { - /* TODO: Handle context better. */ - FOContext context = null; - return this.viewportIPD(context, lineLength); - } - - public int inlineSizeMaximum(int lineLength) { - /* TODO: Handle context better. */ - FOContext context = null; - return this.viewportIPD(context, lineLength); - } - } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java 2006-06-13 20:21:40 UTC (rev 7564) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java 2006-06-13 20:51:25 UTC (rev 7565) @@ -31,15 +31,15 @@ import org.axsl.common.Constants; import org.axsl.foR.FOContext; +import org.axsl.foR.FOLineNonText; import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; import org.axsl.foR.ProxyFactory; import org.axsl.graphicR.Graphic; import org.axsl.graphicR.GraphicException; -import org.axsl.text.line.LineNonText; -public class ExternalGraphic extends FObjScaled implements LineNonText, - org.axsl.foR.fo.ExternalGraphic { +public class ExternalGraphic extends FObjScaled + implements org.axsl.foR.fo.ExternalGraphic { /** The resolved Graphic instance encapsulated in this FO. */ /* This could be recreated each time it is requested, but is cached @@ -134,12 +134,73 @@ } } + public FONodeProxy makeProxy(ProxyFactory factory) { + return factory.makeProxy(this); + } + + /** + * {@inheritDoc} + */ + public FOLineNonText getContextWrapper(FOContext context) { + org.axsl.foR.fo.Marker marker = this.ancestorMarker(); + if (marker == null) { + return this; + } + return new org.foray.fotree.FOLineNonText(this, context); + } + + /** + * {@inheritDoc} + */ + public FOLineNonText getWrapped() { + /* This is the wrapped item. */ + return this; + } + + public int inlineSizeOptimum(int lineLength) { + return inlineSizeOptimum(null, lineLength); + } + + /** + * {@inheritDoc} + */ + public int inlineSizeOptimum(FOContext context, int lineLength) { + return this.viewportIPD(context, lineLength); + } + + /** + * {@inheritDoc} + */ + public int inlineSizeMinimum(int lineLength) { + return inlineSizeMinimum(null, lineLength); + } + + /** + * {@inheritDoc} + */ + public int inlineSizeMinimum(FOContext context, int lineLength) { + return this.viewportIPD(context, lineLength); + } + + /** + * {@inheritDoc} + */ + public int inlineSizeMaximum(int lineLength) { + return inlineSizeMaximum(null, lineLength); + } + + /** + * {@inheritDoc} + */ + public int inlineSizeMaximum(FOContext context, int lineLength) { + return this.viewportIPD(context, lineLength); + } + + /** + * {@inheritDoc} + */ public boolean isLastItemInBlock() { return this.getNextSibling() == null; } - public FONodeProxy makeProxy(ProxyFactory factory) { - return factory.makeProxy(this); - } - } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java 2006-06-13 20:21:40 UTC (rev 7564) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java 2006-06-13 20:51:25 UTC (rev 7565) @@ -30,6 +30,8 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; +import org.axsl.foR.FOContext; +import org.axsl.foR.FOLineNonText; import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; import org.axsl.foR.ProxyFactory; @@ -86,12 +88,72 @@ return ((ForeignXML) getForeignXML()).intrinsicContentHeight(); } - public boolean isLastItemInBlock() { - return this.getNextSibling() == null; - } - public FONodeProxy makeProxy(ProxyFactory factory) { return factory.makeProxy(this); } + /** + * {@inheritDoc} + */ + public FOLineNonText getContextWrapper(FOContext context) { + org.axsl.foR.fo.Marker marker = this.ancestorMarker(); + if (marker == null) { + return this; + } + return new org.foray.fotree.FOLineNonText(this, context); + } + + /** + * {@inheritDoc} + */ + public FOLineNonText getWrapped() { + /* This is the wrapped item. */ + return this; + } + + public int inlineSizeOptimum(int lineLength) { + return inlineSizeOptimum(null, lineLength); + } + + /** + * {@inheritDoc} + */ + public int inlineSizeOptimum(FOContext context, int lineLength) { + return this.viewportIPD(context, lineLength); + } + + /** + * {@inheritDoc} + */ + public int inlineSizeMinimum(int lineLength) { + return inlineSizeMinimum(null, lineLength); + } + + /** + * {@inheritDoc} + */ + public int inlineSizeMinimum(FOContext context, int lineLength) { + return this.viewportIPD(context, lineLength); + } + + /** + * {@inheritDoc} + */ + public int inlineSizeMaximum(int lineLength) { + return inlineSizeMaximum(null, lineLength); + } + + /** + * {@inheritDoc} + */ + public int inlineSizeMaximum(FOContext context, int lineLength) { + return this.viewportIPD(context, lineLength); + } + + /** + * {@inheritDoc} + */ + public boolean isLastItemInBlock() { + return this.getNextSibling() == null; + } } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java 2006-06-13 20:21:40 UTC (rev 7564) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java 2006-06-13 20:51:25 UTC (rev 7565) @@ -30,10 +30,10 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FOLineNonText; import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; import org.axsl.foR.ProxyFactory; -import org.axsl.text.line.LineNonText; /** * Implements fo:leader; main property of leader leader-pattern. @@ -41,8 +41,7 @@ * The pattern use-content is ignored, i.e. it still must be implemented. */ -public class Leader extends FObjMixed implements LineNonText, - org.axsl.foR.fo.Leader { +public class Leader extends FObjMixed implements org.axsl.foR.fo.Leader { public Leader(FObj parent, PropertyList propertyList, String systemId, int line, int column) throws FOTreeException { @@ -77,21 +76,46 @@ return true; } + /** + * {@inheritDoc} + */ + public FOLineNonText getContextWrapper(FOContext context) { + org.axsl.foR.fo.Marker marker = this.ancestorMarker(); + if (marker == null) { + return this; + } + return new org.foray.fotree.FOLineNonText(this, context); + } + + /** + * {@inheritDoc} + */ + public FOLineNonText getWrapped() { + /* This is the wrapped item. */ + return this; + } + public int inlineSizeOptimum(int lineLength) { - /* TODO: Handle context better. */ - FOContext context = null; + return traitLeaderLengthOpt(null, lineLength); + } + + public int inlineSizeOptimum(FOContext context, int lineLength) { return traitLeaderLengthOpt(context, lineLength); } public int inlineSizeMinimum(int lineLength) { - /* TODO: Handle context better. */ - FOContext context = null; + return traitLeaderLengthMin(null, lineLength); + } + + public int inlineSizeMinimum(FOContext context, int lineLength) { return traitLeaderLengthMin(context, lineLength); } public int inlineSizeMaximum(int lineLength) { - /* TODO: Handle context better. */ - FOContext context = null; + return traitLeaderLengthMax(null, lineLength); + } + + public int inlineSizeMaximum(FOContext context, int lineLength) { return traitLeaderLengthMax(context, lineLength); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumber.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumber.java 2006-06-13 20:21:40 UTC (rev 7564) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumber.java 2006-06-13 20:51:25 UTC (rev 7565) @@ -29,13 +29,12 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FOLineNonText; import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; import org.axsl.foR.ProxyFactory; -import org.axsl.text.line.LineNonText; -public class PageNumber extends FObj implements LineNonText, - org.axsl.foR.fo.PageNumber { +public class PageNumber extends FObj implements org.axsl.foR.fo.PageNumber { public PageNumber(FObj parent, PropertyList propertyList, String systemId, int line, int column) throws FOTreeException { @@ -54,9 +53,30 @@ return true; } + /** + * {@inheritDoc} + */ + public FOLineNonText getContextWrapper(FOContext context) { + org.axsl.foR.fo.Marker marker = this.ancestorMarker(); + if (marker == null) { + return this; + } + return new org.foray.fotree.FOLineNonText(this, context); + } + + /** + * {@inheritDoc} + */ + public FOLineNonText getWrapped() { + /* This is the wrapped item. */ + return this; + } + public int inlineSizeOptimum(int lineLength) { - /* TODO: Handle context better. */ - FOContext context = null; + return inlineSizeOptimum(null, lineLength); + } + + public int inlineSizeOptimum(FOContext context, int lineLength) { int zeroWidth = getPrimaryFont(context).getFont().width('0', traitFontSize(context)); // This is an estimate for purposes of layout. @@ -64,10 +84,18 @@ } public int inlineSizeMinimum(int lineLength) { + return inlineSizeMinimum(null, lineLength); + } + + public int inlineSizeMinimum(FOContext context, int lineLength) { return inlineSizeOptimum(lineLength); } public int inlineSizeMaximum(int lineLength) { + return inlineSizeMaximum(null, lineLength); + } + + public int inlineSizeMaximum(FOContext context, int lineLength) { return inlineSizeOptimum(lineLength); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java 2006-06-13 20:21:40 UTC (rev 7564) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java 2006-06-13 20:51:25 UTC (rev 7565) @@ -29,16 +29,16 @@ import org.foray.fotree.PropertyList; import org.axsl.foR.FOContext; +import org.axsl.foR.FOLineNonText; import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; import org.axsl.foR.ProxyFactory; -import org.axsl.text.line.LineNonText; /** * An fo:page-number-citation object. See XSL-FO Standard 1.0, Section 6.6.11. */ -public class PageNumberCitation extends FObj implements LineNonText, - org.axsl.foR.fo.PageNumberCitation { +public class PageNumberCitation extends FObj + implements org.axsl.foR.fo.PageNumberCitation { public PageNumberCitation(FObj parent, PropertyList propertyList, String systemId, int line, int column) throws FOTreeException { @@ -57,9 +57,30 @@ return true; } + /** + * {@inheritDoc} + */ + public FOLineNonText getContextWrapper(FOContext context) { + org.axsl.foR.fo.Marker marker = this.ancestorMarker(); + if (marker == null) { + return this; + } + return new org.foray.fotree.FOLineNonText(this, context); + } + + /** + * {@inheritDoc} + */ + public FOLineNonText getWrapped() { + /* This is the wrapped item. */ + return this; + } + public int inlineSizeOptimum(int lineLength) { - /* TODO: Handle context better. */ - FOContext context = null; + return inlineSizeOptimum(null, lineLength); + } + + public int inlineSizeOptimum(FOContext context, int lineLength) { int zeroWidth = getPrimaryFont(context).getFont().width('0', traitFontSize(context)); // This is an estimate for purposes of layout. @@ -67,10 +88,18 @@ } public int inlineSizeMinimum(int lineLength) { + return inlineSizeMinimum(lineLength); + } + + public int inlineSizeMinimum(FOContext context, int lineLength) { return inlineSizeOptimum(lineLength); } public int inlineSizeMaximum(int lineLength) { + return inlineSizeMaximum(null, lineLength); + } + + public int inlineSizeMaximum(FOContext context, int lineLength) { return inlineSizeOptimum(lineLength); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-13 21:13:46
|
Revision: 7567 Author: victormote Date: 2006-06-13 14:13:31 -0700 (Tue, 13 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7567&view=rev Log Message: ----------- Conform to axsl change: Add method to pull the RetrieveMarker instance out if it can. Modified Paths: -------------- 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/FOText.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/InstreamForeignObject.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/PageNumber.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineNonText.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineNonText.java 2006-06-13 20:56:15 UTC (rev 7566) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineNonText.java 2006-06-13 21:13:31 UTC (rev 7567) @@ -25,6 +25,7 @@ package org.foray.fotree; import org.axsl.foR.FOContext; +import org.axsl.foR.fo.RetrieveMarker; /** * Wraps an underlying "real" FOLineNonText along with the context to be used by @@ -98,8 +99,18 @@ return this; } + /** + * {@inheritDoc} + */ public org.axsl.foR.FOLineNonText getWrapped() { return this.realLineNonText; } + /** + * {@inheritDoc} + */ + public RetrieveMarker getRetrieveMarker() { + return this.context.getRetrieveMarker(); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java 2006-06-13 20:56:15 UTC (rev 7566) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java 2006-06-13 21:13:31 UTC (rev 7567) @@ -25,6 +25,7 @@ package org.foray.fotree; import org.axsl.foR.FOContext; +import org.axsl.foR.fo.RetrieveMarker; import org.axsl.fontR.FontUse; import org.axsl.text.line.LineText; @@ -266,8 +267,18 @@ return this; } + /** + * {@inheritDoc} + */ public org.axsl.foR.FOLineText getWrapped() { return this.realLineText; } + /** + * {@inheritDoc} + */ + public RetrieveMarker getRetrieveMarker() { + return this.context.getRetrieveMarker(); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2006-06-13 20:56:15 UTC (rev 7566) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2006-06-13 21:13:31 UTC (rev 7567) @@ -33,6 +33,7 @@ import org.axsl.foR.ProxyFactory; import org.axsl.foR.fo.Block; import org.axsl.foR.fo.Leader; +import org.axsl.foR.fo.RetrieveMarker; import org.axsl.fontR.FontUse; import org.axsl.text.line.LineText; @@ -991,9 +992,19 @@ return new org.foray.fotree.FOLineText(this, context); } + /** + * {@inheritDoc} + */ public org.axsl.foR.FOLineText getWrapped() { /* This is the wrapped item. */ return this; } + /** + * {@inheritDoc} + */ + public RetrieveMarker getRetrieveMarker() { + return null; + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java 2006-06-13 20:56:15 UTC (rev 7566) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java 2006-06-13 21:13:31 UTC (rev 7567) @@ -35,6 +35,7 @@ import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; import org.axsl.foR.ProxyFactory; +import org.axsl.foR.fo.RetrieveMarker; import org.axsl.graphicR.Graphic; import org.axsl.graphicR.GraphicException; @@ -157,6 +158,13 @@ return this; } + /** + * {@inheritDoc} + */ + public RetrieveMarker getRetrieveMarker() { + return null; + } + public int inlineSizeOptimum(int lineLength) { return inlineSizeOptimum(null, lineLength); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java 2006-06-13 20:56:15 UTC (rev 7566) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java 2006-06-13 21:13:31 UTC (rev 7567) @@ -35,6 +35,7 @@ import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; import org.axsl.foR.ProxyFactory; +import org.axsl.foR.fo.RetrieveMarker; public class InstreamForeignObject extends FObjScaled implements org.axsl.foR.fo.InstreamForeignObject { @@ -111,6 +112,13 @@ return this; } + /** + * {@inheritDoc} + */ + public RetrieveMarker getRetrieveMarker() { + return null; + } + public int inlineSizeOptimum(int lineLength) { return inlineSizeOptimum(null, lineLength); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java 2006-06-13 20:56:15 UTC (rev 7566) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java 2006-06-13 21:13:31 UTC (rev 7567) @@ -34,6 +34,7 @@ import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; import org.axsl.foR.ProxyFactory; +import org.axsl.foR.fo.RetrieveMarker; /** * Implements fo:leader; main property of leader leader-pattern. @@ -95,6 +96,13 @@ return this; } + /** + * {@inheritDoc} + */ + public RetrieveMarker getRetrieveMarker() { + return null; + } + public int inlineSizeOptimum(int lineLength) { return traitLeaderLengthOpt(null, lineLength); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumber.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumber.java 2006-06-13 20:56:15 UTC (rev 7566) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumber.java 2006-06-13 21:13:31 UTC (rev 7567) @@ -33,6 +33,7 @@ import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; import org.axsl.foR.ProxyFactory; +import org.axsl.foR.fo.RetrieveMarker; public class PageNumber extends FObj implements org.axsl.foR.fo.PageNumber { @@ -72,6 +73,13 @@ return this; } + /** + * {@inheritDoc} + */ + public RetrieveMarker getRetrieveMarker() { + return null; + } + public int inlineSizeOptimum(int lineLength) { return inlineSizeOptimum(null, lineLength); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java 2006-06-13 20:56:15 UTC (rev 7566) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java 2006-06-13 21:13:31 UTC (rev 7567) @@ -33,6 +33,7 @@ import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; import org.axsl.foR.ProxyFactory; +import org.axsl.foR.fo.RetrieveMarker; /** * An fo:page-number-citation object. See XSL-FO Standard 1.0, Section 6.6.11. @@ -76,6 +77,13 @@ return this; } + /** + * {@inheritDoc} + */ + public RetrieveMarker getRetrieveMarker() { + return null; + } + public int inlineSizeOptimum(int lineLength) { return inlineSizeOptimum(null, lineLength); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-13 22:49:47
|
Revision: 7576 Author: victormote Date: 2006-06-13 15:49:40 -0700 (Tue, 13 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7576&view=rev Log Message: ----------- 1. Add FOTreeBuilder method to tell FOText whether it needs to preserve the text or not. 2. Don't let FOText overwrite the original text if it is inside a Marker. Modified Paths: -------------- 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 Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2006-06-13 22:22:41 UTC (rev 7575) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2006-06-13 22:49:40 UTC (rev 7576) @@ -32,6 +32,8 @@ import org.axsl.foR.FONodeResult; import org.axsl.foR.fo.RetrieveMarker; +import org.apache.commons.logging.Log; + import javax.swing.tree.TreeNode; /** @@ -178,5 +180,13 @@ } return parent.ancestorMarker(); } + + public FOTreeBuilder getFOTreeBuilder() { + return realParent().getFOTreeBuilder(); + } + public Log getLogger() { + return realParent().getLogger(); + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2006-06-13 22:22:41 UTC (rev 7575) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2006-06-13 22:49:40 UTC (rev 7576) @@ -33,6 +33,7 @@ import org.axsl.foR.ProxyFactory; import org.axsl.foR.fo.Block; import org.axsl.foR.fo.Leader; +import org.axsl.foR.fo.Marker; import org.axsl.foR.fo.RetrieveMarker; import org.axsl.fontR.FontUse; import org.axsl.text.line.LineText; @@ -75,12 +76,27 @@ public FOText(FObj parent, char[] chars) { super(parent); this.ca = chars; - /* TODO: Handle context better. */ - FOContext context = null; + filterContent(); + } + + private void filterContent() { + /* If we need to preserve the raw content, no filtering should be done, + * or if it is done, it must be done on a duplicate of the raw data. */ + if (this.getFOTreeBuilder().preserveRawContent()) { + return; + } + Marker ancestorMarker = this.ancestorMarker(); + if (ancestorMarker != null) { + /* There is an fo:marker ancestor, so we can't know what the values + * are for white-space-treatment, linefeed-treatment, + * text-transform, and white-space-collapse. + * Store the text raw and process it one-the-fly. */ + return; + } /* Convert the text as far as possible, store it, and set the status. * We cannot filter text-transform yet, because we may need subsequent * FOText instances. */ - this.ca = this.getPreTextTransformText(context); + this.ca = this.getPreTextTransformText(null); this.filterStatus = FILTER_PRE_TRANSFORM; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java 2006-06-13 22:22:41 UTC (rev 7575) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java 2006-06-13 22:49:40 UTC (rev 7576) @@ -406,4 +406,17 @@ return this.cachingGraphics; } + /** + * Indicates whether we wish to preserve the raw FO Tree content so that it + * can be round-tripped. Setting this value to true will generally increase + * the amount of memory consumed, the amount of processing time consumed, + * or both. + * Setting it to false allows the system to use less memory or processing + * cycles, but at the cost of modifying the underlying data. + * @return True if the raw document content should be preserved intact. + */ + public boolean preserveRawContent() { + return false; + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-13 22:22:41 UTC (rev 7575) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-13 22:49:40 UTC (rev 7576) @@ -40,8 +40,6 @@ import org.axsl.text.TextServer; import org.axsl.text.line.LineText; -import org.apache.commons.logging.Log; - import java.awt.Color; import java.util.ArrayList; import java.util.List; @@ -248,14 +246,6 @@ return effectiveParent(context).getFlow(context); } - public FOTreeBuilder getFOTreeBuilder() { - return realParent().getFOTreeBuilder(); - } - - public Log getLogger() { - return realParent().getLogger(); - } - /** * {@inheritDoc} */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-14 16:10:21
|
Revision: 7583 Author: victormote Date: 2006-06-14 09:02:31 -0700 (Wed, 14 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7583&view=rev Log Message: ----------- Move standard exception-throwing method from FObj to FONode. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2006-06-14 15:51:03 UTC (rev 7582) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2006-06-14 16:02:31 UTC (rev 7583) @@ -30,6 +30,7 @@ import org.axsl.foR.FOContext; import org.axsl.foR.FONodeProxy; import org.axsl.foR.FONodeResult; +import org.axsl.foR.FOTreeException; import org.axsl.foR.fo.RetrieveMarker; import org.apache.commons.logging.Log; @@ -188,5 +189,16 @@ public Log getLogger() { return realParent().getLogger(); } - + + public void throwException(String message) throws FOTreeException { + throwException(getContextMessage(), message); + } + + public void throwException(String contextMessage, String message) + throws FOTreeException{ + FOTreeException exception = new FOTreeException(message); + exception.setContextMessage(contextMessage); + throw exception; + } + } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-14 15:51:03 UTC (rev 7582) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-14 16:02:31 UTC (rev 7583) @@ -306,20 +306,6 @@ return true; } - /** - * {@inheritDoc} - */ - public void throwException(String message) throws FOTreeException { - throwException(getContextMessage(), message); - } - - public void throwException(String contextMessage, String message) - throws FOTreeException{ - FOTreeException exception = new FOTreeException(message); - exception.setContextMessage(contextMessage); - throw exception; - } - public void checkExceptionLocation(FOTreeException exception) { if (exception.isContextSet()) { return; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-14 16:10:28
|
Revision: 7584 Author: victormote Date: 2006-06-14 09:10:13 -0700 (Wed, 14 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7584&view=rev Log Message: ----------- Add to-do items regarding data storage options. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-14 16:02:31 UTC (rev 7583) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-14 16:10:13 UTC (rev 7584) @@ -48,7 +48,10 @@ * Base class for formatting objects. */ public abstract class FObj extends FONode implements org.axsl.foR.FObj { - + + /* TODO: Consider making this an array to minimize casting, and to save + * memory, at the expense of processing time. (Use ArrayList during parsing, + * then convert to array when parsing is complete.)*/ protected ArrayList children = new ArrayList(); public PropertyList propertyList; Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2006-06-14 16:02:31 UTC (rev 7583) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2006-06-14 16:10:13 UTC (rev 7584) @@ -151,6 +151,9 @@ public class PropertyList { /** Map of the properties, keyed by a String of the property name. */ + /* TODO: Consider making this an array to minimize casting, and to save + * memory, at the expense of processing time. (Use ArrayList during parsing, + * then convert to array when parsing is complete.)*/ private ArrayList properties = new ArrayList(); /** The FObj instance to which these properties are attached. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-14 20:25:54
|
Revision: 7595 Author: victormote Date: 2006-06-14 13:25:45 -0700 (Wed, 14 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7595&view=rev Log Message: ----------- 1. Conform to axsl Change: Remove two unused methods. 2. Rename method for consistency with standards. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-14 19:21:04 UTC (rev 7594) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-14 20:25:45 UTC (rev 7595) @@ -185,23 +185,25 @@ } /** - * {@inheritDoc} + * @param context An object that knows how to resolve FO Tree context + * issues. + * @return The nearest ancestor FObj that generates reference areas. */ - public org.axsl.foR.FObj getNearestAncestorGeneratingRA(FOContext context) { + public org.axsl.foR.FObj ancestorGeneratingRA(FOContext context) { if (effectiveParent(context).traitIsReferenceArea()) { return effectiveParent(context); } - return effectiveParent(context).getNearestAncestorGeneratingRA(context); + return effectiveParent(context).ancestorGeneratingRA(context); } /** * @return Self or the nearest ancestor FObj that generates reference areas. */ - public org.axsl.foR.FObj getNearestGeneratingRA(FOContext context) { + public org.axsl.foR.FObj nearestGeneratingRA(FOContext context) { if (this.traitIsReferenceArea()) { return this; } - return getNearestAncestorGeneratingRA(context); + return ancestorGeneratingRA(context); } /** Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java 2006-06-14 19:21:04 UTC (rev 7594) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java 2006-06-14 20:25:45 UTC (rev 7595) @@ -106,7 +106,7 @@ /** * Overrides the method in FObj because Root has no parent. */ - public org.axsl.foR.FObj getNearestAncestorGeneratingRA(FOContext context) { + public org.axsl.foR.FObj ancestorGeneratingRA(FOContext context) { return null; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-14 21:55:35
|
Revision: 7603 Author: victormote Date: 2006-06-14 14:55:29 -0700 (Wed, 14 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7603&view=rev Log Message: ----------- For properties that don't inherit, move to new method that doesn't require the FOContext or the FObj. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Name.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2006-06-14 21:49:49 UTC (rev 7602) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2006-06-14 21:55:29 UTC (rev 7603) @@ -527,7 +527,7 @@ public String getMarkerClassName(FOContext context) { Name property = (Name) getProperty(Constants.FOPROP_MARKER_CLASS_NAME); if (property != null) { - return property.getValue(context, fobj); + return property.getValue(); } return Name.getValueNoInstance(); } @@ -536,7 +536,7 @@ Name property = (Name) getProperty(Constants .FOPROP_RETRIEVE_CLASS_NAME); if (property != null) { - return property.getValue(context, fobj); + return property.getValue(); } return Name.getValueNoInstance(); } @@ -545,20 +545,20 @@ Enumerated property = (Enumerated) getProperty(Constants .FOPROP_RETRIEVE_POSITION); if (property != null) { - return property.getValue(context, fobj); + return property.getValue(); } return Enumerated.getValueNoInstance - (context, Constants.FOPROP_RETRIEVE_POSITION, fobj); + (Constants.FOPROP_RETRIEVE_POSITION); } public short getRetrieveBoundary(FOContext context) { Enumerated property = (Enumerated) getProperty(Constants .FOPROP_RETRIEVE_BOUNDARY); if (property != null) { - return property.getValue(context, fobj); + return property.getValue(); } return Enumerated.getValueNoInstance - (context, Constants.FOPROP_RETRIEVE_BOUNDARY, fobj); + (Constants.FOPROP_RETRIEVE_BOUNDARY); } public int getColumnNumber(FOContext context) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Name.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Name.java 2006-06-14 21:49:49 UTC (rev 7602) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Name.java 2006-06-14 21:55:29 UTC (rev 7603) @@ -86,6 +86,17 @@ return getValueNoInstance(); } + /** + * Overloaded version of {@link #getValue(FOContext, FObj)} for properties + * that have no inheritance, either implicit or explicit. + */ + public String getValue() { + if (this.value instanceof DtName) { + return ((DtName) this.value).getValue(); + } + return getValueNoInstance(); + } + public static String getValueNoInstance() { return ""; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-14 22:02:10
|
Revision: 7604 Author: victormote Date: 2006-06-14 15:02:03 -0700 (Wed, 14 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7604&view=rev Log Message: ----------- Conform to axsl changes: Remove unnecessary parameters. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-14 21:55:29 UTC (rev 7603) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-14 22:02:03 UTC (rev 7604) @@ -498,20 +498,20 @@ return propertyList.getFlowName(context); } - public String traitMarkerClassName(FOContext context) { - return propertyList.getMarkerClassName(context); + public String traitMarkerClassName() { + return propertyList.getMarkerClassName(); } - public String traitRetrieveClassName(FOContext context) { - return propertyList.getRetrieveClassName(context); + public String traitRetrieveClassName() { + return propertyList.getRetrieveClassName(); } - public short traitRetrievePosition(FOContext context) { - return propertyList.getRetrievePosition(context); + public short traitRetrievePosition() { + return propertyList.getRetrievePosition(); } - public short traitRetrieveBoundary(FOContext context) { - return propertyList.getRetrieveBoundary(context); + public short traitRetrieveBoundary() { + return propertyList.getRetrieveBoundary(); } public int traitColumnNumber(FOContext context) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2006-06-14 21:55:29 UTC (rev 7603) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2006-06-14 22:02:03 UTC (rev 7604) @@ -524,7 +524,7 @@ return Name.getValueNoInstance(); } - public String getMarkerClassName(FOContext context) { + public String getMarkerClassName() { Name property = (Name) getProperty(Constants.FOPROP_MARKER_CLASS_NAME); if (property != null) { return property.getValue(); @@ -532,7 +532,7 @@ return Name.getValueNoInstance(); } - public String getRetrieveClassName(FOContext context) { + public String getRetrieveClassName() { Name property = (Name) getProperty(Constants .FOPROP_RETRIEVE_CLASS_NAME); if (property != null) { @@ -541,7 +541,7 @@ return Name.getValueNoInstance(); } - public short getRetrievePosition(FOContext context) { + public short getRetrievePosition() { Enumerated property = (Enumerated) getProperty(Constants .FOPROP_RETRIEVE_POSITION); if (property != null) { @@ -551,7 +551,7 @@ (Constants.FOPROP_RETRIEVE_POSITION); } - public short getRetrieveBoundary(FOContext context) { + public short getRetrieveBoundary() { Enumerated property = (Enumerated) getProperty(Constants .FOPROP_RETRIEVE_BOUNDARY); if (property != null) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java 2006-06-14 21:55:29 UTC (rev 7603) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java 2006-06-14 22:02:03 UTC (rev 7604) @@ -31,7 +31,6 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; -import org.axsl.foR.FOContext; import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; import org.axsl.foR.ProxyFactory; @@ -62,8 +61,6 @@ } public void start() throws FOTreeException { - /* TODO: Handle context better. */ - FOContext context = null; // Make sure that no sibling marker has the same 'marker-class-name'. List siblings = realParent().getChildren(); for (int i = 0; i < siblings.size(); i++) { @@ -78,10 +75,10 @@ if (siblingMarker == this) { continue; } - if (this.traitMarkerClassName(context).equals - (siblingMarker.traitMarkerClassName(context))) { + if (this.traitMarkerClassName().equals + (siblingMarker.traitMarkerClassName())) { throwException("marker-class-name '" - + this.traitMarkerClassName(context) + + this.traitMarkerClassName() + "' already exists for this parent"); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-14 22:40:56
|
Revision: 7606 Author: victormote Date: 2006-06-14 15:37:39 -0700 (Wed, 14 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7606&view=rev Log Message: ----------- Whitespace changes only. Modified Paths: -------------- 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/FObjScaled.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/Property.java trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyException.java trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyListUnparsed.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/NamespaceFO.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/ObjectMakerFO.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/PropertyMakerFO.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/AbstractTableBody.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/PageMasterReference.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/PageNumberGenerator.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/TableBody.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/TableFooter.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableHeader.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/fo/prop/AbsoluteDimension.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteOffset.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentAdjust.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentBaseline.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AudioDial.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Azimuth.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Background.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundColor.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundImage.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundPosition.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BaselineShift.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Boolean.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Border.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderColor.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderPrecedence.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSeparation.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSpacing.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderStyle.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderWidth.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/CaseTitle.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Character.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Clip.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Color.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnCount.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnGap.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnNumber.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnWidth.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentDimension.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentType.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Country.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Cue.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DestinationPlacementOffset.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Dimension.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DisplayAlign.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DominantBaseline.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Elevation.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Enumerated.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Extent.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ExternalDestination.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Font.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontFamily.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSize.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSizeAdjust.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStretch.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStyle.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontVariant.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontWeight.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ForcePageCount.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Format.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GlyphOrientation.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GroupingSize.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphLadderCount.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphPushCharCount.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphRemainCharCount.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Id.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InitialPageNumber.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InternalDestination.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Keep.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Language.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LastLineEndIndent.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LeaderLength.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LeaderPatternWidth.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LetterSpacing.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LineHeight.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Margin.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/MaximumRepeats.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Name.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/NumberColumnsRepeated.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/NumberColumnsSpanned.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/NumberRowsSpanned.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Orphans.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Padding.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/PageDimension.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Pause.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Pitch.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/PlayDuring.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvDistanceBetween.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvLabelSeparation.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RefId.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RegionName.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RelativeDimension.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RelativeSpace.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Role.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RuleThickness.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Script.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Size.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/SourceDocument.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/SpeechRate.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Src.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/SwitchTo.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TableLayout.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TargetPresentationContext.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TargetProcessingContext.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TargetStylesheet.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextAlign.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextAlignLast.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextAltitude.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextDecoration.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextDepth.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextIndent.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextShadow.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TreatAsWordSpace.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/VerticalAlign.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/VoiceFamily.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Volume.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Widows.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/WordSpacing.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/WritingMode.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ZIndex.java trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/NamespaceExtensions.java trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/ObjectMakerExtensions.java trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/obj/ContinuedLabel.java trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyParser.java trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyTokenizer.java trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/NamespaceSVG.java trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/ObjectMakerSVG.java trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/SVGElement.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/Datatype.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtAngle.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtCharacter.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtColor.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtCountry.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtFrequency.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtInteger.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtKeep.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLanguage.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLength.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLengthBPIPDirection.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLengthConditional.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtLengthRange.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtName.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtNumber.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtPercentage.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtRectangle.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtScript.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtShadowEffect.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtShape.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtSpace.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtString.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtTextDeco.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtTime.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtURI.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/DtWritingMode.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/Expr.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprAdditive.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprAdditiveOper.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprColor.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprInner.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprMultiplicative.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprMultiplicativeOper.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprNumeric.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprPrimary.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprUnary.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ExprUnaryOper.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnAbs.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnBodyStart.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnCeiling.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFloor.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFromParent.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFromTableColumn.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnInheritedProp.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnLabelEnd.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnMax.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnMin.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnNearestSpecProp.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnProportionalColWidth.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnRGB.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnRound.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/Function.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/PropertyCollection.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/PropertyKeyword.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/PropertyValue.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/ValueCollection.java trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/NamespaceXML.java trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/PropertyMakerXML.java trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/Lang.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineNonText.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineNonText.java 2006-06-14 22:02:13 UTC (rev 7605) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineNonText.java 2006-06-14 22:37:39 UTC (rev 7606) @@ -1,19 +1,19 @@ /* * Copyright 2006 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java 2006-06-14 22:02:13 UTC (rev 7605) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java 2006-06-14 22:37:39 UTC (rev 7606) @@ -1,19 +1,19 @@ /* * Copyright 2006 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2006-06-14 22:02:13 UTC (rev 7605) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2006-06-14 22:37:39 UTC (rev 7606) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.fotree; import org.foray.common.OrderedTreeNode; @@ -185,7 +185,7 @@ public FOTreeBuilder getFOTreeBuilder() { return realParent().getFOTreeBuilder(); } - + public Log getLogger() { return realParent().getLogger(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2006-06-14 22:02:13 UTC (rev 7605) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2006-06-14 22:37:39 UTC (rev 7606) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.fotree; import org.foray.common.XMLCharacter; @@ -137,7 +137,7 @@ * <li>text-transform. See XSL-FO Standard 1.0 Section 7.16.6.</li> * </ul> * @param context TODO - * + * * @return The text that should appear in the refined FO tree. */ public char[] getRefinedText(FOContext context) { @@ -178,7 +178,7 @@ * text-transform looks at previous and subsequent FOText items, which must * inevitably look back at the original FOText instance.</p> * @param context TODO - * + * * @return The text that should appear in the refined FO tree, except that * text-transform is not applied. */ @@ -402,7 +402,7 @@ if (desiredIndex >= 0 && desiredIndex < charArray.length) { return ca[desiredIndex]; } - + int remainingOffset = 0; if (offset > 0) { // Look in subsequent text items. @@ -499,7 +499,7 @@ * <ul> * <li>white-space-collapse. See XSL-FO Standard 1.0 Section 7.15.12.</li> * </ul> - * + * * @return The text that should appear in the area tree. */ public char[] getAreaTreeText(FOContext context) { @@ -987,11 +987,11 @@ public String getSystemId() { return this.parentFO().getSystemId(); } - + public int getLine() { return this.parentFO().getLine(); } - + public int getColumn() { return this.parentFO().getColumn(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java 2006-06-14 22:02:13 UTC (rev 7605) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java 2006-06-14 22:37:39 UTC (rev 7606) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.fotree; import org.foray.fotree.fo.NamespaceFO; Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-14 22:02:13 UTC (rev 7605) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-14 22:37:39 UTC (rev 7606) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -53,12 +53,12 @@ * memory, at the expense of processing time. (Use ArrayList during parsing, * then convert to array when parsing is complete.)*/ protected ArrayList children = new ArrayList(); - + public PropertyList property... [truncated message content] |
|
From: <vic...@us...> - 2006-06-14 23:01:48
|
Revision: 7607 Author: victormote Date: 2006-06-14 16:01:40 -0700 (Wed, 14 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7607&view=rev Log Message: ----------- Clean up some javadoc to-do items. Modified Paths: -------------- 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/fo/prop/ContentDimension.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Enumerated.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2006-06-14 22:37:39 UTC (rev 7606) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2006-06-14 23:01:40 UTC (rev 7607) @@ -54,7 +54,8 @@ /** * Return this node's effective parent, cast as an FObj. * This differs from the value returned by - * @param context TODO + * @param context An object that knows how to resolve FO Tree context + * issues. * @return This node's effective parent. */ public FObj effectiveParent(FOContext context) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2006-06-14 22:37:39 UTC (rev 7606) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java 2006-06-14 23:01:40 UTC (rev 7607) @@ -136,7 +136,8 @@ * <li>linefeed-treatment. See XSL-FO Standard 1.0 Section 7.15.7.</li> * <li>text-transform. See XSL-FO Standard 1.0 Section 7.16.6.</li> * </ul> - * @param context TODO + * @param context An object that knows how to resolve FO Tree context + * issues. * * @return The text that should appear in the refined FO tree. */ @@ -177,7 +178,8 @@ * is applied it does not create a stack overflow. This is possible because * text-transform looks at previous and subsequent FOText items, which must * inevitably look back at the original FOText instance.</p> - * @param context TODO + * @param context An object that knows how to resolve FO Tree context + * issues. * * @return The text that should appear in the refined FO tree, except that * text-transform is not applied. @@ -206,7 +208,8 @@ /** * Applies text-transform to one character of the array. - * @param context TODO + * @param context An object that knows how to resolve FO Tree context + * issues. * @param charArray The array which is being transformed. * @param index The 0-based index into charArray, which points to the * character being transformed. @@ -254,7 +257,8 @@ * ambiguous and appears to be definable by the user agent. * See http://lists.w3.org/Archives/Public/xsl-editors/2005AprJun/0006.html * for a discussion of this matter. - * @param context TODO + * @param context An object that knows how to resolve FO Tree context + * issues. * @param charArray The char[] being transformed. * @param index The 0-based index into charArray pointing to the character * that is being tested. @@ -385,7 +389,8 @@ * to a character in the current FOText. Treats all FOText objects within a * block as one unit, allowing text in adjoining FOText objects to be * returned if the parameters are outside of the current object. - * @param context TODO + * @param context An object that knows how to resolve FO Tree context + * issues. * @param charArray The charArray to be tested. * @param index 0-based index into charArray. * @param offset Signed integer with relative position within the block of Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentDimension.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentDimension.java 2006-06-14 22:37:39 UTC (rev 7606) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentDimension.java 2006-06-14 23:01:40 UTC (rev 7607) @@ -71,7 +71,8 @@ /** * Returns the implied or stated scaling factor. - * @param context TODO + * @param context An object that knows how to resolve FO Tree context + * issues. * @param fobj The FObj instance to which this property is attached. * @param absoluteAxis One of {@link Constants#AXIS_HORIZONTAL} or * {@link Constants#AXIS_VERTICAL}. Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Enumerated.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Enumerated.java 2006-06-14 22:37:39 UTC (rev 7606) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Enumerated.java 2006-06-14 23:01:40 UTC (rev 7607) @@ -336,7 +336,8 @@ /** * - * @param context TODO + * @param context An object that knows how to resolve FO Tree context + * issues. * @param fobj This is the ancestor FObj node that should be used to get * the inherited value. Note that this method does no error-checking on * fobj. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-14 23:09:06
|
Revision: 7608 Author: victormote Date: 2006-06-14 16:08:57 -0700 (Wed, 14 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7608&view=rev Log Message: ----------- Conform to axsl change: Remove unneeded parameter. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.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/PageSequence.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-14 23:01:40 UTC (rev 7607) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-14 23:08:57 UTC (rev 7608) @@ -494,8 +494,8 @@ /** * {@inheritDoc} */ - public String traitFlowName(FOContext context) { - return propertyList.getFlowName(context); + public String traitFlowName() { + return propertyList.getFlowName(); } public String traitMarkerClassName() { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2006-06-14 23:01:40 UTC (rev 7607) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2006-06-14 23:08:57 UTC (rev 7608) @@ -516,10 +516,10 @@ (context, Constants.FOPROP_SPAN, fobj); } - public String getFlowName(FOContext context) { + public String getFlowName() { Name property = (Name) getProperty(Constants.FOPROP_FLOW_NAME); if (property != null) { - return property.getValue(context, fobj); + return property.getValue(); } return Name.getValueNoInstance(); } @@ -655,7 +655,8 @@ } /** - * @param context TODO + * @param context An object that knows how to resolve FO Tree context + * issues. * @return The <em>nominal</em> width. */ public int getColumnWidth(FOContext context, int tableWidth) { 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 2006-06-14 23:01:40 UTC (rev 7607) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractFlow.java 2006-06-14 23:08:57 UTC (rev 7608) @@ -28,7 +28,6 @@ import org.foray.fotree.Namespace; import org.foray.fotree.PropertyList; -import org.axsl.foR.FOContext; import org.axsl.foR.FOTreeException; public abstract class AbstractFlow extends FObj { @@ -43,9 +42,7 @@ } protected void start() throws FOTreeException { - /* TODO: Handle context better. */ - FOContext context = null; - String name = traitFlowName(context); + 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/PageSequence.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java 2006-06-14 23:01:40 UTC (rev 7607) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java 2006-06-14 23:08:57 UTC (rev 7608) @@ -98,13 +98,11 @@ } public void addFlow(Flow flow) throws FOTreeException { - /* TODO: Handle context better. */ - FOContext context = null; if (this.flow != null) { throwException("Only a single fo:flow permitted per " + getFullName()); } - if (flowMap.containsKey(flow.traitFlowName(context))) { + if (flowMap.containsKey(flow.traitFlowName())) { throwException("flow-names must be unique within an " + getFullName()); } @@ -114,26 +112,24 @@ public void addStaticContent(StaticContent staticContent) throws FOTreeException { - /* TODO: Handle context better. */ - FOContext context = null; if (this.flow!=null) { throwException("Static content ('" - + staticContent.traitFlowName(context) + + staticContent.traitFlowName() + "') is not allowed after fo:flow"); } - if (flowMap.containsKey(staticContent.traitFlowName(context))) { + if (flowMap.containsKey(staticContent.traitFlowName())) { throwException("flow-names must be unique within an " + "fo:page-sequence"); } - String flowName = staticContent.traitFlowName(context); + String flowName = staticContent.traitFlowName(); if (! getLayoutMasterSet().regionNameExists(flowName) && !flowName.equals("xsl-before-float-separator") && !flowName.equals("xsl-footnote-separator")) { getLogger().error("region-name '" - + staticContent.traitFlowName(context) + + staticContent.traitFlowName() + "' doesn't exist in the layout-master-set."); } - flowMap.put(staticContent.traitFlowName(context), staticContent); + flowMap.put(staticContent.traitFlowName(), staticContent); } public StaticContent getStaticContent(String regionName) { @@ -236,9 +232,9 @@ spm = pageSequenceMaster.getNextSimplePageMaster( ((pageNumberInDocument % 2) == 1), isBlank); Region region = (Region) spm.getRegionBody(); - if (! flow.traitFlowName(context).equals( + if (! flow.traitFlowName().equals( region.traitRegionName())) { - throw new FOTreeException("Flow '" + flow.traitFlowName(context) + throw new FOTreeException("Flow '" + flow.traitFlowName() + "' does not map to the region-body in page-master '" + spm.traitMasterName(context) + "'"); } @@ -261,9 +257,9 @@ pageSequenceMaster.reset(); } else { Region region = (Region) this.simplePageMaster.getRegionBody(); - if (! flow.traitFlowName(context).equals( + if (! flow.traitFlowName().equals( region.traitRegionName())) { - throwException("Flow '" + flow.traitFlowName(context) + throwException("Flow '" + flow.traitFlowName() + "' does not map to the region-body in page-master '" + this.simplePageMaster.traitMasterName(context) + "'"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-14 23:21:29
|
Revision: 7609 Author: victormote Date: 2006-06-14 16:21:17 -0700 (Wed, 14 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7609&view=rev Log Message: ----------- Conform to axsl change: Remove unneeded parameter. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Character.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-14 23:08:57 UTC (rev 7608) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-14 23:21:17 UTC (rev 7609) @@ -1016,11 +1016,8 @@ return propertyList.getRight(context, widthContainingBlock); } - /** - * {@inheritDoc} - */ - public char traitCharacter(FOContext context) { - return propertyList.getCharacter(context); + public char traitCharacter() { + return propertyList.getCharacter(); } /** Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2006-06-14 23:08:57 UTC (rev 7608) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2006-06-14 23:21:17 UTC (rev 7609) @@ -1316,17 +1316,15 @@ widthContainingBlock); } - public char getCharacter(FOContext context) { + public char getCharacter() { Character property = (Character) getProperty(Constants .FOPROP_CHARACTER); if (property != null) { - return property.getValue(context, fobj); + return property.getValue(); } - return Character.getValueNoInstance(context, - Constants.FOPROP_CHARACTER, fobj); + return Character.getValueNoInstance(Constants.FOPROP_CHARACTER); } - public String getSrc(FOContext context) { Src property = (Src) getProperty(Constants.FOPROP_SRC); if (property == null) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java 2006-06-14 23:08:57 UTC (rev 7608) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java 2006-06-14 23:21:17 UTC (rev 7609) @@ -57,9 +57,7 @@ } public void start() throws FOTreeException { - /* TODO: Handle context better. */ - FOContext context = null; - char c = traitCharacter(context); + char c = traitCharacter(); if (c == org.foray.fotree.fo.prop.Character.CHARACTER_NOT_SPECIFIED) { throwException("Property \"character\" is required."); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Character.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Character.java 2006-06-14 23:08:57 UTC (rev 7608) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Character.java 2006-06-14 23:21:17 UTC (rev 7609) @@ -72,6 +72,7 @@ propertyList)); } + /* For "hyphenation-character", which can be inherited. */ public char getValue(FOContext context, FObj fobj) { if (this.value instanceof PropertyKeyword) { switch (propertyType) { @@ -87,12 +88,20 @@ return 0; } + /* + * For "character" property, which has no inheritance. + */ + public char getValue() { + if (this.value instanceof DtCharacter) { + return ((DtCharacter) this.value).getValue(); + } + return 0; + } + + /* For properties that can be inherited. */ public static char getValueNoInstance(FOContext context, short propertyType, FObj fobj) { switch (propertyType) { - case Constants.FOPROP_CHARACTER: { - return CHARACTER_NOT_SPECIFIED; - } case Constants.FOPROP_HYPHENATION_CHARACTER: { FObj parent = fobj.effectiveParent(context); if (parent != null) { @@ -109,6 +118,17 @@ return 0; } + /* For properties that have no inheritance, i.e. "character". */ + public static char getValueNoInstance(short propertyType) { + switch (propertyType) { + case Constants.FOPROP_CHARACTER: { + return CHARACTER_NOT_SPECIFIED; + } + } + return 0; + + } + protected short[] getValidKeywords() { switch (propertyType) { case Constants.FOPROP_HYPHENATION_CHARACTER: { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-14 23:57:57
|
Revision: 7613 Author: victormote Date: 2006-06-14 16:57:47 -0700 (Wed, 14 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7613&view=rev Log Message: ----------- Remove unneeded parameter. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Enumerated.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-14 23:42:40 UTC (rev 7612) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-14 23:57:47 UTC (rev 7613) @@ -664,8 +664,8 @@ return propertyList.getOddOrEven(); } - public short traitBlankOrNotBlank(FOContext context) { - return propertyList.getBlankOrNotBlank(context); + public short traitBlankOrNotBlank() { + return propertyList.getBlankOrNotBlank(); } /** Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2006-06-14 23:42:40 UTC (rev 7612) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2006-06-14 23:57:47 UTC (rev 7613) @@ -853,14 +853,14 @@ return Enumerated.getValueNoInstance(Constants.FOPROP_ODD_OR_EVEN); } - public short getBlankOrNotBlank(FOContext context) { + public short getBlankOrNotBlank() { Enumerated property = (Enumerated) getProperty(Constants .FOPROP_BLANK_OR_NOT_BLANK); if (property != null) { - return property.getValue(context, fobj); + return property.getValue(null, fobj); } return Enumerated.getValueNoInstance - (context, Constants.FOPROP_BLANK_OR_NOT_BLANK, fobj); + (Constants.FOPROP_BLANK_OR_NOT_BLANK); } public int getInitialPageNumber(FOContext context, int lastPageNumberUsed) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java 2006-06-14 23:42:40 UTC (rev 7612) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java 2006-06-14 23:57:47 UTC (rev 7613) @@ -31,7 +31,6 @@ import org.foray.fotree.PropertyList; import org.axsl.common.Constants; -import org.axsl.foR.FOContext; import org.axsl.foR.FONodeProxy; import org.axsl.foR.FOTreeException; import org.axsl.foR.ProxyFactory; @@ -76,9 +75,6 @@ protected boolean isValid(boolean isOddPage, boolean isFirstPage, boolean isEmptyPage) { - /* TODO: Handle context better. */ - FOContext context = null; - // page-position int pagePosition = traitPagePosition(); if (isFirstPage) { if (pagePosition == Constants.FOVAL_REST) { @@ -113,11 +109,11 @@ // blank-or-not-blank if (isEmptyPage) { - if (traitBlankOrNotBlank(context) == Constants.FOVAL_NOT_BLANK) { + if (traitBlankOrNotBlank() == Constants.FOVAL_NOT_BLANK) { return false; } } else { - if (traitBlankOrNotBlank(context) == Constants.FOVAL_BLANK) { + if (traitBlankOrNotBlank() == Constants.FOVAL_BLANK) { return false; } } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Enumerated.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Enumerated.java 2006-06-14 23:42:40 UTC (rev 7612) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Enumerated.java 2006-06-14 23:57:47 UTC (rev 7613) @@ -355,7 +355,7 @@ return fobj.traitBackgroundRepeat(context); } case Constants.FOPROP_BLANK_OR_NOT_BLANK: { - return fobj.traitBlankOrNotBlank(context); + return fobj.traitBlankOrNotBlank(); } case Constants.FOPROP_BORDER_COLLAPSE: { return fobj.traitBorderCollapse(context); @@ -393,9 +393,15 @@ case Constants.FOPROP_LINE_STACKING_STRATEGY: { return fobj.traitLineStackingStrategy(context); } + case Constants.FOPROP_ODD_OR_EVEN: { + return fobj.traitOddOrEven(); + } case Constants.FOPROP_OVERFLOW: { return fobj.traitOverflow(context); } + case Constants.FOPROP_PAGE_POSITION: { + return fobj.propertyList.getPagePosition(); + } case Constants.FOPROP_POSITION: { return fobj.propertyList.getPosition(context); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-15 00:05:29
|
Revision: 7614 Author: victormote Date: 2006-06-14 17:05:18 -0700 (Wed, 14 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7614&view=rev Log Message: ----------- Get the context needed for intrinsic measurements. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjScaled.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/InstreamForeignObject.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjScaled.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjScaled.java 2006-06-14 23:57:47 UTC (rev 7613) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjScaled.java 2006-06-15 00:05:18 UTC (rev 7614) @@ -44,13 +44,13 @@ * @return The width, in millipoints, of the content of this object, as * reported by the content itself. */ - protected abstract int intrinsicContentWidth(); + protected abstract int intrinsicContentWidth(FOContext context); /** * @return The height, in millipoints, of the content of this object, as * reported by the content itself. */ - protected abstract int intrinsicContentHeight(); + protected abstract int intrinsicContentHeight(FOContext context); /** * {@inheritDoc} @@ -65,8 +65,8 @@ return viewportIPD; } float scalingFactor = this.getContentWidth( - context, this.intrinsicContentWidth(), viewportIPD); - return (int) (this.intrinsicContentWidth() * scalingFactor); + context, this.intrinsicContentWidth(context), viewportIPD); + return (int) (this.intrinsicContentWidth(context) * scalingFactor); } /** @@ -82,8 +82,8 @@ return viewportBPD; } float scalingFactor = this.getContentHeight( - context, this.intrinsicContentHeight(), viewportBPD); - return (int) (this.intrinsicContentHeight() * scalingFactor); + context, this.intrinsicContentHeight(context), viewportBPD); + return (int) (this.intrinsicContentHeight(context) * scalingFactor); } /** Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java 2006-06-14 23:57:47 UTC (rev 7613) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java 2006-06-15 00:05:18 UTC (rev 7614) @@ -96,9 +96,7 @@ /** * {@inheritDoc} */ - protected int intrinsicContentWidth() { - /* TODO: Handle context better. */ - FOContext context = null; + protected int intrinsicContentWidth(FOContext context) { if (getGraphic(context) == null) { return Constants.DIMENSION_AUTO; } @@ -117,9 +115,7 @@ /** * {@inheritDoc} */ - protected int intrinsicContentHeight() { - /* TODO: Handle context better. */ - FOContext context = null; + protected int intrinsicContentHeight(FOContext context) { if (getGraphic(context) == null) { return Constants.DIMENSION_AUTO; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java 2006-06-14 23:57:47 UTC (rev 7613) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java 2006-06-15 00:05:18 UTC (rev 7614) @@ -78,14 +78,14 @@ /** * {@inheritDoc} */ - protected int intrinsicContentWidth() { + protected int intrinsicContentWidth(FOContext context) { return ((ForeignXML) getForeignXML()).intrinsicContentWidth(); } /** * {@inheritDoc} */ - protected int intrinsicContentHeight() { + protected int intrinsicContentHeight(FOContext context) { return ((ForeignXML) getForeignXML()).intrinsicContentHeight(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-15 00:50:43
|
Revision: 7616 Author: victormote Date: 2006-06-14 17:50:36 -0700 (Wed, 14 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7616&view=rev Log Message: ----------- 1. Remove no-longer-needed method in FObjMixed. 2. Improve validation and text handling in BookMarkTitle. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java 2006-06-15 00:34:05 UTC (rev 7615) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java 2006-06-15 00:50:36 UTC (rev 7616) @@ -26,7 +26,6 @@ import org.foray.common.XMLCharacter; -import org.axsl.foR.FOContext; import org.axsl.foR.FOTreeException; /** @@ -108,31 +107,6 @@ super.addChild(child); } - /** - * Returns the "area tree construction" text associated with a given child - * of this FObjMixed item. By "area tree construction" text is meant the - * raw text after certain filtering has been done in conformance with the - * traits. - * @see FOText#getAreaTreeText(FOContext) - * @param childIndex The index into the Collection of children that - * tells which child should be returned. - * @return The text associated with childIndex, or null if childIndex is - * not valid. - */ - public char[] getText(int childIndex) { - /* TODO: Handle context better. */ - FOContext context = null; - if (childIndex < 0 || childIndex > getChildren().size() - 1) { - return null; - } - FOText text = null; - if (! (getChildren().get(childIndex) instanceof FOText)) { - return null; - } - text = (FOText) getChildren().get(childIndex); - return text.getAreaTreeText(context); - } - public boolean canContainBlock() { return true; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java 2006-06-15 00:34:05 UTC (rev 7615) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java 2006-06-15 00:50:36 UTC (rev 7616) @@ -24,6 +24,7 @@ package org.foray.fotree.fo.obj; +import org.foray.fotree.FOText; import org.foray.fotree.FObj; import org.foray.fotree.FObjMixed; import org.foray.fotree.Namespace; @@ -44,8 +45,26 @@ super(parent, propertyList, systemId, line, column); } + public void end() throws FOTreeException { + super.end(); + /* Validate children. Content Model: (#PCDATA) + * Must have exactly one child, an FOText instance. */ + if (this.children.size() != 1) { + throwException(this.getFullName() + " must have exactly one " + + "child."); + } + if (! (this.children.get(0) instanceof FOText)) { + throwException(this.getFullName() + " child must be #PCDATA."); + } + } + + public FOText getText() { + /* Existence and cast verified in end(). */ + return (FOText) this.children.get(0); + } + public char[] getContent() { - return getText(0); + return getText().getRawText(); } public String getName() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-15 21:42:29
|
Revision: 7625 Author: victormote Date: 2006-06-15 14:42:19 -0700 (Thu, 15 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7625&view=rev Log Message: ----------- Conform to axsl change: Require context to get the ref-id. It can take the "inherit" key word and can be inside an fo:marker. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.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/Bookmark.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/PageNumberCitation.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-15 20:26:07 UTC (rev 7624) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-15 21:42:19 UTC (rev 7625) @@ -284,7 +284,7 @@ /** * {@inheritDoc} */ - public String refIdNeeded() { + public String refIdNeeded(FOContext context) { return null; } 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 2006-06-15 20:26:07 UTC (rev 7624) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java 2006-06-15 21:42:19 UTC (rev 7625) @@ -118,7 +118,7 @@ /** * {@inheritDoc} */ - public String refIdNeeded() { + public String refIdNeeded(FOContext context) { return traitInternalDestination(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java 2006-06-15 20:26:07 UTC (rev 7624) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java 2006-06-15 21:42:19 UTC (rev 7625) @@ -113,7 +113,7 @@ /** * {@inheritDoc} */ - public String refIdNeeded() { + public String refIdNeeded(FOContext context) { return traitInternalDestination(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java 2006-06-15 20:26:07 UTC (rev 7624) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java 2006-06-15 21:42:19 UTC (rev 7625) @@ -50,7 +50,9 @@ } public void start() throws FOTreeException { - /* TODO: Handle context better. */ + /* Using a null context here is OK, because we are not computing + * a length to be used anywhere, only testing the relative values of + * the min, max, and optimum. */ FOContext context = null; final int testConstant = 1000000; if (traitLeaderLengthMin(context, testConstant) Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java 2006-06-15 20:26:07 UTC (rev 7624) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java 2006-06-15 21:42:19 UTC (rev 7625) @@ -114,9 +114,7 @@ /** * {@inheritDoc} */ - public String refIdNeeded() { - /* TODO: Handle context better. */ - FOContext context = null; + public String refIdNeeded(FOContext context) { return traitRefId(context); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java 2006-06-15 20:26:07 UTC (rev 7624) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java 2006-06-15 21:42:19 UTC (rev 7625) @@ -195,7 +195,10 @@ } public void checkUnmatchedReference(org.axsl.foR.FObj fobj) { - String refId = fobj.refIdNeeded(); + /* TODO: If a page-number-citation object with ref-id="inherit" is + * inside a marker, the value could inherit from a retrieve-marker's + * ancestors, and the ref-id returned here will be bogus. */ + String refId = fobj.refIdNeeded(null); if (refId == null) { return; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-15 22:26:08
|
Revision: 7630 Author: victormote Date: 2006-06-15 15:26:01 -0700 (Thu, 15 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7630&view=rev Log Message: ----------- Conform to axsl change: Remove unneeded methods. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.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 Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-15 22:19:14 UTC (rev 7629) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-15 22:26:01 UTC (rev 7630) @@ -702,9 +702,6 @@ return propertyList.getForcePageCount(context); } - /** - * {@inheritDoc} - */ public String traitMasterName(FOContext context) { return propertyList.getMasterName(context); } @@ -751,9 +748,6 @@ return propertyList.getColumnCount(context); } - /** - * {@inheritDoc} - */ public int traitMaximumRepeats(FOContext context) { return propertyList.getMaximumRepeats(context); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java 2006-06-15 22:19:14 UTC (rev 7629) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java 2006-06-15 22:26:01 UTC (rev 7630) @@ -33,7 +33,6 @@ import org.axsl.foR.FOTreeException; import org.axsl.foR.ProxyFactory; import org.axsl.foR.fo.Flow; -import org.axsl.foR.fo.SimplePageMaster; import java.util.HashMap; @@ -193,7 +192,7 @@ return this.flow; } - public org.axsl.foR.fo.SimplePageMaster getSimplePageMaster() { + public SimplePageMaster getSimplePageMaster() { /* TODO: Handle context better. */ FOContext context = null; String masterReference = this.traitMasterReference(context); @@ -210,9 +209,9 @@ /** * {@inheritDoc} */ - public SimplePageMaster getPageMaster(int pageNumberInSequence, - int pageNumberInDocument, boolean isLast, boolean isBlank) - throws FOTreeException { + public org.axsl.foR.fo.SimplePageMaster getPageMaster( + int pageNumberInSequence, int pageNumberInDocument, boolean isLast, + boolean isBlank) throws FOTreeException { /* TODO: Handle context better. */ FOContext context = null; /* Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java 2006-06-15 22:19:14 UTC (rev 7629) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java 2006-06-15 22:26:01 UTC (rev 7630) @@ -112,7 +112,7 @@ } } - public org.axsl.foR.fo.SimplePageMaster getNextSimplePageMaster( + public SimplePageMaster getNextSimplePageMaster( boolean oddPage, boolean blankPage) throws FOTreeException { /* TODO: Handle context better. */ FOContext context = null; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
