diff options
| author | Simon Pepping <spepping@apache.org> | 2011-01-27 15:46:47 +0000 |
|---|---|---|
| committer | Simon Pepping <spepping@apache.org> | 2011-01-27 15:46:47 +0000 |
| commit | 551f1f2bb3e322ca37ef34a939b85fc7f01a90c3 (patch) | |
| tree | 3bd2e6a48a2be31ade21779ea91a054a5783e580 | |
| parent | 1f44b274690b65c0dbfce537036983fef6a1d638 (diff) | |
| parent | f540b00cf2c8cf1126f6d45e3a9062b2bccd7a58 (diff) | |
| download | xmlgraphics-fop-551f1f2bb3e322ca37ef34a939b85fc7f01a90c3.tar.gz xmlgraphics-fop-551f1f2bb3e322ca37ef34a939b85fc7f01a90c3.zip | |
Merged some fixes from trunk
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_ComplexScripts@1064162 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | src/java/org/apache/fop/area/Area.java | 4 | ||||
| -rw-r--r-- | src/java/org/apache/fop/fo/FObj.java | 6 | ||||
| -rw-r--r-- | src/java/org/apache/fop/layoutmgr/TraitSetter.java | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/java/org/apache/fop/area/Area.java b/src/java/org/apache/fop/area/Area.java index 92132772c..fb844e886 100644 --- a/src/java/org/apache/fop/area/Area.java +++ b/src/java/org/apache/fop/area/Area.java @@ -387,11 +387,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 (traits == null) { traits = new java.util.HashMap<Integer, Object>(20); } - traits.put((Integer) traitCode, prop); + traits.put(traitCode, prop); } /** diff --git a/src/java/org/apache/fop/fo/FObj.java b/src/java/org/apache/fop/fo/FObj.java index 21ab55d35..176f749fd 100644 --- a/src/java/org/apache/fop/fo/FObj.java +++ b/src/java/org/apache/fop/fo/FObj.java @@ -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 */ diff --git a/src/java/org/apache/fop/layoutmgr/TraitSetter.java b/src/java/org/apache/fop/layoutmgr/TraitSetter.java index 6039ad941..ff0e70811 100644 --- a/src/java/org/apache/fop/layoutmgr/TraitSetter.java +++ b/src/java/org/apache/fop/layoutmgr/TraitSetter.java @@ -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)); |