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

diff --cc src/java/org/apache/fop/area/Area.java
index 92132772c6322adbd8698bef1070b8e65b215ad6,1f14ed740c872a9f90e2d90823a3e8085d79e422..fb844e88622c92747f54ff8af49e0c24dce0446c
--- 1/src/java/org/apache/fop/area/Area.java
--- 2/src/java/org/apache/fop/area/Area.java
+++ b/src/java/org/apache/fop/area/Area.java
@@@ -387,24 -378,11 +387,24 @@@ public class Area extends AreaTreeObjec
       * @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);
 +        if (traits == null) {
 +            traits = new java.util.HashMap<Integer, Object>(20);
 +        }
-         traits.put((Integer) traitCode, prop);
++        traits.put(traitCode, prop);
 +    }
 +
 +    /**
 +     * Set traits on this area, copying from an existing traits map.
 +     *
 +     * @param traits the map of traits
 +     */
 +    public void setTraits ( Map traits ) {
 +        if ( traits != null ) {
 +            this.traits = new java.util.HashMap ( traits );
 +        } else {
 +            this.traits = null;
          }
 -        props.put(traitCode, prop);
      }
  
      /**

diff --cc src/java/org/apache/fop/fo/FObj.java
Simple merge