git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1064159 13f79535-47bb-0310-9956-ffa450edef68tags/fop-1_1rc1old
@@ -378,11 +378,11 @@ public class Area extends AreaTreeObject implements Serializable { | |||
* @param traitCode the trait key | |||
* @param prop the value of the trait | |||
*/ | |||
public void addTrait(Object traitCode, Object prop) { | |||
public void addTrait(Integer traitCode, Object prop) { | |||
if (props == null) { | |||
props = new java.util.HashMap<Integer, Object>(20); | |||
} | |||
props.put((Integer)traitCode, prop); | |||
props.put(traitCode, prop); | |||
} | |||
/** |
@@ -47,10 +47,10 @@ public abstract class FObj extends FONode implements Constants { | |||
private static final PropertyMaker[] PROPERTY_LIST_TABLE | |||
= FOPropertyMapping.getGenericMappings(); | |||
/** | |||
* pointer to the descendant subtree | |||
*/ | |||
/** pointer to the descendant subtree */ | |||
protected FONode firstChild; | |||
/** pointer to the end of the descendant subtree */ | |||
protected FONode lastChild; | |||
/** The list of extension attachments, null if none */ |
@@ -104,10 +104,10 @@ public final class TraitSetter { | |||
private static void addBorderTrait(Area area, | |||
CommonBorderPaddingBackground bpProps, | |||
boolean bDiscard, int iSide, int mode, | |||
Object oTrait) { | |||
Integer trait) { | |||
int iBP = bpProps.getBorderWidth(iSide, bDiscard); | |||
if (iBP > 0) { | |||
area.addTrait(oTrait, | |||
area.addTrait(trait, | |||
new BorderProps(bpProps.getBorderStyle(iSide), | |||
iBP, bpProps.getBorderColor(iSide), | |||
mode)); |