pbwest 2004/05/01 23:17:16
Modified: src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
AbstractViewport.java
Log:
Rectangle2D viewArea renamed area for consistency with superclass
Area. Setting and getting of geometry now in Area.
Revision Changes Path
No revision
No revision
1.1.2.2 +8 -27 xml-fop/src/java/org/apache/fop/area/Attic/AbstractViewport.java
Index: AbstractViewport.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/AbstractViewport.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- AbstractViewport.java 28 Feb 2004 02:06:44 -0000 1.1.2.1
+++ AbstractViewport.java 2 May 2004 06:17:16 -0000 1.1.2.2
@@ -33,9 +33,6 @@
extends Area
implements Viewport {
- /** The viewport rectange */
- protected Rectangle2D viewArea = null;
-
/** Does the viewport rectange clip the reference-area? */
protected boolean clip = true;
@@ -62,46 +59,30 @@
/**
* @param pageSeq
* @param generatedBy
- * @param viewArea the viewport rectangle
+ * @param area the viewport rectangle
* @param parent
* @param sync
*/
public AbstractViewport(
- Rectangle2D viewArea,
+ Rectangle2D area,
FoPageSequence pageSeq,
FONode generatedBy,
Node parent,
Object sync) {
super(pageSeq, generatedBy, parent, sync);
- this.viewArea = viewArea;
+ this.area = area;
}
/**
* @param pageSeq
* @param generatedBy
- * @param viewArea the viewport rectangle
+ * @param area the viewport rectangle
*/
public AbstractViewport(
- Rectangle2D viewArea,
+ Rectangle2D area,
FoPageSequence pageSeq,
FONode generatedBy) {
super(pageSeq, generatedBy);
- this.viewArea = viewArea;
- }
- /* (non-Javadoc)
- * @see org.apache.fop.area.Viewport#getViewArea()
- */
- public Rectangle2D getViewArea() {
- synchronized (sync) {
- return viewArea;
- }
- }
- /* (non-Javadoc)
- * @see org.apache.fop.area.Viewport#setViewArea(java.awt.geom.Rectangle2D)
- */
- public void setViewArea(Rectangle2D viewArea) {
- synchronized (sync) {
- this.viewArea = viewArea;
- }
+ this.area = area;
}
/* (non-Javadoc)
* @see
org.apache.fop.area.Viewport#setReferenceArea(org.apache.fop.area.ReferenceArea)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
