arved 01/07/16 20:15:57
Modified: src/org/apache/fop/layout Area.java AreaContainer.java
BodyAreaContainer.java ColumnArea.java
Log:
AHS: improving area information
Revision Changes Path
1.22 +9 -1 xml-fop/src/org/apache/fop/layout/Area.java
Index: Area.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/Area.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Area.java 2001/07/16 10:45:43 1.21
+++ Area.java 2001/07/17 03:15:57 1.22
@@ -1,4 +1,4 @@
-/* $Id: Area.java,v 1.21 2001/07/16 10:45:43 arved Exp $
+/* $Id: Area.java,v 1.22 2001/07/17 03:15:57 arved Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -361,11 +361,19 @@
return bp;
}
+ public void addMarker(Marker marker) {
+ markers.addElement(marker);
+ }
+
public void addMarkers(Vector markers) {
markers.addAll(markers);
}
public void addLineagePair(org.apache.fop.fo.FObj fo, int areaPosition) {
returnedBy.put(fo, new Integer(areaPosition));
+ }
+
+ public Vector getMarkers() {
+ return markers;
}
}
1.13 +13 -1 xml-fop/src/org/apache/fop/layout/AreaContainer.java
Index: AreaContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/AreaContainer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AreaContainer.java 2001/06/12 11:37:36 1.12
+++ AreaContainer.java 2001/07/17 03:15:57 1.13
@@ -1,4 +1,4 @@
-/* $Id: AreaContainer.java,v 1.12 2001/06/12 11:37:36 keiron Exp $
+/* $Id: AreaContainer.java,v 1.13 2001/07/17 03:15:57 arved Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -20,6 +20,10 @@
private int yPosition; // should be able to take value 'top' and 'bottom' too
private int position;
+ // use this for identifying the general usage of the area,
+ // like 'main-reference-area' or 'region-before'
+ private String areaName;
+
public AreaContainer(FontState fontState, int xPosition,
int yPosition, int allocationWidth, int maxHeight,
int position) {
@@ -63,4 +67,12 @@
public void shiftYPosition(int value) {
yPosition += value;
}
+
+ public String getAreaName() {
+ return areaName;
+ }
+
+ public void setAreaName(String areaName) {
+ this.areaName = areaName;
+ }
}
1.9 +4 -1 xml-fop/src/org/apache/fop/layout/BodyAreaContainer.java
Index: BodyAreaContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/BodyAreaContainer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BodyAreaContainer.java 2001/06/12 11:37:37 1.8
+++ BodyAreaContainer.java 2001/07/17 03:15:57 1.9
@@ -1,4 +1,4 @@
-/* $Id: BodyAreaContainer.java,v 1.8 2001/06/12 11:37:37 keiron Exp $
+/* $Id: BodyAreaContainer.java,v 1.9 2001/07/17 03:15:57 arved Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -68,13 +68,16 @@
mainRefAreaHeight = maxHeight - beforeFloatRefAreaHeight -
footnoteRefAreaHeight;
beforeFloatReferenceArea = new AreaContainer(fontState, xPosition, yPosition,
allocationWidth, beforeFloatRefAreaHeight, Position.ABSOLUTE);
+ beforeFloatReferenceArea.setAreaName("before-float-reference-area");
this.addChild(beforeFloatReferenceArea);
mainReferenceArea = new AreaContainer(fontState, xPosition, yPosition,
allocationWidth, mainRefAreaHeight, Position.ABSOLUTE);
+ mainReferenceArea.setAreaName("main-reference-area");
this.addChild(mainReferenceArea);
int footnoteRefAreaYPosition = yPosition - mainRefAreaHeight;
footnoteReferenceArea = new AreaContainer(fontState, xPosition,
footnoteRefAreaYPosition,
allocationWidth, footnoteRefAreaHeight, Position.ABSOLUTE);
+ footnoteReferenceArea.setAreaName("footnote-reference-area");
this.addChild(footnoteReferenceArea);
// all padding and border-width must be 0
1.3 +2 -1 xml-fop/src/org/apache/fop/layout/ColumnArea.java
Index: ColumnArea.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/ColumnArea.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ColumnArea.java 2001/06/12 11:37:39 1.2
+++ ColumnArea.java 2001/07/17 03:15:57 1.3
@@ -1,4 +1,4 @@
-/* $Id: ColumnArea.java,v 1.2 2001/06/12 11:37:39 keiron Exp $
+/* $Id: ColumnArea.java,v 1.3 2001/07/17 03:15:57 arved Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -25,6 +25,7 @@
super(fontState, xPosition, yPosition, allocationWidth,
maxHeight, Position.ABSOLUTE);
this.maxColumns = columnCount;
+ this.setAreaName("normal-flow-ref.-area");
}
public void render(Renderer renderer) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
