Restored setMargins.

Fixed creation of nested rectangles through ContentRectangle.
Made get*WritingMode() methods public.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@197711 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/area/Area.java b/src/java/org/apache/fop/area/Area.java
index dcd1ec0c3a73889dfee3357197963125e4259985..6e905382ef3a1d943808e38d751baf618af9efe6 100644 (file)
--- a/src/java/org/apache/fop/area/Area.java
+++ b/src/java/org/apache/fop/area/Area.java
@@ -92,13 +92,13 @@ public class Area extends AreaNode implements Cloneable  {
         return content;
     }
 
-//    protected void setMargins(
-//             double before, double after, double start, double end) {
-//        spaces.setBefore(before);
-//        spaces.setAfter(after);
-//        spaces.setStart(start);
-//        spaces.setEnd(end);
-//    }
+    protected void setMargins(
+               double before, double after, double start, double end) {
+        spaces.setBefore(before);
+        spaces.setAfter(after);
+        spaces.setStart(start);
+        spaces.setEnd(end);
+    }
     /** Translates this area into position in its parent area */
     protected AffineTransform translation = null;
        /**
@@ -147,8 +147,8 @@ public class Area extends AreaNode implements Cloneable  {
         } catch (PropertyException e) {
             throw new RuntimeException(e.getMessage());
         }
-        content = new ContentRectangle(this, contentWritingMode);
-        //padding = new PaddingRectangle(frameWritingMode, content, 0.0, 0.0);
+        content = new ContentRectangle(this);
+        padding = content.getPadding();
         borders = padding.getBorders();
         spaces = borders.getSpaces();
     }
@@ -275,15 +275,15 @@ public class Area extends AreaNode implements Cloneable  {
             }
         }
 
-        protected int getWritingMode() {
+        public int getWritingMode() {
             return writingMode;
         }
 
-        protected int getContentWritingMode() {
+        public int getContentWritingMode() {
             return contentWritingMode;
         }
 
-        protected int getFrameWritingMode() {
+        public int getFrameWritingMode() {
             return frameWritingMode;
         }