vmote 2003/08/24 10:46:10
Modified: src/java/org/apache/fop/area CTM.java
src/java/org/apache/fop/fo PropertyManager.java
Log:
move property resolution logic from area/CTM.getCTMandRelDims() back to
fo/PropertyManager
Revision Changes Path
1.4 +2 -3 xml-fop/src/java/org/apache/fop/area/CTM.java
Index: CTM.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/CTM.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CTM.java 23 Aug 2003 19:26:30 -0000 1.3
+++ CTM.java 24 Aug 2003 17:46:10 -0000 1.4
@@ -290,8 +290,7 @@
int width, height;
// We will use the absolute reference-orientation to set up the CTM.
// The value here is relative to its ancestor reference area.
- int absRefOrient = pm.getAbsRefOrient(
-
pm.getProperties().get("reference-orientation").getNumber().intValue());
+ int absRefOrient = pm.getAbsRefOrient();
if (absRefOrient % 180 == 0) {
width = (int) absVPrect.getWidth();
height = (int) absVPrect.getHeight();
@@ -327,7 +326,7 @@
}
ctm = ctm.rotate(absRefOrient);
}
- int wm = pm.getProperties().get("writing-mode").getEnum();
+ int wm = pm.getWritingMode();
/* Since we've already put adjusted width and height values for the
* top and left positions implied by the reference-orientation, we
* can set ipd and bpd appropriately based on the writing mode.
1.11 +6 -2 xml-fop/src/java/org/apache/fop/fo/PropertyManager.java
Index: PropertyManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/PropertyManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PropertyManager.java 23 Aug 2003 19:26:30 -0000 1.10
+++ PropertyManager.java 24 Aug 2003 17:46:10 -0000 1.11
@@ -511,8 +511,12 @@
/**
* Calculate absolute reference-orientation relative to media orientation.
*/
- public int getAbsRefOrient(int myRefOrient) {
- return myRefOrient;
+ public int getAbsRefOrient() {
+ return properties.get("reference-orientation").getNumber().intValue();
+ }
+
+ public int getWritingMode() {
+ return properties.get("writing-mode").getEnum();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
