diff options
| author | Glen Mazza <gmazza@apache.org> | 2003-12-20 06:53:23 +0000 |
|---|---|---|
| committer | Glen Mazza <gmazza@apache.org> | 2003-12-20 06:53:23 +0000 |
| commit | 0223653f86057291343b9d52d6414ebfd869cb6a (patch) | |
| tree | bb76af27265ad085f2184bb45f01a329b53fcb51 /src/java/org | |
| parent | 9133beaf697ac6bc082f9256f9aea295f81ef80c (diff) | |
| download | xmlgraphics-fop-0223653f86057291343b9d52d6414ebfd869cb6a.tar.gz xmlgraphics-fop-0223653f86057291343b9d52d6414ebfd869cb6a.zip | |
1. Moved static element and property structures from PropertyList (previously in former PropertyListBuilder) to FObj
2. Renamed FObj "properties" instance variable to "propertyList" (reduces
confusion on the type of object holding FO property information in the code)
3. Unneeded imports removed (Finn Bock's patch, Bug #25582).
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197042 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org')
60 files changed, 602 insertions, 628 deletions
diff --git a/src/java/org/apache/fop/area/AreaTree.java b/src/java/org/apache/fop/area/AreaTree.java index 10772a716..65bfaa4a5 100644 --- a/src/java/org/apache/fop/area/AreaTree.java +++ b/src/java/org/apache/fop/area/AreaTree.java @@ -52,7 +52,6 @@ package org.apache.fop.area; import org.apache.fop.area.extensions.BookmarkData; import org.apache.fop.fo.extensions.Outline; -import org.apache.fop.apps.Document; import java.util.ArrayList; import java.util.List; diff --git a/src/java/org/apache/fop/fo/FObj.java b/src/java/org/apache/fop/fo/FObj.java index 0cb569789..7693fef74 100644 --- a/src/java/org/apache/fop/fo/FObj.java +++ b/src/java/org/apache/fop/fo/FObj.java @@ -59,6 +59,7 @@ import java.util.Set; import org.apache.fop.apps.FOPException; import org.apache.fop.fo.flow.Marker; +import org.apache.fop.fo.properties.FOPropertyMapping; import org.xml.sax.Attributes; /** @@ -67,10 +68,13 @@ import org.xml.sax.Attributes; public class FObj extends FONode { private static final String FO_URI = "http://www.w3.org/1999/XSL/Format"; + public static HashMap propertyListTable = null; + public static HashMap elementTable = null; + /** * Formatting properties for this fo element. */ - public PropertyList properties; + public PropertyList propertyList; /** * Property manager for handling some common properties. @@ -100,6 +104,22 @@ public class FObj extends FONode { */ public FObj(FONode parent) { super(parent); + + if (propertyListTable == null) { + propertyListTable = new HashMap(); + propertyListTable.putAll(FOPropertyMapping.getGenericMappings()); + } + + if (elementTable == null) { + elementTable = new HashMap(); + for (Iterator iter = + FOPropertyMapping.getElementMappings().iterator(); + iter.hasNext();) { + String elem = (String) iter.next(); + elementTable.put(elem, FOPropertyMapping.getElementMapping(elem)); + } + } + } /** Marks input file containing this object **/ @@ -128,14 +148,15 @@ public class FObj extends FONode { */ public void handleAttrs(Attributes attlist) throws FOPException { FObj parentFO = findNearestAncestorFObj(); - PropertyList parentProperties = null; + PropertyList parentPropertyList = null; if (parentFO != null) { - parentProperties = parentFO.getPropertiesForNamespace(FO_URI); + parentPropertyList = parentFO.getPropertiesForNamespace(FO_URI); } - properties = new PropertyList(this, parentProperties, FO_URI, name); - properties.addAttributesToList(attlist); - this.propMgr = makePropertyManager(properties); + propertyList = new PropertyList(this, parentPropertyList, FO_URI, + name); + propertyList.addAttributesToList(attlist); + this.propMgr = makePropertyManager(propertyList); setWritingMode(); } @@ -194,16 +215,16 @@ public class FObj extends FONode { * For a given namespace, determine whether the properties of this object * match that namespace. * @param nameSpaceURI the namespace URI to be tested against - * @return this.properties, if the namespaces match; otherwise, null + * @return this.propertyList, if the namespaces match; otherwise, null */ public PropertyList getPropertiesForNamespace(String nameSpaceURI) { - if (this.properties == null) { + if (this.propertyList == null) { return null; } - if (!nameSpaceURI.equals(this.properties.getNameSpace())) { + if (!nameSpaceURI.equals(this.propertyList.getNameSpace())) { return null; } - return this.properties; + return this.propertyList; } /** @@ -238,7 +259,7 @@ public class FObj extends FONode { * @return the property */ public Property getProperty(String name) { - return (properties.get(name)); + return (propertyList.get(name)); } /** @@ -248,7 +269,7 @@ public class FObj extends FONode { * fo and sets the id attribute of this object. */ public void setupID() { - Property prop = this.properties.get("id"); + Property prop = this.propertyList.get("id"); if (prop != null) { String str = prop.getString(); if (str != null && !str.equals("")) { @@ -307,7 +328,7 @@ public class FObj extends FONode { */ protected void setWritingMode() { FObj p = findNearestAncestorGeneratingRAs(true, true); - this.properties.setWritingMode( + this.propertyList.setWritingMode( p.getProperty("writing-mode").getEnum()); } diff --git a/src/java/org/apache/fop/fo/FObjMixed.java b/src/java/org/apache/fop/fo/FObjMixed.java index 58c7c3855..2bae957d7 100644 --- a/src/java/org/apache/fop/fo/FObjMixed.java +++ b/src/java/org/apache/fop/fo/FObjMixed.java @@ -87,7 +87,7 @@ public class FObjMixed extends FObj { } private void setup() { - if (this.properties != null) { + if (this.propertyList != null) { setupID(); } } diff --git a/src/java/org/apache/fop/fo/PropertyList.java b/src/java/org/apache/fop/fo/PropertyList.java index 6bbb2225b..ca2d3775b 100644 --- a/src/java/org/apache/fop/fo/PropertyList.java +++ b/src/java/org/apache/fop/fo/PropertyList.java @@ -58,10 +58,7 @@ import org.xml.sax.Attributes; // FOP import org.apache.fop.apps.FOPException; import org.apache.fop.fo.Property.Maker; -import org.apache.fop.fo.properties.FOPropertyMapping; import org.apache.fop.fo.properties.WritingMode; -import org.apache.fop.apps.FOPException; - /** @@ -130,9 +127,6 @@ public class PropertyList extends HashMap { private String element = ""; private FObj fobj = null; - private static HashMap propertyListTable = null; - private static HashMap elementTable = null; - /** * Basic constructor. * @param parentPropertyList the PropertyList belonging to the new objects @@ -146,21 +140,6 @@ public class PropertyList extends HashMap { this.parentPropertyList = parentPropertyList; this.namespace = space; this.element = elementName; - - if (propertyListTable == null) { - propertyListTable = new HashMap(); - propertyListTable.putAll(FOPropertyMapping.getGenericMappings()); - } - - if (elementTable == null) { - elementTable = new HashMap(); - for (Iterator iter = - FOPropertyMapping.getElementMappings().iterator(); - iter.hasNext();) { - String elem = (String) iter.next(); - elementTable.put(elem, FOPropertyMapping.getElementMapping(elem)); - } - } } /** @@ -507,7 +486,7 @@ public class PropertyList extends HashMap { FObj parentFO = fobj.findNearestAncestorFObj(); HashMap validProperties; - validProperties = (HashMap) elementTable.get(element); + validProperties = (HashMap) fobj.elementTable.get(element); /* Handle "compound" properties, ex. space-before.minimum */ String basePropertyName = findBasePropertyName(attributeName); @@ -688,7 +667,7 @@ public class PropertyList extends HashMap { */ protected Property.Maker findMaker(String space, String elementName, String propertyName) { - return findMaker((HashMap)elementTable.get(elementName), + return findMaker((HashMap) fobj.elementTable.get(elementName), propertyName); } @@ -704,11 +683,11 @@ public class PropertyList extends HashMap { String propertyName) { Property.Maker propertyMaker = null; if (elemTable != null) { - propertyMaker = (Property.Maker)elemTable.get(propertyName); + propertyMaker = (Property.Maker) elemTable.get(propertyName); } if (propertyMaker == null) { propertyMaker = - (Property.Maker)propertyListTable.get(propertyName); + (Property.Maker) fobj.propertyListTable.get(propertyName); } return propertyMaker; } diff --git a/src/java/org/apache/fop/fo/PropertyManager.java b/src/java/org/apache/fop/fo/PropertyManager.java index 7c017b34b..2fad54b89 100644 --- a/src/java/org/apache/fop/fo/PropertyManager.java +++ b/src/java/org/apache/fop/fo/PropertyManager.java @@ -77,7 +77,7 @@ import org.apache.fop.fo.properties.CommonHyphenation; */ public class PropertyManager { - private PropertyList properties; + private PropertyList propertyList; private FOTreeControl foTreeControl = null; private Font fontState = null; private CommonBorderAndPadding borderAndPadding = null; @@ -101,15 +101,15 @@ public class PropertyManager { * @param pList property list */ public PropertyManager(PropertyList pList) { - this.properties = pList; + this.propertyList = pList; } /** * Returns the property list that is used for lookup. * @return the property list */ - public PropertyList getProperties() { - return properties; + public PropertyList getPropertyList() { + return propertyList; } /** @@ -139,9 +139,9 @@ public class PropertyManager { } /**@todo this is ugly. need to improve. */ - String fontFamily = properties.get("font-family").getString(); - String fontStyle = properties.get("font-style").getString(); - String fw = properties.get("font-weight").getString(); + String fontFamily = propertyList.get("font-family").getString(); + String fontStyle = propertyList.get("font-style").getString(); + String fw = propertyList.get("font-weight").getString(); int fontWeight = 400; if (fw.equals("bolder")) { // +100 from inherited @@ -162,8 +162,8 @@ public class PropertyManager { // NOTE: this is incomplete. font-size may be specified with // various kinds of keywords too - int fontSize = properties.get("font-size").getLength().getValue(); - //int fontVariant = properties.get("font-variant").getEnum(); + int fontSize = propertyList.get("font-size").getLength().getValue(); + //int fontVariant = propertyList.get("font-variant").getEnum(); String fname = foTreeControl.fontLookup(fontFamily, fontStyle, fontWeight); FontMetrics metrics = foTreeControl.getMetricsFor(fname); @@ -192,15 +192,15 @@ public class PropertyManager { private void initBorderInfo(int whichSide, String[] saSide) { borderAndPadding.setPadding(whichSide, - properties.get( + propertyList.get( MSGFMT_PADDING.format(saSide)).getCondLength()); // If style = none, force width to 0, don't get Color (spec 7.7.20) - int style = properties.get(MSGFMT_STYLE.format(saSide)).getEnum(); + int style = propertyList.get(MSGFMT_STYLE.format(saSide)).getEnum(); if (style != Constants.NONE) { borderAndPadding.setBorder(whichSide, style, - properties.get( + propertyList.get( MSGFMT_WIDTH.format(saSide)).getCondLength(), - properties.get( + propertyList.get( MSGFMT_COLOR.format(saSide)).getColorType()); } } @@ -214,25 +214,25 @@ public class PropertyManager { if (hyphProps == null) { this.hyphProps = new CommonHyphenation(); hyphProps.hyphenate = - this.properties.get("hyphenate").getEnum(); - hyphProps.hyphenationChar = this.properties.get( + this.propertyList.get("hyphenate").getEnum(); + hyphProps.hyphenationChar = this.propertyList.get( "hyphenation-character").getCharacter(); - hyphProps.hyphenationPushCharacterCount = this.properties.get( + hyphProps.hyphenationPushCharacterCount = this.propertyList.get( "hyphenation-push-character-count").getNumber(). intValue(); - hyphProps.hyphenationRemainCharacterCount = this.properties.get( + hyphProps.hyphenationRemainCharacterCount = this.propertyList.get( "hyphenation-remain-character-count").getNumber(). intValue(); hyphProps.language = - this.properties.get("language").getString(); - hyphProps.country = this.properties.get("country").getString(); + this.propertyList.get("language").getString(); + hyphProps.country = this.propertyList.get("country").getString(); } return hyphProps; } /*public int checkBreakBefore(Area area) { if (!(area instanceof ColumnArea)) { - switch (properties.get("break-before").getEnum()) { + switch (propertyList.get("break-before").getEnum()) { case BreakBefore.PAGE: return Status.FORCE_PAGE_BREAK; case BreakBefore.ODD_PAGE: @@ -246,7 +246,7 @@ public class PropertyManager { } } else { ColumnArea colArea = (ColumnArea)area; - switch (properties.get("break-before").getEnum()) { + switch (propertyList.get("break-before").getEnum()) { case BreakBefore.PAGE: // if first ColumnArea, and empty, return OK if (!colArea.hasChildren() && (colArea.getColumnIndex() == 1)) @@ -282,7 +282,7 @@ public class PropertyManager { } public int checkBreakAfter(Area area) { - switch (properties.get("break-after").getEnum()) { + switch (propertyList.get("break-after").getEnum()) { case BreakAfter.PAGE: return Status.FORCE_PAGE_BREAK; case BreakAfter.ODD_PAGE: @@ -307,22 +307,22 @@ public class PropertyManager { // Common Margin Properties-Block props.marginTop = - this.properties.get("margin-top").getLength().getValue(); + this.propertyList.get("margin-top").getLength().getValue(); props.marginBottom = - this.properties.get("margin-bottom").getLength().getValue(); + this.propertyList.get("margin-bottom").getLength().getValue(); props.marginLeft = - this.properties.get("margin-left").getLength().getValue(); + this.propertyList.get("margin-left").getLength().getValue(); props.marginRight = - this.properties.get("margin-right").getLength().getValue(); + this.propertyList.get("margin-right").getLength().getValue(); // For now, we only get the optimum value for space-before and after - props.spaceBefore = this.properties.get("space-before"). + props.spaceBefore = this.propertyList.get("space-before"). getSpace().getOptimum().getLength().getValue(); - props.spaceAfter = this.properties.get("space-after"). + props.spaceAfter = this.propertyList.get("space-after"). getSpace().getOptimum().getLength().getValue(); - props.startIndent = this.properties.get("start-indent"). + props.startIndent = this.propertyList.get("start-indent"). getLength().getValue(); - props.endIndent = this.properties.get("end-indent"). + props.endIndent = this.propertyList.get("end-indent"). getLength().getValue(); return props; @@ -335,22 +335,22 @@ public class PropertyManager { */ public CommonBackground getBackgroundProps() { CommonBackground bp = new CommonBackground(); - bp.backAttachment = properties.get("background-attachment").getEnum(); - bp.backColor = properties.get("background-color").getColorType(); + bp.backAttachment = propertyList.get("background-attachment").getEnum(); + bp.backColor = propertyList.get("background-color").getColorType(); if (bp.backColor.getAlpha() == 0) { bp.backColor = null; } - bp.backImage = properties.get("background-image").getString(); + bp.backImage = propertyList.get("background-image").getString(); if (bp.backImage == null || NONE.equals(bp.backImage)) { bp.backImage = null; } else { - bp.backRepeat = properties.get("background-repeat").getEnum(); - Property prop = properties.get("background-position-horizontal"); + bp.backRepeat = propertyList.get("background-repeat").getEnum(); + Property prop = propertyList.get("background-position-horizontal"); if (prop != null) { bp.backPosHorizontal = prop.getLength(); } - prop = properties.get("background-position-vertical"); + prop = propertyList.get("background-position-vertical"); if (prop != null) { bp.backPosVertical = prop.getLength(); } @@ -376,8 +376,8 @@ public class PropertyManager { */ public InlineProps getInlineProps() { InlineProps props = new InlineProps(); - props.spaceStart = new SpaceVal(properties.get("space-start").getSpace()); - props.spaceEnd = new SpaceVal(properties.get("space-end").getSpace()); + props.spaceStart = new SpaceVal(propertyList.get("space-start").getSpace()); + props.spaceEnd = new SpaceVal(propertyList.get("space-end").getSpace()); return props; } @@ -389,11 +389,11 @@ public class PropertyManager { public CommonAccessibility getAccessibilityProps() { CommonAccessibility props = new CommonAccessibility(); String str; - str = this.properties.get("source-document").getString(); + str = this.propertyList.get("source-document").getString(); if (!NONE.equals(str)) { props.sourceDoc = str; } - str = this.properties.get("role").getString(); + str = this.propertyList.get("role").getString(); if (!NONE.equals(str)) { props.role = str; } @@ -428,11 +428,11 @@ public class PropertyManager { public CommonAbsolutePosition getAbsolutePositionProps() { CommonAbsolutePosition props = new CommonAbsolutePosition(); props.absolutePosition = - this.properties.get("absolute-position").getEnum(); - props.top = this.properties.get("top").getLength().getValue(); - props.bottom = this.properties.get("bottom").getLength().getValue(); - props.left = this.properties.get("left").getLength().getValue(); - props.right = this.properties.get("right").getLength().getValue(); + this.propertyList.get("absolute-position").getEnum(); + props.top = this.propertyList.get("top").getLength().getValue(); + props.bottom = this.propertyList.get("bottom").getLength().getValue(); + props.left = this.propertyList.get("left").getLength().getValue(); + props.right = this.propertyList.get("right").getLength().getValue(); return props; } @@ -443,12 +443,12 @@ public class PropertyManager { */ public BlockProps getBlockProps() { BlockProps props = new BlockProps(); - props.firstIndent = this.properties.get("text-indent").getLength().getValue(); + props.firstIndent = this.propertyList.get("text-indent").getLength().getValue(); props.lastIndent = 0; - /*this.properties.get("last-line-end-indent").getLength().mvalue(); */ - props.textAlign = this.properties.get("text-align").getEnum(); - props.textAlignLast = this.properties.get("text-align-last").getEnum(); - props.lineStackType = this.properties.get("line-stacking-strategy").getEnum(); + /*this.propertyList.get("last-line-end-indent").getLength().mvalue(); */ + props.textAlign = this.propertyList.get("text-align").getEnum(); + props.textAlignLast = this.propertyList.get("text-align-last").getEnum(); + props.lineStackType = this.propertyList.get("line-stacking-strategy").getEnum(); return props; } @@ -460,13 +460,13 @@ public class PropertyManager { */ public LayoutProps getLayoutProps() { LayoutProps props = new LayoutProps(); - props.breakBefore = this.properties.get("break-before").getEnum(); - props.breakAfter = this.properties.get("break-after").getEnum(); - props.bIsSpan = (this.properties.get("span").getEnum() == Span.ALL); + props.breakBefore = this.propertyList.get("break-before").getEnum(); + props.breakAfter = this.propertyList.get("break-after").getEnum(); + props.bIsSpan = (this.propertyList.get("span").getEnum() == Span.ALL); props.spaceBefore = new SpaceVal( - this.properties.get("space-before").getSpace()); + this.propertyList.get("space-before").getSpace()); props.spaceAfter = new SpaceVal( - this.properties.get("space-after").getSpace()); + this.propertyList.get("space-after").getSpace()); return props; } @@ -481,28 +481,28 @@ public class PropertyManager { if (textInfo == null) { textInfo = new TextInfo(); textInfo.fs = getFontState(foTreeControl); - textInfo.color = properties.get("color").getColorType(); + textInfo.color = propertyList.get("color").getColorType(); textInfo.verticalAlign = - properties.get("vertical-align").getEnum(); + propertyList.get("vertical-align").getEnum(); - textInfo.wrapOption = properties.get("wrap-option").getEnum(); + textInfo.wrapOption = propertyList.get("wrap-option").getEnum(); textInfo.bWrap = (textInfo.wrapOption == Constants.WRAP); textInfo.wordSpacing = new SpaceVal( - properties.get("word-spacing").getSpace()); + propertyList.get("word-spacing").getSpace()); /* textInfo.letterSpacing = - new SpaceVal(properties.get("letter-spacing").getSpace());*/ + new SpaceVal(propertyList.get("letter-spacing").getSpace());*/ textInfo.whiteSpaceCollapse = - properties.get("white-space-collapse").getEnum(); + propertyList.get("white-space-collapse").getEnum(); - textInfo.lineHeight = this.properties.get( + textInfo.lineHeight = this.propertyList.get( "line-height").getLength().getValue(); textInfo.textTransform - = this.properties.get("text-transform").getEnum(); + = this.propertyList.get("text-transform").getEnum(); } return textInfo; @@ -513,14 +513,14 @@ public class PropertyManager { * @return the enumerated reference-orientation */ public int getAbsRefOrient() { - return properties.get("reference-orientation").getNumber().intValue(); + return propertyList.get("reference-orientation").getNumber().intValue(); } /** * @return the enumerated writing-mode */ public int getWritingMode() { - return properties.get("writing-mode").getEnum(); + return propertyList.get("writing-mode").getEnum(); } } diff --git a/src/java/org/apache/fop/fo/expr/BodyStartFunction.java b/src/java/org/apache/fop/fo/expr/BodyStartFunction.java index c6cada8ae..989211458 100644 --- a/src/java/org/apache/fop/fo/expr/BodyStartFunction.java +++ b/src/java/org/apache/fop/fo/expr/BodyStartFunction.java @@ -88,7 +88,7 @@ public class BodyStartFunction extends FunctionBase { } Numeric startIndent = - ((ListItem)item).properties.get("start-indent").getNumeric(); + ((ListItem)item).propertyList.get("start-indent").getNumeric(); return new NumericProperty(distance.add(startIndent)); } diff --git a/src/java/org/apache/fop/fo/expr/LabelEndFunction.java b/src/java/org/apache/fop/fo/expr/LabelEndFunction.java index ba129c1ba..7856d05f7 100644 --- a/src/java/org/apache/fop/fo/expr/LabelEndFunction.java +++ b/src/java/org/apache/fop/fo/expr/LabelEndFunction.java @@ -95,7 +95,7 @@ public class LabelEndFunction extends FunctionBase { if (item == null) { throw new PropertyException("label-end() called from outside an fo:list-item"); } - Length startIndent = ((ListItem)item).properties.get("start-indent").getLength(); + Length startIndent = ((ListItem)item).propertyList.get("start-indent").getLength(); LinearCombinationLength labelEnd = new LinearCombinationLength(); diff --git a/src/java/org/apache/fop/fo/flow/BasicLink.java b/src/java/org/apache/fop/fo/flow/BasicLink.java index 52aec130c..abff1d3f4 100644 --- a/src/java/org/apache/fop/fo/flow/BasicLink.java +++ b/src/java/org/apache/fop/fo/flow/BasicLink.java @@ -97,15 +97,15 @@ public class BasicLink extends Inline { // Common Relative Position Properties CommonRelativePosition mRelProps = propMgr.getRelativePositionProps(); - // this.properties.get("alignment-adjust"); - // this.properties.get("alignment-baseline"); - // this.properties.get("baseline-shift"); - // this.properties.get("destination-place-offset"); - // this.properties.get("dominant-baseline"); - String ext = properties.get("external-destination").getString(); + // this.propertyList.get("alignment-adjust"); + // this.propertyList.get("alignment-baseline"); + // this.propertyList.get("baseline-shift"); + // this.propertyList.get("destination-place-offset"); + // this.propertyList.get("dominant-baseline"); + String ext = propertyList.get("external-destination").getString(); setupID(); - // this.properties.get("indicate-destination"); - String internal = properties.get("internal-destination").getString(); + // this.propertyList.get("indicate-destination"); + String internal = propertyList.get("internal-destination").getString(); if (ext.length() > 0) { link = ext; external = true; @@ -114,15 +114,15 @@ public class BasicLink extends Inline { } else { getLogger().error("basic-link requires an internal or external destination"); } - // this.properties.get("keep-together"); - // this.properties.get("keep-with-next"); - // this.properties.get("keep-with-previous"); - // this.properties.get("line-height"); - // this.properties.get("line-height-shift-adjustment"); - // this.properties.get("show-destination"); - // this.properties.get("target-processing-context"); - // this.properties.get("target-presentation-context"); - // this.properties.get("target-stylesheet"); + // this.propertyList.get("keep-together"); + // this.propertyList.get("keep-with-next"); + // this.propertyList.get("keep-with-previous"); + // this.propertyList.get("line-height"); + // this.propertyList.get("line-height-shift-adjustment"); + // this.propertyList.get("show-destination"); + // this.propertyList.get("target-processing-context"); + // this.propertyList.get("target-presentation-context"); + // this.propertyList.get("target-stylesheet"); } diff --git a/src/java/org/apache/fop/fo/flow/BidiOverride.java b/src/java/org/apache/fop/fo/flow/BidiOverride.java index 661eb9be1..7318ea160 100644 --- a/src/java/org/apache/fop/fo/flow/BidiOverride.java +++ b/src/java/org/apache/fop/fo/flow/BidiOverride.java @@ -80,17 +80,17 @@ public class BidiOverride extends FObjMixed { // Common Margin Properties-Inline CommonRelativePosition mProps = propMgr.getRelativePositionProps(); - // this.properties.get("color"); - // this.properties.get("direction"); + // this.propertyList.get("color"); + // this.propertyList.get("direction"); setupID(); - // this.properties.get("letter-spacing"); - // this.properties.get("line-height"); - // this.properties.get("line-height-shift-adjustment"); - // this.properties.get("score-spaces"); - // this.properties.get("text-shadow"); - // this.properties.get("text-transform"); - // this.properties.get("unicode-bidi"); - // this.properties.get("word-spacing"); + // this.propertyList.get("letter-spacing"); + // this.propertyList.get("line-height"); + // this.propertyList.get("line-height-shift-adjustment"); + // this.propertyList.get("score-spaces"); + // this.propertyList.get("text-shadow"); + // this.propertyList.get("text-transform"); + // this.propertyList.get("unicode-bidi"); + // this.propertyList.get("word-spacing"); } diff --git a/src/java/org/apache/fop/fo/flow/Block.java b/src/java/org/apache/fop/fo/flow/Block.java index 9636496b1..44d1203a0 100644 --- a/src/java/org/apache/fop/fo/flow/Block.java +++ b/src/java/org/apache/fop/fo/flow/Block.java @@ -132,14 +132,14 @@ public class Block extends FObjMixed { */ public void handleAttrs(Attributes attlist) throws FOPException { super.handleAttrs(attlist); - this.span = this.properties.get("span").getEnum(); + this.span = this.propertyList.get("span").getEnum(); this.wsTreatment = - this.properties.get("white-space-treatment").getEnum(); + this.propertyList.get("white-space-treatment").getEnum(); this.bWScollapse = - (this.properties.get("white-space-collapse").getEnum() + (this.propertyList.get("white-space-collapse").getEnum() == Constants.TRUE); this.lfTreatment = - this.properties.get("linefeed-treatment").getEnum(); + this.propertyList.get("linefeed-treatment").getEnum(); setupID(); @@ -171,57 +171,57 @@ public class Block extends FObjMixed { CommonRelativePosition mRelProps = propMgr.getRelativePositionProps(); - // this.properties.get("break-after"); - // this.properties.get("break-before"); - // this.properties.get("color"); - // this.properties.get("text-depth"); - // this.properties.get("text-altitude"); - // this.properties.get("hyphenation-keep"); - // this.properties.get("hyphenation-ladder-count"); + // this.propertyList.get("break-after"); + // this.propertyList.get("break-before"); + // this.propertyList.get("color"); + // this.propertyList.get("text-depth"); + // this.propertyList.get("text-altitude"); + // this.propertyList.get("hyphenation-keep"); + // this.propertyList.get("hyphenation-ladder-count"); setupID(); - // this.properties.get("keep-together"); - // this.properties.get("keep-with-next"); - // this.properties.get("keep-with-previous"); - // this.properties.get("last-line-end-indent"); - // this.properties.get("linefeed-treatment"); - // this.properties.get("line-height"); - // this.properties.get("line-height-shift-adjustment"); - // this.properties.get("line-stacking-strategy"); - // this.properties.get("orphans"); - // this.properties.get("white-space-treatment"); - // this.properties.get("span"); - // this.properties.get("text-align"); - // this.properties.get("text-align-last"); - // this.properties.get("text-indent"); - // this.properties.get("visibility"); - // this.properties.get("white-space-collapse"); - // this.properties.get("widows"); - // this.properties.get("wrap-option"); - // this.properties.get("z-index"); - - this.align = this.properties.get("text-align").getEnum(); + // this.propertyList.get("keep-together"); + // this.propertyList.get("keep-with-next"); + // this.propertyList.get("keep-with-previous"); + // this.propertyList.get("last-line-end-indent"); + // this.propertyList.get("linefeed-treatment"); + // this.propertyList.get("line-height"); + // this.propertyList.get("line-height-shift-adjustment"); + // this.propertyList.get("line-stacking-strategy"); + // this.propertyList.get("orphans"); + // this.propertyList.get("white-space-treatment"); + // this.propertyList.get("span"); + // this.propertyList.get("text-align"); + // this.propertyList.get("text-align-last"); + // this.propertyList.get("text-indent"); + // this.propertyList.get("visibility"); + // this.propertyList.get("white-space-collapse"); + // this.propertyList.get("widows"); + // this.propertyList.get("wrap-option"); + // this.propertyList.get("z-index"); + + this.align = this.propertyList.get("text-align").getEnum(); this.alignLast = - this.properties.get("text-align-last").getEnum(); - this.breakAfter = this.properties.get("break-after").getEnum(); - this.lineHeight = this.properties.get( + this.propertyList.get("text-align-last").getEnum(); + this.breakAfter = this.propertyList.get("break-after").getEnum(); + this.lineHeight = this.propertyList.get( "line-height").getLength().getValue(); - this.startIndent = this.properties.get( + this.startIndent = this.propertyList.get( "start-indent").getLength().getValue(); - this.endIndent = this.properties.get( + this.endIndent = this.propertyList.get( "end-indent").getLength().getValue(); - this.spaceBefore = this.properties.get( + this.spaceBefore = this.propertyList.get( "space-before.optimum").getLength().getValue(); - this.spaceAfter = this.properties.get( + this.spaceAfter = this.propertyList.get( "space-after.optimum").getLength().getValue(); - this.textIndent = this.properties.get( + this.textIndent = this.propertyList.get( "text-indent").getLength().getValue(); this.keepWithNext = - this.properties.get("keep-with-next").getEnum(); + this.propertyList.get("keep-with-next").getEnum(); this.blockWidows = - this.properties.get("widows").getNumber().intValue(); + this.propertyList.get("widows").getNumber().intValue(); this.blockOrphans = - this.properties.get("orphans").getNumber().intValue(); + this.propertyList.get("orphans").getNumber().intValue(); } diff --git a/src/java/org/apache/fop/fo/flow/BlockContainer.java b/src/java/org/apache/fop/fo/flow/BlockContainer.java index 3d4bc11cc..77ab61871 100644 --- a/src/java/org/apache/fop/fo/flow/BlockContainer.java +++ b/src/java/org/apache/fop/fo/flow/BlockContainer.java @@ -93,7 +93,7 @@ public class BlockContainer extends FObj { */ public void handleAttrs(Attributes attlist) throws FOPException { super.handleAttrs(attlist); - this.span = this.properties.get("span").getEnum(); + this.span = this.propertyList.get("span").getEnum(); setupID(); } @@ -109,28 +109,28 @@ public class BlockContainer extends FObj { // Common Margin-Block Properties CommonMarginBlock mProps = propMgr.getMarginProps(); - // this.properties.get("block-progression-dimension"); - // this.properties.get("break-after"); - // this.properties.get("break-before"); - // this.properties.get("clip"); - // this.properties.get("display-align"); - // this.properties.get("height"); + // this.propertyList.get("block-progression-dimension"); + // this.propertyList.get("break-after"); + // this.propertyList.get("break-before"); + // this.propertyList.get("clip"); + // this.propertyList.get("display-align"); + // this.propertyList.get("height"); setupID(); - // this.properties.get("keep-together"); - // this.properties.get("keep-with-next"); - // this.properties.get("keep-with-previous"); - // this.properties.get("overflow"); - // this.properties.get("reference-orientation"); - // this.properties.get("span"); - // this.properties.get("width"); - // this.properties.get("writing-mode"); + // this.propertyList.get("keep-together"); + // this.propertyList.get("keep-with-next"); + // this.propertyList.get("keep-with-previous"); + // this.propertyList.get("overflow"); + // this.propertyList.get("reference-orientation"); + // this.propertyList.get("span"); + // this.propertyList.get("width"); + // this.propertyList.get("writing-mode"); this.backgroundColor = - this.properties.get("background-color").getColorType(); + this.propertyList.get("background-color").getColorType(); - this.width = this.properties.get("width").getLength().getValue(); - this.height = this.properties.get("height").getLength().getValue(); - span = this.properties.get("span").getEnum(); + this.width = this.propertyList.get("width").getLength().getValue(); + this.height = this.propertyList.get("height").getLength().getValue(); + span = this.propertyList.get("span").getEnum(); } diff --git a/src/java/org/apache/fop/fo/flow/Character.java b/src/java/org/apache/fop/fo/flow/Character.java index d19ba8580..eeb549f15 100644 --- a/src/java/org/apache/fop/fo/flow/Character.java +++ b/src/java/org/apache/fop/fo/flow/Character.java @@ -115,29 +115,29 @@ public class Character extends FObj { CommonRelativePosition mRelProps = propMgr.getRelativePositionProps(); - // this.properties.get("alignment-adjust"); - // this.properties.get("treat-as-word-space"); - // this.properties.get("alignment-baseline"); - // this.properties.get("baseline-shift"); - // this.properties.get("character"); - // this.properties.get("color"); - // this.properties.get("dominant-baseline"); - // this.properties.get("text-depth"); - // this.properties.get("text-altitude"); - // this.properties.get("glyph-orientation-horizontal"); - // this.properties.get("glyph-orientation-vertical"); + // this.propertyList.get("alignment-adjust"); + // this.propertyList.get("treat-as-word-space"); + // this.propertyList.get("alignment-baseline"); + // this.propertyList.get("baseline-shift"); + // this.propertyList.get("character"); + // this.propertyList.get("color"); + // this.propertyList.get("dominant-baseline"); + // this.propertyList.get("text-depth"); + // this.propertyList.get("text-altitude"); + // this.propertyList.get("glyph-orientation-horizontal"); + // this.propertyList.get("glyph-orientation-vertical"); setupID(); - // this.properties.get("keep-with-next"); - // this.properties.get("keep-with-previous"); - // this.properties.get("letter-spacing"); - // this.properties.get("line-height"); - // this.properties.get("line-height-shift-adjustment"); - // this.properties.get("score-spaces"); - // this.properties.get("suppress-at-line-break"); - // this.properties.get("text-decoration"); - // this.properties.get("text-shadow"); - // this.properties.get("text-transform"); - // this.properties.get("word-spacing"); + // this.propertyList.get("keep-with-next"); + // this.propertyList.get("keep-with-previous"); + // this.propertyList.get("letter-spacing"); + // this.propertyList.get("line-height"); + // this.propertyList.get("line-height-shift-adjustment"); + // this.propertyList.get("score-spaces"); + // this.propertyList.get("suppress-at-line-break"); + // this.propertyList.get("text-decoration"); + // this.propertyList.get("text-shadow"); + // this.propertyList.get("text-transform"); + // this.propertyList.get("word-spacing"); } /** diff --git a/src/java/org/apache/fop/fo/flow/ExternalGraphic.java b/src/java/org/apache/fop/fo/flow/ExternalGraphic.java index 0e78676c0..2b3430fbf 100644 --- a/src/java/org/apache/fop/fo/flow/ExternalGraphic.java +++ b/src/java/org/apache/fop/fo/flow/ExternalGraphic.java @@ -102,27 +102,27 @@ public class ExternalGraphic extends FObj { * This gets the sizes for the image and the dimensions and clipping. */ public void setup() { - url = this.properties.get("src").getString(); + url = this.propertyList.get("src").getString(); if (url == null) { return; } url = ImageFactory.getURL(url); // assume lr-tb for now - Length ipd = properties.get("inline-progression-dimension.optimum").getLength(); + Length ipd = propertyList.get("inline-progression-dimension.optimum").getLength(); if (!ipd.isAuto()) { viewWidth = ipd.getValue(); } else { - ipd = properties.get("width").getLength(); + ipd = propertyList.get("width").getLength(); if (!ipd.isAuto()) { viewWidth = ipd.getValue(); } } - Length bpd = properties.get("block-progression-dimension.optimum").getLength(); + Length bpd = propertyList.get("block-progression-dimension.optimum").getLength(); if (!bpd.isAuto()) { viewHeight = bpd.getValue(); } else { - bpd = properties.get("height").getLength(); + bpd = propertyList.get("height").getLength(); if (!bpd.isAuto()) { viewHeight = bpd.getValue(); } @@ -133,7 +133,7 @@ public class ExternalGraphic extends FObj { int cwidth = -1; int cheight = -1; - Length ch = properties.get("content-height").getLength(); + Length ch = propertyList.get("content-height").getLength(); if (!ch.isAuto()) { /*if (ch.scaleToFit()) { if (viewHeight != -1) { @@ -142,7 +142,7 @@ public class ExternalGraphic extends FObj { } else {*/ cheight = ch.getValue(); } - Length cw = properties.get("content-width").getLength(); + Length cw = propertyList.get("content-width").getLength(); if (!cw.isAuto()) { /*if (cw.scaleToFit()) { if (viewWidth != -1) { @@ -152,7 +152,7 @@ public class ExternalGraphic extends FObj { cwidth = cw.getValue(); } - int scaling = properties.get("scaling").getEnum(); + int scaling = propertyList.get("scaling").getEnum(); if ((scaling == Scaling.UNIFORM) || (cwidth == -1) || cheight == -1) { ImageFactory fact = ImageFactory.getInstance(); fopimage = fact.getImage(url, getUserAgent()); @@ -194,7 +194,7 @@ public class ExternalGraphic extends FObj { } if (cwidth > viewWidth || cheight > viewHeight) { - int overflow = properties.get("overflow").getEnum(); + int overflow = propertyList.get("overflow").getEnum(); if (overflow == Overflow.HIDDEN) { clip = true; } else if (overflow == Overflow.ERROR_IF_OVERFLOW) { @@ -206,7 +206,7 @@ public class ExternalGraphic extends FObj { int xoffset = 0; int yoffset = 0; - int da = properties.get("display-align").getEnum(); + int da = propertyList.get("display-align").getEnum(); switch(da) { case DisplayAlign.BEFORE: break; @@ -221,7 +221,7 @@ public class ExternalGraphic extends FObj { break; } - int ta = properties.get("text-align").getEnum(); + int ta = propertyList.get("text-align").getEnum(); switch(ta) { case TextAlign.CENTER: xoffset = (viewWidth - cwidth) / 2; diff --git a/src/java/org/apache/fop/fo/flow/Float.java b/src/java/org/apache/fop/fo/flow/Float.java index c07f34f8a..834b06043 100644 --- a/src/java/org/apache/fop/fo/flow/Float.java +++ b/src/java/org/apache/fop/fo/flow/Float.java @@ -70,8 +70,8 @@ public class Float extends ToBeImplementedElement { private void setup() { - // this.properties.get("float"); - // this.properties.get("clear"); + // this.propertyList.get("float"); + // this.propertyList.get("clear"); } diff --git a/src/java/org/apache/fop/fo/flow/InitialPropertySet.java b/src/java/org/apache/fop/fo/flow/InitialPropertySet.java index 40fc5f2bf..ce8a9d1a3 100644 --- a/src/java/org/apache/fop/fo/flow/InitialPropertySet.java +++ b/src/java/org/apache/fop/fo/flow/InitialPropertySet.java @@ -91,16 +91,16 @@ public class InitialPropertySet extends ToBeImplementedElement { // Common Relative Position Properties CommonRelativePosition mRelProps = propMgr.getRelativePositionProps(); - // this.properties.get("color"); + // this.propertyList.get("color"); setupID(); - // this.properties.get("letter-spacing"); - // this.properties.get("line-height"); - // this.properties.get("line-height-shift-adjustment"); - // this.properties.get("score-spaces"); - // this.properties.get("text-decoration"); - // this.properties.get("text-shadow"); - // this.properties.get("text-transform"); - // this.properties.get("word-spacing"); + // this.propertyList.get("letter-spacing"); + // this.propertyList.get("line-height"); + // this.propertyList.get("line-height-shift-adjustment"); + // this.propertyList.get("score-spaces"); + // this.propertyList.get("text-decoration"); + // this.propertyList.get("text-shadow"); + // this.propertyList.get("text-transform"); + // this.propertyList.get("word-spacing"); } diff --git a/src/java/org/apache/fop/fo/flow/Inline.java b/src/java/org/apache/fop/fo/flow/Inline.java index 3864b9bb2..99309101c 100644 --- a/src/java/org/apache/fop/fo/flow/Inline.java +++ b/src/java/org/apache/fop/fo/flow/Inline.java @@ -118,22 +118,22 @@ public class Inline extends FObjMixed { // Common Relative Position Properties CommonRelativePosition mRelProps = propMgr.getRelativePositionProps(); - // this.properties.get("alignment-adjust"); - // this.properties.get("alignment-baseline"); - // this.properties.get("baseline-shift"); - // this.properties.get("color"); - // this.properties.get("dominant-baseline"); + // this.propertyList.get("alignment-adjust"); + // this.propertyList.get("alignment-baseline"); + // this.propertyList.get("baseline-shift"); + // this.propertyList.get("color"); + // this.propertyList.get("dominant-baseline"); setupID(); - // this.properties.get("keep-together"); - // this.properties.get("keep-with-next"); - // this.properties.get("keep-with-previous"); - // this.properties.get("line-height"); - // this.properties.get("line-height-shift-adjustment"); - // this.properties.get("text-devoration"); - // this.properties.get("visibility"); - // this.properties.get("z-index"); - - int textDecoration = this.properties.get("text-decoration").getEnum(); + // this.propertyList.get("keep-together"); + // this.propertyList.get("keep-with-next"); + // this.propertyList.get("keep-with-previous"); + // this.propertyList.get("line-height"); + // this.propertyList.get("line-height-shift-adjustment"); + // this.propertyList.get("text-devoration"); + // this.propertyList.get("visibility"); + // this.propertyList.get("z-index"); + + int textDecoration = this.propertyList.get("text-decoration").getEnum(); if (textDecoration == TextDecoration.UNDERLINE) { this.underlined = true; diff --git a/src/java/org/apache/fop/fo/flow/InlineContainer.java b/src/java/org/apache/fop/fo/flow/InlineContainer.java index 80468970d..8d5212e0e 100644 --- a/src/java/org/apache/fop/fo/flow/InlineContainer.java +++ b/src/java/org/apache/fop/fo/flow/InlineContainer.java @@ -92,25 +92,25 @@ public class InlineContainer extends FObj { CommonRelativePosition mRelProps = propMgr.getRelativePositionProps(); - // this.properties.get("alignment-adjust"); - // this.properties.get("alignment-baseline"); - // this.properties.get("baseline-shift"); - // this.properties.get("block-progression-dimension"); - // this.properties.get("clip"); - // this.properties.get("display-align"); - // this.properties.get("dominant-baseline"); - // this.properties.get("height"); + // this.propertyList.get("alignment-adjust"); + // this.propertyList.get("alignment-baseline"); + // this.propertyList.get("baseline-shift"); + // this.propertyList.get("block-progression-dimension"); + // this.propertyList.get("clip"); + // this.propertyList.get("display-align"); + // this.propertyList.get("dominant-baseline"); + // this.propertyList.get("height"); setupID(); - // this.properties.get("inline-progression-dimension"); - // this.properties.get("keep-together"); - // this.properties.get("keep-with-next"); - // this.properties.get("keep-with-previous"); - // this.properties.get("line-height"); - // this.properties.get("line-height-shift-adjustment"); - // this.properties.get("overflow"); - // this.properties.get("reference-orientation"); - // this.properties.get("width"); - // this.properties.get("writing-mode"); + // this.propertyList.get("inline-progression-dimension"); + // this.propertyList.get("keep-together"); + // this.propertyList.get("keep-with-next"); + // this.propertyList.get("keep-with-previous"); + // this.propertyList.get("line-height"); + // this.propertyList.get("line-height-shift-adjustment"); + // this.propertyList.get("overflow"); + // this.propertyList.get("reference-orientation"); + // this.propertyList.get("width"); + // this.propertyList.get("writing-mode"); } /** diff --git a/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java b/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java index 6693b4225..0eaa19d16 100644 --- a/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java +++ b/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java @@ -74,7 +74,7 @@ public class InstreamForeignObject extends FObj { public int computeXOffset (int ipd, int cwidth) { int xoffset = 0; - int ta = properties.get("text-align").getEnum(); + int ta = propertyList.get("text-align").getEnum(); switch (ta) { case TextAlign.CENTER: xoffset = (ipd - cwidth) / 2; @@ -93,7 +93,7 @@ public class InstreamForeignObject extends FObj { public int computeYOffset(int bpd, int cheight) { int yoffset = 0; - int da = properties.get("display-align").getEnum(); + int da = propertyList.get("display-align").getEnum(); switch (da) { case DisplayAlign.BEFORE: break; @@ -137,58 +137,58 @@ public class InstreamForeignObject extends FObj { // Common Relative Position Properties RelativePositionProps mRelProps = propMgr.getRelativePositionProps(); - // this.properties.get("alignment-adjust"); - // this.properties.get("alignment-baseline"); - // this.properties.get("baseline-shift"); - // this.properties.get("block-progression-dimension"); - // this.properties.get("content-height"); - // this.properties.get("content-type"); - // this.properties.get("content-width"); - // this.properties.get("display-align"); - // this.properties.get("dominant-baseline"); - // this.properties.get("height"); + // this.propertyList.get("alignment-adjust"); + // this.propertyList.get("alignment-baseline"); + // this.propertyList.get("baseline-shift"); + // this.propertyList.get("block-progression-dimension"); + // this.propertyList.get("content-height"); + // this.propertyList.get("content-type"); + // this.propertyList.get("content-width"); + // this.propertyList.get("display-align"); + // this.propertyList.get("dominant-baseline"); + // this.propertyList.get("height"); setupID(); - // this.properties.get("inline-progression-dimension"); - // this.properties.get("keep-with-next"); - // this.properties.get("keep-with-previous"); - // this.properties.get("line-height"); - // this.properties.get("line-height-shift-adjustment"); - // this.properties.get("overflow"); - // this.properties.get("scaling"); - // this.properties.get("scaling-method"); - // this.properties.get("text-align"); - // this.properties.get("width"); + // this.propertyList.get("inline-progression-dimension"); + // this.propertyList.get("keep-with-next"); + // this.propertyList.get("keep-with-previous"); + // this.propertyList.get("line-height"); + // this.propertyList.get("line-height-shift-adjustment"); + // this.propertyList.get("overflow"); + // this.propertyList.get("scaling"); + // this.propertyList.get("scaling-method"); + // this.propertyList.get("text-align"); + // this.propertyList.get("width"); /* retrieve properties * - int align = this.properties.get("text-align").getEnum(); - int valign = this.properties.get("vertical-align").getEnum(); - int overflow = this.properties.get("overflow").getEnum(); - - this.breakBefore = this.properties.get("break-before").getEnum(); - this.breakAfter = this.properties.get("break-after").getEnum(); - this.width = this.properties.get("width").getLength().mvalue(); - this.height = this.properties.get("height").getLength().mvalue(); + int align = this.propertyList.get("text-align").getEnum(); + int valign = this.propertyList.get("vertical-align").getEnum(); + int overflow = this.propertyList.get("overflow").getEnum(); + + this.breakBefore = this.propertyList.get("break-before").getEnum(); + this.breakAfter = this.propertyList.get("break-after").getEnum(); + this.width = this.propertyList.get("width").getLength().mvalue(); + this.height = this.propertyList.get("height").getLength().mvalue(); this.contwidth = - this.properties.get("content-width").getLength().mvalue(); + this.propertyList.get("content-width").getLength().mvalue(); this.contheight = - this.properties.get("content-height").getLength().mvalue(); - this.wauto = this.properties.get("width").getLength().isAuto(); - this.hauto = this.properties.get("height").getLength().isAuto(); + this.propertyList.get("content-height").getLength().mvalue(); + this.wauto = this.propertyList.get("width").getLength().isAuto(); + this.hauto = this.propertyList.get("height").getLength().isAuto(); this.cwauto = - this.properties.get("content-width").getLength().isAuto(); + this.propertyList.get("content-width").getLength().isAuto(); this.chauto = - this.properties.get("content-height").getLength().isAuto(); + this.propertyList.get("content-height").getLength().isAuto(); this.startIndent = - this.properties.get("start-indent").getLength().mvalue(); + this.propertyList.get("start-indent").getLength().mvalue(); this.endIndent = - this.properties.get("end-indent").getLength().mvalue(); + this.propertyList.get("end-indent").getLength().mvalue(); this.spaceBefore = - this.properties.get("space-before.optimum").getLength().mvalue(); + this.propertyList.get("space-before.optimum").getLength().mvalue(); this.spaceAfter = - this.properties.get("space-after.optimum").getLength().mvalue(); + this.propertyList.get("space-after.optimum").getLength().mvalue(); - this.scaling = this.properties.get("scaling").getEnum(); + this.scaling = this.propertyList.get("scaling").getEnum(); */ diff --git a/src/java/org/apache/fop/fo/flow/Leader.java b/src/java/org/apache/fop/fo/flow/Leader.java index e4fc70ba0..d1691a3e5 100644 --- a/src/java/org/apache/fop/fo/flow/Leader.java +++ b/src/java/org/apache/fop/fo/flow/Leader.java @@ -107,37 +107,37 @@ public class Leader extends FObjMixed { // Common Relative Position Properties CommonRelativePosition mRelProps = propMgr.getRelativePositionProps(); - // this.properties.get("alignment-adjust"); - // this.properties.get("alignment-baseline"); - // this.properties.get("baseline-shift"); - // this.properties.get("color"); - // this.properties.get("dominant-baseline"); - // this.properties.get("text-depth"); - // this.properties.get("text-altitude"); + // this.propertyList.get("alignment-adjust"); + // this.propertyList.get("alignment-baseline"); + // this.propertyList.get("baseline-shift"); + // this.propertyList.get("color"); + // this.propertyList.get("dominant-baseline"); + // this.propertyList.get("text-depth"); + // this.propertyList.get("text-altitude"); setupID(); - // this.properties.get("leader-alignment"); - // this.properties.get("leader-length"); - // this.properties.get("leader-pattern"); - // this.properties.get("leader-pattern-width"); - // this.properties.get("rule-style"); - // this.properties.get("rule-thickness"); - // this.properties.get("letter-spacing"); - // this.properties.get("line-height"); - // this.properties.get("line-height-shift-adjustment"); - // this.properties.get("text-shadow"); - // this.properties.get("visibility"); - // this.properties.get("word-spacing"); - // this.properties.get("z-index"); + // this.propertyList.get("leader-alignment"); + // this.propertyList.get("leader-length"); + // this.propertyList.get("leader-pattern"); + // this.propertyList.get("leader-pattern-width"); + // this.propertyList.get("rule-style"); + // this.propertyList.get("rule-thickness"); + // this.propertyList.get("letter-spacing"); + // this.propertyList.get("line-height"); + // this.propertyList.get("line-height-shift-adjustment"); + // this.propertyList.get("text-shadow"); + // this.propertyList.get("visibility"); + // this.propertyList.get("word-spacing"); + // this.propertyList.get("z-index"); // color properties - ColorType c = this.properties.get("color").getColorType(); + ColorType c = this.propertyList.get("color").getColorType(); float red = c.getRed(); float green = c.getGreen(); float blue = c.getBlue(); // fo:leader specific properties // determines the pattern of leader; allowed values: space, rule,dots, use-content - leaderPattern = this.properties.get("leader-pattern").getEnum(); + leaderPattern = this.propertyList.get("leader-pattern").getEnum(); switch(leaderPattern) { case LeaderPattern.SPACE: // use Space @@ -146,8 +146,8 @@ public class Leader extends FObjMixed { // the following properties only apply // for leader-pattern = "rule" ruleThickness = - properties.get("rule-thickness").getLength().getValue(); - ruleStyle = properties.get("rule-style").getEnum(); + propertyList.get("rule-thickness").getLength().getValue(); + ruleStyle = propertyList.get("rule-style").getEnum(); break; case LeaderPattern.DOTS: break; @@ -159,13 +159,13 @@ public class Leader extends FObjMixed { // if leaderPatternWidth = 0 = default = use-font-metric patternWidth = - this.properties.get("leader-pattern-width").getLength().getValue(); + this.propertyList.get("leader-pattern-width").getLength().getValue(); } public int getLength(String prop, int dim) { int length; - Length maxlength = properties.get(prop).getLength(); + Length maxlength = propertyList.get(prop).getLength(); if (maxlength instanceof PercentLength) { length = (int)(((PercentLength)maxlength).value() * dim); diff --git a/src/java/org/apache/fop/fo/flow/ListBlock.java b/src/java/org/apache/fop/fo/flow/ListBlock.java index d0d5f0223..4088d38e1 100644 --- a/src/java/org/apache/fop/fo/flow/ListBlock.java +++ b/src/java/org/apache/fop/fo/flow/ListBlock.java @@ -109,30 +109,30 @@ public class ListBlock extends FObj { // Common Relative Position Properties CommonRelativePosition mRelProps = propMgr.getRelativePositionProps(); - // this.properties.get("break-after"); - // this.properties.get("break-before"); + // this.propertyList.get("break-after"); + // this.propertyList.get("break-before"); setupID(); - // this.properties.get("keep-together"); - // this.properties.get("keep-with-next"); - // this.properties.get("keep-with-previous"); - // this.properties.get("provisional-distance-between-starts"); - // this.properties.get("provisional-label-separation"); - - this.align = this.properties.get("text-align").getEnum(); - this.alignLast = this.properties.get("text-align-last").getEnum(); + // this.propertyList.get("keep-together"); + // this.propertyList.get("keep-with-next"); + // this.propertyList.get("keep-with-previous"); + // this.propertyList.get("provisional-distance-between-starts"); + // this.propertyList.get("provisional-label-separation"); + + this.align = this.propertyList.get("text-align").getEnum(); + this.alignLast = this.propertyList.get("text-align-last").getEnum(); this.lineHeight = - this.properties.get("line-height").getLength().getValue(); + this.propertyList.get("line-height").getLength().getValue(); this.startIndent = - this.properties.get("start-indent").getLength().getValue(); + this.propertyList.get("start-indent").getLength().getValue(); this.endIndent = - this.properties.get("end-indent").getLength().getValue(); + this.propertyList.get("end-indent").getLength().getValue(); this.spaceBefore = - this.properties.get("space-before.optimum").getLength().getValue(); + this.propertyList.get("space-before.optimum").getLength().getValue(); this.spaceAfter = - this.properties.get("space-after.optimum").getLength().getValue(); + this.propertyList.get("space-after.optimum").getLength().getValue(); this.spaceBetweenListRows = 0; // not used at present this.backgroundColor = - this.properties.get("background-color").getColorType(); + this.propertyList.get("background-color").getColorType(); } diff --git a/src/java/org/apache/fop/fo/flow/ListItem.java b/src/java/org/apache/fop/fo/flow/ListItem.java index 1d4e7e11c..efef19ec8 100644 --- a/src/java/org/apache/fop/fo/flow/ListItem.java +++ b/src/java/org/apache/fop/fo/flow/ListItem.java @@ -109,22 +109,22 @@ public class ListItem extends FObj { // Common Relative Position Properties CommonRelativePosition mRelProps = propMgr.getRelativePositionProps(); - // this.properties.get("break-after"); - // this.properties.get("break-before"); + // this.propertyList.get("break-after"); + // this.propertyList.get("break-before"); setupID(); - // this.properties.get("keep-together"); - // this.properties.get("keep-with-next"); - // this.properties.get("keep-with-previous"); - // this.properties.get("relative-align"); + // this.propertyList.get("keep-together"); + // this.propertyList.get("keep-with-next"); + // this.propertyList.get("keep-with-previous"); + // this.propertyList.get("relative-align"); - this.align = this.properties.get("text-align").getEnum(); - this.alignLast = this.properties.get("text-align-last").getEnum(); + this.align = this.propertyList.get("text-align").getEnum(); + this.alignLast = this.propertyList.get("text-align-last").getEnum(); this.lineHeight = - this.properties.get("line-height").getLength().getValue(); + this.propertyList.get("line-height").getLength().getValue(); this.spaceBefore = - this.properties.get("space-before.optimum").getLength().getValue(); + this.propertyList.get("space-before.optimum").getLength().getValue(); this.spaceAfter = - this.properties.get("space-after.optimum").getLength().getValue(); + this.propertyList.get("space-after.optimum").getLength().getValue(); } diff --git a/src/java/org/apache/fop/fo/flow/ListItemBody.java b/src/java/org/apache/fop/fo/flow/ListItemBody.java index 073b55dab..f645540b3 100644 --- a/src/java/org/apache/fop/fo/flow/ListItemBody.java +++ b/src/java/org/apache/fop/fo/flow/ListItemBody.java @@ -75,7 +75,7 @@ public class ListItemBody extends FObj { CommonAccessibility mAccProps = propMgr.getAccessibilityProps(); setupID(); - // this.properties.get("keep-together"); + // this.propertyList.get("keep-together"); /* * For calculating the lineage - The fo:list-item-body formatting object diff --git a/src/java/org/apache/fop/fo/flow/ListItemLabel.java b/src/java/org/apache/fop/fo/flow/ListItemLabel.java index a4cad1de0..49c0b4c6e 100644 --- a/src/java/org/apache/fop/fo/flow/ListItemLabel.java +++ b/src/java/org/apache/fop/fo/flow/ListItemLabel.java @@ -79,7 +79,7 @@ public class ListItemLabel extends FObj { CommonAccessibility mAccProps = propMgr.getAccessibilityProps(); setupID(); - // this.properties.get("keep-together"); + // this.propertyList.get("keep-together"); /* * For calculating the lineage - The fo:list-item-label formatting object diff --git a/src/java/org/apache/fop/fo/flow/Marker.java b/src/java/org/apache/fop/fo/flow/Marker.java index 3198085f0..c001016cf 100644 --- a/src/java/org/apache/fop/fo/flow/Marker.java +++ b/src/java/org/apache/fop/fo/flow/Marker.java @@ -89,7 +89,7 @@ public class Marker extends FObjMixed { super.handleAttrs(attlist); this.markerClassName = - this.properties.get("marker-class-name").getString(); + this.propertyList.get("marker-class-name").getString(); } /** diff --git a/src/java/org/apache/fop/fo/flow/MultiCase.java b/src/java/org/apache/fop/fo/flow/MultiCase.java index a69da4adc..6520bc7d7 100644 --- a/src/java/org/apache/fop/fo/flow/MultiCase.java +++ b/src/java/org/apache/fop/fo/flow/MultiCase.java @@ -75,9 +75,9 @@ public class MultiCase extends ToBeImplementedElement { CommonAccessibility mAccProps = propMgr.getAccessibilityProps(); setupID(); - // this.properties.get("starting-state"); - // this.properties.get("case-name"); - // this.properties.get("case-title"); + // this.propertyList.get("starting-state"); + // this.propertyList.get("case-name"); + // this.propertyList.get("case-title"); } diff --git a/src/java/org/apache/fop/fo/flow/MultiPropertySet.java b/src/java/org/apache/fop/fo/flow/MultiPropertySet.java index 2411bb94e..97a78a81c 100644 --- a/src/java/org/apache/fop/fo/flow/MultiPropertySet.java +++ b/src/java/org/apache/fop/fo/flow/MultiPropertySet.java @@ -71,7 +71,7 @@ public class MultiPropertySet extends ToBeImplementedElement { private void setup() { setupID(); - // this.properties.get("active-state"); + // this.propertyList.get("active-state"); } diff --git a/src/java/org/apache/fop/fo/flow/MultiSwitch.java b/src/java/org/apache/fop/fo/flow/MultiSwitch.java index 9e32b0895..322292c36 100644 --- a/src/java/org/apache/fop/fo/flow/MultiSwitch.java +++ b/src/java/org/apache/fop/fo/flow/MultiSwitch.java @@ -74,7 +74,7 @@ public class MultiSwitch extends ToBeImplementedElement { // Common Accessibility Properties CommonAccessibility mAccProps = propMgr.getAccessibilityProps(); - // this.properties.get("auto-restore"); + // this.propertyList.get("auto-restore"); setupID(); } diff --git a/src/java/org/apache/fop/fo/flow/MultiToggle.java b/src/java/org/apache/fop/fo/flow/MultiToggle.java index a06f78b37..0df3c29b2 100644 --- a/src/java/org/apache/fop/fo/flow/MultiToggle.java +++ b/src/java/org/apache/fop/fo/flow/MultiToggle.java @@ -75,7 +75,7 @@ public class MultiToggle extends ToBeImplementedElement { CommonAccessibility mAccProps = propMgr.getAccessibilityProps(); setupID(); - // this.properties.get("switch-to"); + // this.propertyList.get("switch-to"); } diff --git a/src/java/org/apache/fop/fo/flow/PageNumber.java b/src/java/org/apache/fop/fo/flow/PageNumber.java index d0d1c1899..00efde644 100644 --- a/src/java/org/apache/fop/fo/flow/PageNumber.java +++ b/src/java/org/apache/fop/fo/flow/PageNumber.java @@ -109,28 +109,28 @@ public class PageNumber extends FObj { CommonRelativePosition mRelProps = propMgr.getRelativePositionProps(); - // this.properties.get("alignment-adjust"); - // this.properties.get("alignment-baseline"); - // this.properties.get("baseline-shift"); - // this.properties.get("dominant-baseline"); + // this.propertyList.get("alignment-adjust"); + // this.propertyList.get("alignment-baseline"); + // this.propertyList.get("baseline-shift"); + // this.propertyList.get("dominant-baseline"); setupID(); - // this.properties.get("keep-with-next"); - // this.properties.get("keep-with-previous"); - // this.properties.get("letter-spacing"); - // this.properties.get("line-height"); - // this.properties.get("line-height-shift-adjustment"); - // this.properties.get("score-spaces"); - // this.properties.get("text-decoration"); - // this.properties.get("text-shadow"); - // this.properties.get("text-transform"); - // this.properties.get("word-spacing"); - - ColorType c = this.properties.get("color").getColorType(); + // this.propertyList.get("keep-with-next"); + // this.propertyList.get("keep-with-previous"); + // this.propertyList.get("letter-spacing"); + // this.propertyList.get("line-height"); + // this.propertyList.get("line-height-shift-adjustment"); + // this.propertyList.get("score-spaces"); + // this.propertyList.get("text-decoration"); + // this.propertyList.get("text-shadow"); + // this.propertyList.get("text-transform"); + // this.propertyList.get("word-spacing"); + + ColorType c = this.propertyList.get("color").getColorType(); this.red = c.getRed(); this.green = c.getGreen(); this.blue = c.getBlue(); - this.wrapOption = this.properties.get("wrap-option").getEnum(); + this.wrapOption = this.propertyList.get("wrap-option").getEnum(); } diff --git a/src/java/org/apache/fop/fo/flow/PageNumberCitation.java b/src/java/org/apache/fop/fo/flow/PageNumberCitation.java index d82f400ef..8fb8ba0de 100644 --- a/src/java/org/apache/fop/fo/flow/PageNumberCitation.java +++ b/src/java/org/apache/fop/fo/flow/PageNumberCitation.java @@ -61,7 +61,7 @@ import org.apache.fop.fo.properties.CommonBorderAndPadding; import org.apache.fop.fo.properties.CommonMarginInline; import org.apache.fop.fo.properties.CommonRelativePosition; import org.apache.fop.fonts.Font; -import org.apache.fop.util.CharUtilities; + /** * Class modelling the fo:page-number-citation object. See Sec. 6.6.11 of the @@ -123,30 +123,30 @@ public class PageNumberCitation extends FObj { CommonRelativePosition mRelProps = propMgr.getRelativePositionProps(); - // this.properties.get("alignment-adjust"); - // this.properties.get("alignment-baseline"); - // this.properties.get("baseline-shift"); - // this.properties.get("dominant-baseline"); + // this.propertyList.get("alignment-adjust"); + // this.propertyList.get("alignment-baseline"); + // this.propertyList.get("baseline-shift"); + // this.propertyList.get("dominant-baseline"); setupID(); - // this.properties.get("keep-with-next"); - // this.properties.get("keep-with-previous"); - // this.properties.get("letter-spacing"); - // this.properties.get("line-height"); - // this.properties.get("line-height-shift-adjustment"); - // this.properties.get("ref-id"); - // this.properties.get("score-spaces"); - // this.properties.get("text-decoration"); - // this.properties.get("text-shadow"); - // this.properties.get("text-transform"); - // this.properties.get("word-spacing"); - - ColorType c = this.properties.get("color").getColorType(); + // this.propertyList.get("keep-with-next"); + // this.propertyList.get("keep-with-previous"); + // this.propertyList.get("letter-spacing"); + // this.propertyList.get("line-height"); + // this.propertyList.get("line-height-shift-adjustment"); + // this.propertyList.get("ref-id"); + // this.propertyList.get("score-spaces"); + // this.propertyList.get("text-decoration"); + // this.propertyList.get("text-shadow"); + // this.propertyList.get("text-transform"); + // this.propertyList.get("word-spacing"); + + ColorType c = this.propertyList.get("color").getColorType(); this.red = c.getRed(); this.green = c.getGreen(); this.blue = c.getBlue(); - this.wrapOption = this.properties.get("wrap-option").getEnum(); - this.refId = this.properties.get("ref-id").getString(); + this.wrapOption = this.propertyList.get("wrap-option").getEnum(); + this.refId = this.propertyList.get("ref-id").getString(); if (this.refId.equals("")) { //throw new FOPException("page-number-citation must contain \"ref-id\""); diff --git a/src/java/org/apache/fop/fo/flow/RetrieveMarker.java b/src/java/org/apache/fop/fo/flow/RetrieveMarker.java index 242b4d565..768c0c889 100644 --- a/src/java/org/apache/fop/fo/flow/RetrieveMarker.java +++ b/src/java/org/apache/fop/fo/flow/RetrieveMarker.java @@ -85,11 +85,11 @@ public class RetrieveMarker extends FObjMixed { public void handleAttrs(Attributes attlist) throws FOPException { super.handleAttrs(attlist); this.retrieveClassName = - this.properties.get("retrieve-class-name").getString(); + this.propertyList.get("retrieve-class-name").getString(); this.retrievePosition = - this.properties.get("retrieve-position").getEnum(); + this.propertyList.get("retrieve-position").getEnum(); this.retrieveBoundary = - this.properties.get("retrieve-boundary").getEnum(); + this.propertyList.get("retrieve-boundary").getEnum(); } public String getRetrieveClassName() { diff --git a/src/java/org/apache/fop/fo/flow/Table.java b/src/java/org/apache/fop/fo/flow/Table.java index 13f5eb3b8..1a9a9530c 100644 --- a/src/java/org/apache/fop/fo/flow/Table.java +++ b/src/java/org/apache/fop/fo/flow/Table.java @@ -148,45 +148,45 @@ public class Table extends FObj { CommonRelativePosition mRelProps = propMgr.getRelativePositionProps(); - // this.properties.get("block-progression-dimension"); - // this.properties.get("border-after-precendence"); - // this.properties.get("border-before-precedence"); - // this.properties.get("border-collapse"); - // this.properties.get("border-end-precendence"); - // this.properties.get("border-separation"); - // this.properties.get("border-start-precendence"); - // this.properties.get("break-after"); - // this.properties.get("break-before"); + // this.propertyList.get("block-progression-dimension"); + // this.propertyList.get("border-after-precendence"); + // this.propertyList.get("border-before-precedence"); + // this.propertyList.get("border-collapse"); + // this.propertyList.get("border-end-precendence"); + // this.propertyList.get("border-separation"); + // this.propertyList.get("border-start-precendence"); + // this.propertyList.get("break-after"); + // this.propertyList.get("break-before"); setupID(); - // this.properties.get("inline-progression-dimension"); - // this.properties.get("height"); - // this.properties.get("keep-together"); - // this.properties.get("keep-with-next"); - // this.properties.get("keep-with-previous"); - // this.properties.get("table-layout"); - // this.properties.get("table-omit-footer-at-break"); - // this.properties.get("table-omit-header-at-break"); - // this.properties.get("width"); - // this.properties.get("writing-mode"); - - this.breakBefore = this.properties.get("break-before").getEnum(); - this.breakAfter = this.properties.get("break-after").getEnum(); - this.spaceBefore = this.properties.get( + // this.propertyList.get("inline-progression-dimension"); + // this.propertyList.get("height"); + // this.propertyList.get("keep-together"); + // this.propertyList.get("keep-with-next"); + // this.propertyList.get("keep-with-previous"); + // this.propertyList.get("table-layout"); + // this.propertyList.get("table-omit-footer-at-break"); + // this.propertyList.get("table-omit-header-at-break"); + // this.propertyList.get("width"); + // this.propertyList.get("writing-mode"); + + this.breakBefore = this.propertyList.get("break-before").getEnum(); + this.breakAfter = this.propertyList.get("break-after").getEnum(); + this.spaceBefore = this.propertyList.get( "space-before.optimum").getLength().getValue(); - this.spaceAfter = this.properties.get( + this.spaceAfter = this.propertyList.get( "space-after.optimum").getLength().getValue(); this.backgroundColor = - this.properties.get("background-color").getColorType(); - this.ipd = this.properties.get( + this.propertyList.get("background-color").getColorType(); + this.ipd = this.propertyList.get( "inline-progression-dimension").getLengthRange(); - this.height = this.properties.get("height").getLength().getValue(); - this.bAutoLayout = (this.properties.get( + this.height = this.propertyList.get("height").getLength().getValue(); + this.bAutoLayout = (this.propertyList.get( "table-layout").getEnum() == TableLayout.AUTO); - this.omitHeaderAtBreak = this.properties.get( + this.omitHeaderAtBreak = this.propertyList.get( "table-omit-header-at-break").getEnum() == TableOmitHeaderAtBreak.TRUE; - this.omitFooterAtBreak = this.properties.get( + this.omitFooterAtBreak = this.propertyList.get( "table-omit-footer-at-break").getEnum() == TableOmitFooterAtBreak.TRUE; diff --git a/src/java/org/apache/fop/fo/flow/TableAndCaption.java b/src/java/org/apache/fop/fo/flow/TableAndCaption.java index 7fec0e3ab..69e49bc00 100644 --- a/src/java/org/apache/fop/fo/flow/TableAndCaption.java +++ b/src/java/org/apache/fop/fo/flow/TableAndCaption.java @@ -92,11 +92,11 @@ public class TableAndCaption extends ToBeImplementedElement { // Common Relative Position Properties CommonRelativePosition mRelProps = propMgr.getRelativePositionProps(); - // this.properties.get("caption-side"); + // this.propertyList.get("caption-side"); setupID(); - // this.properties.get("keep-together"); - // this.properties.get("keep-with-next"); - // this.properties.get("keep-with-previous"); + // this.propertyList.get("keep-together"); + // this.propertyList.get("keep-with-next"); + // this.propertyList.get("keep-with-previous"); } diff --git a/src/java/org/apache/fop/fo/flow/TableBody.java b/src/java/org/apache/fop/fo/flow/TableBody.java index 474acc814..6ced2d9e0 100644 --- a/src/java/org/apache/fop/fo/flow/TableBody.java +++ b/src/java/org/apache/fop/fo/flow/TableBody.java @@ -100,12 +100,12 @@ public class TableBody extends FObj { setupID(); - this.spaceBefore = this.properties.get( + this.spaceBefore = this.propertyList.get( "space-before.optimum").getLength().getValue(); - this.spaceAfter = this.properties.get( + this.spaceAfter = this.propertyList.get( "space-after.optimum").getLength().getValue(); this.backgroundColor = - this.properties.get("background-color").getColorType(); + this.propertyList.get("background-color").getColorType(); } diff --git a/src/java/org/apache/fop/fo/flow/TableCaption.java b/src/java/org/apache/fop/fo/flow/TableCaption.java index 1e702426b..142a64f1e 100644 --- a/src/java/org/apache/fop/fo/flow/TableCaption.java +++ b/src/java/org/apache/fop/fo/flow/TableCaption.java @@ -91,12 +91,12 @@ public class TableCaption extends ToBeImplementedElement { // Common Relative Position Properties CommonRelativePosition mRelProps = propMgr.getRelativePositionProps(); - // this.properties.get("block-progression-dimension"); - // this.properties.get("height"); + // this.propertyList.get("block-progression-dimension"); + // this.propertyList.get("height"); setupID(); - // this.properties.get("inline-progression-dimension"); - // this.properties.get("keep-togethe"); - // this.properties.get("width"); + // this.propertyList.get("inline-progression-dimension"); + // this.propertyList.get("keep-togethe"); + // this.propertyList.get("width"); } diff --git a/src/java/org/apache/fop/fo/flow/TableCell.java b/src/java/org/apache/fop/fo/flow/TableCell.java index 1453a3228..4c7ffc765 100644 --- a/src/java/org/apache/fop/fo/flow/TableCell.java +++ b/src/java/org/apache/fop/fo/flow/TableCell.java @@ -215,59 +215,59 @@ public class TableCell extends FObj { // Common Relative Position Properties CommonRelativePosition mRelProps = propMgr.getRelativePositionProps(); - // this.properties.get("border-after-precedence"); - // this.properties.get("border-before-precendence"); - // this.properties.get("border-end-precendence"); - // this.properties.get("border-start-precendence"); - // this.properties.get("block-progression-dimension"); - // this.properties.get("column-number"); - // this.properties.get("display-align"); - // this.properties.get("relative-align"); - // this.properties.get("empty-cells"); - // this.properties.get("ends-row"); - // this.properties.get("height"); + // this.propertyList.get("border-after-precedence"); + // this.propertyList.get("border-before-precendence"); + // this.propertyList.get("border-end-precendence"); + // this.propertyList.get("border-start-precendence"); + // this.propertyList.get("block-progression-dimension"); + // this.propertyList.get("column-number"); + // this.propertyList.get("display-align"); + // this.propertyList.get("relative-align"); + // this.propertyList.get("empty-cells"); + // this.propertyList.get("ends-row"); + // this.propertyList.get("height"); setupID(); - // this.properties.get("number-columns-spanned"); - // this.properties.get("number-rows-spanned"); - // this.properties.get("starts-row"); - // this.properties.get("width"); + // this.propertyList.get("number-columns-spanned"); + // this.propertyList.get("number-rows-spanned"); + // this.propertyList.get("starts-row"); + // this.propertyList.get("width"); this.iColNumber = - properties.get("column-number").getNumber().intValue(); + propertyList.get("column-number").getNumber().intValue(); if (iColNumber < 0) { iColNumber = 0; } this.numColumnsSpanned = - this.properties.get("number-columns-spanned").getNumber().intValue(); + this.propertyList.get("number-columns-spanned").getNumber().intValue(); if (numColumnsSpanned < 1) { numColumnsSpanned = 1; } this.numRowsSpanned = - this.properties.get("number-rows-spanned").getNumber().intValue(); + this.propertyList.get("number-rows-spanned").getNumber().intValue(); if (numRowsSpanned < 1) { numRowsSpanned = 1; } this.backgroundColor = - this.properties.get("background-color").getColorType(); + this.propertyList.get("background-color").getColorType(); - bSepBorders = (this.properties.get("border-collapse").getEnum() + bSepBorders = (this.propertyList.get("border-collapse").getEnum() == BorderCollapse.SEPARATE); calcBorders(propMgr.getBorderAndPadding()); // Vertical cell alignment - verticalAlign = this.properties.get("display-align").getEnum(); + verticalAlign = this.propertyList.get("display-align").getEnum(); if (verticalAlign == DisplayAlign.AUTO) { // Depends on all cells starting in row bRelativeAlign = true; - verticalAlign = this.properties.get("relative-align").getEnum(); + verticalAlign = this.propertyList.get("relative-align").getEnum(); } else { bRelativeAlign = false; // Align on a per-cell basis } this.minCellHeight = - this.properties.get("height").getLength().getValue(); + this.propertyList.get("height").getLength().getValue(); } /** @@ -284,7 +284,7 @@ public class TableCell extends FObj { * border-separate should only be specified on the table object, * but it inherits. */ - int iSep = properties.get( + int iSep = propertyList.get( "border-separation.inline-progression-direction").getLength().getValue(); this.startAdjust = iSep / 2 + bp.getBorderStartWidth(false) + bp.getPaddingStart(false); @@ -294,7 +294,7 @@ public class TableCell extends FObj { + bp.getPaddingEnd(false); // Offset of content rectangle in the block-progression direction - borderSeparation = properties.get( + borderSeparation = propertyList.get( "border-separation.block-progression-direction").getLength().getValue(); this.beforeOffset = borderSeparation / 2 + bp.getBorderBeforeWidth(false) diff --git a/src/java/org/apache/fop/fo/flow/TableColumn.java b/src/java/org/apache/fop/fo/flow/TableColumn.java index f1d081d4e..4670a12b4 100644 --- a/src/java/org/apache/fop/fo/flow/TableColumn.java +++ b/src/java/org/apache/fop/fo/flow/TableColumn.java @@ -133,22 +133,22 @@ public class TableColumn extends FObj { CommonBorderAndPadding bap = propMgr.getBorderAndPadding(); CommonBackground bProps = propMgr.getBackgroundProps(); - // this.properties.get("column-width"); - // this.properties.get("number-columns-repeated"); - // this.properties.get("number-columns-spanned"); - // this.properties.get("visibility"); + // this.propertyList.get("column-width"); + // this.propertyList.get("number-columns-repeated"); + // this.propertyList.get("number-columns-spanned"); + // this.propertyList.get("visibility"); - iColumnNumber = properties.get("column-number").getNumber().intValue(); + iColumnNumber = propertyList.get("column-number").getNumber().intValue(); numColumnsRepeated = - properties.get("number-columns-repeated").getNumber().intValue(); + propertyList.get("number-columns-repeated").getNumber().intValue(); this.backgroundColor = - this.properties.get("background-color").getColorType(); + this.propertyList.get("background-color").getColorType(); - Property prop = this.properties.get("column-width"); + Property prop = this.propertyList.get("column-width"); if (prop != null) { - columnWidthPropVal = properties.get("column-width").getLength(); + columnWidthPropVal = propertyList.get("column-width").getLength(); // This won't include resolved table-units or % values yet. columnWidth = columnWidthPropVal.getValue(); diff --git a/src/java/org/apache/fop/fo/flow/TableRow.java b/src/java/org/apache/fop/fo/flow/TableRow.java index 316d6c1b9..786ce1f0c 100644 --- a/src/java/org/apache/fop/fo/flow/TableRow.java +++ b/src/java/org/apache/fop/fo/flow/TableRow.java @@ -105,7 +105,7 @@ public class TableRow extends FObj { // Common Accessibility Properties CommonAccessibility mAccProps = propMgr.getAccessibilityProps(); - // this.properties.get("block-progression-dimension"); + // this.propertyList.get("block-progression-dimension"); // Common Aural Properties CommonAural mAurProps = propMgr.getAuralProps(); @@ -119,30 +119,30 @@ public class TableRow extends FObj { // Common Relative Position Properties CommonRelativePosition mRelProps = propMgr.getRelativePositionProps(); - // this.properties.get("break-before"); - // this.properties.get("break-after"); + // this.propertyList.get("break-before"); + // this.propertyList.get("break-after"); setupID(); - // this.properties.get("height"); - // this.properties.get("keep-together"); - // this.properties.get("keep-with-next"); - // this.properties.get("keep-with-previous"); + // this.propertyList.get("height"); + // this.propertyList.get("keep-together"); + // this.propertyList.get("keep-with-next"); + // this.propertyList.get("keep-with-previous"); - this.breakAfter = this.properties.get("break-after").getEnum(); + this.breakAfter = this.propertyList.get("break-after").getEnum(); this.backgroundColor = - this.properties.get("background-color").getColorType(); + this.propertyList.get("background-color").getColorType(); this.keepTogether = getKeepValue("keep-together.within-column"); this.keepWithNext = getKeepValue("keep-with-next.within-column"); this.keepWithPrevious = getKeepValue("keep-with-previous.within-column"); - this.minHeight = this.properties.get("height").getLength().getValue(); + this.minHeight = this.propertyList.get("height").getLength().getValue(); setup = true; } private KeepValue getKeepValue(String sPropName) { - Property p = this.properties.get(sPropName); + Property p = this.propertyList.get(sPropName); Number n = p.getNumber(); if (n != null) { return new KeepValue(KeepValue.KEEP_WITH_VALUE, n.intValue()); diff --git a/src/java/org/apache/fop/fo/pagination/ColorProfile.java b/src/java/org/apache/fop/fo/pagination/ColorProfile.java index a700bd027..6f6476933 100644 --- a/src/java/org/apache/fop/fo/pagination/ColorProfile.java +++ b/src/java/org/apache/fop/fo/pagination/ColorProfile.java @@ -86,10 +86,10 @@ public class ColorProfile extends FObj { * object. */ public void end() { - src = this.properties.get("src").getString(); - profileName = this.properties.get("color-profile-name").getString(); - intent = this.properties.get("rendering-intent").getEnum(); - this.properties = null; + src = this.propertyList.get("src").getString(); + profileName = this.propertyList.get("color-profile-name").getString(); + intent = this.propertyList.get("rendering-intent").getEnum(); + this.propertyList = null; } /** diff --git a/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java b/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java index e0b69a42e..db52a0f84 100644 --- a/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java +++ b/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java @@ -98,9 +98,9 @@ public class ConditionalPageMasterReference extends FObj { validateParent(parent); - this.pagePosition = this.properties.get("page-position").getEnum(); - this.oddOrEven = this.properties.get("odd-or-even").getEnum(); - this.blankOrNotBlank = this.properties.get("blank-or-not-blank").getEnum(); + this.pagePosition = this.propertyList.get("page-position").getEnum(); + this.oddOrEven = this.propertyList.get("odd-or-even").getEnum(); + this.blankOrNotBlank = this.propertyList.get("blank-or-not-blank").getEnum(); } /** diff --git a/src/java/org/apache/fop/fo/pagination/PageSequence.java b/src/java/org/apache/fop/fo/pagination/PageSequence.java index a0c5f017f..0192382da 100644 --- a/src/java/org/apache/fop/fo/pagination/PageSequence.java +++ b/src/java/org/apache/fop/fo/pagination/PageSequence.java @@ -189,7 +189,7 @@ public class PageSequence extends FObj { // we are now on the first page of the page sequence thisIsFirstPage = true; - ipnValue = this.properties.get("initial-page-number").getString(); + ipnValue = this.propertyList.get("initial-page-number").getString(); if (ipnValue.equals("auto")) { pageNumberType = AUTO; @@ -209,7 +209,7 @@ public class PageSequence extends FObj { } - String masterName = this.properties.get("master-reference").getString(); + String masterName = this.propertyList.get("master-reference").getString(); this.simplePageMaster = this.layoutMasterSet.getSimplePageMaster(masterName); if (this.simplePageMaster == null) { @@ -224,17 +224,17 @@ public class PageSequence extends FObj { // get the 'format' properties this.pageNumberGenerator = - new PageNumberGenerator(this.properties.get("format").getString(), - this.properties.get("grouping-separator").getCharacter(), - this.properties.get("grouping-size").getNumber().intValue(), - this.properties.get("letter-value").getEnum()); + new PageNumberGenerator(this.propertyList.get("format").getString(), + this.propertyList.get("grouping-separator").getCharacter(), + this.propertyList.get("grouping-size").getNumber().intValue(), + this.propertyList.get("letter-value").getEnum()); this.pageNumberGenerator.enableLogging(getLogger()); this.forcePageCount = - this.properties.get("force-page-count").getEnum(); + this.propertyList.get("force-page-count").getEnum(); - // this.properties.get("country"); - // this.properties.get("language"); + // this.propertyList.get("country"); + // this.propertyList.get("language"); setupID(); //call startStructuredPageSequence to ensure, that startPageSequence is called diff --git a/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java b/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java index 98d654fcf..d3f2bc5c8 100644 --- a/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java +++ b/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java @@ -99,7 +99,7 @@ public class PageSequenceMaster extends FObj { if (parent.getName().equals("fo:layout-master-set")) { this.layoutMasterSet = (LayoutMasterSet)parent; - String pm = this.properties.get("master-name").getString(); + String pm = this.propertyList.get("master-name").getString(); if (pm == null) { getLogger().warn("page-sequence-master does not have " + "a master-name and so is being ignored"); diff --git a/src/java/org/apache/fop/fo/pagination/Region.java b/src/java/org/apache/fop/fo/pagination/Region.java index ab7c49e66..d477b220e 100644 --- a/src/java/org/apache/fop/fo/pagination/Region.java +++ b/src/java/org/apache/fop/fo/pagination/Region.java @@ -111,12 +111,12 @@ public abstract class Region extends FObj { super.handleAttrs(attlist); // regions may have name, or default - if (null == this.properties.get(PROP_REGION_NAME)) { + if (null == this.propertyList.get(PROP_REGION_NAME)) { setRegionName(getDefaultRegionName()); - } else if (this.properties.get(PROP_REGION_NAME).getString().equals("")) { + } else if (this.propertyList.get(PROP_REGION_NAME).getString().equals("")) { setRegionName(getDefaultRegionName()); } else { - setRegionName(this.properties.get(PROP_REGION_NAME).getString()); + setRegionName(this.propertyList.get(PROP_REGION_NAME).getString()); // check that name is OK. Not very pretty. if (isReserved(getRegionName()) && !getRegionName().equals(getDefaultRegionName())) { @@ -133,11 +133,11 @@ public abstract class Region extends FObj { + "of simple-page-master, not " + parent.getName()); } - this.wm = this.properties.get("writing-mode").getEnum(); + this.wm = this.propertyList.get("writing-mode").getEnum(); - // this.properties.get("clip"); - // this.properties.get("display-align"); - this.overflow = this.properties.get("overflow").getEnum(); + // this.propertyList.get("clip"); + // this.propertyList.get("display-align"); + this.overflow = this.propertyList.get("overflow").getEnum(); } public abstract Rectangle getViewportRectangle(FODimension pageRefRect); diff --git a/src/java/org/apache/fop/fo/pagination/RegionBA.java b/src/java/org/apache/fop/fo/pagination/RegionBA.java index c2e236cf4..fd795cd9f 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionBA.java +++ b/src/java/org/apache/fop/fo/pagination/RegionBA.java @@ -86,7 +86,7 @@ public abstract class RegionBA extends RegionBASE { public void end() { super.end(); bPrecedence = - (this.properties.get("precedence").getEnum() == Precedence.TRUE); + (this.propertyList.get("precedence").getEnum() == Precedence.TRUE); } /** diff --git a/src/java/org/apache/fop/fo/pagination/RegionBASE.java b/src/java/org/apache/fop/fo/pagination/RegionBASE.java index 0fbc87b43..425df2b39 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionBASE.java +++ b/src/java/org/apache/fop/fo/pagination/RegionBASE.java @@ -74,7 +74,7 @@ public abstract class RegionBASE extends Region { public void end() { // The problem with this is that it might not be known yet.... // Supposing extent is calculated in terms of percentage - this.extent = this.properties.get("extent").getLength().getValue(); + this.extent = this.propertyList.get("extent").getLength().getValue(); } /** diff --git a/src/java/org/apache/fop/fo/pagination/RegionBody.java b/src/java/org/apache/fop/fo/pagination/RegionBody.java index 2e9880ec5..0ead97981 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionBody.java +++ b/src/java/org/apache/fop/fo/pagination/RegionBody.java @@ -111,10 +111,10 @@ public class RegionBody extends Region { private int getRelMargin(int reldir, String sRelPropName) { FObj parent = (FObj) getParent(); String sPropName = "margin-" - + parent.properties.wmRelToAbs(reldir); - Property prop = properties.getExplicitBaseProp(sPropName); + + parent.propertyList.wmRelToAbs(reldir); + Property prop = propertyList.getExplicitBaseProp(sPropName); if (prop == null) { - prop = properties.getExplicitBaseProp(sRelPropName); + prop = propertyList.getExplicitBaseProp(sRelPropName); } return ((prop != null) ? prop.getLength().getValue() : 0); } diff --git a/src/java/org/apache/fop/fo/pagination/Root.java b/src/java/org/apache/fop/fo/pagination/Root.java index 9eec1bd43..5c83fceb5 100644 --- a/src/java/org/apache/fop/fo/pagination/Root.java +++ b/src/java/org/apache/fop/fo/pagination/Root.java @@ -78,7 +78,7 @@ public class Root extends FObj { */ public Root(FONode parent) { super(parent); - // this.properties.get("media-usage"); + // this.propertyList.get("media-usage"); pageSequences = new java.util.ArrayList(); if (parent != null) { //throw new FOPException("root must be root element"); diff --git a/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java b/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java index 29c279c23..ae16402a4 100644 --- a/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java +++ b/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java @@ -92,7 +92,7 @@ public class SimplePageMaster extends FObj { if (parent.getName().equals("fo:layout-master-set")) { LayoutMasterSet layoutMasterSet = (LayoutMasterSet)parent; - masterName = this.properties.get("master-name").getString(); + masterName = this.propertyList.get("master-name").getString(); if (masterName == null) { getLogger().warn("simple-page-master does not have " + "a master-name and so is being ignored"); diff --git a/src/java/org/apache/fop/fo/pagination/Title.java b/src/java/org/apache/fop/fo/pagination/Title.java index 059377b0d..2b7bab983 100644 --- a/src/java/org/apache/fop/fo/pagination/Title.java +++ b/src/java/org/apache/fop/fo/pagination/Title.java @@ -97,18 +97,18 @@ public class Title extends FObjMixed { CommonMarginInline mProps = propMgr.getMarginInlineProps(); Property prop; - prop = this.properties.get("baseline-shift"); + prop = this.propertyList.get("baseline-shift"); if (prop instanceof LengthProperty) { Length bShift = prop.getLength(); } else if (prop instanceof EnumProperty) { int bShift = prop.getEnum(); } - ColorType col = this.properties.get("color").getColorType(); - Length lHeight = this.properties.get("line-height").getLength(); - int lShiftAdj = this.properties.get( + ColorType col = this.propertyList.get("color").getColorType(); + Length lHeight = this.propertyList.get("line-height").getLength(); + int lShiftAdj = this.propertyList.get( "line-height-shift-adjustment").getEnum(); - int vis = this.properties.get("visibility").getEnum(); - Length zIndex = this.properties.get("z-index").getLength(); + int vis = this.propertyList.get("visibility").getEnum(); + Length zIndex = this.propertyList.get("z-index").getLength(); } diff --git a/src/java/org/apache/fop/fonts/FontSetup.java b/src/java/org/apache/fop/fonts/FontSetup.java index c6e0bee45..a96c508f1 100644 --- a/src/java/org/apache/fop/fonts/FontSetup.java +++ b/src/java/org/apache/fop/fonts/FontSetup.java @@ -73,8 +73,6 @@ import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; // Java -import java.util.Map; -import java.util.Iterator; import java.util.List; /** diff --git a/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java b/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java index 652589172..03f9e0786 100644 --- a/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java +++ b/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java @@ -165,7 +165,6 @@ import org.apache.fop.layoutmgr.table.Column; import org.apache.fop.layoutmgr.table.Row; import org.apache.fop.layoutmgr.table.TableLayoutManager; import org.apache.fop.traits.MinOptMax; -import org.apache.fop.util.CharUtilities; /** * Concrete implementation of FOTreeVisitor for the purpose of adding @@ -353,7 +352,7 @@ public class AddLMVisitor implements FOTreeVisitor { }; lm.setUserAgent(node.getUserAgent()); lm.setFObj(node); - lm.setAlignment(node.properties.get("leader-alignment").getEnum()); + lm.setAlignment(node.propertyList.get("leader-alignment").getEnum()); currentLMList.add(lm); } @@ -461,7 +460,7 @@ public class AddLMVisitor implements FOTreeVisitor { } public InlineArea getCharacterInlineArea(Character node) { - String str = node.properties.get("character").getString(); + String str = node.propertyList.get("character").getString(); if (str.length() == 1) { org.apache.fop.area.inline.Character ch = new org.apache.fop.area.inline.Character( @@ -483,7 +482,7 @@ public class AddLMVisitor implements FOTreeVisitor { lm.setUserAgent(node.getUserAgent()); lm.setFObj(node); lm.setCurrentArea(area); - lm.setAlignment(node.properties.get("vertical-align").getEnum()); + lm.setAlignment(node.propertyList.get("vertical-align").getEnum()); lm.setLead(node.getViewHeight()); currentLMList.add(lm); } @@ -521,7 +520,7 @@ public class AddLMVisitor implements FOTreeVisitor { BlockContainerLayoutManager blm = new BlockContainerLayoutManager(); blm.setUserAgent(node.getUserAgent()); blm.setFObj(node); - blm.setOverflow(node.properties.get("overflow").getEnum()); + blm.setOverflow(node.propertyList.get("overflow").getEnum()); currentLMList.add(blm); } @@ -539,7 +538,7 @@ public class AddLMVisitor implements FOTreeVisitor { lm.setUserAgent(node.getUserAgent()); lm.setFObj(node); lm.setCurrentArea(areaCurrent); - lm.setAlignment(node.properties.get("vertical-align").getEnum()); + lm.setAlignment(node.propertyList.get("vertical-align").getEnum()); lm.setLead(areaCurrent.getHeight()); currentLMList.add(lm); } @@ -570,10 +569,10 @@ public class AddLMVisitor implements FOTreeVisitor { // and inline-progression-dimension // if replaced then use height then ignore block-progression-dimension - //int h = this.properties.get("height").getLength().mvalue(); + //int h = this.propertyList.get("height").getLength().mvalue(); // use specified line-height then ignore dimension in height direction - boolean hasLH = false;//properties.get("line-height").getSpecifiedValue() != null; + boolean hasLH = false;//propertyList.get("line-height").getSpecifiedValue() != null; Length len; @@ -581,27 +580,27 @@ public class AddLMVisitor implements FOTreeVisitor { int ipd = -1; boolean bpdauto = false; if (hasLH) { - bpd = node.properties.get("line-height").getLength().getValue(); + bpd = node.propertyList.get("line-height").getLength().getValue(); } else { // this property does not apply when the line-height applies // isn't the block-progression-dimension always in the same // direction as the line height? - len = node.properties.get("block-progression-dimension.optimum").getLength(); + len = node.propertyList.get("block-progression-dimension.optimum").getLength(); if (!len.isAuto()) { bpd = len.getValue(); } else { - len = node.properties.get("height").getLength(); + len = node.propertyList.get("height").getLength(); if (!len.isAuto()) { bpd = len.getValue(); } } } - len = node.properties.get("inline-progression-dimension.optimum").getLength(); + len = node.propertyList.get("inline-progression-dimension.optimum").getLength(); if (!len.isAuto()) { ipd = len.getValue(); } else { - len = node.properties.get("width").getLength(); + len = node.propertyList.get("width").getLength(); if (!len.isAuto()) { ipd = len.getValue(); } @@ -611,7 +610,7 @@ public class AddLMVisitor implements FOTreeVisitor { // to the content-height and content-width int cwidth = -1; int cheight = -1; - len = node.properties.get("content-width").getLength(); + len = node.propertyList.get("content-width").getLength(); if (!len.isAuto()) { /*if(len.scaleToFit()) { if(ipd != -1) { @@ -620,7 +619,7 @@ public class AddLMVisitor implements FOTreeVisitor { } else {*/ cwidth = len.getValue(); } - len = node.properties.get("content-height").getLength(); + len = node.propertyList.get("content-height").getLength(); if (!len.isAuto()) { /*if(len.scaleToFit()) { if(bpd != -1) { @@ -643,7 +642,7 @@ public class AddLMVisitor implements FOTreeVisitor { if (cheight == -1) { cheight = (int)size.getY() * 1000; } - int scaling = node.properties.get("scaling").getEnum(); + int scaling = node.propertyList.get("scaling").getEnum(); if (scaling == Scaling.UNIFORM) { // adjust the larger double rat1 = cwidth / (size.getX() * 1000f); @@ -665,7 +664,7 @@ public class AddLMVisitor implements FOTreeVisitor { boolean clip = false; if (cwidth > ipd || cheight > bpd) { - int overflow = node.properties.get("overflow").getEnum(); + int overflow = node.propertyList.get("overflow").getEnum(); if (overflow == Overflow.HIDDEN) { clip = true; } else if (overflow == Overflow.ERROR_IF_OVERFLOW) { diff --git a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java index 73a296d3a..4fb688fee 100644 --- a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java @@ -107,7 +107,7 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager { } protected int getRotatedIPD() { - PropertyList props = propManager.getProperties(); + PropertyList props = propManager.getPropertyList(); int height = props.get("height").getLength().getValue(); height = props.get("inline-progression-dimension.optimum").getLength().getValue(); diff --git a/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java index ec4938f10..d023527cc 100644 --- a/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java @@ -67,7 +67,6 @@ import org.apache.fop.area.Span; import org.apache.fop.area.BeforeFloat; import org.apache.fop.area.Footnote; import org.apache.fop.area.Resolveable; -import org.apache.fop.area.Trait; import org.apache.fop.datatypes.FODimension; @@ -771,9 +770,9 @@ public class PageLayoutManager extends AbstractLayoutManager implements Runnable private PageViewport createPageAreas(SimplePageMaster spm) { int pageWidth = - spm.properties.get("page-width").getLength().getValue(); + spm.propertyList.get("page-width").getLength().getValue(); int pageHeight = - spm.properties.get("page-height").getLength().getValue(); + spm.propertyList.get("page-height").getLength().getValue(); // Get absolute margin properties (top, left, bottom, right) CommonMarginBlock mProps = spm.getPropertyManager().getMarginProps(); @@ -859,7 +858,7 @@ public class PageLayoutManager extends AbstractLayoutManager implements Runnable BodyRegion body = new BodyRegion(); setRegionPosition(r, body, absRegVPRect); int columnCount = - r.properties.get("column-count").getNumber().intValue(); + r.propertyList.get("column-count").getNumber().intValue(); if ((columnCount > 1) && (r.overflow == Overflow.SCROLL)) { // recover by setting 'column-count' to 1. This is allowed but // not required by the spec. @@ -870,7 +869,7 @@ public class PageLayoutManager extends AbstractLayoutManager implements Runnable body.setColumnCount(columnCount); int columnGap = - r.properties.get("column-gap").getLength().getValue(); + r.propertyList.get("column-gap").getLength().getValue(); body.setColumnGap(columnGap); return body; } diff --git a/src/java/org/apache/fop/render/awt/AWTRenderer.java b/src/java/org/apache/fop/render/awt/AWTRenderer.java index 0bcd28d38..e646e9347 100644 --- a/src/java/org/apache/fop/render/awt/AWTRenderer.java +++ b/src/java/org/apache/fop/render/awt/AWTRenderer.java @@ -89,8 +89,6 @@ import org.apache.fop.area.inline.TextArea; import org.apache.fop.datatypes.ColorType; import org.apache.fop.fo.FOTreeControl; import org.apache.fop.fo.properties.BackgroundRepeat; -import org.apache.fop.fonts.Typeface; -import org.apache.fop.fonts.FontMetrics; import org.apache.fop.image.FopImage; import org.apache.fop.image.ImageFactory; import org.apache.fop.render.AbstractRenderer; diff --git a/src/java/org/apache/fop/render/ps/AbstractPSDocumentGraphics2D.java b/src/java/org/apache/fop/render/ps/AbstractPSDocumentGraphics2D.java index 09600a85c..63ec9c646 100644 --- a/src/java/org/apache/fop/render/ps/AbstractPSDocumentGraphics2D.java +++ b/src/java/org/apache/fop/render/ps/AbstractPSDocumentGraphics2D.java @@ -51,7 +51,6 @@ package org.apache.fop.render.ps; //Java -import java.awt.Graphics; import java.awt.Color; import java.awt.Shape; import java.awt.geom.AffineTransform; @@ -60,7 +59,6 @@ import java.io.IOException; //FOP import org.apache.fop.apps.Document; -import org.apache.fop.fonts.Font; import org.apache.fop.fonts.FontSetup; /** diff --git a/src/java/org/apache/fop/render/ps/AbstractPSTranscoder.java b/src/java/org/apache/fop/render/ps/AbstractPSTranscoder.java index a02b51c24..f5cff7539 100644 --- a/src/java/org/apache/fop/render/ps/AbstractPSTranscoder.java +++ b/src/java/org/apache/fop/render/ps/AbstractPSTranscoder.java @@ -51,38 +51,21 @@ package org.apache.fop.render.ps; -import java.awt.geom.AffineTransform; -import java.awt.geom.Rectangle2D; - import java.awt.Color; -import java.net.MalformedURLException; -import java.net.URL; - import java.io.IOException; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.container.ContainerUtil; import org.apache.batik.bridge.BridgeContext; -import org.apache.batik.bridge.BridgeException; -import org.apache.batik.bridge.GVTBuilder; -import org.apache.batik.bridge.ViewBox; - -import org.apache.batik.dom.svg.SVGOMDocument; - -import org.apache.batik.gvt.GraphicsNode; - import org.apache.batik.transcoder.TranscoderException; import org.apache.batik.transcoder.TranscoderOutput; -import org.apache.batik.transcoder.image.resources.Messages; import org.apache.batik.transcoder.image.ImageTranscoder; import org.apache.fop.svg.AbstractFOPTranscoder; import org.w3c.dom.Document; -import org.w3c.dom.svg.SVGDocument; -import org.w3c.dom.svg.SVGSVGElement; /** * This class enables to transcode an input to a PostScript document. diff --git a/src/java/org/apache/fop/render/rtf/ListAttributesConverter.java b/src/java/org/apache/fop/render/rtf/ListAttributesConverter.java index 13b8051dc..a31bf8067 100644 --- a/src/java/org/apache/fop/render/rtf/ListAttributesConverter.java +++ b/src/java/org/apache/fop/render/rtf/ListAttributesConverter.java @@ -74,7 +74,7 @@ import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfText; public class ListAttributesConverter { - static RtfAttributes convertAttributes(PropertyList properties) + static RtfAttributes convertAttributes(PropertyList propertyList) throws FOPException { RtfAttributes attrib = new RtfAttributes(); @@ -83,7 +83,7 @@ public class ListAttributesConverter { int iStartIndentInTwips = 0; //start-indent - if ((prop = properties.get("start-indent")) != null) { + if ((prop = propertyList.get("start-indent")) != null) { LengthProperty lengthprop = (LengthProperty)prop; Float f = new Float(lengthprop.getLength().getValue() / 1000f); @@ -97,7 +97,7 @@ public class ListAttributesConverter { attrib.set(RtfListTable.LIST_INDENT, iStartIndentInTwips); //end-indent - if ((prop = properties.get("end-indent")) != null) { + if ((prop = propertyList.get("end-indent")) != null) { LengthProperty lengthprop = (LengthProperty)prop; Float f = new Float(lengthprop.getLength().getValue() / 1000f); diff --git a/src/java/org/apache/fop/render/rtf/RTFHandler.java b/src/java/org/apache/fop/render/rtf/RTFHandler.java index 493a612a7..f8ffe0640 100644 --- a/src/java/org/apache/fop/render/rtf/RTFHandler.java +++ b/src/java/org/apache/fop/render/rtf/RTFHandler.java @@ -183,7 +183,7 @@ public class RTFHandler extends FOInputHandler { //read page size and margins, if specified Property prop; - if ((prop = pageSeq.properties.get("master-reference")) != null) { + if ((prop = pageSeq.propertyList.get("master-reference")) != null) { String reference = prop.getString(); SimplePageMaster pagemaster @@ -193,7 +193,7 @@ public class RTFHandler extends FOInputHandler { if (pagemaster != null) { sect.getRtfAttributes().set( PageAttributesConverter.convertPageAttributes( - pagemaster.properties, null)); + pagemaster.propertyList, null)); } } @@ -314,7 +314,7 @@ public class RTFHandler extends FOInputHandler { public void startBlock(Block bl) { try { RtfAttributes rtfAttr - = TextAttributesConverter.convertAttributes(bl.properties, null); + = TextAttributesConverter.convertAttributes(bl.propertyList, null); IRtfTextrunContainer container = (IRtfTextrunContainer)builderContext.getContainer( @@ -369,7 +369,7 @@ public class RTFHandler extends FOInputHandler { try { RtfAttributes atts - = TableAttributesConverter.convertTableAttributes(tbl.properties); + = TableAttributesConverter.convertTableAttributes(tbl.propertyList); final IRtfTableContainer tc = (IRtfTableContainer)builderContext.getContainer( @@ -448,7 +448,7 @@ public class RTFHandler extends FOInputHandler { try { RtfAttributes rtfAttr - = TextAttributesConverter.convertCharacterAttributes(inl.properties, null); + = TextAttributesConverter.convertCharacterAttributes(inl.propertyList, null); IRtfTextrunContainer container = (IRtfTextrunContainer)builderContext.getContainer( @@ -494,7 +494,7 @@ public class RTFHandler extends FOInputHandler { */ public void startBody(TableBody tb) { try { - RtfAttributes atts = TableAttributesConverter.convertRowAttributes (tb.properties, + RtfAttributes atts = TableAttributesConverter.convertRowAttributes (tb.propertyList, null); RtfTable tbl = (RtfTable)builderContext.getContainer(RtfTable.class, true, this); @@ -527,7 +527,7 @@ public class RTFHandler extends FOInputHandler { final RtfTable tbl = (RtfTable)builderContext.getContainer(RtfTable.class, true, null); - RtfAttributes atts = TableAttributesConverter.convertRowAttributes(tr.properties, + RtfAttributes atts = TableAttributesConverter.convertRowAttributes(tr.propertyList, tbl.getHeaderAttribs()); if (tr.getParent() instanceof TableHeader) { @@ -575,12 +575,12 @@ public class RTFHandler extends FOInputHandler { float width = tctx.getColumnWidth(); // create an RtfTableCell in the current RtfTableRow - RtfAttributes atts = TableAttributesConverter.convertCellAttributes(tc.properties); + RtfAttributes atts = TableAttributesConverter.convertCellAttributes(tc.propertyList); RtfTableCell cell = row.newTableCell((int)width, atts); //process number-rows-spanned attribute Property p = null; - if ((p = tc.properties.get("number-rows-spanned")) != null) { + if ((p = tc.propertyList.get("number-rows-spanned")) != null) { // Start vertical merge cell.setVMerge(RtfTableCell.MERGE_START); @@ -617,7 +617,7 @@ public class RTFHandler extends FOInputHandler { = (IRtfListContainer)builderContext.getContainer( IRtfListContainer.class, true, this); final RtfList newList = c.newList( - ListAttributesConverter.convertAttributes(lb.properties)); + ListAttributesConverter.convertAttributes(lb.propertyList)); builderContext.pushContainer(newList); } catch (IOException ioe) { log.error("startList: " + ioe.getMessage()); @@ -757,7 +757,7 @@ public class RTFHandler extends FOInputHandler { Property p = null; //get source file - if ((p = eg.properties.get("src")) != null) { + if ((p = eg.propertyList.get("src")) != null) { newGraphic.setURL (p.getString()); } else { log.error("The attribute 'src' of <fo:external-graphic> is required."); @@ -765,7 +765,7 @@ public class RTFHandler extends FOInputHandler { } //get scaling - if ((p = eg.properties.get("scaling")) != null) { + if ((p = eg.propertyList.get("scaling")) != null) { EnumProperty e = (EnumProperty)p; if (p.getEnum() == Constants.UNIFORM) { newGraphic.setScaling ("uniform"); @@ -773,7 +773,7 @@ public class RTFHandler extends FOInputHandler { } //get width - if ((p = eg.properties.get("width")) != null) { + if ((p = eg.propertyList.get("width")) != null) { LengthProperty lengthProp = (LengthProperty)p; if (lengthProp.getLength() instanceof FixedLength) { Float f = new Float(lengthProp.getLength().getValue() / 1000f); @@ -783,7 +783,7 @@ public class RTFHandler extends FOInputHandler { } //get height - if ((p = eg.properties.get("height")) != null) { + if ((p = eg.propertyList.get("height")) != null) { LengthProperty lengthProp = (LengthProperty)p; if (lengthProp.getLength() instanceof FixedLength) { Float f = new Float(lengthProp.getLength().getValue() / 1000f); @@ -859,7 +859,7 @@ public class RTFHandler extends FOInputHandler { try { RtfAttributes rtfAttr = TextAttributesConverter.convertCharacterAttributes( - pagenum.properties, null); + pagenum.propertyList, null); IRtfTextrunContainer container = (IRtfTextrunContainer)builderContext.getContainer( diff --git a/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java b/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java index 037a45ec5..ed14fd446 100644 --- a/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java +++ b/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java @@ -114,13 +114,13 @@ public class TableAttributesConverter { * * @throws ConverterException On convertion error */ - static RtfAttributes convertTableAttributes(PropertyList properties) + static RtfAttributes convertTableAttributes(PropertyList propertyList) throws FOPException { RtfAttributes attrib = new RtfAttributes(); LengthProperty lengthProp = null; // margin-left - lengthProp = (LengthProperty)properties.get("margin-left"); + lengthProp = (LengthProperty)propertyList.get("margin-left"); if (lengthProp != null) { Float f = new Float(lengthProp.getLength().getValue() / 1000f); final String sValue = f.toString() + "pt"; diff --git a/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java b/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java index ed5990acf..088d253fc 100644 --- a/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java +++ b/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java @@ -139,8 +139,8 @@ class TextAttributesConverter { } - private static void attrBlockFontFamily(PropertyList properties, RtfAttributes rtfAttr) { - String fopValue = properties.get("font-family").getString(); + private static void attrBlockFontFamily(PropertyList propertyList, RtfAttributes rtfAttr) { + String fopValue = propertyList.get("font-family").getString(); if (fopValue != null) { rtfAttr.set(RtfText.ATTR_FONT_FAMILY, @@ -148,14 +148,14 @@ class TextAttributesConverter { } } - private static void attrBlockFontSize(PropertyList properties, RtfAttributes rtfAttr) { - int fopValue = properties.get("font-size").getLength().getValue() / 500; + private static void attrBlockFontSize(PropertyList propertyList, RtfAttributes rtfAttr) { + int fopValue = propertyList.get("font-size").getLength().getValue() / 500; rtfAttr.set("fs", fopValue); } - private static void attrBlockFontColor(PropertyList properties, RtfAttributes rtfAttr) { + private static void attrBlockFontColor(PropertyList propertyList, RtfAttributes rtfAttr) { // Cell background color - ColorTypeProperty colorTypeProp = (ColorTypeProperty)properties.get("color"); + ColorTypeProperty colorTypeProp = (ColorTypeProperty)propertyList.get("color"); if (colorTypeProp != null) { ColorType colorType = colorTypeProp.getColorType(); if (colorType != null) { @@ -175,8 +175,8 @@ class TextAttributesConverter { - private static void attrBlockFontWeight(PropertyList properties, RtfAttributes rtfAttr) { - String fopValue = properties.get("font-weight").getString(); + private static void attrBlockFontWeight(PropertyList propertyList, RtfAttributes rtfAttr) { + String fopValue = propertyList.get("font-weight").getString(); if (fopValue == "bold" || fopValue == "700") { rtfAttr.set("b", 1); } else { @@ -184,8 +184,8 @@ class TextAttributesConverter { } } - private static void attrBlockFontItalic(PropertyList properties, RtfAttributes rtfAttr) { - String fopValue = properties.get("font-style").getString(); + private static void attrBlockFontItalic(PropertyList propertyList, RtfAttributes rtfAttr) { + String fopValue = propertyList.get("font-style").getString(); if (fopValue.equals("italic")) { rtfAttr.set(RtfText.ATTR_ITALIC, 1); } else { @@ -193,8 +193,8 @@ class TextAttributesConverter { } } - private static void attrBlockFontUnderline(PropertyList properties, RtfAttributes rtfAttr) { - EnumProperty enumProp = (EnumProperty)properties.get("text-decoration"); + private static void attrBlockFontUnderline(PropertyList propertyList, RtfAttributes rtfAttr) { + EnumProperty enumProp = (EnumProperty)propertyList.get("text-decoration"); if (enumProp.getEnum() == Constants.UNDERLINE) { rtfAttr.set(RtfText.ATTR_UNDERLINE, 1); } else { @@ -202,11 +202,11 @@ class TextAttributesConverter { } } - private static void attrBlockSpaceBeforeAfter(PropertyList properties, RtfAttributes rtfAttr) { + private static void attrBlockSpaceBeforeAfter(PropertyList propertyList, RtfAttributes rtfAttr) { SpaceProperty spaceProp = null; //space-before - spaceProp = (SpaceProperty)properties.get("space-before"); + spaceProp = (SpaceProperty)propertyList.get("space-before"); if (spaceProp != null) { Float f = new Float( spaceProp.getLengthRange().getOptimum().getLength().getValue() / 1000f); @@ -222,7 +222,7 @@ class TextAttributesConverter { } //space-after - spaceProp = (SpaceProperty)properties.get("space-after"); + spaceProp = (SpaceProperty)propertyList.get("space-after"); if (spaceProp != null) { Float f = new Float( spaceProp.getLengthRange().getOptimum().getLength().getValue() / 1000f); @@ -238,12 +238,12 @@ class TextAttributesConverter { } } - private static void attrBlockMargins(PropertyList properties, RtfAttributes rtfAttr) { + private static void attrBlockMargins(PropertyList propertyList, RtfAttributes rtfAttr) { try { LengthProperty lengthProp = null; // margin-left - lengthProp = (LengthProperty)properties.get("margin-left"); + lengthProp = (LengthProperty)propertyList.get("margin-left"); if (lengthProp != null) { Float f = new Float(lengthProp.getLength().getValue() / 1000f); String sValue = f.toString() + "pt"; @@ -256,7 +256,7 @@ class TextAttributesConverter { } // margin-right - lengthProp = (LengthProperty)properties.get("margin-right"); + lengthProp = (LengthProperty)propertyList.get("margin-right"); if (lengthProp != null) { Float f = new Float(lengthProp.getLength().getValue() / 1000f); String sValue = f.toString() + "pt"; @@ -274,8 +274,8 @@ class TextAttributesConverter { - private static void attrBlockTextAlign(PropertyList properties, RtfAttributes rtfAttr) { - int fopValue = properties.get("text-align").getEnum(); + private static void attrBlockTextAlign(PropertyList propertyList, RtfAttributes rtfAttr) { + int fopValue = propertyList.get("text-align").getEnum(); String rtfValue = null; switch (fopValue) { case Constants.CENTER: @@ -301,8 +301,8 @@ class TextAttributesConverter { * @param bl the Block object the properties are read from * @param rtfAttr the RtfAttributes object the attributes are written to */ - private static void attrBlockBackgroundColor(PropertyList properties, RtfAttributes rtfAttr) { - ColorType fopValue = properties.get("background-color").getColorType(); + private static void attrBlockBackgroundColor(PropertyList propertyList, RtfAttributes rtfAttr) { + ColorType fopValue = propertyList.get("background-color").getColorType(); int rtfColor = 0; /* FOP uses a default background color of "transparent", which is actually a transparent black, which is generally not suitable as a |