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:17:03 UTC
cvs commit: xml-fop/src/org/apache/fop/fo/flow ListItemBody.java ListItemLabel.java PageNumber.java PageNumberCitation.java SimpleLink.java TableColumn.java
jordan 00/06/21 17:17:02
Modified: src/org/apache/fop/fo/flow ListItemBody.java
ListItemLabel.java PageNumber.java
PageNumberCitation.java SimpleLink.java
TableColumn.java
Log:
added id support (required for internal-links)
Revision Changes Path
1.7 +5 -1 xml-fop/src/org/apache/fop/fo/flow/ListItemBody.java
Index: ListItemBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/ListItemBody.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ListItemBody.java 1999/11/25 17:33:12 1.6
+++ ListItemBody.java 2000/06/22 00:17:00 1.7
@@ -1,4 +1,4 @@
-/*-- $Id: ListItemBody.java,v 1.6 1999/11/25 17:33:12 jtauber Exp $ --
+/*-- $Id: ListItemBody.java,v 1.7 2000/06/22 00:17:00 jordan Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -82,7 +82,11 @@
public Status layout(Area area) throws FOPException {
if (this.marker == START) {
this.marker = 0;
+ // initialize id
+ String id = this.properties.get("id").getString();
+ area.getIDReferences().initializeID(id,area);
}
+
int numChildren = this.children.size();
for (int i = this.marker; i < numChildren; i++) {
FObj fo = (FObj) children.elementAt(i);
1.7 +6 -1 xml-fop/src/org/apache/fop/fo/flow/ListItemLabel.java
Index: ListItemLabel.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/ListItemLabel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ListItemLabel.java 1999/11/25 17:33:12 1.6
+++ ListItemLabel.java 2000/06/22 00:17:00 1.7
@@ -1,4 +1,4 @@
-/*-- $Id: ListItemLabel.java,v 1.6 1999/11/25 17:33:12 jtauber Exp $ --
+/*-- $Id: ListItemLabel.java,v 1.7 2000/06/22 00:17:00 jordan Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -85,6 +85,11 @@
if (numChildren != 1) {
throw new FOPException("list-item-label must have exactly one block in this version of FOP");
}
+
+ // initialize id
+ String id = this.properties.get("id").getString();
+ area.getIDReferences().initializeID(id,area);
+
Block block = (Block) children.elementAt(0);
block.setIsInLabel();
1.8 +6 -1 xml-fop/src/org/apache/fop/fo/flow/PageNumber.java
Index: PageNumber.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/PageNumber.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PageNumber.java 1999/12/03 08:12:58 1.7
+++ PageNumber.java 2000/06/22 00:17:00 1.8
@@ -1,4 +1,4 @@
-/*-- $Id: PageNumber.java,v 1.7 1999/12/03 08:12:58 jtauber Exp $ --
+/*-- $Id: PageNumber.java,v 1.8 2000/06/22 00:17:00 jordan Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -109,7 +109,12 @@
this.whiteSpaceTreatment = this.properties.get("white-space-treatment").getEnum();
this.marker = 0;
+
+ // initialize id
+ String id = this.properties.get("id").getString();
+ area.getIDReferences().initializeID(id,area);
}
+
String p = Integer.toString(area.getPage().getNumber());
this.marker = ((BlockArea) area).addText(fs, red, green, blue,
wrapOption,
1.2 +6 -1 xml-fop/src/org/apache/fop/fo/flow/PageNumberCitation.java
Index: PageNumberCitation.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/PageNumberCitation.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PageNumberCitation.java 2000/06/18 21:06:24 1.1
+++ PageNumberCitation.java 2000/06/22 00:17:00 1.2
@@ -1,4 +1,4 @@
-/*-- $Id: PageNumberCitation.java,v 1.1 2000/06/18 21:06:24 fotis Exp $ --
+/*-- $Id: PageNumberCitation.java,v 1.2 2000/06/22 00:17:00 jordan Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -192,7 +192,12 @@
this.whiteSpaceTreatment = this.properties.get("white-space-treatment").getEnum();
this.marker = 0;
+
+ // initialize id
+ String id = this.properties.get("id").getString();
+ area.getIDReferences().initializeID(id,area);
}
+
if(idPageNumber <0)
{
FObj root;
1.5 +4 -1 xml-fop/src/org/apache/fop/fo/flow/SimpleLink.java
Index: SimpleLink.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/SimpleLink.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SimpleLink.java 2000/06/21 01:23:10 1.4
+++ SimpleLink.java 2000/06/22 00:17:01 1.5
@@ -1,4 +1,4 @@
-/*-- $Id: SimpleLink.java,v 1.4 2000/06/21 01:23:10 jordan Exp $ --
+/*-- $Id: SimpleLink.java,v 1.5 2000/06/22 00:17:01 jordan Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -107,6 +107,9 @@
}
if (this.marker == START) {
+ // initialize id
+ String id = this.properties.get("id").getString();
+ area.getIDReferences().initializeID(id,area);
this.marker = 0;
}
1.8 +5 -1 xml-fop/src/org/apache/fop/fo/flow/TableColumn.java
Index: TableColumn.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableColumn.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TableColumn.java 2000/03/07 09:47:33 1.7
+++ TableColumn.java 2000/06/22 00:17:01 1.8
@@ -1,4 +1,4 @@
-/*-- $Id: TableColumn.java,v 1.7 2000/03/07 09:47:33 fotis Exp $ --
+/*-- $Id: TableColumn.java,v 1.8 2000/06/22 00:17:01 jordan Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -121,6 +121,10 @@
this.properties.get("border-style").getEnum();
this.columnWidth =
this.properties.get("column-width").getLength().mvalue();
+
+ // initialize id
+ String id = this.properties.get("id").getString();
+ area.getIDReferences().initializeID(id,area);
}
this.areaContainer =