|
From: <vic...@us...> - 2006-06-15 22:58:33
|
Revision: 7631 Author: victormote Date: 2006-06-15 15:58:27 -0700 (Thu, 15 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7631&view=rev Log Message: ----------- Conform to axsl changes: Rename method and recast it with a boolean return value, mostly to prevent exposing too much detail. Also, remove unneeded context 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/prop/InitialPageNumber.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:26:01 UTC (rev 7630) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-15 22:58:27 UTC (rev 7631) @@ -675,8 +675,9 @@ /** * {@inheritDoc} */ - public short getRawInitialPageNumber(FOContext context) { - return propertyList.getRawInitialPageNumber(context); + public boolean initialPageNumberSetExplicitly() { + short rawInitialPageNumber = propertyList.getRawInitialPageNumber(); + return rawInitialPageNumber == Constants.FOVAL_NOT_A_KEYWORD; } public String traitFormat() { 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-15 22:26:01 UTC (rev 7630) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2006-06-15 22:58:27 UTC (rev 7631) @@ -876,12 +876,12 @@ return InitialPageNumber.getValueNoInstance(lastPageNumberUsed); } - public short getRawInitialPageNumber(FOContext context) { + public short getRawInitialPageNumber() { InitialPageNumber property = (InitialPageNumber) getProperty(Constants .FOPROP_INITIAL_PAGE_NUMBER); if (property != null) { - return property.getRawValue(context, fobj); + return property.getRawValue(fobj); } return InitialPageNumber.getRawValueNoInstance(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InitialPageNumber.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InitialPageNumber.java 2006-06-15 22:26:01 UTC (rev 7630) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InitialPageNumber.java 2006-06-15 22:58:27 UTC (rev 7631) @@ -104,13 +104,14 @@ return getValueNoInstance(lastPageNumberUsed); } - public short getRawValue(FOContext context, FObj fobj) { + public short getRawValue(FObj fobj) { if (this.value instanceof PropertyKeyword) { short keyword = ((PropertyKeyword) this.value).getValue(); if (keyword == Constants.FOVAL_INHERIT) { - FObj parent = fobj.effectiveParent(context); + FObj parent = fobj.realParent(); if (parent != null) { - return parent.getRawInitialPageNumber(context); + PropertyList propertyList = parent.propertyList; + return propertyList.getRawInitialPageNumber(); } return getRawValueNoInstance(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-15 23:05:14
|
Revision: 7633 Author: victormote Date: 2006-06-15 16:05:06 -0700 (Thu, 15 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7633&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/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-15 22:58:36 UTC (rev 7632) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-15 23:05:06 UTC (rev 7633) @@ -692,8 +692,8 @@ return propertyList.getGroupingSize(); } - public short traitLetterValue(FOContext context) { - return propertyList.getLetterValue(context); + public short traitLetterValue() { + return propertyList.getLetterValue(); } /** 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-15 22:58:36 UTC (rev 7632) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2006-06-15 23:05:06 UTC (rev 7633) @@ -913,14 +913,13 @@ return GroupingSize.getValueNoInstance(); } - public short getLetterValue(FOContext context) { + public short getLetterValue() { Enumerated property = (Enumerated) getProperty(Constants .FOPROP_LETTER_VALUE); if (property != null) { - return property.getValue(context, fobj); + return property.getValue(); } - return Enumerated.getValueNoInstance - (context, Constants.FOPROP_LETTER_VALUE, fobj); + return Enumerated.getValueNoInstance(Constants.FOPROP_LETTER_VALUE); } public short getForcePageCount(FOContext 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:58:36 UTC (rev 7632) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java 2006-06-15 23:05:06 UTC (rev 7633) @@ -78,12 +78,10 @@ } public void start() throws FOTreeException { - /* TODO: Handle context better. */ - FOContext context = null; // get the 'format' properties this.pageNumberGenerator = new PageNumberGenerator(this.traitFormat(), this.traitGroupingSeparator(), this.traitGroupingSize(), - this.traitLetterValue(context)); + this.traitLetterValue()); } public void end() throws FOTreeException { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-15 23:10:02
|
Revision: 7634 Author: victormote Date: 2006-06-15 16:09:48 -0700 (Thu, 15 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7634&view=rev Log Message: ----------- Remove unneeded method 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/obj/PageSequence.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/SinglePageMasterReference.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 23:05:06 UTC (rev 7633) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-15 23:09:48 UTC (rev 7634) @@ -652,8 +652,8 @@ return propertyList.traitKeepWithPreviousWithinPage(context); } - public String traitMasterReference(FOContext context) { - return propertyList.getMasterReference(context); + public String traitMasterReference() { + return propertyList.getMasterReference(); } public short traitPagePosition() { 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-15 23:05:06 UTC (rev 7633) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2006-06-15 23:09:48 UTC (rev 7634) @@ -827,10 +827,10 @@ return getKeepWithPrevious(context, Keep.WITHIN_PAGE); } - public String getMasterReference(FOContext context) { + public String getMasterReference() { Name property = (Name) getProperty(Constants.FOPROP_MASTER_REFERENCE); if (property != null) { - return property.getValue(context, fobj); + return property.getValue(); } return Name.getValueNoInstance(); } 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-15 23:05:06 UTC (rev 7633) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java 2006-06-15 23:09:48 UTC (rev 7634) @@ -54,7 +54,7 @@ public void start() { /* Validate properties. */ - if (traitMasterReference(null) == null) { + if (traitMasterReference() == null) { logWarning(getFullName() + " has no master-reference, and " + "will be ignored."); } 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 23:05:06 UTC (rev 7633) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java 2006-06-15 23:09:48 UTC (rev 7634) @@ -191,16 +191,12 @@ } public SimplePageMaster getSimplePageMaster() { - /* TODO: Handle context better. */ - FOContext context = null; - String masterReference = this.traitMasterReference(context); + String masterReference = this.traitMasterReference(); return getLayoutMasterSet().getSimplePageMaster(masterReference); } public PageSequenceMaster getPageSequenceMaster() { - /* TODO: Handle context better. */ - FOContext context = null; - String masterReference = this.traitMasterReference(context); + String masterReference = this.traitMasterReference(); return getLayoutMasterSet().getPageSequenceMaster(masterReference); } @@ -247,7 +243,7 @@ pageSequenceMaster = getPageSequenceMaster(); if (pageSequenceMaster == null) { throwException("master-reference '" - + traitMasterReference(context) + + traitMasterReference() + "' for fo:page-sequence matches no " + "simple-page-master or page-sequence-master"); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java 2006-06-15 23:05:06 UTC (rev 7633) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java 2006-06-15 23:09:48 UTC (rev 7634) @@ -73,7 +73,7 @@ ConditionalPageMasterReference cpmr = (ConditionalPageMasterReference)this.children.get(i); if (cpmr.isValid(isOddPage, isFirstPage, isEmptyPage)) { - return cpmr.traitMasterReference(context); + return cpmr.traitMasterReference(); } } return null; Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java 2006-06-15 23:05:06 UTC (rev 7633) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java 2006-06-15 23:09:48 UTC (rev 7634) @@ -49,9 +49,7 @@ public RepeatablePMReference(FObj parent, PropertyList propertyList, String systemId, int line, int column) throws FOTreeException { super(parent, propertyList, systemId, line, column); - /* TODO: Handle context better. */ - FOContext context = null; - String masterReference = traitMasterReference(context); + String masterReference = traitMasterReference(); if (! masterReference.equals("")) { if (! (parent instanceof PageSequenceMaster)) { throwException(getFullName() + " must be child of " Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java 2006-06-15 23:05:06 UTC (rev 7633) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java 2006-06-15 23:09:48 UTC (rev 7634) @@ -55,7 +55,7 @@ } public void start() { - String masterReference = traitMasterReference(null); + String masterReference = traitMasterReference(); if (masterReference.equals("")) { this.logWarning(getFullName() + " has no master-reference, and " + "will be ignored."); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-15 23:21:06
|
Revision: 7636 Author: victormote Date: 2006-06-15 16:20:58 -0700 (Thu, 15 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7636&view=rev Log Message: ----------- Remove unneeded method 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/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/prop/MaximumRepeats.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 23:12:40 UTC (rev 7635) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-15 23:20:58 UTC (rev 7636) @@ -749,8 +749,8 @@ return propertyList.getColumnCount(context); } - public int traitMaximumRepeats(FOContext context) { - return propertyList.getMaximumRepeats(context); + public int traitMaximumRepeats() { + return propertyList.getMaximumRepeats(); } /** 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-15 23:12:40 UTC (rev 7635) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2006-06-15 23:20:58 UTC (rev 7636) @@ -1005,11 +1005,11 @@ return ColumnCount.getValueNoInstance(); } - public int getMaximumRepeats(FOContext context) { + public int getMaximumRepeats() { MaximumRepeats property = (MaximumRepeats) getProperty(Constants.FOPROP_MAXIMUM_REPEATS); if (property != null) { - return property.getValue(context, fobj); + return property.getValue(fobj); } return MaximumRepeats.getValueNoInstance(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java 2006-06-15 23:12:40 UTC (rev 7635) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java 2006-06-15 23:20:58 UTC (rev 7636) @@ -63,7 +63,7 @@ public String getNextPageMasterName(FOContext context, boolean isOddPage, boolean isFirstPage, boolean isEmptyPage) { - if (numberConsumed < traitMaximumRepeats(context)) { + if (numberConsumed < traitMaximumRepeats()) { numberConsumed++; } else { return null; Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java 2006-06-15 23:12:40 UTC (rev 7635) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java 2006-06-15 23:20:58 UTC (rev 7636) @@ -72,7 +72,7 @@ public String getNextPageMasterName(FOContext context, boolean isOddPage, boolean isFirstPage, boolean isEmptyPage) { - if (numberConsumed < traitMaximumRepeats(context)) { + if (numberConsumed < traitMaximumRepeats()) { numberConsumed++; } else { return null; Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/MaximumRepeats.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/MaximumRepeats.java 2006-06-15 23:12:40 UTC (rev 7635) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/MaximumRepeats.java 2006-06-15 23:20:58 UTC (rev 7636) @@ -33,9 +33,11 @@ import org.foray.fotree.value.PropertyValue; import org.axsl.common.Constants; -import org.axsl.foR.FOContext; - +/** + * The "maximum-repeats" property in XSL-FO. + * See XSL-FO 1.0, Section 7.25.10. + */ public class MaximumRepeats extends Property { public static final int NO_LIMIT = 2147483647; @@ -67,14 +69,14 @@ propertyList)); } - public int getValue(FOContext context, FObj fobj) { + public int getValue(FObj fobj) { if (this.value instanceof PropertyKeyword) { short keyword = ((PropertyKeyword) this.value).getValue(); switch (keyword) { case Constants.FOVAL_INHERIT: { - FObj parent = fobj.effectiveParent(context); + FObj parent = fobj.realParent(); if (parent != null) { - return parent.traitMaximumRepeats(context); + return parent.traitMaximumRepeats(); } return getValueNoInstance(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-15 23:26:42
|
Revision: 7637 Author: victormote Date: 2006-06-15 16:26:33 -0700 (Thu, 15 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7637&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/LayoutMasterSet.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/RepeatablePMReference.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 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 23:20:58 UTC (rev 7636) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-15 23:26:33 UTC (rev 7637) @@ -703,8 +703,8 @@ return propertyList.getForcePageCount(context); } - public String traitMasterName(FOContext context) { - return propertyList.getMasterName(context); + public String traitMasterName() { + return propertyList.getMasterName(); } /** 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-15 23:20:58 UTC (rev 7636) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2006-06-15 23:26:33 UTC (rev 7637) @@ -931,10 +931,10 @@ return ForcePageCount.getValueNoInstance(); } - public String getMasterName(FOContext context) { + public String getMasterName() { Name property = (Name) getProperty(Constants.FOPROP_MASTER_NAME); if (property != null) { - return property.getValue(context, fobj); + return property.getValue(); } return Name.getValueNoInstance(); } 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-15 23:20:58 UTC (rev 7636) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java 2006-06-15 23:26:33 UTC (rev 7637) @@ -71,13 +71,13 @@ SimplePageMaster simplePageMaster) throws FOTreeException { // check against duplication of master-name - if (existsName(simplePageMaster.traitMasterName(context))) { + if (existsName(simplePageMaster.traitMasterName())) { throwException("'master-name' (" - + simplePageMaster.traitMasterName(context) + + simplePageMaster.traitMasterName() + ") must be unique across page-masters and " + "page-sequence-masters"); } - this.simplePageMasters.put(simplePageMaster.traitMasterName(context), + this.simplePageMasters.put(simplePageMaster.traitMasterName(), simplePageMaster); } 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 23:20:58 UTC (rev 7636) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java 2006-06-15 23:26:33 UTC (rev 7637) @@ -28,7 +28,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; @@ -206,8 +205,6 @@ public org.axsl.foR.fo.SimplePageMaster getPageMaster( int pageNumberInSequence, int pageNumberInDocument, boolean isLast, boolean isBlank) throws FOTreeException { - /* TODO: Handle context better. */ - FOContext context = null; /* * TODO: This is the legacy code from the AreaTree, which is stateful. * Convert this to stateless logic. Specifically, @@ -229,15 +226,13 @@ region.traitRegionName())) { throw new FOTreeException("Flow '" + flow.traitFlowName() + "' does not map to the region-body in page-master '" - + spm.traitMasterName(context) + "'"); + + spm.traitMasterName() + "'"); } } return spm; } private void setupPagination() throws FOTreeException { - /* TODO: Handle context better. */ - FOContext context = null; this.simplePageMaster = getSimplePageMaster(); if (this.simplePageMaster == null) { pageSequenceMaster = getPageSequenceMaster(); @@ -254,7 +249,7 @@ region.traitRegionName())) { throwException("Flow '" + flow.traitFlowName() + "' does not map to the region-body in page-master '" - + this.simplePageMaster.traitMasterName(context) + + this.simplePageMaster.traitMasterName() + "'"); } } 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 23:20:58 UTC (rev 7636) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java 2006-06-15 23:26:33 UTC (rev 7637) @@ -62,7 +62,7 @@ public void start() throws FOTreeException { /* Validate properties. */ - String masterName = this.traitMasterName(null); + String masterName = this.traitMasterName(); if (masterName == null) { logWarning(getFullName() + " has no page-master-name, and will be " + "ignored."); @@ -121,7 +121,7 @@ currentSubSequence = getNextSubSequence(); if (currentSubSequence==null) { throwException("no subsequences in page-sequence-master '" - + traitMasterName(context) + "'"); + + traitMasterName() + "'"); } firstPage = true; } @@ -135,12 +135,12 @@ if (!canRecover) { throwException("subsequences exhausted in " + "page-sequence-master '" - + traitMasterName(context) + + traitMasterName() + "', cannot recover"); } getLogger().warn("subsequences exhausted in " + "page-sequence-master '" - + traitMasterName(context) + + traitMasterName() + "', use previous subsequence"); currentSubSequence.reset(); canRecover = false; @@ -155,7 +155,7 @@ if (pageMaster==null) { throwException("No simple-page-master matching '" + pageMasterName + "' in page-sequence-master '" - + traitMasterName(context) +"'."); + + traitMasterName() +"'."); } return pageMaster; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java 2006-06-15 23:20:58 UTC (rev 7636) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java 2006-06-15 23:26:33 UTC (rev 7637) @@ -77,7 +77,7 @@ } else { return null; } - return traitMasterName(context); + return traitMasterName(); } public void reset() { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java 2006-06-15 23:20:58 UTC (rev 7636) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java 2006-06-15 23:26:33 UTC (rev 7637) @@ -60,7 +60,7 @@ protected void start() throws FOTreeException { /* TODO: Handle context better. */ FOContext context = null; - if (traitMasterName(context) == null) { + if (traitMasterName() == null) { logWarning("simple-page-master has no " + "master-name, and will be ignored."); } else { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java 2006-06-15 23:20:58 UTC (rev 7636) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java 2006-06-15 23:26:33 UTC (rev 7637) @@ -79,7 +79,7 @@ boolean isFirstPage, boolean isEmptyPage) { if (! this.isDone) { this.isDone = true; - return traitMasterName(context); + return traitMasterName(); } 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-15 23:43:50
|
Revision: 7640 Author: victormote Date: 2006-06-15 16:43:42 -0700 (Thu, 15 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7640&view=rev Log Message: ----------- 1. Conform to axsl change: Remove unneeded method. 2. Remove unneeded parameter from method. 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/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/SimplePageMaster.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 23:29:56 UTC (rev 7639) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-15 23:43:42 UTC (rev 7640) @@ -714,11 +714,8 @@ return propertyList.getRegionName(); } - /** - * {@inheritDoc} - */ - public boolean traitPrecedence(FOContext context) { - return propertyList.getPrecedence(context); + public boolean traitPrecedence() { + return propertyList.getPrecedence(); } /** 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-15 23:29:56 UTC (rev 7639) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2006-06-15 23:43:42 UTC (rev 7640) @@ -951,13 +951,16 @@ return null; } - public boolean getPrecedence(FOContext context) { + public boolean getPrecedence() { Boolean property = (Boolean) getProperty(Constants.FOPROP_PRECEDENCE); + /* Null context is OK, because the object this applies to cannot be + * insider a marker. */ + FOContext context = null; if (property != null) { return property.getValue(context, fobj); } - return Boolean.getValueNoInstance(context, - fobj, Constants.FOPROP_AUTO_RESTORE); + return Boolean.getValueNoInstance(context,fobj, + Constants.FOPROP_PRECEDENCE); } public int getExtent(FOContext context) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java 2006-06-15 23:29:56 UTC (rev 7639) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java 2006-06-15 23:43:42 UTC (rev 7640) @@ -58,7 +58,7 @@ */ public int getXPositionVP_CR(FOContext context) { int xPosition = getPageMaster().getXPositionRA_CR(); - if (traitPrecedence(context) == false) { + if (traitPrecedence() == false) { xPosition += getPageMaster().getStartExtent(); } return xPosition; @@ -78,7 +78,7 @@ */ public int getWidthVP_CR(FOContext context) { int width = getPageMaster().getWidthRA_CR(); - if (traitPrecedence(context) == false) { + if (traitPrecedence() == false) { width -= getPageMaster().getStartExtent() + getPageMaster().getEndExtent(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java 2006-06-15 23:29:56 UTC (rev 7639) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java 2006-06-15 23:43:42 UTC (rev 7640) @@ -59,7 +59,7 @@ public int getXPositionVP_CR(FOContext context) { int pageWidth = getPageMaster().traitPageWidth(context); int xPosition = getPageMaster().getMarginLeft(context, pageWidth); - if (traitPrecedence(context) == false) { + if (traitPrecedence() == false) { xPosition += getPageMaster().getStartExtent(); } return xPosition; @@ -82,7 +82,7 @@ int width = getPageMaster().traitPageWidth(context) - getPageMaster().getMarginLeft(context, pageWidth) - getPageMaster().getMarginRight(context, pageWidth); - if (traitPrecedence(context) == false) { + if (traitPrecedence() == false) { width -= getPageMaster().getStartExtent() + getPageMaster().getEndExtent(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java 2006-06-15 23:29:56 UTC (rev 7639) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java 2006-06-15 23:43:42 UTC (rev 7640) @@ -146,12 +146,10 @@ * @return True iff the region-before has Precedence. */ public boolean getBeforePrecedence() { - /* TODO: Handle context better. */ - FOContext context = null; - if (getRegionBefore() == null) { + if (this.regionBefore == null) { return false; } - return getRegionBefore().traitPrecedence(context); + return regionBefore.traitPrecedence(); } /** @@ -159,12 +157,10 @@ * @return True iff the region-after has Precedence. */ public boolean getAfterPrecedence() { - /* TODO: Handle context better. */ - FOContext context = null; - if (getRegionAfter() == null) { + if (this.regionAfter == null) { return false; } - return getRegionAfter().traitPrecedence(context); + return this.regionAfter.traitPrecedence(); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-16 00:38:10
|
Revision: 7641 Author: victormote Date: 2006-06-15 17:37:58 -0700 (Thu, 15 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7641&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/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/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/SimplePageMaster.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/ColumnGap.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Extent.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 23:43:42 UTC (rev 7640) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-06-16 00:37:58 UTC (rev 7641) @@ -721,8 +721,8 @@ /** * {@inheritDoc} */ - public int traitExtent(FOContext context) { - return propertyList.getExtent(context); + public int traitExtent() { + return propertyList.getExtent(); } /** 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-15 23:43:42 UTC (rev 7640) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2006-06-16 00:37:58 UTC (rev 7641) @@ -963,10 +963,10 @@ Constants.FOPROP_PRECEDENCE); } - public int getExtent(FOContext context) { + public int getExtent() { Extent property = (Extent) getProperty(Constants.FOPROP_EXTENT); if (property != null) { - return property.getValue(context, fobj); + return property.getValue(fobj); } return Extent.getValueNoInstance(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java 2006-06-15 23:43:42 UTC (rev 7640) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java 2006-06-16 00:37:58 UTC (rev 7641) @@ -70,7 +70,7 @@ public int getYPositionVP_CR(FOContext context) { return getPageMaster().getYPositionRA_CR() - getPageMaster().getHeightRA_CR() - + traitExtent(context); + + traitExtent(); } /** @@ -89,7 +89,7 @@ * {@inheritDoc} */ public int getHeightVP_CR(FOContext context) { - return traitExtent(context); + return traitExtent(); } public FONodeProxy makeProxy(ProxyFactory factory) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java 2006-06-15 23:43:42 UTC (rev 7640) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java 2006-06-16 00:37:58 UTC (rev 7641) @@ -93,7 +93,7 @@ * Inherited documentation: @inheritDoc */ public int getHeightVP_CR(FOContext context) { - return traitExtent(context); + return traitExtent(); } public FONodeProxy makeProxy(ProxyFactory factory) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java 2006-06-15 23:43:42 UTC (rev 7640) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java 2006-06-16 00:37:58 UTC (rev 7641) @@ -58,7 +58,7 @@ public int getXPositionVP_CR(FOContext context) { return getPageMaster().getXPositionRA_CR() + getPageMaster().getWidthRA_CR() - - traitExtent(context); + - traitExtent(); } /** @@ -76,7 +76,7 @@ * Inherited documentation: @inheritDoc */ public int getWidthVP_CR(FOContext context) { - return traitExtent(context); + return traitExtent(); } /** Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java 2006-06-15 23:43:42 UTC (rev 7640) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java 2006-06-16 00:37:58 UTC (rev 7641) @@ -75,7 +75,7 @@ * Inherited documentation: @inheritDoc */ public int getWidthVP_CR(FOContext context) { - return traitExtent(context); + return traitExtent(); } /** Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java 2006-06-15 23:43:42 UTC (rev 7640) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java 2006-06-16 00:37:58 UTC (rev 7641) @@ -168,12 +168,10 @@ * @return The extent, in millipoints, of this pages's region-before. */ public int getBeforeExtent() { - /* TODO: Handle context better. */ - FOContext context = null; if (getRegionBefore() == null) { return 0; } - return getRegionBefore().traitExtent(context); + return getRegionBefore().traitExtent(); } /** @@ -181,12 +179,10 @@ * @return The extent, in millipoints, of this pages's region-after. */ public int getAfterExtent() { - /* TODO: Handle context better. */ - FOContext context = null; if (getRegionAfter() == null) { return 0; } - return getRegionAfter().traitExtent(context); + return getRegionAfter().traitExtent(); } /** @@ -194,12 +190,10 @@ * @return The extent, in millipoints, of this pages's region-start. */ public int getStartExtent() { - /* TODO: Handle context better. */ - FOContext context = null; if (getRegionStart() == null) { return 0; } - return getRegionStart().traitExtent(context); + return getRegionStart().traitExtent(); } /** @@ -207,12 +201,10 @@ * @return The extent, in millipoints, of this pages's region-end. */ public int getEndExtent() { - /* TODO: Handle context better. */ - FOContext context = null; if (getRegionEnd() == null) { return 0; } - return getRegionEnd().traitExtent(context); + return getRegionEnd().traitExtent(); } /** Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteOffset.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteOffset.java 2006-06-15 23:43:42 UTC (rev 7640) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteOffset.java 2006-06-16 00:37:58 UTC (rev 7641) @@ -85,7 +85,7 @@ if (parent == null) { return getValueNoInstance(); } - return parent.traitExtent(context); + return parent.traitExtent(); } } } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnGap.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnGap.java 2006-06-15 23:43:42 UTC (rev 7640) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnGap.java 2006-06-16 00:37:58 UTC (rev 7641) @@ -77,7 +77,7 @@ if (parent == null) { return getValueNoInstance(); } - return parent.traitExtent(context); + return parent.traitExtent(); } } } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Extent.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Extent.java 2006-06-15 23:43:42 UTC (rev 7640) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Extent.java 2006-06-16 00:37:58 UTC (rev 7641) @@ -72,16 +72,19 @@ propertyList)); } - public int getValue(FOContext context, FObj fobj) { + public int getValue(FObj fobj) { + /* Null context is OK. The objects for these cannot be inside a + * marker.*/ + FOContext context = null; if (this.value instanceof PropertyKeyword) { short keyword = ((PropertyKeyword) value).getValue(); switch (keyword) { case Constants.FOVAL_INHERIT: { - FObj parent = fobj.effectiveParent(context); + FObj parent = fobj.realParent(); if (parent == null) { return getValueNoInstance(); } - return parent.traitExtent(context); + return parent.traitExtent(); } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-07-22 16:17:14
|
Revision: 7805 Author: victormote Date: 2006-07-22 09:15:41 -0700 (Sat, 22 Jul 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7805&view=rev Log Message: ----------- Consolidate unexpected value reporting a bit. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/Property.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/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/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/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/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/xml/prop/Lang.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/Property.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/Property.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/Property.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -95,6 +95,17 @@ return propertyType; } + protected PropertyException unexpectedValue(String value, + PropertyList propertyList) { + return unexpectedValue(value, propertyList, null); + } + + protected PropertyException unexpectedValue(String value, + PropertyList propertyList, String reason) { + return new PropertyException(unexpectedValueMessage(reason, value, + propertyList)); + } + /** * Creates an "Unexpected value" message suitable for user messages or * exception reporting. @@ -103,7 +114,7 @@ * @return A formatted, ready-to-present message describing the error. * @see #unexpectedValueMessage(String, String, PropertyList) */ - public String unexpectedValueMessage(String value, + private String unexpectedValueMessage(String value, PropertyList propertyList) { return unexpectedValueMessage(null, value, propertyList); } @@ -118,7 +129,7 @@ * @return A formatted, ready-to-present message describing the error. * @see #unexpectedValueMessage(String, PropertyList) */ - public String unexpectedValueMessage(String reason, String value, + private String unexpectedValueMessage(String reason, String value, PropertyList propertyList) { StringBuffer buffer = new StringBuffer(); FObj fobj = propertyList.getFObj(); Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteDimension.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteDimension.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteDimension.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -76,8 +76,7 @@ if (pv instanceof DtPercentage) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public int getValue(FOContext context, byte relativeAxis, Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteOffset.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteOffset.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteOffset.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -68,8 +68,7 @@ if (pv instanceof DtPercentage) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public int getValue(FOContext context, byte direction, Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentAdjust.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentAdjust.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentAdjust.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -77,8 +77,7 @@ if (pv instanceof DtPercentage) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public short traitValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentBaseline.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentBaseline.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentBaseline.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -65,8 +65,7 @@ if (pv != null) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public short traitValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AudioDial.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AudioDial.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AudioDial.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -68,8 +68,7 @@ return pv; } } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public double getValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Azimuth.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Azimuth.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Azimuth.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -79,8 +79,7 @@ } } if (! isBehind) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } } PropertyValue pv = checkKeywords(remainingValue); @@ -91,23 +90,20 @@ case Constants.FOVAL_RIGHTWARDS: case Constants.FOVAL_INHERIT: { if (this.isBehind) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } } } return pv; } if (this.isBehind) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } pv = DtAngle.makeAngleDT(value); if (pv != null) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public float getValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Background.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Background.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Background.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -75,8 +75,7 @@ // Tokenize the input & put the tokens into an ArrayList StringTokenizer st = new StringTokenizer(value); if (st.countTokens() < 1 || st.countTokens() > MAX_TOKENS) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } ArrayList tokenList = new ArrayList(st.countTokens()); while (st.hasMoreTokens()) { @@ -87,8 +86,7 @@ for (int i = 0; i < tokenList.size(); i++) { short contentType = getContentType((String) tokenList.get(i)); if (contentType < 0) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } positionArray[i] = contentType; } @@ -101,8 +99,7 @@ switch (positionArray[i]) { case Constants.FOPROP_BACKGROUND_COLOR: { if (colorFound) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } collection.addItem(new BackgroundColor(propertyList, positionArray[i], propertyFullName, @@ -111,8 +108,7 @@ } case Constants.FOPROP_BACKGROUND_IMAGE: { if (imageFound) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } collection.addItem(new BackgroundImage(propertyList, positionArray[i], propertyFullName, @@ -121,8 +117,7 @@ } case Constants.FOPROP_BACKGROUND_REPEAT: { if (repeatFound) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } collection.addItem(new Enumerated(propertyList, positionArray[i], propertyFullName, @@ -131,8 +126,7 @@ } case Constants.FOPROP_BACKGROUND_ATTACHMENT: { if (attachmentFound) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } collection.addItem(new Enumerated(propertyList, positionArray[i], propertyFullName, @@ -141,8 +135,7 @@ } case Constants.FOPROP_BACKGROUND_POSITION: { if (positionFound) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } String propertyInput = (String) tokenList.get(i); if (i < positionArray.length && positionArray[i + 1] Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundImage.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundImage.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundImage.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -69,8 +69,7 @@ if (pv != null) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public Graphic getValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundPosition.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundPosition.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundPosition.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -90,8 +90,7 @@ if (pv != null) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } private PropertyValue createShorthandValue(PropertyList propertyList, @@ -106,8 +105,7 @@ } StringTokenizer st = new StringTokenizer(value); if (st.countTokens() < 1 || st.countTokens() > 2) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } while (st.hasMoreTokens()) { String token = st.nextToken(); @@ -132,8 +130,7 @@ (propertyList, propertyType, pv); collection.addItem(property); } else { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } } if (collection.getCount() == 1) { @@ -149,16 +146,14 @@ if (pv2 instanceof DtPercentage || pv2 instanceof DtLength) { return collection; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } /* * If the first item is a keyword, the other needs to be also. */ if (pv instanceof PropertyKeyword) { if (! (pv2 instanceof PropertyKeyword)) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } } // The two keywords need to be from each of the two sets. Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BaselineShift.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BaselineShift.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BaselineShift.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -67,8 +67,7 @@ if (pv instanceof DtPercentage) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public int traitValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Boolean.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Boolean.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Boolean.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -61,8 +61,7 @@ if (pv != null) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public boolean getValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Border.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Border.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Border.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -79,8 +79,7 @@ while (st.hasMoreTokens()) { Property property = parseToken(propertyList, st.nextToken()); if (property == null) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } if (collection == null) { collection = new PropertyCollection(); @@ -90,8 +89,7 @@ if (collection != null) { return collection; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public Property parseToken(PropertyList propertyList, String token) Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderColor.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderColor.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderColor.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -77,8 +77,7 @@ if (pv instanceof ExprColor) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } private PropertyValue createShorthandValue(PropertyList propertyList, Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderPrecedence.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderPrecedence.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderPrecedence.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -68,8 +68,7 @@ if (pv instanceof DtInteger) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public int getValue(FOContext context, FObj fobj, byte direction) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSeparation.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSeparation.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSeparation.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -76,8 +76,7 @@ return new DtLengthBPIPDirection(null, ((DtLength) pv)); } } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public int getValue(FOContext context, byte axis, FObj fobj) { @@ -152,8 +151,7 @@ if (pv instanceof DtLength) { length = (DtLength) pv; } else { - throw new PropertyException(unexpectedValueMessage(attributeValue, - propertyList)); + throw unexpectedValue(attributeValue, propertyList); } String subPropertyName = Property.getSubPropertyName(propertyFullName); if (subPropertyName.equals("block-progression-direction")) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSpacing.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSpacing.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSpacing.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -83,8 +83,7 @@ return new DtLengthBPIPDirection(length2, length1); } } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } /** Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderStyle.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderStyle.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderStyle.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -93,8 +93,7 @@ if (kw != null) { return kw; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } private PropertyValue createShorthandValue(PropertyList propertyList, Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderWidth.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderWidth.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderWidth.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -93,8 +93,7 @@ if (pv instanceof DtLengthConditional) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } private PropertyValue createShorthandValue(PropertyList propertyList, Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/CaseTitle.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/CaseTitle.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/CaseTitle.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -45,8 +45,7 @@ if (value.length() != 0) { return new DtString(value); ... [truncated message content] |
|
From: <vic...@us...> - 2006-08-21 00:21:49
|
Revision: 7835 Author: victormote Date: 2006-08-20 17:21:41 -0700 (Sun, 20 Aug 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7835&view=rev Log Message: ----------- Change the table-layout property return value from an int to a short. 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/prop/TableLayout.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-08-21 00:20:42 UTC (rev 7834) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-08-21 00:21:41 UTC (rev 7835) @@ -1095,7 +1095,7 @@ /** * {@inheritDoc} */ - public int traitTableLayout() { + public short traitTableLayout() { return propertyList.getTableLayout(); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2006-08-21 00:20:42 UTC (rev 7834) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2006-08-21 00:21:41 UTC (rev 7835) @@ -1544,7 +1544,7 @@ return property.getValue(context, fobj); } - public int getTableLayout() { + public short getTableLayout() { final TableLayout property = (TableLayout) getProperty(Constants .FOPROP_TABLE_LAYOUT); if (property == null) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TableLayout.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TableLayout.java 2006-08-21 00:20:42 UTC (rev 7834) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TableLayout.java 2006-08-21 00:21:41 UTC (rev 7835) @@ -56,14 +56,14 @@ throw unexpectedValue(value, propertyList); } - public int getValue() { + public short getValue() { if (this.value instanceof PropertyKeyword) { return ((PropertyKeyword) this.value).getValue(); } return getValueNoInstance(); } - public static int getValueNoInstance() { + public static short getValueNoInstance() { return Constants.FOVAL_AUTO; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-08-27 21:26:29
|
Revision: 7837 Author: victormote Date: 2006-08-27 14:26:23 -0700 (Sun, 27 Aug 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7837&view=rev Log Message: ----------- Conform to axsl change. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableColumn.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-08-27 19:28:25 UTC (rev 7836) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-08-27 21:26:23 UTC (rev 7837) @@ -588,13 +588,6 @@ /** * {@inheritDoc} */ - public double traitColumnWidthTableUnits() { - return propertyList.getColumnWidthTableUnits(); - } - - /** - * {@inheritDoc} - */ public short traitBreakAfter(final FOContext context) { return propertyList.getBreakAfter(context); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableColumn.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableColumn.java 2006-08-27 19:28:25 UTC (rev 7836) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableColumn.java 2006-08-27 21:26:23 UTC (rev 7837) @@ -107,4 +107,11 @@ return factory.makeProxy(this); } + /** + * {@inheritDoc} + */ + public double traitColumnWidthTableUnits() { + return propertyList.getColumnWidthTableUnits(); + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
