pbwest 2004/05/01 23:12:53
Modified: src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
RegionViewport.java
Log:
Rectangle2D viewArea renamed area for consistency with superclass
Area
Revision Changes Path
No revision
No revision
1.3.2.3 +10 -10 xml-fop/src/java/org/apache/fop/area/RegionViewport.java
Index: RegionViewport.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/RegionViewport.java,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- RegionViewport.java 28 Feb 2004 02:06:44 -0000 1.3.2.2
+++ RegionViewport.java 2 May 2004 06:12:53 -0000 1.3.2.3
@@ -35,19 +35,19 @@
/**
* Create a new region viewport.
*
- * @param viewArea the view area of this viewport
+ * @param area the view area of this viewport
*/
public RegionViewport(
- Rectangle2D viewArea,
+ Rectangle2D area,
FoPageSequence pageSeq,
FONode generatedBy,
Node parent,
Object sync) {
- super(viewArea, pageSeq, generatedBy, parent, sync);
+ super(area, pageSeq, generatedBy, parent, sync);
}
/**
- * Set the region-regerence-area for this region viewport.
+ * Set the region-reference-area for this region viewport.
*
* @param regRef the child region inside this viewport
*/
@@ -151,10 +151,10 @@
*/
private void writeObject(java.io.ObjectOutputStream out)
throws IOException {
- out.writeFloat((float) viewArea.getX());
- out.writeFloat((float) viewArea.getY());
- out.writeFloat((float) viewArea.getWidth());
- out.writeFloat((float) viewArea.getHeight());
+ out.writeFloat((float) area.getX());
+ out.writeFloat((float) area.getY());
+ out.writeFloat((float) area.getWidth());
+ out.writeFloat((float) area.getHeight());
out.writeBoolean(clip);
//out.writeObject(props);
out.writeObject(refArea);
@@ -162,7 +162,7 @@
private void readObject(java.io.ObjectInputStream in)
throws IOException, ClassNotFoundException {
- viewArea = new Rectangle2D.Float(in.readFloat(), in.readFloat(),
+ area = new Rectangle2D.Float(in.readFloat(), in.readFloat(),
in.readFloat(), in.readFloat());
clip = in.readBoolean();
//props = (HashMap)in.readObject();
@@ -183,7 +183,7 @@
} catch (CloneNotSupportedException e) {
throw new RuntimeException(e);
}
- rv.viewArea = (Rectangle2D)(viewArea.clone());
+ rv.area = (Rectangle2D)(area.clone());
rv.refArea = (PageRefArea)(refArea.clone());
return rv;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
