|
From: <vic...@us...> - 2006-06-14 15:36:50
|
Revision: 7580 Author: victormote Date: 2006-06-14 08:36:29 -0700 (Wed, 14 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7580&view=rev Log Message: ----------- Move to-do items from web page to the code itself. Modified Paths: -------------- 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 trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SubSequenceSpecifier.java 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-14 15:22:51 UTC (rev 7579) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java 2006-06-14 15:36:29 UTC (rev 7580) @@ -45,10 +45,9 @@ private PageSequenceMaster pageSequenceMaster; - /** - * Max times this page master can be repeated. - * INFINITE is used for the unbounded case - */ + /* TODO: This state information should probably be stored in + * PageSequenceMaster, with a unique value for each occurrence used within + * each PageSequence. */ private int numberConsumed = 0; private ArrayList conditionalPageMasterRefs; 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-14 15:22:51 UTC (rev 7579) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java 2006-06-14 15:36:29 UTC (rev 7580) @@ -41,6 +41,9 @@ public class RepeatablePMReference extends PageMasterReference implements SubSequenceSpecifier { + /* TODO: This state information should probably be stored in + * PageSequenceMaster, with a unique value for each occurrence used within + * each PageSequence. */ private int numberConsumed = 0; public RepeatablePMReference(FObj parent, PropertyList propertyList, 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-14 15:22:51 UTC (rev 7579) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java 2006-06-14 15:36:29 UTC (rev 7580) @@ -39,6 +39,9 @@ */ public class SinglePageMasterReference extends PageMasterReference { + /* TODO: This state information should probably be stored in + * PageSequenceMaster, with a unique value for each occurrence used within + * each PageSequence. */ private boolean isDone = false; public SinglePageMasterReference(FObj parent, PropertyList propertyList, Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SubSequenceSpecifier.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SubSequenceSpecifier.java 2006-06-14 15:22:51 UTC (rev 7579) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SubSequenceSpecifier.java 2006-06-14 15:36:29 UTC (rev 7580) @@ -40,6 +40,10 @@ * Called before a new page sequence is rendered so subsequences can reset * any state they keep during the formatting process. */ + /* TODO: This method should be removed. Any state information should be + * tracked by the PageSequenceMaster, with unique values for each + * PageSequence. At the very least it needs to be renamed to avoid confusion + * with the method of the same signature in FONode. */ void reset(); } 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:23
|
Revision: 7582 Author: victormote Date: 2006-06-14 08:51:03 -0700 (Wed, 14 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7582&view=rev Log Message: ----------- Add method recasting parent instead of using instance variable. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java 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-14 15:36:45 UTC (rev 7581) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java 2006-06-14 15:51:03 UTC (rev 7582) @@ -40,7 +40,6 @@ */ public class PageSequenceMaster extends FObj { - private LayoutMasterSet layoutMasterSet; private ArrayList subSequenceSpecifiers; private SubSequenceSpecifier currentSubSequence; private int currentSubSequenceNumber; @@ -54,7 +53,7 @@ public PageSequenceMaster(FObj parent, PropertyList propertyList, String systemId, int line, int column) throws FOTreeException { super(parent, propertyList, systemId, line, column); - + /* Validate ancestry. */ if (! (parent instanceof LayoutMasterSet)) { throwException(getFullName() + " must be child " + "of fo:layout-master-set."); @@ -65,18 +64,24 @@ } public void start() throws FOTreeException { - /* TODO: Handle context better. */ - FOContext context = null; - this.layoutMasterSet = (LayoutMasterSet) getParent(); - if (this.traitMasterName(context) == null) { + String masterName = this.traitMasterName(null); + if (masterName == null) { logWarning(getFullName() + " has no page-master-name, and will be " + "ignored."); } else { - this.layoutMasterSet.addPageSequenceMaster(traitMasterName(context), - this); + this.layoutMasterSet().addPageSequenceMaster(masterName, this); } } + /** + * The parent. + * @return The parent, properly cast. + */ + public LayoutMasterSet layoutMasterSet() { + /* Cast verified at construction. */ + return (LayoutMasterSet) this.parentFO(); + } + protected void addSubsequenceSpecifier( SubSequenceSpecifier pageMasterReference) { subSequenceSpecifiers.add(pageMasterReference); @@ -138,7 +143,7 @@ pageMasterName = currentSubSequence .getNextPageMasterName(context, oddPage, firstPage, blankPage); } - SimplePageMaster pageMaster=this.layoutMasterSet + SimplePageMaster pageMaster=this.layoutMasterSet() .getSimplePageMaster(pageMasterName); if (pageMaster==null) { throwException("No simple-page-master matching '" 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-14 15:36:45 UTC (rev 7581) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java 2006-06-14 15:51:03 UTC (rev 7582) @@ -60,12 +60,19 @@ this.logWarning(getFullName() + " has no master-reference, and " + "will be ignored."); } else { - /* Cast verified at construction. */ - PageSequenceMaster psm = (PageSequenceMaster) this.parentFO(); - psm.addSubsequenceSpecifier(this); + pageSequenceMaster().addSubsequenceSpecifier(this); } } + /** + * The parent. + * @return The parent, properly cast. + */ + public PageSequenceMaster pageSequenceMaster() { + /* Cast verified at construction. */ + return (PageSequenceMaster) this.parentFO(); + } + public String getName() { return "single-page-master-reference"; } 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:50:00
|
Revision: 7586 Author: victormote Date: 2006-06-14 09:32:57 -0700 (Wed, 14 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7586&view=rev Log Message: ----------- Remove instance variable that is a duplicate of "children". The only difference was that specifiers lacking a master-reference were left out of the removed instance variable. However, the will be ignored during processing anyway. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.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/fo/obj/PageSequenceMaster.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java 2006-06-14 16:15:58 UTC (rev 7585) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java 2006-06-14 16:32:57 UTC (rev 7586) @@ -34,14 +34,11 @@ import org.axsl.foR.FOTreeException; import org.axsl.foR.ProxyFactory; -import java.util.ArrayList; - /** * Models the fo:page-sequence-master object. */ public class PageSequenceMaster extends FObj { - private ArrayList subSequenceSpecifiers; private SubSequenceSpecifier currentSubSequence; private int currentSubSequenceNumber; @@ -59,7 +56,6 @@ throwException(getFullName() + " must be child " + "of fo:layout-master-set."); } - subSequenceSpecifiers = new ArrayList(); currentSubSequenceNumber = -1; currentSubSequence = null; } @@ -98,17 +94,12 @@ return (LayoutMasterSet) this.parentFO(); } - protected void addSubsequenceSpecifier( - SubSequenceSpecifier pageMasterReference) { - subSequenceSpecifiers.add(pageMasterReference); - } - protected SubSequenceSpecifier getNextSubSequence() { currentSubSequenceNumber++; if (currentSubSequenceNumber >= 0 - && currentSubSequenceNumber < subSequenceSpecifiers.size()) { - return (SubSequenceSpecifier)subSequenceSpecifiers - .get(currentSubSequenceNumber); + && currentSubSequenceNumber < this.children.size()) { + return (SubSequenceSpecifier) + this.children.get(currentSubSequenceNumber); } return null; } @@ -116,8 +107,8 @@ public void reset() { currentSubSequenceNumber = -1; currentSubSequence = null; - for (int i = 0; i< subSequenceSpecifiers.size(); i++) { - ((SubSequenceSpecifier)subSequenceSpecifiers.get(i)).reset(); + for (int i = 0; i< this.children.size(); i++) { + ((SubSequenceSpecifier)this.children.get(i)).reset(); } } 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-14 16:15:58 UTC (rev 7585) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java 2006-06-14 16:32:57 UTC (rev 7586) @@ -43,8 +43,6 @@ public class RepeatablePMAlternatives extends FObj implements SubSequenceSpecifier { - private PageSequenceMaster pageSequenceMaster; - /* TODO: This state information should probably be stored in * PageSequenceMaster, with a unique value for each occurrence used within * each PageSequence. */ @@ -57,10 +55,7 @@ throws FOTreeException { super(parent, propertyList, systemId, line, column); - if (parent instanceof PageSequenceMaster) { - this.pageSequenceMaster = (PageSequenceMaster)parent; - this.pageSequenceMaster.addSubsequenceSpecifier(this); - } else { + if (! (parent instanceof PageSequenceMaster)) { throwException(getFullName() + " must be child of " + "fo:page-sequence-master."); } 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-14 16:15:58 UTC (rev 7585) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java 2006-06-14 16:32:57 UTC (rev 7586) @@ -53,11 +53,7 @@ FOContext context = null; String masterReference = traitMasterReference(context); if (! masterReference.equals("")) { - if (parent instanceof PageSequenceMaster) { - PageSequenceMaster pageSequenceMaster - = (PageSequenceMaster)parent; - pageSequenceMaster.addSubsequenceSpecifier(this); - } else { + if (! (parent instanceof PageSequenceMaster)) { throwException(getFullName() + " must be child of " + "fo:page-sequence-master."); } 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-14 16:15:58 UTC (rev 7585) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java 2006-06-14 16:32:57 UTC (rev 7586) @@ -59,8 +59,6 @@ if (masterReference.equals("")) { this.logWarning(getFullName() + " has no master-reference, and " + "will be ignored."); - } else { - pageSequenceMaster().addSubsequenceSpecifier(this); } } 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:50:03
|
Revision: 7588 Author: victormote Date: 2006-06-14 09:49:53 -0700 (Wed, 14 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7588&view=rev Log Message: ----------- Remove instance variable that is a duplicate of "children". The only difference was that conditional-page-master-reference items lacking a master-reference were left out of the removed instance variable. However, they will be ignored during processing anyway. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java 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 16:45:18 UTC (rev 7587) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java 2006-06-14 16:49:53 UTC (rev 7588) @@ -58,9 +58,6 @@ if (traitMasterReference(null) == null) { logWarning(getFullName() + " has no master-reference, and " + "will be ignored."); - } else { - this.repeatablePMAlternatives() - .addConditionalPageMasterReference(this); } } 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-14 16:45:18 UTC (rev 7587) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java 2006-06-14 16:49:53 UTC (rev 7588) @@ -35,8 +35,6 @@ import org.axsl.foR.FOTreeException; import org.axsl.foR.ProxyFactory; -import java.util.ArrayList; - /** * The XSL-FO "repeatable-page-master-alternatives" object. */ @@ -48,8 +46,6 @@ * each PageSequence. */ private int numberConsumed = 0; - private ArrayList conditionalPageMasterRefs; - public RepeatablePMAlternatives(FObj parent, PropertyList propertyList, String systemId, int line, int column) throws FOTreeException { @@ -59,18 +55,12 @@ throwException(getFullName() + " must be child of " + "fo:page-sequence-master."); } - conditionalPageMasterRefs = new ArrayList(); } public String getName() { return "repeatable-page-master-alternatives"; } - public void addConditionalPageMasterReference( - ConditionalPageMasterReference cpmr) { - this.conditionalPageMasterRefs.add(cpmr); - } - public String getNextPageMasterName(FOContext context, boolean isOddPage, boolean isFirstPage, boolean isEmptyPage) { if (numberConsumed < traitMaximumRepeats(context)) { @@ -79,10 +69,9 @@ return null; } - for (int i = 0; i < conditionalPageMasterRefs.size(); i++) { + for (int i = 0; i < this.children.size(); i++) { ConditionalPageMasterReference cpmr = - (ConditionalPageMasterReference)conditionalPageMasterRefs - .get(i); + (ConditionalPageMasterReference)this.children.get(i); if (cpmr.isValid(isOddPage, isFirstPage, isEmptyPage)) { return cpmr.traitMasterReference(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 23:28:24
|
Revision: 7638 Author: victormote Date: 2006-06-15 16:28:17 -0700 (Thu, 15 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7638&view=rev Log Message: ----------- Remove unneeded parameter. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.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 trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SubSequenceSpecifier.java 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:26:33 UTC (rev 7637) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java 2006-06-15 23:28:17 UTC (rev 7638) @@ -29,7 +29,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; @@ -114,8 +113,6 @@ public SimplePageMaster getNextSimplePageMaster( boolean oddPage, boolean blankPage) throws FOTreeException { - /* TODO: Handle context better. */ - FOContext context = null; boolean firstPage = false; if (currentSubSequence==null) { currentSubSequence = getNextSubSequence(); @@ -126,7 +123,7 @@ firstPage = true; } String pageMasterName = currentSubSequence - .getNextPageMasterName(context, oddPage, firstPage, blankPage); + .getNextPageMasterName(oddPage, firstPage, blankPage); boolean canRecover = true; while (pageMasterName==null) { SubSequenceSpecifier nextSubSequence = getNextSubSequence(); @@ -148,7 +145,7 @@ currentSubSequence = nextSubSequence; } pageMasterName = currentSubSequence - .getNextPageMasterName(context, oddPage, firstPage, blankPage); + .getNextPageMasterName(oddPage, firstPage, blankPage); } SimplePageMaster pageMaster=this.layoutMasterSet() .getSimplePageMaster(pageMasterName); 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:26:33 UTC (rev 7637) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java 2006-06-15 23:28:17 UTC (rev 7638) @@ -30,7 +30,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; @@ -61,8 +60,8 @@ return "repeatable-page-master-alternatives"; } - public String getNextPageMasterName(FOContext context, boolean isOddPage, - boolean isFirstPage, boolean isEmptyPage) { + public String getNextPageMasterName(boolean isOddPage, boolean isFirstPage, + boolean isEmptyPage) { if (numberConsumed < traitMaximumRepeats()) { numberConsumed++; } else { 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:26:33 UTC (rev 7637) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java 2006-06-15 23:28:17 UTC (rev 7638) @@ -30,7 +30,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; @@ -70,8 +69,8 @@ return "repeatable-page-master-reference"; } - public String getNextPageMasterName(FOContext context, boolean isOddPage, - boolean isFirstPage, boolean isEmptyPage) { + public String getNextPageMasterName(boolean isOddPage, boolean isFirstPage, + boolean isEmptyPage) { if (numberConsumed < traitMaximumRepeats()) { numberConsumed++; } 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:26:33 UTC (rev 7637) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java 2006-06-15 23:28:17 UTC (rev 7638) @@ -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; @@ -75,8 +74,8 @@ return "single-page-master-reference"; } - public String getNextPageMasterName(FOContext context, boolean isOddPage, - boolean isFirstPage, boolean isEmptyPage) { + public String getNextPageMasterName(boolean isOddPage, boolean isFirstPage, + boolean isEmptyPage) { if (! this.isDone) { this.isDone = true; return traitMasterName(); Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SubSequenceSpecifier.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SubSequenceSpecifier.java 2006-06-15 23:26:33 UTC (rev 7637) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SubSequenceSpecifier.java 2006-06-15 23:28:17 UTC (rev 7638) @@ -24,7 +24,6 @@ package org.foray.fotree.fo.obj; -import org.axsl.foR.FOContext; import org.axsl.foR.FOTreeException; /** @@ -33,8 +32,8 @@ */ public interface SubSequenceSpecifier { - String getNextPageMasterName(FOContext context, boolean isOddPage, - boolean isFirstPage, boolean isEmptyPage) throws FOTreeException; + String getNextPageMasterName(boolean isOddPage, boolean isFirstPage, + boolean isEmptyPage) throws FOTreeException; /** * Called before a new page sequence is rendered so subsequences can reset 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:30:03
|
Revision: 7639 Author: victormote Date: 2006-06-15 16:29:56 -0700 (Thu, 15 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7639&view=rev Log Message: ----------- Remove unneeded parameter. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java 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:28:17 UTC (rev 7638) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java 2006-06-15 23:29:56 UTC (rev 7639) @@ -67,8 +67,7 @@ return "layout-master-set"; } - protected void addSimplePageMaster(FOContext context, - SimplePageMaster simplePageMaster) + protected void addSimplePageMaster(SimplePageMaster simplePageMaster) throws FOTreeException { // check against duplication of master-name if (existsName(simplePageMaster.traitMasterName())) { 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:28:17 UTC (rev 7638) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java 2006-06-15 23:29:56 UTC (rev 7639) @@ -58,13 +58,11 @@ } protected void start() throws FOTreeException { - /* TODO: Handle context better. */ - FOContext context = null; if (traitMasterName() == null) { logWarning("simple-page-master has no " + "master-name, and will be ignored."); } else { - getLayoutMasterSet().addSimplePageMaster(context, this); + getLayoutMasterSet().addSimplePageMaster(this); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-07-23 17:20:38
|
Revision: 7815 Author: victormote Date: 2006-07-23 10:19:43 -0700 (Sun, 23 Jul 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7815&view=rev Log Message: ----------- Implement standard use of final modifier on local variable and method parameters. Modified Paths: -------------- 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/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 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-07-23 14:56:47 UTC (rev 7814) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractFlow.java 2006-07-23 17:19:43 UTC (rev 7815) @@ -32,8 +32,9 @@ public abstract class AbstractFlow extends FObj { - protected AbstractFlow(FObj parent, PropertyList propertyList, - String systemId, int line, int column) throws FOTreeException { + protected AbstractFlow(final FObj parent, final PropertyList propertyList, + final String systemId, final int line, final int column) + throws FOTreeException { super(parent, propertyList, systemId, line, column); if (! (parent instanceof PageSequence)) { throwException(getFullName() + " must be child of " @@ -42,7 +43,7 @@ } protected void start() throws FOTreeException { - String name = traitFlowName(); + final String name = traitFlowName(); if (name == null || name.equals("")) { throwException(getFullName() + "requires a 'flow-name'."); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractTableBody.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractTableBody.java 2006-07-23 14:56:47 UTC (rev 7814) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractTableBody.java 2006-07-23 17:19:43 UTC (rev 7815) @@ -33,8 +33,9 @@ public abstract class AbstractTableBody extends FObj implements org.axsl.foR.fo.AbstractTableBody { - public AbstractTableBody(FObj parent, PropertyList propertyList, - String systemId, int line, int column) throws FOTreeException { + public AbstractTableBody(final FObj parent, final PropertyList propertyList, + final String systemId, final int line, final int column) + throws FOTreeException { super(parent, propertyList, systemId, line, column); if (! (parent instanceof Table)) { throwException(getFullName() + " must be child of fo:table."); 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-07-23 14:56:47 UTC (rev 7814) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java 2006-07-23 17:19:43 UTC (rev 7815) @@ -33,8 +33,9 @@ public class BasicLink extends Inline implements org.axsl.foR.fo.BasicLink { - public BasicLink(FObj parent, PropertyList propertyList, - String systemId, int line, int column) throws FOTreeException { + public BasicLink(final FObj parent, final PropertyList propertyList, + final String systemId, final int line, final int column) + throws FOTreeException { super(parent, propertyList, systemId, line, column); } @@ -66,7 +67,7 @@ /** * Override the FONode method, because "this" is the object being sought. */ - public org.axsl.foR.fo.BasicLink getBasicLink(FOContext context) { + public org.axsl.foR.fo.BasicLink getBasicLink(final FOContext context) { return this; } @@ -118,7 +119,7 @@ /** * {@inheritDoc} */ - public String refIdNeeded(FOContext context) { + public String refIdNeeded(final FOContext context) { return traitInternalDestination(); } 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-07-23 14:56:47 UTC (rev 7814) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BidiOverride.java 2006-07-23 17:19:43 UTC (rev 7815) @@ -37,8 +37,9 @@ public class BidiOverride extends FObj implements org.axsl.foR.fo.BidiOverride { - public BidiOverride(FObj parent, PropertyList propertyList, - String systemId, int line, int column) throws FOTreeException { + public BidiOverride(final FObj parent, final PropertyList propertyList, + final String systemId, final int line, final int column) + throws FOTreeException { super(parent, propertyList, systemId, line, column); } @@ -54,7 +55,7 @@ return true; } - public FONodeProxy makeProxy(ProxyFactory factory) { + public FONodeProxy makeProxy(final 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-07-23 14:56:47 UTC (rev 7814) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Block.java 2006-07-23 17:19:43 UTC (rev 7815) @@ -42,8 +42,9 @@ public class Block extends FObjMixed implements org.axsl.foR.fo.Block { - public Block(FObj parent, PropertyList propertyList, String systemId, - int line, int column) throws FOTreeException { + public Block(final FObj parent, final PropertyList propertyList, + final String systemId, final int line, final int column) + throws FOTreeException { super(parent, propertyList, systemId, line, column); } @@ -58,7 +59,7 @@ /** * Overrides the method in FObj, because this is the containing block. */ - public org.axsl.foR.fo.Block getContainingBlock(FOContext context) { + public org.axsl.foR.fo.Block getContainingBlock(final FOContext context) { return this; } @@ -98,9 +99,9 @@ * @return The List of this block's logical blocks, as defined. */ public List getLogicalBlocks() { - ArrayList outsideList = new ArrayList(); + final ArrayList outsideList = new ArrayList(); ArrayList insideList = new ArrayList(); - Stack stack = new Stack(); + final Stack stack = new Stack(); /* * Place the children on the stack in reverse order (last item on the * bottom, first on the top). @@ -109,13 +110,13 @@ stack.push(getChildren().get(i)); } while (! stack.isEmpty()) { - FONode node = (FONode) stack.pop(); + final FONode node = (FONode) stack.pop(); // FOText is always a leaf. Include in list. if (node instanceof FOText) { insideList.add(node); continue; } - FObj fobj = (FObj) node; + final FObj fobj = (FObj) node; /* Block-type content is a special case. Include it in list instead * of its descendants. */ if (fobj.isContentBlock()) { @@ -126,7 +127,7 @@ outsideList.add(node); continue; } - List children = fobj.getChildren(); + final List children = fobj.getChildren(); // If there are no children, it is a leaf. Include in list. if (children == null || children.size() < 1) { insideList.add(node); @@ -151,7 +152,7 @@ return true; } - public FONodeProxy makeProxy(ProxyFactory factory) { + public FONodeProxy makeProxy(final 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-07-23 14:56:47 UTC (rev 7814) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java 2006-07-23 17:19:43 UTC (rev 7815) @@ -35,8 +35,9 @@ public class BlockContainer extends FObj implements org.axsl.foR.fo.BlockContainer { - public BlockContainer(FObj parent, PropertyList propertyList, - String systemId, int line, int column) throws FOTreeException { + public BlockContainer(final FObj parent, final PropertyList propertyList, + final String systemId, final int line, final int column) + throws FOTreeException { super(parent, propertyList, systemId, line, column); } @@ -61,7 +62,7 @@ return true; } - public FONodeProxy makeProxy(ProxyFactory factory) { + public FONodeProxy makeProxy(final 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-07-23 14:56:47 UTC (rev 7814) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java 2006-07-23 17:19:43 UTC (rev 7815) @@ -38,8 +38,9 @@ * An fo:bookmark object in XSL-FO. */ public class Bookmark extends FObj implements org.axsl.foR.fo.Bookmark { - public Bookmark(FObj parent, PropertyList propertyList, String systemId, - int line, int column) throws FOTreeException { + public Bookmark(final FObj parent, final PropertyList propertyList, + final String systemId, final int line, final int column) + throws FOTreeException { super(parent, propertyList, systemId, line, column); /* * Validate that this is a child of either fo:bookmark-tree or @@ -53,12 +54,12 @@ } public void start() throws FOTreeException { - String _internalDestination = this.traitInternalDestination(); + final String _internalDestination = this.traitInternalDestination(); if (_internalDestination == null || _internalDestination.equals("")) { getLogger().warn(getFullName() + "requires an internal-destination."); } - String _externalDestination = this.traitExternalDestination(); + final String _externalDestination = this.traitExternalDestination(); if (_externalDestination != null &&!_externalDestination.equals("")) { getLogger().warn(getFullName() + "external-destination not supported currently."); @@ -75,7 +76,7 @@ } // Validate that all other children are Outline instances. for (int i = 1; i < children.size(); i++) { - FObj child = (FObj) children.get(i); + final FObj child = (FObj) children.get(i); if (child instanceof BookmarkTitle) { throwException("Child fo:bookmark-title not allowed in this " + "position."); @@ -87,7 +88,7 @@ } } - public Bookmark getParentOutline(FOContext context) { + public Bookmark getParentOutline(final FOContext context) { for (FONode node = (FONode) getParent(); node != null; node = node.effectiveParent(context)) { if (node instanceof Bookmark) { @@ -113,11 +114,11 @@ /** * {@inheritDoc} */ - public String refIdNeeded(FOContext context) { + public String refIdNeeded(final FOContext context) { return traitInternalDestination(); } - public FONodeProxy makeProxy(ProxyFactory factory) { + public FONodeProxy makeProxy(final 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-07-23 14:56:47 UTC (rev 7814) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java 2006-07-23 17:19:43 UTC (rev 7815) @@ -40,8 +40,9 @@ public class BookmarkTitle extends FObjMixed implements org.axsl.foR.fo.BookmarkTitle { - public BookmarkTitle(FObj parent, PropertyList propertyList, - String systemId, int line, int column) throws FOTreeException { + public BookmarkTitle(final FObj parent, final PropertyList propertyList, + final String systemId, final int line, final int column) + throws FOTreeException { super(parent, propertyList, systemId, line, column); } @@ -82,7 +83,7 @@ return false; } - public FONodeProxy makeProxy(ProxyFactory factory) { + public FONodeProxy makeProxy(final 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-07-23 14:56:47 UTC (rev 7814) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTree.java 2006-07-23 17:19:43 UTC (rev 7815) @@ -38,8 +38,9 @@ public class BookmarkTree extends FObj implements org.axsl.foR.fo.BookmarkTree { - public BookmarkTree(FObj parent, PropertyList propertyList, - String systemId, int line, int column) throws FOTreeException { + public BookmarkTree(final FObj parent, final PropertyList propertyList, + final String systemId, final int line, final int column) + throws FOTreeException { super(parent, propertyList, systemId, line, column); // Validate that this is a child of fo:root. if (! (parent instanceof Root)) { @@ -50,7 +51,7 @@ public void end() throws FOTreeException { // Validate that all children are Bookmark instances. for (int i = 1; i < children.size(); i++) { - FObj child = (FObj) children.get(i); + final FObj child = (FObj) children.get(i); if (! (child instanceof Bookmark)) { throwException(child.getFullName() + " cannot be child of " + this.getFullName()); @@ -66,7 +67,7 @@ return this.getFOTreeBuilder().getFONamespace(); } - public FONodeProxy makeProxy(ProxyFactory factory) { + public FONodeProxy makeProxy(final 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-07-23 14:56:47 UTC (rev 7814) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java 2006-07-23 17:19:43 UTC (rev 7815) @@ -39,8 +39,9 @@ */ public class Character extends FObj implements org.axsl.foR.fo.Character { - public Character(FObj parent, PropertyList propertyList, String systemId, - int line, int column) throws FOTreeException { + public Character(final FObj parent, final PropertyList propertyList, + final String systemId, final int line, final int column) + throws FOTreeException { super(parent, propertyList, systemId, line, column); } @@ -57,24 +58,24 @@ } public void start() throws FOTreeException { - char c = traitCharacter(); + final char c = traitCharacter(); if (c == org.foray.fotree.fo.prop.Character.CHARACTER_NOT_SPECIFIED) { throwException("Property \"character\" is required."); } /* This is a duplication of data, but is deemed acceptable at the * moment, because it is expected that use of fo:character will normally * be very limited. */ - char[] chars = new char[] {c}; - FOText text = new FOText(this, chars); + final char[] chars = new char[] {c}; + final FOText text = new FOText(this, chars); super.addChild(text); } - public char[] getAreaTreeText(FOContext context) { - FOText text = (FOText) this.children.get(0); + public char[] getAreaTreeText(final FOContext context) { + final FOText text = (FOText) this.children.get(0); return text.getAreaTreeText(context); } - public FONodeProxy makeProxy(ProxyFactory factory) { + public FONodeProxy makeProxy(final 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-07-23 14:56:47 UTC (rev 7814) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ColorProfile.java 2006-07-23 17:19:43 UTC (rev 7815) @@ -36,8 +36,9 @@ public class ColorProfile extends FObj implements org.axsl.foR.fo.ColorProfile { - public ColorProfile(FObj parent, PropertyList propertyList, String systemId, - int line, int column) throws FOTreeException { + public ColorProfile(final FObj parent, final PropertyList propertyList, + final String systemId, final int line, final int column) + throws FOTreeException { super(parent, propertyList, systemId, line, column); logWarning(getFullName() + " not implemented."); } @@ -50,7 +51,7 @@ return this.getFOTreeBuilder().getFONamespace(); } - public FONodeProxy makeProxy(ProxyFactory factory) { + public FONodeProxy makeProxy(final 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-07-23 14:56:47 UTC (rev 7814) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java 2006-07-23 17:19:43 UTC (rev 7815) @@ -41,9 +41,9 @@ */ public class ConditionalPageMasterReference extends FObj { - public ConditionalPageMasterReference(FObj parent, - PropertyList propertyList, String systemId, int line, int column) - throws FOTreeException { + public ConditionalPageMasterReference(final FObj parent, + final PropertyList propertyList, final String systemId, + final int line, final int column) throws FOTreeException { super(parent, propertyList, systemId, line, column); /* Validate ancestry. */ if (! (parent instanceof RepeatablePMAlternatives)) { @@ -73,9 +73,9 @@ return (RepeatablePMAlternatives) this.parentFO(); } - protected boolean isValid(boolean isOddPage, boolean isFirstPage, - boolean isEmptyPage) { - int pagePosition = traitPagePosition(); + protected boolean isValid(final boolean isOddPage, + final boolean isFirstPage, final boolean isEmptyPage) { + final int pagePosition = traitPagePosition(); if (isFirstPage) { if (pagePosition == Constants.FOVAL_REST) { return false; @@ -124,7 +124,7 @@ return this.getFOTreeBuilder().getFONamespace(); } - public FONodeProxy makeProxy(ProxyFactory factory) { + public FONodeProxy makeProxy(final 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-07-23 14:56:47 UTC (rev 7814) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java 2006-07-23 17:19:43 UTC (rev 7815) @@ -36,8 +36,9 @@ public class Declarations extends FObj implements org.axsl.foR.fo.Declarations { - public Declarations(FObj parent, PropertyList propertyList, - String systemId, int line, int column) throws FOTreeException { + public Declarations(final FObj parent,final PropertyList propertyList, + final String systemId, final int line, final int column) + throws FOTreeException { super(parent, propertyList, systemId, line, column); } @@ -49,7 +50,7 @@ return this.getFOTreeBuilder().getFONamespace(); } - public FONodeProxy makeProxy(ProxyFactory factory) { + public FONodeProxy makeProxy(final 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-07-23 14:56:47 UTC (rev 7814) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java 2006-07-23 17:19:43 UTC (rev 7815) @@ -58,8 +58,9 @@ * computations. */ protected int pixelsPerInch = 96; - public ExternalGraphic(FObj parent, PropertyList propertyList, - String systemId, int line, int column) throws FOTreeException { + public ExternalGraphic(final FObj parent, final PropertyList propertyList, + final String systemId, final int line, final int column) + throws FOTreeException { super(parent, propertyList, systemId, line, column); } @@ -78,14 +79,14 @@ /** * @return The resolved Graphic instance encapsulated by this FO. */ - public Graphic getGraphic(FOContext context) { + public Graphic getGraphic(final FOContext context) { if (this.graphic == null && ! makeGraphicAttempted) { makeGraphicAttempted = true; try { this.graphic = getGraphicServer().makeGraphic(traitSrc(context), getFOTreeBuilder().getGraphicSearchPath(), getFOTreeBuilder().getCachingGraphics()); - } catch (GraphicException e) { + } catch (final GraphicException e) { getLogger().error(e.getMessage() + "\n" + this.getContextMessage()); } @@ -96,7 +97,7 @@ /** * {@inheritDoc} */ - protected int intrinsicContentWidth(FOContext context) { + protected int intrinsicContentWidth(final FOContext context) { if (getGraphic(context) == null) { return Constants.DIMENSION_AUTO; } @@ -107,7 +108,7 @@ /* Use conversion formula 1 pixel = 1/96 inch. See XSL-FO Standard * 1.0, Section 6.6.5, where this formula is suggested. */ return pixelsToMillipoints(getGraphic(context).pixelWidth(), 96); - } catch (GraphicException e) { + } catch (final GraphicException e) { return Constants.DIMENSION_AUTO; } } @@ -115,7 +116,7 @@ /** * {@inheritDoc} */ - protected int intrinsicContentHeight(FOContext context) { + protected int intrinsicContentHeight(final FOContext context) { if (getGraphic(context) == null) { return Constants.DIMENSION_AUTO; } @@ -126,20 +127,20 @@ /* Use conversion formula 1 pixel = 1/96 inch. See XSL-FO Standard * 1.0, Section 6.6.5, where this formula is suggested. */ return pixelsToMillipoints(getGraphic(context).pixelHeight(), 96); - } catch (GraphicException e) { + } catch (final GraphicException e) { return Constants.DIMENSION_AUTO; } } - public FONodeProxy makeProxy(ProxyFactory factory) { + public FONodeProxy makeProxy(final ProxyFactory factory) { return factory.makeProxy(this); } /** * {@inheritDoc} */ - public FOLineNonText getContextWrapper(FOContext context) { - org.axsl.foR.fo.Marker marker = this.ancestorMarker(); + public FOLineNonText getContextWrapper(final FOContext context) { + final org.axsl.foR.fo.Marker marker = this.ancestorMarker(); if (marker == null) { return this; } @@ -161,42 +162,45 @@ return null; } - public int inlineSizeOptimum(int lineLength) { + public int inlineSizeOptimum(final int lineLength) { return inlineSizeOptimum(null, lineLength); } /** * {@inheritDoc} */ - public int inlineSizeOptimum(FOContext context, int lineLength) { + public int inlineSizeOptimum(final FOContext context, + final int lineLength) { return this.viewportIPD(context, lineLength); ... [truncated message content] |
