pbwest 2004/06/14 03:50:33
Modified: src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
Area.java
Log:
Restored setMargins.
Fixed creation of nested rectangles through ContentRectangle.
Made get*WritingMode() methods public.
Revision Changes Path
No revision
No revision
1.1.2.20 +12 -12 xml-fop/src/java/org/apache/fop/area/Area.java
Index: Area.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Area.java,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -r1.1.2.19 -r1.1.2.20
--- Area.java 14 Jun 2004 08:53:46 -0000 1.1.2.19
+++ Area.java 14 Jun 2004 10:50:33 -0000 1.1.2.20
@@ -92,13 +92,13 @@
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 @@
} 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 @@
}
}
- protected int getWritingMode() {
+ public int getWritingMode() {
return writingMode;
}
- protected int getContentWritingMode() {
+ public int getContentWritingMode() {
return contentWritingMode;
}
- protected int getFrameWritingMode() {
+ public int getFrameWritingMode() {
return frameWritingMode;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
