use trait setter for setting traits

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@195972 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/org/apache/fop/fo/flow/ExternalGraphic.java b/src/org/apache/fop/fo/flow/ExternalGraphic.java
index b38dc1f1ba787f8110a5b4e3bd6eb409e630b736..07a0bc7831deefc2642bad1d691b703644268613 100644 (file)
--- a/src/org/apache/fop/fo/flow/ExternalGraphic.java
+++ b/src/org/apache/fop/fo/flow/ExternalGraphic.java
@@ -23,8 +23,8 @@ import org.apache.fop.fo.properties.Scaling;
 import org.apache.fop.image.ImageFactory;
 import org.apache.fop.image.FopImage;
 import org.apache.fop.area.inline.InlineArea;
-import org.apache.fop.layoutmgr.AbstractLayoutManager;
 import org.apache.fop.layoutmgr.LeafNodeLayoutManager;
+import org.apache.fop.layoutmgr.TraitSetter;
 import org.apache.fop.area.inline.Image;
 import org.apache.fop.area.inline.Viewport;
 import org.apache.fop.datatypes.Length;
@@ -104,8 +104,8 @@ public class ExternalGraphic extends FObj {
         // Common Border, Padding, and Background Properties
         BorderAndPadding bap = propMgr.getBorderAndPadding();
         BackgroundProps bProps = propMgr.getBackgroundProps();
-        AbstractLayoutManager.addBorders(vp, bap);
-        AbstractLayoutManager.addBackground(vp, bProps);
+        TraitSetter.addBorders(vp, bap);
+        TraitSetter.addBackground(vp, bProps);
 
         return vp;
     }

diff --git a/src/org/apache/fop/fo/pagination/Region.java b/src/org/apache/fop/fo/pagination/Region.java
index 0c7b2046bdbfab4ce2a54a2269a522cad44226ce..70ae1b1a5c020362ef0bc9860d9dae26a84771aa 100644 (file)
--- a/src/org/apache/fop/fo/pagination/Region.java
+++ b/src/org/apache/fop/fo/pagination/Region.java
@@ -21,7 +21,7 @@ import org.apache.fop.apps.FOPException;
 import org.apache.fop.area.CTM;
 import org.apache.fop.area.RegionViewport;
 import org.apache.fop.area.RegionReference;
-import org.apache.fop.layoutmgr.AbstractLayoutManager;
+import org.apache.fop.layoutmgr.TraitSetter;
 
 // SAX
 import org.xml.sax.Attributes;
@@ -101,8 +101,8 @@ public abstract class Region extends FObj {
         // Common Border, Padding, and Background Properties
         BorderAndPadding bap = propMgr.getBorderAndPadding();
         BackgroundProps bProps = propMgr.getBackgroundProps();
-        AbstractLayoutManager.addBorders(r, bap);
-        AbstractLayoutManager.addBackground(r, bProps);
+        TraitSetter.addBorders(r, bap);
+        TraitSetter.addBackground(r, bProps);
 
         // this.properties.get("clip");
         // this.properties.get("display-align");