pbwest 2004/01/31 21:49:10
Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
TransformMatrix.java
Log:
Fixed Copyright years.
Varioable name changes to match type name.
Revision ChangesPath
No revision
No revision
1.1.2.2 +32 -32xml-fop/src/java/org/apache/fop/area/Attic/TransformMatrix.java
Index: TransformMatrix.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/TransformMatrix.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TransformMatrix.java 30 Jan 2004 05:52:13 - 1.1.2.1
+++ TransformMatrix.java 1 Feb 2004 05:49:10 - 1.1.2.2
@@ -4,7 +4,7 @@
*The Apache Software License, Version 1.1
*
*
- * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
+ * Copyright (C) 1999-2004 The Apache Software Foundation. All rights reserved
*
* Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met:
@@ -57,7 +57,7 @@
import org.apache.fop.fo.properties.WritingMode;
/**
- * Describe a PDF or PostScript style coordinate transformation matrix
(TransformMatrix).
+ * Describe a PDF or PostScript style coordinate transformation matrix.
* The matrix encodes translations, scaling and rotations of the coordinate
* system used to render pages.
*/
@@ -65,11 +65,11 @@
private double a, b, c, d, e, f;
-private static final TransformMatrix CTM_LRTB =
+private static final TransformMatrix TM_LRTB =
new TransformMatrix(1, 0, 0, 1, 0, 0);
-private static final TransformMatrix CTM_RLTB =
+private static final TransformMatrix TM_RLTB =
new TransformMatrix(-1, 0, 0, 1, 0, 0);
-private static final TransformMatrix CTM_TBRL =
+private static final TransformMatrix TM_TBRL =
new TransformMatrix(0, 1, -1, 0, 0, 0);
/**
@@ -123,15 +123,15 @@
/**
* Initialize a TransformMatrix with the values of another TransformMatrix.
*
- * @param ctm another TransformMatrix
+ * @param tm another TransformMatrix
*/
-protected TransformMatrix(TransformMatrix ctm) {
-this.a = ctm.a;
-this.b = ctm.b;
-this.c = ctm.c;
-this.d = ctm.d;
-this.e = ctm.e;
-this.f = ctm.f;
+protected TransformMatrix(TransformMatrix tm) {
+this.a = tm.a;
+this.b = tm.b;
+this.c = tm.c;
+this.d = tm.d;
+this.e = tm.e;
+this.f = tm.f;
}
/**
@@ -145,23 +145,23 @@
* TransformMatrix is being set.
* @return a new TransformMatrix with the required transform
*/
-public static TransformMatrix getWMctm(int wm, int ipd, int bpd) {
-TransformMatrix wmctm;
+public static TransformMatrix getWMtm(int wm, int ipd, int bpd) {
+TransformMatrix wmtm;
switch (wm) {
case WritingMode.LR_TB:
-return new TransformMatrix(CTM_LRTB);
+return new TransformMatrix(TM_LRTB);
case WritingMode.RL_TB: {
-wmctm = new TransformMatrix(CTM_RLTB);
-wmctm.e = ipd;
-return wmctm;
+wmtm = new TransformMatrix(TM_RLTB);
+wmtm.e = ipd;
+return wmtm;
}
-//return CTM_RLTB.translate(ipd, 0);
+//return TM_RLTB.translate(ipd, 0);
case WritingMode.TB_RL: { // CJK
-wmctm = new TransformMatrix(CTM_TBRL);
-wmctm.e = bpd;
-return wmctm;
+wmtm = new TransformMatrix(TM_TBRL);
+wmtm.e = bpd;
+return wmtm;
}
-//return CTM_TBRL.translate(0, ipd);
+//return TM_TBRL.translate(0, ipd);
default:
return null;
}
@@ -323,7 +323,7 @@
* (Note: scrolling between region vp and ref area when
* doing online content!)
*/
-TransformMatrix ctm =
+TransformMatrix tm =
new TransformMatrix(absVPrect.getX(), absVPrect.getY());
// First transform for rotation
@@ -332,16 +332,16 @@
// first quadrant. Note: rotation is counter-clockwise
switch (absRefOrient) {
case 90:
-ctm = ctm.translate(0, width); //
