pbwest 2004/05/31 23:27:05
Modified: src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
RegionStartVport.java RegionEndVport.java
BlockArea.java RegionStartRefArea.java
RegionBeforeVport.java RegionRefArea.java
RegionAfterVport.java RegionBodyVport.java
PageViewport.java RegionBodyRefArea.java
AbstractViewport.java RegionEndRefArea.java
Area.java RegionAfterRefArea.java
RegionViewport.java RegionBeforeRefArea.java
AbstractReferenceArea.java
Log:
W.I.P. Removed constructors with Rectangle2D.
Changed Rectangle2D area to space, added Rectangle2Ds
border, padding and content to Area.
Made content the reference for IPD and BPD calculations.
Revision Changes Path
No revision
No revision
1.1.2.6 +2 -20 xml-fop/src/java/org/apache/fop/area/Attic/RegionStartVport.java
Index: RegionStartVport.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/RegionStartVport.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- RegionStartVport.java 10 May 2004 11:45:18 -0000 1.1.2.5
+++ RegionStartVport.java 1 Jun 2004 06:27:05 -0000 1.1.2.6
@@ -19,8 +19,6 @@
*/
package org.apache.fop.area;
-import java.awt.geom.Rectangle2D;
-
import org.apache.fop.datastructs.Node;
import org.apache.fop.fo.flow.FoPageSequence;
@@ -42,22 +40,6 @@
Object sync) {
// the page-sequence is the generated-by node
super(pageSeq, pageSeq, parent, sync);
- }
-
- /**
- * Creates a new region-start area with the defined rectangular area
- * @param area the rectangular area
- * @param pageSeq the generating <code>page-sequence</code>
- * @param parent the page-reference-area
- * @param sync
- */
- public RegionStartVport(
- Rectangle2D area,
- FoPageSequence pageSeq,
- Node parent,
- Object sync) {
- // the page-sequence is the generated-by node
- super(area, pageSeq, pageSeq, parent, sync);
}
/**
1.1.2.6 +2 -20 xml-fop/src/java/org/apache/fop/area/Attic/RegionEndVport.java
Index: RegionEndVport.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/RegionEndVport.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- RegionEndVport.java 10 May 2004 11:45:18 -0000 1.1.2.5
+++ RegionEndVport.java 1 Jun 2004 06:27:05 -0000 1.1.2.6
@@ -19,8 +19,6 @@
*/
package org.apache.fop.area;
-import java.awt.geom.Rectangle2D;
-
import org.apache.fop.datastructs.Node;
import org.apache.fop.fo.flow.FoPageSequence;
@@ -42,22 +40,6 @@
Object sync) {
// the page-sequence is the generated-by node
super(pageSeq, pageSeq, parent, sync);
- }
-
- /**
- * Creates a new region-end area with the defined rectangular area
- * @param area the rectangular area
- * @param pageSeq the generating <code>page-sequence</code>
- * @param parent the page-reference-area
- * @param sync
- */
- public RegionEndVport(
- Rectangle2D area,
- FoPageSequence pageSeq,
- Node parent,
- Object sync) {
- // the page-sequence is the generated-by node
- super(area, pageSeq, pageSeq, parent, sync);
}
/**
1.1.2.7 +52 -3 xml-fop/src/java/org/apache/fop/area/Attic/BlockArea.java
Index: BlockArea.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/BlockArea.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BlockArea.java 30 May 2004 16:19:36 -0000 1.1.2.6
+++ BlockArea.java 1 Jun 2004 06:27:05 -0000 1.1.2.7
@@ -44,7 +44,7 @@
}
/** The page space allocation for layout of the block */
- private Rectangle2D pageSpace;
+ private Rectangle2D pageSpace = new Rectangle2D.Float();
// /**
// * Receives an allocation of page space from area parent
@@ -63,9 +63,30 @@
*/
public Rectangle2D pageSpaceRequest(AreaRange spaceRange) {
AreaRange request = adjustedRequest(spaceRange);
+ // Is there a sufficient allocation already available?
+ if (spaceContains(spaceRange.minima)) {
+ if (spaceContains(spaceRange.maxima)) {
+ // Reduce available space and OK the request
+ // N.B. the space request must take into account the
+ // space required for footnotes
+ // If all of the text fits into the available space, then the
+ // siblings of the line area must be tested to discover whether
+ // they contain inline items which will go into the same
+ // line-area. At this point, e.g., footnotes will be found.
+ } else {
+ // Negotiate available space with the requester
+
+ }
+ } else { // Need more space from above. Page may be full
+ // Negotiate with parent for more space
+ }
return null;
}
+ private boolean spaceContains(Rectangle2D rect) {
+ return pageSpace.contains(
+ rect.getMinX(), rect.getMinY(), rect.getWidth(), rect.getHeight());
+ }
private AreaRange adjustedRequest(AreaRange request) {
// TODO Adjust the request for padding, borders and margins on this
// block
@@ -78,6 +99,34 @@
*/
public void acceptLayout(Rectangle2D layout) {
+ }
+
+ protected float getStartSpace() {
+ return getStartIndent() + getStartIntrusion();
+ }
+
+ protected float getEndSpace() {
+ return getEndIndent() + getEndIntrusion();
+ }
+
+ protected float getStartIndent() {
+ // Dummy start-indent
+ return 10.0f;
+ }
+
+ protected float getEndIndent() {
+ // Dummy end-indent
+ return 10.0f;
+ }
+
+ protected float getStartIntrusion() {
+ // dummy intrusion
+ return 0.0f;
+ }
+
+ protected float getEndIntrusion() {
+ // dummy intrusion
+ return 0.0f;
}
}
1.1.2.5 +2 -20
xml-fop/src/java/org/apache/fop/area/Attic/RegionStartRefArea.java
Index: RegionStartRefArea.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/RegionStartRefArea.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- RegionStartRefArea.java 4 May 2004 07:46:45 -0000 1.1.2.4
+++ RegionStartRefArea.java 1 Jun 2004 06:27:05 -0000 1.1.2.5
@@ -19,8 +19,6 @@
*/
package org.apache.fop.area;
-import java.awt.geom.Rectangle2D;
-
import org.apache.fop.datastructs.Node;
import org.apache.fop.fo.flow.FoPageSequence;
@@ -44,22 +42,6 @@
Object sync) {
// the page-sequence is the generated-by node
super(pageSeq, pageSeq, parent, sync);
- }
-
- /**
- * Creates a new region-start area with the given rectangular area
- * @param area the rectangular area
- * @param pageSeq the generating <code>page-sequence</code>
- * @param parent the page-reference-area
- * @param sync
- */
- public RegionStartRefArea(
- Rectangle2D area,
- FoPageSequence pageSeq,
- Node parent,
- Object sync) {
- // the page-sequence is the generated-by node
- super(area, pageSeq, pageSeq, parent, sync);
}
/**
1.1.2.6 +2 -20
xml-fop/src/java/org/apache/fop/area/Attic/RegionBeforeVport.java
Index: RegionBeforeVport.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/RegionBeforeVport.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- RegionBeforeVport.java 10 May 2004 11:45:18 -0000 1.1.2.5
+++ RegionBeforeVport.java 1 Jun 2004 06:27:05 -0000 1.1.2.6
@@ -19,8 +19,6 @@
*/
package org.apache.fop.area;
-import java.awt.geom.Rectangle2D;
-
import org.apache.fop.datastructs.Node;
import org.apache.fop.fo.flow.FoPageSequence;
@@ -42,22 +40,6 @@
Object sync) {
// the page-sequence is the generated-by node
super(pageSeq, pageSeq, parent, sync);
- }
-
- /**
- * Creates a new region-before area with the defined rectangular area
- * @param area the rectangular area
- * @param pageSeq the generating <code>page-sequence</code>
- * @param parent the page-reference-area
- * @param sync
- */
- public RegionBeforeVport(
- Rectangle2D area,
- FoPageSequence pageSeq,
- Node parent,
- Object sync) {
- // the page-sequence is the generated-by node
- super(area, pageSeq, pageSeq, parent, sync);
}
/**
1.1.2.4 +1 -19 xml-fop/src/java/org/apache/fop/area/Attic/RegionRefArea.java
Index: RegionRefArea.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/RegionRefArea.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- RegionRefArea.java 4 May 2004 04:42:40 -0000 1.1.2.3
+++ RegionRefArea.java 1 Jun 2004 06:27:05 -0000 1.1.2.4
@@ -17,7 +17,6 @@
*/
package org.apache.fop.area;
-import java.awt.geom.Rectangle2D;
import java.util.ArrayList;
import java.util.List;
@@ -50,23 +49,6 @@
Node parent,
Object sync) {
super(pageSeq, generatedBy, parent, sync);
- }
-
- /**
- * Creates a new region reference area, with a defined rectangular area
- * @param area the geometry of this area
- * @param pageSeq the generating page sequence
- * @param generatedBy the generating node; in this case, the page sequence
- * @param parent the associated viewport area
- * @param sync
- */
- public RegionRefArea(
- Rectangle2D area,
- FoPageSequence pageSeq,
- FONode generatedBy,
- Node parent,
- Object sync) {
- super(area, pageSeq, generatedBy, parent, sync);
}
/**
1.1.2.6 +2 -19 xml-fop/src/java/org/apache/fop/area/Attic/RegionAfterVport.java
Index: RegionAfterVport.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/RegionAfterVport.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- RegionAfterVport.java 10 May 2004 11:45:18 -0000 1.1.2.5
+++ RegionAfterVport.java 1 Jun 2004 06:27:05 -0000 1.1.2.6
@@ -19,8 +19,6 @@
*/
package org.apache.fop.area;
-import java.awt.geom.Rectangle2D;
-
import org.apache.fop.datastructs.Node;
import org.apache.fop.fo.flow.FoPageSequence;
@@ -42,21 +40,6 @@
Object sync) {
// the page-sequence is the generated-by node
super(pageSeq, pageSeq, parent, sync);
- }
-
- /**
- * Creates a new region-after area with the defined rectangular area
- * @param area the rectangular area
- * @param pageSeq the generating <code>page-sequence</code>
- * @param parent the page-reference-area
- * @param sync
- */
- public RegionAfterVport(
- Rectangle2D area,
- FoPageSequence pageSeq,
- Node parent,
- Object sync) {
- super(area, pageSeq, pageSeq, parent, sync);
}
/**
1.1.2.7 +2 -21 xml-fop/src/java/org/apache/fop/area/Attic/RegionBodyVport.java
Index: RegionBodyVport.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/RegionBodyVport.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- RegionBodyVport.java 10 May 2004 11:45:18 -0000 1.1.2.6
+++ RegionBodyVport.java 1 Jun 2004 06:27:05 -0000 1.1.2.7
@@ -19,8 +19,6 @@
*/
package org.apache.fop.area;
-import java.awt.geom.Rectangle2D;
-
import org.apache.fop.datastructs.Node;
import org.apache.fop.fo.flow.FoPageSequence;
@@ -29,23 +27,6 @@
* @version $Revision$ $Name$
*/
public class RegionBodyVport extends RegionViewport {
-
- /**
- * Creates a <code>region-body-viewport</code> with the given rectangular
- * area
- * @param area the rectangular area
- * @param pageSeq the generating <code>page-sequence</code>
- * @param parent
- * @param sync
- */
- public RegionBodyVport(
- Rectangle2D area,
- FoPageSequence pageSeq,
- Node parent,
- Object sync) {
- // the page-sequence is the generated-by node
- super(area, pageSeq, pageSeq, parent, sync);
- }
/**
* Creates a <code>region-body-viewport</code> with no rectangular area
1.2.2.7 +0 -19 xml-fop/src/java/org/apache/fop/area/PageViewport.java
Index: PageViewport.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/PageViewport.java,v
retrieving revision 1.2.2.6
retrieving revision 1.2.2.7
diff -u -r1.2.2.6 -r1.2.2.7
--- PageViewport.java 4 May 2004 07:46:45 -0000 1.2.2.6
+++ PageViewport.java 1 Jun 2004 06:27:05 -0000 1.2.2.7
@@ -17,8 +17,6 @@
*/
package org.apache.fop.area;
-import java.awt.geom.Rectangle2D;
-
import org.apache.fop.datastructs.Node;
import org.apache.fop.fo.flow.FoPageSequence;
@@ -45,23 +43,6 @@
FoPageSequence pageSeq) {
// The pageSeq is also the generating node
super(pageSeq, pageSeq);
- }
-
- /**
- * Creates a page viewport, with a null page reference area and the given
- * rectangular area
- * @param area the rectangular area
- * @param pageSeq the page-sequence which generated this area
- * @param parent
- * @param sync
- */
- public PageViewport(
- Rectangle2D area,
- FoPageSequence pageSeq,
- Node parent,
- Object sync) {
- // The pageSeq is also the generating node
- super(area, pageSeq, pageSeq, parent, sync);
}
/**
1.1.2.8 +1 -27
xml-fop/src/java/org/apache/fop/area/Attic/RegionBodyRefArea.java
Index: RegionBodyRefArea.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/RegionBodyRefArea.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- RegionBodyRefArea.java 8 May 2004 13:09:10 -0000 1.1.2.7
+++ RegionBodyRefArea.java 1 Jun 2004 06:27:05 -0000 1.1.2.8
@@ -17,8 +17,6 @@
*/
package org.apache.fop.area;
-import java.awt.geom.Rectangle2D;
-
import org.apache.fop.datastructs.Node;
import org.apache.fop.fo.flow.FoPageSequence;
@@ -53,30 +51,6 @@
Object sync) {
// the page-sequence is the generated-by node
super(pageSeq, pageSeq, parent, sync);
- }
-
- /**
- * Creates a new body region area with the given rectangular area, column
- * count and gap
- * This sets the region reference area class to BODY.
- * @param columnCount
- * @param columnGap
- * @param area the rectangular area
- * @param pageSeq the generating <code>page-sequence</code>
- * @param parent the page-reference-area
- * @param sync
- */
- public RegionBodyRefArea(
- int columnCount,
- int columnGap,
- Rectangle2D area,
- FoPageSequence pageSeq,
- Node parent,
- Object sync) {
- // the page-sequence is the generated-by node
- super(area, pageSeq, pageSeq, parent, sync);
- this.columnCount = columnCount;
- this.columnGap = columnGap;
}
/**
1.1.2.4 +4 -28 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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- AbstractViewport.java 2 May 2004 19:24:53 -0000 1.1.2.3
+++ AbstractViewport.java 1 Jun 2004 06:27:05 -0000 1.1.2.4
@@ -19,8 +19,6 @@
*/
package org.apache.fop.area;
-import java.awt.geom.Rectangle2D;
-
import org.apache.fop.datastructs.Node;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.flow.FoPageSequence;
@@ -38,49 +36,27 @@
/** The reference-area of the viewport/reference pair */
protected ReferenceArea refArea;
-
- /**
- * @param pageSeq
- * @param generatedBy
- * @param parent
- * @param sync
- */
- public AbstractViewport(FoPageSequence pageSeq, FONode generatedBy,
- Node parent, Object sync) {
- super(pageSeq, generatedBy, parent, sync);
- }
/**
* @param pageSeq
* @param generatedBy
- */
- public AbstractViewport(FoPageSequence pageSeq, FONode generatedBy) {
- super(pageSeq, generatedBy);
- }
- /**
- * @param pageSeq
- * @param generatedBy
- * @param area the viewport rectangle
* @param parent
* @param sync
*/
public AbstractViewport(
- Rectangle2D area,
FoPageSequence pageSeq,
FONode generatedBy,
Node parent,
Object sync) {
- super(area, pageSeq, generatedBy, parent, sync);
+ super(pageSeq, generatedBy, parent, sync);
}
/**
* @param pageSeq
* @param generatedBy
- * @param area the viewport rectangle
*/
public AbstractViewport(
- Rectangle2D area,
FoPageSequence pageSeq,
FONode generatedBy) {
- super(area, pageSeq, generatedBy);
+ super(pageSeq, generatedBy);
}
/* (non-Javadoc)
* @see
org.apache.fop.area.Viewport#setReferenceArea(org.apache.fop.area.ReferenceArea)
1.1.2.5 +2 -20 xml-fop/src/java/org/apache/fop/area/Attic/RegionEndRefArea.java
Index: RegionEndRefArea.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/RegionEndRefArea.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- RegionEndRefArea.java 4 May 2004 07:46:45 -0000 1.1.2.4
+++ RegionEndRefArea.java 1 Jun 2004 06:27:05 -0000 1.1.2.5
@@ -19,8 +19,6 @@
*/
package org.apache.fop.area;
-import java.awt.geom.Rectangle2D;
-
import org.apache.fop.datastructs.Node;
import org.apache.fop.fo.flow.FoPageSequence;
@@ -44,22 +42,6 @@
Object sync) {
// the page-sequence is the generated-by node
super(pageSeq, pageSeq, parent, sync);
- }
-
- /**
- * Creates a new region-end area with the given rectangular area
- * @param area the rectangular area
- * @param pageSeq the generating <code>page-sequence</code>
- * @param parent the page-reference-area
- * @param sync
- */
- public RegionEndRefArea(
- Rectangle2D area,
- FoPageSequence pageSeq,
- Node parent,
- Object sync) {
- // the page-sequence is the generated-by node
- super(area, pageSeq, pageSeq, parent, sync);
}
/**
1.1.2.15 +80 -64 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.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- Area.java 30 May 2004 16:24:08 -0000 1.1.2.14
+++ Area.java 1 Jun 2004 06:27:05 -0000 1.1.2.15
@@ -43,12 +43,15 @@
*/
public class Area extends AreaNode implements Cloneable {
- /** The geometrical area. The <code>width</code> of this
- * <code>Rectangle</code> is the <code>inline-progression-dimension</code>
- * of the area, and the <code>height</code> is the
+ /** The total geometrical area covered by this <code>Area</code>, including
+ * content rectangle, padding, borders and spaces. The <code>width</code>
+ * of this <code>Rectangle</code> is the <code>inline-progression-dimension
+ * </code> of the area, and the <code>height</code> is the
* <code>block-progression-dimension</code>. */
-
- protected Rectangle2D area = null;
+ protected Rectangle2D space = new Rectangle2D.Float();
+ protected Rectangle2D border = null;
+ protected Rectangle2D padding = null;
+ protected Rectangle2D content = new Rectangle2D.Float();
/** True if the the <code>writing-mode</code> of the content area is
* horizontal */
protected boolean contentIsHorizontal = true;
@@ -56,6 +59,55 @@
* left-to-right */
protected boolean contentLeftToRight = true;
+ /**
+ * @return the border
+ */
+ public Rectangle2D getBorder() {
+ return border;
+ }
+ /**
+ * @param border to set
+ */
+ public void setBorder(Rectangle2D border) {
+ this.border = border;
+ }
+ /**
+ * @return the content
+ */
+ public Rectangle2D getContent() {
+ return content;
+ }
+ /**
+ * @param content to set
+ */
+ public void setContent(Rectangle2D content) {
+ this.content = content;
+ }
+ /**
+ * @return the padding
+ */
+ public Rectangle2D getPadding() {
+ return padding;
+ }
+ /**
+ * @param padding to set
+ */
+ public void setPadding(Rectangle2D padding) {
+ this.padding = padding;
+ }
+ /**
+ * @return the space
+ */
+ public Rectangle2D getSpace() {
+ return space;
+ }
+ /**
+ * @param space to set
+ */
+ public void setSpace(Rectangle2D space) {
+ this.space = space;
+ }
+
private void setup() {
try {
contentIsHorizontal =
@@ -66,25 +118,6 @@
throw new RuntimeException(e.getMessage());
}
}
- /**
- * Constructs an <code>Area</code> which is based on the given
- * <code>Rectangle2D</code>
- * @param area the rectangular area
- * @param pageSeq through which this area was generated
- * @param generatedBy the given <code>FONode</code> generated this
- * @param parent <code>Node</code> of this
- * @param sync the object on which this area is synchronized <code>for tree
- * operations</code>.
- */
- public Area(
- Rectangle2D area,
- FoPageSequence pageSeq,
- FONode generatedBy,
- Node parent,
- Object sync) {
- this(pageSeq, generatedBy, parent, sync);
- this.area = area;
- }
/**
* Constructs an <code>Area</code> with a null rectangular area
@@ -105,21 +138,6 @@
}
/**
- * Constructs an <code>Area</code> with the given rectangular area,
- * which is the root of a tree, and is synchronized on itself.
- * @param area the rectangular area
- * @param pageSeq through which this area was generated
- * @param generatedBy the given <code>FONode</code> generated this
- */
- public Area(
- Rectangle2D area,
- FoPageSequence pageSeq,
- FONode generatedBy) {
- this(pageSeq, generatedBy);
- this.area = area;
- }
-
- /**
* Construct an <code>Area</code> which is the root of a tree, and is
* synchronized on itself
* @param pageSeq through which this area was generated
@@ -155,13 +173,15 @@
*/
public double getBPDimPts() {
synchronized (this) {
- if (area == null) {
- return 0;
- }
+ // TODO - check this. Should the rectangle just be rotated as
+ // required? This is incompatible with transform in space
+ // requests at block reference-areas. OK if the transform is
+ // only for area rotations. This depnds on how Java handles the
+ // layout of text in horizontal locales.
if (contentIsHorizontal) {
- return area.getHeight();
+ return content.getHeight();
} else {
- return area.getWidth();
+ return content.getWidth();
}
}
}
@@ -192,15 +212,13 @@
*/
public void setBPDimPts(float pts) {
synchronized (this) {
- if (area == null) {
- area = new Rectangle2D.Float();
- }
+ // TODO - check this
if (contentIsHorizontal) {
- area.setRect(
- area.getX(),area.getY(), area.getWidth(), pts);
+ content.setRect(
+ content.getX(),content.getY(), content.getWidth(), pts);
} else {
- area.setRect(
- area.getX(),area.getY(), pts, area.getHeight());
+ content.setRect(
+ content.getX(),content.getY(), pts, content.getHeight());
}
}
}
@@ -229,13 +247,11 @@
*/
public double getIPDimPts() {
synchronized (this) {
- if (area == null) {
- area = new Rectangle2D.Float();
- }
+ // TODO - check this
if (contentIsHorizontal){
- return area.getWidth();
+ return content.getWidth();
} else {
- return area.getHeight();
+ return content.getHeight();
}
}
}
@@ -264,13 +280,13 @@
*/
public void setIPDimPts(double pts) {
synchronized (this) {
- if (area == null) {
- area = new Rectangle2D.Float();
- }
+ // Check this
if (contentIsHorizontal){
- area.setRect(area.getX(), area.getY(), pts, area.getHeight());
+ content.setRect(
+ content.getX(), content.getY(), pts, content.getHeight());
} else {
- area.setRect(area.getX(), area.getY(), area.getWidth(), pts);
+ content.setRect(
+ content.getX(), content.getY(), content.getWidth(), pts);
}
}
}
@@ -299,7 +315,7 @@
private ArrayList listeners = null;
/**
* Registers a listener to be notified on any change of dimension in the
- * <code>Rectangle2D</code> area
+ * <code>Rectangle2D</code> content
* @param listener to be notified
*/
public void registerAreaListener(AreaListener listener) {
@@ -313,12 +329,12 @@
/**
* Notifies any registered listener of a change of dimensions in the
- * <code>Rectangle2D</code> area
+ * <code>Rectangle2D</code> content
*/
protected void notifyListeners() {
for (int i = 0; i < listeners.size(); i++) {
synchronized (this) {
- ((AreaListener)(listeners.get(i))).setDimensions(area);
+ ((AreaListener)(listeners.get(i))).setDimensions(content);
}
}
}
1.1.2.5 +2 -20
xml-fop/src/java/org/apache/fop/area/Attic/RegionAfterRefArea.java
Index: RegionAfterRefArea.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/RegionAfterRefArea.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- RegionAfterRefArea.java 4 May 2004 07:46:45 -0000 1.1.2.4
+++ RegionAfterRefArea.java 1 Jun 2004 06:27:05 -0000 1.1.2.5
@@ -19,8 +19,6 @@
*/
package org.apache.fop.area;
-import java.awt.geom.Rectangle2D;
-
import org.apache.fop.datastructs.Node;
import org.apache.fop.fo.flow.FoPageSequence;
@@ -44,22 +42,6 @@
Object sync) {
// the page-sequence is the generated-by node
super(pageSeq, pageSeq, parent, sync);
- }
-
- /**
- * Creates a new region-after area with the given rectangular area
- * @param area the rectangular area
- * @param pageSeq the generating <code>page-sequence</code>
- * @param parent the page-reference-area
- * @param sync
- */
- public RegionAfterRefArea(
- Rectangle2D area,
- FoPageSequence pageSeq,
- Node parent,
- Object sync) {
- // the page-sequence is the generated-by node
- super(area, pageSeq, pageSeq, parent, sync);
}
/**
1.3.2.7 +0 -43 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.6
retrieving revision 1.3.2.7
diff -u -r1.3.2.6 -r1.3.2.7
--- RegionViewport.java 10 May 2004 11:45:18 -0000 1.3.2.6
+++ RegionViewport.java 1 Jun 2004 06:27:05 -0000 1.3.2.7
@@ -17,8 +17,6 @@
*/
package org.apache.fop.area;
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
import org.apache.fop.datastructs.Node;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.flow.FoPageSequence;
@@ -30,22 +28,6 @@
public class RegionViewport
extends AbstractViewport
implements Viewport, Cloneable {
- /**
- * Creates a new region viewport with the given rectangular area
- * @param area the rectangular area
- * @param pageSeq the generating <code>page-sequence</code>
- * @param generatedBy the generating node; in this case, the page sequence
- * @param parent the <code>main-reference-area</code>
- * @param sync
- */
- public RegionViewport(
- Rectangle2D area,
- FoPageSequence pageSeq,
- FONode generatedBy,
- Node parent,
- Object sync) {
- super(area, pageSeq, generatedBy, parent, sync);
- }
/**
* Creates a new region viewport with a null rectangular area
@@ -162,30 +144,6 @@
// }
/**
- * @param out
- * @throws IOException
- */
- private void writeObject(java.io.ObjectOutputStream out)
- throws IOException {
- 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);
- }
-
- private void readObject(java.io.ObjectInputStream in)
- throws IOException, ClassNotFoundException {
- area = new Rectangle2D.Float(in.readFloat(), in.readFloat(),
- in.readFloat(), in.readFloat());
- clip = in.readBoolean();
- //props = (HashMap)in.readObject();
- setRegionRefArea((RegionRefArea) in.readObject());
- }
-
- /**
* Clone this region viewport.
* Used when creating a copy from the page master.
*
@@ -199,7 +157,6 @@
} catch (CloneNotSupportedException e) {
throw new RuntimeException(e);
}
- rv.area = (Rectangle2D)(area.clone());
rv.refArea = (PageRefArea)(refArea.clone());
return rv;
}
1.1.2.5 +2 -20
xml-fop/src/java/org/apache/fop/area/Attic/RegionBeforeRefArea.java
Index: RegionBeforeRefArea.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/RegionBeforeRefArea.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- RegionBeforeRefArea.java 4 May 2004 07:46:45 -0000 1.1.2.4
+++ RegionBeforeRefArea.java 1 Jun 2004 06:27:05 -0000 1.1.2.5
@@ -19,8 +19,6 @@
*/
package org.apache.fop.area;
-import java.awt.geom.Rectangle2D;
-
import org.apache.fop.datastructs.Node;
import org.apache.fop.fo.flow.FoPageSequence;
@@ -44,22 +42,6 @@
Object sync) {
// the page-sequence is the generated-by node
super(pageSeq, pageSeq, parent, sync);
- }
-
- /**
- * Creates a new region-before area with the given rectangular area
- * @param area the rectangular area
- * @param pageSeq the generating <code>page-sequence</code>
- * @param parent the page-reference-area
- * @param sync
- */
- public RegionBeforeRefArea(
- Rectangle2D area,
- FoPageSequence pageSeq,
- Node parent,
- Object sync) {
- // the page-sequence is the generated-by node
- super(area, pageSeq, pageSeq, parent, sync);
}
/**
1.1.2.5 +2 -20
xml-fop/src/java/org/apache/fop/area/Attic/AbstractReferenceArea.java
Index: AbstractReferenceArea.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/AbstractReferenceArea.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- AbstractReferenceArea.java 2 May 2004 19:24:53 -0000 1.1.2.4
+++ AbstractReferenceArea.java 1 Jun 2004 06:27:05 -0000 1.1.2.5
@@ -19,8 +19,6 @@
package org.apache.fop.area;
import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
-
import org.apache.fop.datastructs.Node;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.flow.FoPageSequence;
@@ -48,22 +46,6 @@
Node parent,
Object sync) {
super(pageSeq, generatedBy, parent, sync);
- // TODO Auto-generated constructor stub
- }
-
- /**
- * @param pageSeq through which this area was generated
- * @param generatedBy the given <code>FONode</code> generated this
- * @param parent area of this
- * @param sync object on which operations in this are synchronized
- */
- public AbstractReferenceArea(
- Rectangle2D area,
- FoPageSequence pageSeq,
- FONode generatedBy,
- Node parent,
- Object sync) {
- super(area, pageSeq, generatedBy, parent, sync);
// TODO Auto-generated constructor stub
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
