gmazza 2004/01/13 16:00:39 Modified: src/java/org/apache/fop/fo FObj.java src/java/org/apache/fop/fo/flow TableRow.java src/java/org/apache/fop/fo/pagination ConditionalPageMasterReference.java Flow.java PageMasterReference.java RegionBody.java RepeatablePageMasterAlternatives.java RepeatablePageMasterReference.java src/java/org/apache/fop/render/mif MIFHandler.java Log: More String->Int conversions (ones I've missed previously.) Appears I've finally converted all of them. From Finn Bock's patch. Revision Changes Path 1.31 +2 -3 xml-fop/src/java/org/apache/fop/fo/FObj.java Index: FObj.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FObj.java,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- FObj.java 28 Dec 2003 16:13:10 -0000 1.30 +++ FObj.java 14 Jan 2004 00:00:37 -0000 1.31 @@ -258,8 +258,7 @@ * @param name - the name of the desired property to obtain * @return the property */ - public Property getProperty(String name) { - int propId = FOPropertyMapping.getPropertyId(name); + public Property getProperty(int propId) { return (propertyList.get(propId)); } @@ -330,7 +329,7 @@ protected void setWritingMode() { FObj p = findNearestAncestorGeneratingRAs(true, true); this.propertyList.setWritingMode( - p.getProperty("writing-mode").getEnum()); + p.getProperty(PR_WRITING_MODE).getEnum()); } /** 1.12 +4 -5 xml-fop/src/java/org/apache/fop/fo/flow/TableRow.java Index: TableRow.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableRow.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- TableRow.java 31 Dec 2003 01:41:46 -0000 1.11 +++ TableRow.java 14 Jan 2004 00:00:37 -0000 1.12 @@ -133,17 +133,16 @@ this.backgroundColor = this.propertyList.get(PR_BACKGROUND_COLOR).getColorType(); - this.keepTogether = getKeepValue("keep-together.within-column"); - this.keepWithNext = getKeepValue("keep-with-next.within-column"); + this.keepTogether = getKeepValue(PR_KEEP_TOGETHER | CP_WITHIN_COLUMN); + this.keepWithNext = getKeepValue(PR_KEEP_WITH_NEXT | CP_WITHIN_COLUMN); this.keepWithPrevious = - getKeepValue("keep-with-previous.within-column"); + getKeepValue(PR_KEEP_WITH_PREVIOUS | CP_WITHIN_COLUMN); this.minHeight = this.propertyList.get(PR_HEIGHT).getLength().getValue(); setup = true; } - private KeepValue getKeepValue(String sPropName) { - int propId = FOPropertyMapping.getPropertyId(sPropName); + private KeepValue getKeepValue(int propId) { Property p = this.propertyList.get(propId); Number n = p.getNumber(); if (n != null) { 1.6 +2 -2 xml-fop/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java Index: ConditionalPageMasterReference.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ConditionalPageMasterReference.java 28 Dec 2003 17:10:17 -0000 1.5 +++ ConditionalPageMasterReference.java 14 Jan 2004 00:00:37 -0000 1.6 @@ -92,8 +92,8 @@ */ public void handleAttrs(Attributes attlist) throws FOPException { super.handleAttrs(attlist); - if (getProperty("master-reference") != null) { - setMasterName(getProperty("master-reference").getString()); + if (getProperty(PR_MASTER_REFERENCE) != null) { + setMasterName(getProperty(PR_MASTER_REFERENCE).getString()); } validateParent(parent); 1.7 +2 -2 xml-fop/src/java/org/apache/fop/fo/pagination/Flow.java Index: Flow.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Flow.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Flow.java 16 Sep 2003 05:21:06 -0000 1.6 +++ Flow.java 14 Jan 2004 00:00:37 -0000 1.7 @@ -122,7 +122,7 @@ } } */ - setFlowName(getProperty("flow-name").getString()); + setFlowName(getProperty(PR_FLOW_NAME).getString()); // Now done in addChild of page-sequence //pageSequence.addFlow(this); 1.4 +2 -2 xml-fop/src/java/org/apache/fop/fo/pagination/PageMasterReference.java Index: PageMasterReference.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/PageMasterReference.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- PageMasterReference.java 16 Sep 2003 05:21:06 -0000 1.3 +++ PageMasterReference.java 14 Jan 2004 00:00:37 -0000 1.4 @@ -80,8 +80,8 @@ */ public void handleAttrs(Attributes attlist) throws FOPException { super.handleAttrs(attlist); - if (getProperty("master-reference") != null) { - this.masterName = getProperty("master-reference").getString(); + if (getProperty(PR_MASTER_REFERENCE) != null) { + this.masterName = getProperty(PR_MASTER_REFERENCE).getString(); } validateParent(parent); } 1.12 +5 -6 xml-fop/src/java/org/apache/fop/fo/pagination/RegionBody.java Index: RegionBody.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionBody.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- RegionBody.java 5 Jan 2004 01:31:09 -0000 1.11 +++ RegionBody.java 14 Jan 2004 00:00:37 -0000 1.12 @@ -89,18 +89,18 @@ * set but indent is explicitly set, it will return that. */ CommonMarginBlock mProps = propMgr.getMarginProps(); - int start = getRelMargin(PropertyList.START, "start-indent"); + int start = getRelMargin(PropertyList.START, PR_START_INDENT); Rectangle vpRect; if (this.wm == WritingMode.LR_TB || this.wm == WritingMode.RL_TB) { vpRect = new Rectangle(start, mProps.spaceBefore, reldims.ipd - start - - getRelMargin(PropertyList.END, "end-indent"), + - getRelMargin(PropertyList.END, PR_END_INDENT), reldims.bpd - mProps.spaceBefore - mProps.spaceAfter); } else { vpRect = new Rectangle(start, mProps.spaceBefore, reldims.bpd - mProps.spaceBefore - mProps.spaceAfter, reldims.ipd - start - - getRelMargin(PropertyList.END, "end-indent")); + - getRelMargin(PropertyList.END, PR_END_INDENT)); } return vpRect; } @@ -109,15 +109,14 @@ * Get the relative margin using parent's writing mode, not own * writing mode. */ - private int getRelMargin(int reldir, String sRelPropName) { + private int getRelMargin(int reldir, int relPropId) { FObj parent = (FObj) getParent(); String sPropName = "margin-" + parent.propertyList.wmRelToAbs(reldir); int propId = FOPropertyMapping.getPropertyId(sPropName); Property prop = propertyList.getExplicitBaseProp(propId); if (prop == null) { - propId = FOPropertyMapping.getPropertyId(sRelPropName); - prop = propertyList.getExplicitBaseProp(propId); + prop = propertyList.getExplicitBaseProp(relPropId); } return ((prop != null) ? prop.getLength().getValue() : 0); } 1.4 +1 -1 xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java Index: RepeatablePageMasterAlternatives.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- RepeatablePageMasterAlternatives.java 16 Sep 2003 05:21:06 -0000 1.3 +++ RepeatablePageMasterAlternatives.java 14 Jan 2004 00:00:37 -0000 1.4 @@ -106,7 +106,7 @@ + parent.getName()); } - String mr = getProperty("maximum-repeats").getString(); + String mr = getProperty(PR_MAXIMUM_REPEATS).getString(); if (mr.equals("no-limit")) { this.maximumRepeats = INFINITE; } else { 1.4 +1 -1 xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java Index: RepeatablePageMasterReference.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- RepeatablePageMasterReference.java 16 Sep 2003 05:21:06 -0000 1.3 +++ RepeatablePageMasterReference.java 14 Jan 2004 00:00:37 -0000 1.4 @@ -86,7 +86,7 @@ public void handleAttrs(Attributes attlist) throws FOPException { super.handleAttrs(attlist); - String mr = getProperty("maximum-repeats").getString(); + String mr = getProperty(PR_MAXIMUM_REPEATS).getString(); if (mr.equals("no-limit")) { this.maximumRepeats = INFINITE; } else { 1.5 +3 -2 xml-fop/src/java/org/apache/fop/render/mif/MIFHandler.java Index: MIFHandler.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/mif/MIFHandler.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- MIFHandler.java 10 Jan 2004 19:43:58 -0000 1.4 +++ MIFHandler.java 14 Jan 2004 00:00:38 -0000 1.5 @@ -56,6 +56,7 @@ import org.apache.fop.apps.Document; import org.apache.fop.apps.FOPException; +import org.apache.fop.fo.Constants; import org.apache.fop.fo.FOInputHandler; import org.apache.fop.fo.flow.BasicLink; import org.apache.fop.fo.flow.Block; @@ -144,7 +145,7 @@ public void startPageSequence(PageSequence pageSeq) { // get the layout master set // setup the pages for this sequence - String name = pageSeq.getProperty("master-reference").getString(); + String name = pageSeq.getProperty(Constants.PR_MASTER_REFERENCE).getString(); SimplePageMaster spm = pageSeq.getLayoutMasterSet().getSimplePageMaster(name); if (spm == null) { PageSequenceMaster psm = pageSeq.getLayoutMasterSet().getPageSequenceMaster(name);
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]