浏览代码

Fix an forgotten change of type in class Area and a checkstyle error in class FObj

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1064159 13f79535-47bb-0310-9956-ffa450edef68
tags/fop-1_1rc1old
Simon Pepping 13 年前
父节点
当前提交
f540b00cf2

+ 2
- 2
src/java/org/apache/fop/area/Area.java 查看文件

* @param traitCode the trait key * @param traitCode the trait key
* @param prop the value of the trait * @param prop the value of the trait
*/ */
public void addTrait(Object traitCode, Object prop) {
public void addTrait(Integer traitCode, Object prop) {
if (props == null) { if (props == null) {
props = new java.util.HashMap<Integer, Object>(20); props = new java.util.HashMap<Integer, Object>(20);
} }
props.put((Integer)traitCode, prop);
props.put(traitCode, prop);
} }


/** /**

+ 3
- 3
src/java/org/apache/fop/fo/FObj.java 查看文件

private static final PropertyMaker[] PROPERTY_LIST_TABLE private static final PropertyMaker[] PROPERTY_LIST_TABLE
= FOPropertyMapping.getGenericMappings(); = FOPropertyMapping.getGenericMappings();


/**
* pointer to the descendant subtree
*/
/** pointer to the descendant subtree */
protected FONode firstChild; protected FONode firstChild;

/** pointer to the end of the descendant subtree */
protected FONode lastChild; protected FONode lastChild;


/** The list of extension attachments, null if none */ /** The list of extension attachments, null if none */

+ 2
- 2
src/java/org/apache/fop/layoutmgr/TraitSetter.java 查看文件

private static void addBorderTrait(Area area, private static void addBorderTrait(Area area,
CommonBorderPaddingBackground bpProps, CommonBorderPaddingBackground bpProps,
boolean bDiscard, int iSide, int mode, boolean bDiscard, int iSide, int mode,
Object oTrait) {
Integer trait) {
int iBP = bpProps.getBorderWidth(iSide, bDiscard); int iBP = bpProps.getBorderWidth(iSide, bDiscard);
if (iBP > 0) { if (iBP > 0) {
area.addTrait(oTrait,
area.addTrait(trait,
new BorderProps(bpProps.getBorderStyle(iSide), new BorderProps(bpProps.getBorderStyle(iSide),
iBP, bpProps.getBorderColor(iSide), iBP, bpProps.getBorderColor(iSide),
mode)); mode));

正在加载...
取消
保存