You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by jo...@locus.apache.org on 2000/06/22 02:11:36 UTC
cvs commit: xml-fop/src/org/apache/fop/fo/flow BlockContainer.java DisplayGraphic.java DisplayRule.java DisplaySequence.java
jordan 00/06/21 17:11:36
Modified: src/org/apache/fop/fo/flow BlockContainer.java
DisplayGraphic.java DisplayRule.java
DisplaySequence.java
Log:
added id support (required for internal-links)
Revision Changes Path
1.2 +11 -2 xml-fop/src/org/apache/fop/fo/flow/BlockContainer.java
Index: BlockContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/BlockContainer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BlockContainer.java 2000/03/07 17:27:50 1.1
+++ BlockContainer.java 2000/06/22 00:11:32 1.2
@@ -1,4 +1,4 @@
-/*-- $Id: BlockContainer.java,v 1.1 2000/03/07 17:27:50 fotis Exp $ --
+/*-- $Id: BlockContainer.java,v 1.2 2000/06/22 00:11:32 jordan Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -159,7 +159,11 @@
this.properties.get("border-width").getLength().mvalue();
this.borderStyle =
this.properties.get("border-style").getEnum();
- }
+
+ // initialize id
+ String id = this.properties.get("id").getString();
+ area.getIDReferences().initializeID(id,area);
+ }
boolean prevChildMustKeepWithNext = false;
@@ -181,6 +185,9 @@
areaContainer.setBorderColor(borderColor, borderColor, borderColor, borderColor);
areaContainer.start();
+ areaContainer.setAbsoluteHeight(area.getAbsoluteHeight());
+ areaContainer.setIDReferences(area.getIDReferences());
+
int numChildren = this.children.size();
for (int i = this.marker; i < numChildren; i++) {
FObj fo = (FObj) children.elementAt(i);
@@ -205,6 +212,8 @@
prevChildMustKeepWithNext = true;
}
}
+ area.setAbsoluteHeight(areaContainer.getAbsoluteHeight());
+
areaContainer.end();
if (position == Position.ABSOLUTE)
areaContainer.setHeight(height);
1.10 +7 -1 xml-fop/src/org/apache/fop/fo/flow/DisplayGraphic.java
Index: DisplayGraphic.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/DisplayGraphic.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DisplayGraphic.java 2000/05/31 15:22:19 1.9
+++ DisplayGraphic.java 2000/06/22 00:11:33 1.10
@@ -1,4 +1,4 @@
-/*-- $Id: DisplayGraphic.java,v 1.9 2000/05/31 15:22:19 eschaeffer Exp $ --
+/*-- $Id: DisplayGraphic.java,v 1.10 2000/06/22 00:11:33 jordan Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -190,6 +190,12 @@
if ((spaceBefore != 0) && (this.marker == 0)) {
area.addDisplaySpace(spaceBefore);
}
+
+ if ( marker == 0 ) {
+ // initialize id
+ String id = this.properties.get("id").getString();
+ area.getIDReferences().initializeID(id,area);
+ }
imageArea.start();
imageArea.end();
1.8 +5 -1 xml-fop/src/org/apache/fop/fo/flow/DisplayRule.java
Index: DisplayRule.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/DisplayRule.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DisplayRule.java 1999/11/27 10:11:38 1.7
+++ DisplayRule.java 2000/06/22 00:11:33 1.8
@@ -1,4 +1,4 @@
-/*-- $Id: DisplayRule.java,v 1.7 1999/11/27 10:11:38 jtauber Exp $ --
+/*-- $Id: DisplayRule.java,v 1.8 2000/06/22 00:11:33 jordan Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -131,6 +131,10 @@
endIndent += area.getAllocationWidth() - forcedWidth -
forcedStartOffset;
}
+
+ // initialize id
+ String id = this.properties.get("id").getString();
+ area.getIDReferences().initializeID(id,area);
RuleArea ruleArea = new RuleArea(fs,
area.getAllocationWidth(),
1.7 +4 -1 xml-fop/src/org/apache/fop/fo/flow/DisplaySequence.java
Index: DisplaySequence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/DisplaySequence.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DisplaySequence.java 1999/11/25 17:33:12 1.6
+++ DisplaySequence.java 2000/06/22 00:11:33 1.7
@@ -1,4 +1,4 @@
-/*-- $Id: DisplaySequence.java,v 1.6 1999/11/25 17:33:12 jtauber Exp $ --
+/*-- $Id: DisplaySequence.java,v 1.7 2000/06/22 00:11:33 jordan Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -79,6 +79,9 @@
public Status layout(Area area) throws FOPException {
if (this.marker == START) {
+ // initialize id
+ String id = this.properties.get("id").getString();
+ area.getIDReferences().initializeID(id,area);
this.marker = 0;
}
// this is such common code, perhaps it should be in the super class