keiron 02/05/22 23:27:14
Modified: src/org/apache/fop/apps StreamRenderer.java
src/org/apache/fop/extensions Bookmarks.java
src/org/apache/fop/fo FObj.java FObjMixed.java
src/org/apache/fop/fo/flow BasicLink.java BidiOverride.java
Block.java BlockContainer.java Character.java
ExternalGraphic.java Flow.java
InitialPropertySet.java Inline.java
InlineContainer.java InstreamForeignObject.java
Leader.java ListBlock.java ListItem.java
ListItemBody.java ListItemLabel.java MultiCase.java
MultiProperties.java MultiPropertySet.java
MultiSwitch.java MultiToggle.java PageNumber.java
PageNumberCitation.java Table.java
TableAndCaption.java TableBody.java
TableCaption.java TableCell.java TableColumn.java
TableRow.java
src/org/apache/fop/fo/pagination PageSequence.java
src/org/apache/fop/layout AreaTree.java
Log:
sets up the id independantly of the layout
Revision Changes Path
1.13 +8 -170 xml-fop/src/org/apache/fop/apps/StreamRenderer.java
Index: StreamRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/StreamRenderer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- StreamRenderer.java 17 May 2002 14:47:12 -0000 1.12
+++ StreamRenderer.java 23 May 2002 06:27:12 -0000 1.13
@@ -2,8 +2,7 @@
import java.io.OutputStream;
import java.io.IOException;
-import java.util.Vector;
-import java.util.Enumeration;
+import java.util.HashSet;
import org.xml.sax.SAXException;
@@ -12,8 +11,6 @@
import org.apache.fop.area.AreaTree;
import org.apache.fop.area.Title;
import org.apache.fop.render.Renderer;
-import org.apache.fop.datatypes.IDReferences;
-import org.apache.fop.extensions.ExtensionObj;
import org.apache.fop.fo.pagination.PageSequence;
import org.apache.avalon.framework.logger.Logger;
@@ -72,21 +69,10 @@
private FontInfo fontInfo = new FontInfo();
/**
- The list of pages waiting to be renderered.
+ The current set of id's in the FO tree
+ This is used so we know if the FO tree contains duplicates
*/
- private Vector renderQueue = new Vector();
-
- /**
- The current set of IDReferences, passed to the
- areatrees and pages. This is used by the AreaTree
- as a single map of all IDs.
- */
- private IDReferences idReferences = new IDReferences();
-
- /**
- * The list of extensions.
- */
- private Vector extensions = new Vector();
+ private HashSet idReferences = new HashSet();
private Logger log;
@@ -109,12 +95,12 @@
log = logger;
}
- public IDReferences getIDReferences() {
+ public HashSet getIDReferences() {
return idReferences;
}
- public void addExtension(ExtensionObj ext) {
- extensions.addElement(ext);
+ public AreaTree getAreaTree() {
+ return areaTree;
}
public void startRenderer()
@@ -189,10 +175,6 @@
throws FOPException {
//areaTree.setFontInfo(fontInfo);
-// for(Enumeration e = extensions.elements(); e.hasMoreElements(); ) {
-// ExtensionObj ext = (ExtensionObj)e.nextElement();
-// ext.format(areaTree);
-// }
pageSequence.format(areaTree);
}
@@ -219,149 +201,5 @@
public FontInfo getFontInfo() {
return this.fontInfo;
}
-
- // COMMENT OUT OLD PAGE MANAGEMENT CODE
-// public synchronized void queuePage(Page page)
-// throws FOPException, IOException {
-// /*
-// Try to optimise on the common case that there are
-// no pages pending and that all ID references are
-// valid on the current pages. This short-cuts the
-// pipeline and renders the area immediately.
-// */
-// if ((renderQueue.size() == 0) && idReferences.isEveryIdValid()) {
-// //renderer.render(page, outputStream);
-// } else {
-// addToRenderQueue(page);
-// }
-// pageCount++;
-// }
-
-// private synchronized void addToRenderQueue(Page page)
-// throws FOPException, IOException {
-// RenderQueueEntry entry = new RenderQueueEntry(page);
-// renderQueue.addElement(entry);
-
-// /*
-// The just-added entry could (possibly) resolve the
-// waiting entries, so we try to process the queue
-// now to see.
-// */
-// processQueue(false);
-// }
-
-// /**
-// Try to process the queue from the first entry forward.
-// If an entry can't be processed, then the queue can't
-// move forward, so return.
-// */
-// private synchronized void processQueue(boolean force)
-// throws FOPException, IOException {
-// while (renderQueue.size() > 0) {
-// RenderQueueEntry entry = (RenderQueueEntry) renderQueue.elementAt(0);
-// if ((!force) && (!entry.isResolved()))
-// break;
-
-// //renderer.render(entry.getPage(), outputStream);
-
-// /* TODO
-// Enumeration rootEnumeration =
-// entry.getAreaTree().getExtensions().elements();
-// while (rootEnumeration.hasMoreElements())
-// renderTree.addExtension((ExtensionObj)
rootEnumeration.nextElement());
-// */
-
-// renderQueue.removeElementAt(0);
-// }
-// }
-
-// /**
-// A RenderQueueEntry consists of the Page to be queued,
-// plus a list of outstanding ID references that need to be
-// resolved before the Page can be renderered.<P>
-// */
-// class RenderQueueEntry extends Object {
-// /*
-// The Page that has outstanding ID references.
-// */
-// private Page page;
-
-// /*
-// A list of ID references (names).
-// */
-// private Vector unresolvedIdReferences = new Vector();
-
-// public RenderQueueEntry(Page page) {
-// this.page = page;
-
-// Enumeration e = idReferences.getInvalidElements();
-// while (e.hasMoreElements())
-// unresolvedIdReferences.addElement(e.nextElement());
-// }
-
-// public Page getPage() {
-// return page;
-// }
-
-// /**
-// See if the outstanding references are resolved
-// in the current copy of IDReferences.
-// */
-// public boolean isResolved() {
-// if ((unresolvedIdReferences.size() == 0) ||
idReferences.isEveryIdValid())
-// return true;
-
-// //
-// // See if any of the unresolved references are still unresolved.
-// //
-// Enumeration e = unresolvedIdReferences.elements();
-// while (e.hasMoreElements())
-// if (!idReferences.doesIDExist((String) e.nextElement()))
-// return false;
-
-// unresolvedIdReferences.removeAllElements();
-// return true;
-// }
-// }
-
-// public Page getNextPage(Page current, boolean isWithinPageSequence,
-// boolean isFirstCall) {
-// Page nextPage = null;
-// int pageIndex = 0;
-// if (isFirstCall)
-// pageIndex = renderQueue.size();
-// else
-// pageIndex = renderQueue.indexOf(current);
-// if ((pageIndex + 1) < renderQueue.size()) {
-// nextPage = (Page)renderQueue.elementAt(pageIndex + 1);
-// if (isWithinPageSequence
-//
&&!nextPage.getPageSequence().equals(current.getPageSequence())) {
-// nextPage = null;
-// }
-// }
-// return nextPage;
-// }
-
-// public Page getPreviousPage(Page current, boolean isWithinPageSequence,
-// boolean isFirstCall) {
-// Page previousPage = null;
-// int pageIndex = 0;
-// if (isFirstCall)
-// pageIndex = renderQueue.size();
-// else
-// pageIndex = renderQueue.indexOf(current);
-// // System.out.println("Page index = " + pageIndex);
-// if ((pageIndex - 1) >= 0) {
-// previousPage = (Page)renderQueue.elementAt(pageIndex - 1);
-// PageSequence currentPS = current.getPageSequence();
-// // System.out.println("Current PS = '" + currentPS + "'");
-// PageSequence previousPS = previousPage.getPageSequence();
-// // System.out.println("Previous PS = '" + previousPS + "'");
-// if (isWithinPageSequence &&!previousPS.equals(currentPS)) {
-// // System.out.println("Outside page sequence");
-// previousPage = null;
-// }
-// }
-// return previousPage;
-// }
}
+
1.2 +4 -1 xml-fop/src/org/apache/fop/extensions/Bookmarks.java
Index: Bookmarks.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/extensions/Bookmarks.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Bookmarks.java 17 May 2002 14:47:12 -0000 1.1
+++ Bookmarks.java 23 May 2002 06:27:12 -0000 1.2
@@ -1,5 +1,5 @@
/*
- * $Id: Bookmarks.java,v 1.1 2002/05/17 14:47:12 keiron Exp $
+ * $Id: Bookmarks.java,v 1.2 2002/05/23 06:27:12 keiron 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.
@@ -8,6 +8,7 @@
package org.apache.fop.extensions;
import org.apache.fop.fo.FONode;
+import org.apache.fop.area.AreaTree;
import java.util.*;
@@ -39,6 +40,8 @@
data.addSubData(out.getData());
}
// add data to area tree for resolving and handling
+ AreaTree at = streamRenderer.getAreaTree();
+ at.addTreeExtension(data);
}
}
1.31 +25 -21 xml-fop/src/org/apache/fop/fo/FObj.java
Index: FObj.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FObj.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- FObj.java 28 Apr 2002 21:28:01 -0000 1.30
+++ FObj.java 23 May 2002 06:27:12 -0000 1.31
@@ -1,5 +1,5 @@
/*
- * $Id: FObj.java,v 1.30 2002/04/28 21:28:01 klease Exp $
+ * $Id: FObj.java,v 1.31 2002/05/23 06:27:12 keiron 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.
@@ -11,7 +11,7 @@
import org.apache.fop.layout.Area;
import org.apache.fop.layout.AreaClass;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.datatypes.IDReferences;
+import org.apache.fop.apps.StreamRenderer;
import org.apache.fop.layoutmgr.LayoutManager;
import org.apache.fop.fo.properties.FOPropertyMapping;
import org.apache.fop.layout.Area;
@@ -28,14 +28,17 @@
import java.util.ArrayList;
import java.util.List;
import java.util.HashMap;
+import java.util.HashSet;
/**
* base class for representation of formatting objects and their processing
*/
public class FObj extends FONode {
+ protected StreamRenderer streamRenderer;
public PropertyList properties;
protected PropertyManager propMgr;
protected String areaClass = AreaClass.UNASSIGNED;
+ protected String id = null;
/**
* value of marker before layout begins
@@ -132,6 +135,10 @@
children.add(child);
}
+ public void setStreamRenderer(StreamRenderer st) {
+ streamRenderer = st;
+ }
+
/**
* lets outside sources access the property list
* first used by PageNumberCitation to find the "id" property
@@ -142,6 +149,22 @@
return (properties.get(name));
}
+ protected void setupID() {
+ Property prop = this.properties.get("id");
+ if(prop != null) {
+ String str = prop.getString();
+ if(str != null && !str.equals("")) {
+ HashSet idrefs = streamRenderer.getIDReferences();
+ if(!idrefs.contains(str)) {
+ id = str;
+ idrefs.add(id);
+ } else {
+ log.warn("duplicate id:" + str + " ignored");
+ }
+ }
+ }
+ }
+
/**
* Return the "content width" of the areas generated by this FO.
* This is used by percent-based properties to get the dimension of
@@ -154,25 +177,6 @@
*/
public int getContentWidth() {
return 0;
- }
-
- /**
- * removes property id
- * @param idReferences the id to remove
- */
- public void removeID(IDReferences idReferences) {
- if (((FObj) this).properties.get("id") == null ||
- ((FObj) this).properties.get("id").getString() == null)
- return;
- idReferences.removeID(
- ((FObj) this).properties.get("id").getString());
- int numChildren = this.children.size();
- for (int i = 0; i < numChildren; i++) {
- FONode child = (FONode) children.get(i);
- if ((child instanceof FObj)) {
- ((FObj) child).removeID(idReferences);
- }
- }
}
public boolean generatesReferenceAreas() {
1.24 +3 -5 xml-fop/src/org/apache/fop/fo/FObjMixed.java
Index: FObjMixed.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FObjMixed.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- FObjMixed.java 10 May 2002 12:24:19 -0000 1.23
+++ FObjMixed.java 23 May 2002 06:27:12 -0000 1.24
@@ -1,5 +1,5 @@
/*
- * $Id: FObjMixed.java,v 1.23 2002/05/10 12:24:19 klease Exp $
+ * $Id: FObjMixed.java,v 1.24 2002/05/23 06:27:12 keiron 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.
@@ -64,10 +64,8 @@
public Status layout(Area area) throws FOPException {
if (this.properties != null) {
- Property prop = this.properties.get("id");
- if (prop != null) {
- String id = prop.getString();
-
+ setupID();
+ if (id != null) {
if (this.marker == START) {
if (area.getIDReferences() != null)
area.getIDReferences().createID(id);
1.13 +2 -3 xml-fop/src/org/apache/fop/fo/flow/BasicLink.java
Index: BasicLink.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/BasicLink.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- BasicLink.java 26 Apr 2002 09:40:56 -0000 1.12
+++ BasicLink.java 23 May 2002 06:27:13 -0000 1.13
@@ -1,5 +1,5 @@
/*
- * $Id: BasicLink.java,v 1.12 2002/04/26 09:40:56 keiron Exp $
+ * $Id: BasicLink.java,v 1.13 2002/05/23 06:27:13 keiron 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.
@@ -56,7 +56,7 @@
// this.properties.get("destination-place-offset");
// this.properties.get("dominant-baseline");
// this.properties.get("external-destination");
- // this.properties.get("id");
+ setupID();
// this.properties.get("indicate-destination");
// this.properties.get("internal-destination");
// this.properties.get("keep-together");
@@ -81,7 +81,6 @@
if (this.marker == START) {
// initialize id
- String id = this.properties.get("id").getString();
area.getIDReferences().initializeID(id, area);
this.marker = 0;
}
1.8 +2 -2 xml-fop/src/org/apache/fop/fo/flow/BidiOverride.java
Index: BidiOverride.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/BidiOverride.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BidiOverride.java 26 Apr 2002 09:40:56 -0000 1.7
+++ BidiOverride.java 23 May 2002 06:27:13 -0000 1.8
@@ -1,5 +1,5 @@
/*
- * $Id: BidiOverride.java,v 1.7 2002/04/26 09:40:56 keiron Exp $
+ * $Id: BidiOverride.java,v 1.8 2002/05/23 06:27:13 keiron 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.
@@ -63,7 +63,7 @@
// this.properties.get("color");
// this.properties.get("direction");
- // this.properties.get("id");
+ setupID();
// this.properties.get("letter-spacing");
// this.properties.get("line-height");
// this.properties.get("line-height-shift-adjustment");
1.54 +3 -1 xml-fop/src/org/apache/fop/fo/flow/Block.java
Index: Block.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Block.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- Block.java 28 Apr 2002 21:28:01 -0000 1.53
+++ Block.java 23 May 2002 06:27:13 -0000 1.54
@@ -1,5 +1,5 @@
/*
- * $Id: Block.java,v 1.53 2002/04/28 21:28:01 klease Exp $
+ * $Id: Block.java,v 1.54 2002/05/23 06:27:13 keiron 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.
@@ -85,6 +85,8 @@
== Constants.TRUE);
this.lfTreatment =
this.properties.get("linefeed-treatment").getEnum();
+
+ setupID();
}
public Status layout(Area area) throws FOPException {
1.16 +2 -1 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- BlockContainer.java 14 Nov 2001 13:45:44 -0000 1.15
+++ BlockContainer.java 23 May 2002 06:27:13 -0000 1.16
@@ -1,5 +1,5 @@
/*
- * $Id: BlockContainer.java,v 1.15 2001/11/14 13:45:44 keiron Exp $
+ * $Id: BlockContainer.java,v 1.16 2002/05/23 06:27:13 keiron 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.
@@ -43,6 +43,7 @@
public void handleAttrs(Attributes attlist) throws FOPException {
super.handleAttrs(attlist);
this.span = this.properties.get("span").getEnum();
+ setupID();
}
public Status layout(Area area) throws FOPException {
1.19 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Character.java
Index: Character.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Character.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Character.java 26 Apr 2002 09:40:56 -0000 1.18
+++ Character.java 23 May 2002 06:27:13 -0000 1.19
@@ -1,5 +1,5 @@
/*
- * $Id: Character.java,v 1.18 2002/04/26 09:40:56 keiron Exp $
+ * $Id: Character.java,v 1.19 2002/05/23 06:27:13 keiron 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.
@@ -102,7 +102,7 @@
// this.properties.get("text-altitude");
// this.properties.get("glyph-orientation-horizontal");
// this.properties.get("glyph-orientation-vertical");
- // this.properties.get("id");
+ setupID();
// this.properties.get("keep-with-next");
// this.properties.get("keep-with-previous");
// this.properties.get("letter-spacing");
1.21 +2 -2 xml-fop/src/org/apache/fop/fo/flow/ExternalGraphic.java
Index: ExternalGraphic.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/ExternalGraphic.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ExternalGraphic.java 26 Apr 2002 09:40:56 -0000 1.20
+++ ExternalGraphic.java 23 May 2002 06:27:13 -0000 1.21
@@ -1,5 +1,5 @@
/*
- * $Id: ExternalGraphic.java,v 1.20 2002/04/26 09:40:56 keiron Exp $
+ * $Id: ExternalGraphic.java,v 1.21 2002/05/23 06:27:13 keiron 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.
@@ -96,7 +96,7 @@
// this.properties.get("display-align");
// this.properties.get("dominant-baseline");
// this.properties.get("height");
- // this.properties.get("id");
+ setupID();
// this.properties.get("inline-progression-dimension");
// this.properties.get("keep-with-next");
// this.properties.get("keep-with-previous");
1.32 +1 -2 xml-fop/src/org/apache/fop/fo/flow/Flow.java
Index: Flow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Flow.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Flow.java 26 Apr 2002 09:40:56 -0000 1.31
+++ Flow.java 23 May 2002 06:27:13 -0000 1.32
@@ -1,5 +1,5 @@
/*
- * $Id: Flow.java,v 1.31 2002/04/26 09:40:56 keiron Exp $
+ * $Id: Flow.java,v 1.32 2002/05/23 06:27:13 keiron 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.
@@ -161,7 +161,6 @@
FObj prevChild = (FObj) children.get(this.marker);
prevChild.removeAreas();
prevChild.resetMarker();
- prevChild.removeID(area.getIDReferences());
_status = new Status(Status.AREA_FULL_SOME);
return _status;
// should probably return AREA_FULL_NONE if first
1.7 +2 -2 xml-fop/src/org/apache/fop/fo/flow/InitialPropertySet.java
Index: InitialPropertySet.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/InitialPropertySet.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- InitialPropertySet.java 9 Nov 2001 11:32:37 -0000 1.6
+++ InitialPropertySet.java 23 May 2002 06:27:13 -0000 1.7
@@ -1,5 +1,5 @@
/*
- * $Id: InitialPropertySet.java,v 1.6 2001/11/09 11:32:37 keiron Exp $
+ * $Id: InitialPropertySet.java,v 1.7 2002/05/23 06:27:13 keiron 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.
@@ -42,7 +42,7 @@
RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
// this.properties.get("color");
- // this.properties.get("id");
+ setupID();
// this.properties.get("letter-spacing");
// this.properties.get("line-height");
// this.properties.get("line-height-shift-adjustment");
1.13 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Inline.java
Index: Inline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Inline.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Inline.java 26 Apr 2002 09:40:56 -0000 1.12
+++ Inline.java 23 May 2002 06:27:13 -0000 1.13
@@ -1,5 +1,5 @@
/*
- * $Id: Inline.java,v 1.12 2002/04/26 09:40:56 keiron Exp $
+ * $Id: Inline.java,v 1.13 2002/05/23 06:27:13 keiron 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.
@@ -62,7 +62,7 @@
// this.properties.get("baseline-shift");
// this.properties.get("color");
// this.properties.get("dominant-baseline");
- // this.properties.get("id");
+ setupID();
// this.properties.get("keep-together");
// this.properties.get("keep-with-next");
// this.properties.get("keep-with-previous");
1.8 +2 -2 xml-fop/src/org/apache/fop/fo/flow/InlineContainer.java
Index: InlineContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/InlineContainer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- InlineContainer.java 26 Apr 2002 09:40:56 -0000 1.7
+++ InlineContainer.java 23 May 2002 06:27:13 -0000 1.8
@@ -1,5 +1,5 @@
/*
- * $Id: InlineContainer.java,v 1.7 2002/04/26 09:40:56 keiron Exp $
+ * $Id: InlineContainer.java,v 1.8 2002/05/23 06:27:13 keiron 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.
@@ -56,7 +56,7 @@
// this.properties.get("display-align");
// this.properties.get("dominant-baseline");
// this.properties.get("height");
- // this.properties.get("id");
+ setupID();
// this.properties.get("inline-progression-dimension");
// this.properties.get("keep-together");
// this.properties.get("keep-with-next");
1.26 +2 -3 xml-fop/src/org/apache/fop/fo/flow/InstreamForeignObject.java
Index: InstreamForeignObject.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/InstreamForeignObject.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- InstreamForeignObject.java 26 Apr 2002 09:40:56 -0000 1.25
+++ InstreamForeignObject.java 23 May 2002 06:27:13 -0000 1.26
@@ -1,5 +1,5 @@
/*
- * $Id: InstreamForeignObject.java,v 1.25 2002/04/26 09:40:56 keiron Exp $
+ * $Id: InstreamForeignObject.java,v 1.26 2002/05/23 06:27:13 keiron 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.
@@ -190,7 +190,7 @@
// this.properties.get("display-align");
// this.properties.get("dominant-baseline");
// this.properties.get("height");
- // this.properties.get("id");
+ setupID();
// this.properties.get("inline-progression-dimension");
// this.properties.get("keep-with-next");
// this.properties.get("keep-with-previous");
@@ -203,7 +203,6 @@
// this.properties.get("width");
/* retrieve properties *
- String id = this.properties.get("id").getString();
int align = this.properties.get("text-align").getEnum();
int valign = this.properties.get("vertical-align").getEnum();
int overflow = this.properties.get("overflow").getEnum();
1.19 +2 -3 xml-fop/src/org/apache/fop/fo/flow/Leader.java
Index: Leader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Leader.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Leader.java 26 Apr 2002 09:40:56 -0000 1.18
+++ Leader.java 23 May 2002 06:27:13 -0000 1.19
@@ -1,5 +1,5 @@
/*
- * $Id: Leader.java,v 1.18 2002/04/26 09:40:56 keiron Exp $
+ * $Id: Leader.java,v 1.19 2002/05/23 06:27:13 keiron 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.
@@ -89,7 +89,7 @@
// this.properties.get("dominant-baseline");
// this.properties.get("text-depth");
// this.properties.get("text-altitude");
- // this.properties.get("id");
+ setupID();
// this.properties.get("leader-alignment");
// this.properties.get("leader-length");
// this.properties.get("leader-pattern");
@@ -137,7 +137,6 @@
this.properties.get("leader-alignment").getEnum();
// initialize id
- String id = this.properties.get("id").getString();
blockArea.getIDReferences().initializeID(id, blockArea);
// adds leader to blockarea, there the leaderArea is generated
1.26 +2 -3 xml-fop/src/org/apache/fop/fo/flow/ListBlock.java
Index: ListBlock.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/ListBlock.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ListBlock.java 14 Nov 2001 13:45:44 -0000 1.25
+++ ListBlock.java 23 May 2002 06:27:13 -0000 1.26
@@ -1,5 +1,5 @@
/*
- * $Id: ListBlock.java,v 1.25 2001/11/14 13:45:44 keiron Exp $
+ * $Id: ListBlock.java,v 1.26 2002/05/23 06:27:13 keiron 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.
@@ -58,7 +58,7 @@
// this.properties.get("break-after");
// this.properties.get("break-before");
- // this.properties.get("id");
+ setupID();
// this.properties.get("keep-together");
// this.properties.get("keep-with-next");
// this.properties.get("keep-with-previous");
@@ -98,7 +98,6 @@
}
// initialize id
- String id = this.properties.get("id").getString();
area.getIDReferences().initializeID(id, area);
}
1.22 +2 -4 xml-fop/src/org/apache/fop/fo/flow/ListItem.java
Index: ListItem.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/ListItem.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ListItem.java 22 Nov 2001 07:11:39 -0000 1.21
+++ ListItem.java 23 May 2002 06:27:13 -0000 1.22
@@ -1,5 +1,5 @@
/*
- * $Id: ListItem.java,v 1.21 2001/11/22 07:11:39 keiron Exp $
+ * $Id: ListItem.java,v 1.22 2002/05/23 06:27:13 keiron 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.
@@ -29,7 +29,6 @@
int endIndent;
int spaceBefore;
int spaceAfter;
- String id;
BlockArea blockArea;
public ListItem(FONode parent) {
@@ -57,7 +56,7 @@
// this.properties.get("break-after");
// this.properties.get("break-before");
- // this.properties.get("id");
+ setupID();
// this.properties.get("keep-together");
// this.properties.get("keep-with-next");
// this.properties.get("keep-with-previous");
@@ -71,7 +70,6 @@
this.properties.get("space-before.optimum").getLength().mvalue();
this.spaceAfter =
this.properties.get("space-after.optimum").getLength().mvalue();
- this.id = this.properties.get("id").getString();
area.getIDReferences().createID(id);
1.16 +2 -3 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ListItemBody.java 22 Nov 2001 07:11:39 -0000 1.15
+++ ListItemBody.java 23 May 2002 06:27:13 -0000 1.16
@@ -1,5 +1,5 @@
/*
- * $Id: ListItemBody.java,v 1.15 2001/11/22 07:11:39 keiron Exp $
+ * $Id: ListItemBody.java,v 1.16 2002/05/23 06:27:13 keiron 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.
@@ -29,12 +29,11 @@
// Common Accessibility Properties
AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
- // this.properties.get("id");
+ setupID();
// this.properties.get("keep-together");
this.marker = 0;
// initialize id
- String id = this.properties.get("id").getString();
area.getIDReferences().initializeID(id, area);
}
1.16 +3 -4 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ListItemLabel.java 22 Nov 2001 07:11:39 -0000 1.15
+++ ListItemLabel.java 23 May 2002 06:27:13 -0000 1.16
@@ -1,5 +1,5 @@
/*
- * $Id: ListItemLabel.java,v 1.15 2001/11/22 07:11:39 keiron Exp $
+ * $Id: ListItemLabel.java,v 1.16 2002/05/23 06:27:13 keiron 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.
@@ -32,12 +32,11 @@
// Common Accessibility Properties
AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
-
- // this.properties.get("id");
+
+ setupID();
// this.properties.get("keep-together");
// initialize id
- String id = this.properties.get("id").getString();
area.getIDReferences().initializeID(id, area);
Block block = (Block)children.get(0);
1.7 +2 -2 xml-fop/src/org/apache/fop/fo/flow/MultiCase.java
Index: MultiCase.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/MultiCase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MultiCase.java 9 Nov 2001 11:32:38 -0000 1.6
+++ MultiCase.java 23 May 2002 06:27:13 -0000 1.7
@@ -1,5 +1,5 @@
/*
- * $Id: MultiCase.java,v 1.6 2001/11/09 11:32:38 keiron Exp $
+ * $Id: MultiCase.java,v 1.7 2002/05/23 06:27:13 keiron 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.
@@ -27,7 +27,7 @@
// Common Accessibility Properties
AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
- // this.properties.get("id");
+ setupID();
// this.properties.get("starting-state");
// this.properties.get("case-name");
// this.properties.get("case-title");
1.8 +2 -2 xml-fop/src/org/apache/fop/fo/flow/MultiProperties.java
Index: MultiProperties.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/MultiProperties.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MultiProperties.java 22 Nov 2001 07:11:39 -0000 1.7
+++ MultiProperties.java 23 May 2002 06:27:13 -0000 1.8
@@ -1,5 +1,5 @@
/*
- * $Id: MultiProperties.java,v 1.7 2001/11/22 07:11:39 keiron Exp $
+ * $Id: MultiProperties.java,v 1.8 2002/05/23 06:27:13 keiron 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.
@@ -27,7 +27,7 @@
// Common Accessibility Properties
AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
- // this.properties.get("id");
+ setupID();
return super.layout(area);
}
1.8 +2 -2 xml-fop/src/org/apache/fop/fo/flow/MultiPropertySet.java
Index: MultiPropertySet.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/MultiPropertySet.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MultiPropertySet.java 22 Nov 2001 07:11:39 -0000 1.7
+++ MultiPropertySet.java 23 May 2002 06:27:13 -0000 1.8
@@ -1,5 +1,5 @@
/*
- * $Id: MultiPropertySet.java,v 1.7 2001/11/22 07:11:39 keiron Exp $
+ * $Id: MultiPropertySet.java,v 1.8 2002/05/23 06:27:13 keiron 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.
@@ -24,7 +24,7 @@
public Status layout(Area area) throws FOPException {
- // this.properties.get("id");
+ setupID();
// this.properties.get("active-state");
return super.layout(area);
1.8 +2 -2 xml-fop/src/org/apache/fop/fo/flow/MultiSwitch.java
Index: MultiSwitch.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/MultiSwitch.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MultiSwitch.java 22 Nov 2001 07:11:39 -0000 1.7
+++ MultiSwitch.java 23 May 2002 06:27:13 -0000 1.8
@@ -1,5 +1,5 @@
/*
- * $Id: MultiSwitch.java,v 1.7 2001/11/22 07:11:39 keiron Exp $
+ * $Id: MultiSwitch.java,v 1.8 2002/05/23 06:27:13 keiron 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.
@@ -28,7 +28,7 @@
AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
// this.properties.get("auto-restore");
- // this.properties.get("id");
+ setupID();
return super.layout(area);
}
1.8 +2 -2 xml-fop/src/org/apache/fop/fo/flow/MultiToggle.java
Index: MultiToggle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/MultiToggle.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MultiToggle.java 22 Nov 2001 07:11:39 -0000 1.7
+++ MultiToggle.java 23 May 2002 06:27:13 -0000 1.8
@@ -1,5 +1,5 @@
/*
- * $Id: MultiToggle.java,v 1.7 2001/11/22 07:11:39 keiron Exp $
+ * $Id: MultiToggle.java,v 1.8 2002/05/23 06:27:13 keiron 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.
@@ -27,7 +27,7 @@
// Common Accessibility Properties
AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
- // this.properties.get("id");
+ setupID();
// this.properties.get("switch-to");
return super.layout(area);
1.25 +2 -3 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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- PageNumber.java 26 Apr 2002 09:40:56 -0000 1.24
+++ PageNumber.java 23 May 2002 06:27:13 -0000 1.25
@@ -1,5 +1,5 @@
/*
- * $Id: PageNumber.java,v 1.24 2002/04/26 09:40:56 keiron Exp $
+ * $Id: PageNumber.java,v 1.25 2002/05/23 06:27:13 keiron 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.
@@ -83,7 +83,7 @@
// this.properties.get("alignment-baseline");
// this.properties.get("baseline-shift");
// this.properties.get("dominant-baseline");
- // this.properties.get("id");
+ setupID();
// this.properties.get("keep-with-next");
// this.properties.get("keep-with-previous");
// this.properties.get("letter-spacing");
@@ -107,7 +107,6 @@
this.marker = 0;
// initialize id
- String id = this.properties.get("id").getString();
area.getIDReferences().initializeID(id, area);
}
1.23 +2 -4 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- PageNumberCitation.java 26 Apr 2002 09:40:56 -0000 1.22
+++ PageNumberCitation.java 23 May 2002 06:27:13 -0000 1.23
@@ -1,5 +1,5 @@
/*
- * $Id: PageNumberCitation.java,v 1.22 2002/04/26 09:40:56 keiron Exp $
+ * $Id: PageNumberCitation.java,v 1.23 2002/05/23 06:27:13 keiron 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.
@@ -84,7 +84,6 @@
Area area;
String pageNumber;
String refId;
- String id;
TextState ts;
@@ -138,7 +137,7 @@
// this.properties.get("alignment-baseline");
// this.properties.get("baseline-shift");
// this.properties.get("dominant-baseline");
- // this.properties.get("id");
+ setupID();
// this.properties.get("keep-with-next");
// this.properties.get("keep-with-previous");
// this.properties.get("letter-spacing");
@@ -167,7 +166,6 @@
}
// create id
- this.id = this.properties.get("id").getString();
idReferences.createID(id);
ts = new TextState();
1.45 +2 -5 xml-fop/src/org/apache/fop/fo/flow/Table.java
Index: Table.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Table.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- Table.java 22 Nov 2001 07:11:39 -0000 1.44
+++ Table.java 23 May 2002 06:27:13 -0000 1.45
@@ -1,5 +1,5 @@
/*
- * -- $Id: Table.java,v 1.44 2001/11/22 07:11:39 keiron Exp $ --
+ * -- $Id: Table.java,v 1.45 2002/05/23 06:27:13 keiron 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.
@@ -28,7 +28,6 @@
ColorType backgroundColor;
LengthRange ipd;
int height;
- String id;
TableHeader tableHeader = null;
TableFooter tableFooter = null;
boolean omitHeaderAtBreak = false;
@@ -82,7 +81,7 @@
// this.properties.get("border-start-precendence");
// this.properties.get("break-after");
// this.properties.get("break-before");
- // this.properties.get("id");
+ setupID();
// this.properties.get("inline-progression-dimension");
// this.properties.get("height");
// this.properties.get("keep-together");
@@ -108,8 +107,6 @@
this.height = this.properties.get("height").getLength().mvalue();
this.bAutoLayout = (this.properties.get("table-layout").getEnum() ==
TableLayout.AUTO);
-
- this.id = this.properties.get("id").getString();
this.omitHeaderAtBreak =
this.properties.get("table-omit-header-at-break").getEnum()
1.8 +2 -2 xml-fop/src/org/apache/fop/fo/flow/TableAndCaption.java
Index: TableAndCaption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableAndCaption.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TableAndCaption.java 11 Nov 2001 22:09:37 -0000 1.7
+++ TableAndCaption.java 23 May 2002 06:27:13 -0000 1.8
@@ -1,5 +1,5 @@
/*
- * -- $Id: TableAndCaption.java,v 1.7 2001/11/11 22:09:37 klease Exp $ --
+ * -- $Id: TableAndCaption.java,v 1.8 2002/05/23 06:27:13 keiron 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.
@@ -41,7 +41,7 @@
RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
// this.properties.get("caption-side");
- // this.properties.get("id");
+ setupID();
// this.properties.get("keep-together");
// this.properties.get("keep-with-next");
// this.properties.get("keep-with-previous");
1.43 +2 -5 xml-fop/src/org/apache/fop/fo/flow/TableBody.java
Index: TableBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableBody.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- TableBody.java 22 Nov 2001 07:11:39 -0000 1.42
+++ TableBody.java 23 May 2002 06:27:13 -0000 1.43
@@ -1,5 +1,5 @@
/*
- * $Id: TableBody.java,v 1.42 2001/11/22 07:11:39 keiron Exp $
+ * $Id: TableBody.java,v 1.43 2002/05/23 06:27:13 keiron 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.
@@ -23,7 +23,6 @@
int spaceBefore;
int spaceAfter;
ColorType backgroundColor;
- String id;
ArrayList columns;
RowSpanMgr rowSpanMgr; // manage information about spanning rows
@@ -70,7 +69,7 @@
// Common Relative Position Properties
RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
- // this.properties.get("id");
+ setupID();
this.spaceBefore =
this.properties.get("space-before.optimum").getLength().mvalue();
@@ -78,7 +77,6 @@
this.properties.get("space-after.optimum").getLength().mvalue();
this.backgroundColor =
this.properties.get("background-color").getColorType();
- this.id = this.properties.get("id").getString();
area.getIDReferences().createID(id);
@@ -242,7 +240,6 @@
area.increaseHeight(-spaceAfter);
}
this.resetMarker();
- this.removeID(area.getIDReferences());
}
}
1.7 +2 -2 xml-fop/src/org/apache/fop/fo/flow/TableCaption.java
Index: TableCaption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableCaption.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TableCaption.java 9 Nov 2001 11:32:38 -0000 1.6
+++ TableCaption.java 23 May 2002 06:27:13 -0000 1.7
@@ -1,5 +1,5 @@
/*
- * -- $Id: TableCaption.java,v 1.6 2001/11/09 11:32:38 keiron Exp $ --
+ * -- $Id: TableCaption.java,v 1.7 2002/05/23 06:27:13 keiron 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.
@@ -39,7 +39,7 @@
// this.properties.get("block-progression-dimension");
// this.properties.get("height");
- // this.properties.get("id");
+ setupID();
// this.properties.get("inline-progression-dimension");
// this.properties.get("keep-togethe");
// this.properties.get("width");
1.44 +2 -5 xml-fop/src/org/apache/fop/fo/flow/TableCell.java
Index: TableCell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableCell.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- TableCell.java 22 Nov 2001 07:11:39 -0000 1.43
+++ TableCell.java 23 May 2002 06:27:13 -0000 1.44
@@ -1,5 +1,5 @@
/*
- * -- $Id: TableCell.java,v 1.43 2001/11/22 07:11:39 keiron Exp $ --
+ * -- $Id: TableCell.java,v 1.44 2002/05/23 06:27:13 keiron 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.
@@ -22,7 +22,6 @@
// int spaceAfter;
ColorType backgroundColor;
- String id;
int numColumnsSpanned;
int numRowsSpanned;
int iColNumber = -1; // uninitialized
@@ -144,7 +143,7 @@
// this.properties.get("empty-cells");
// this.properties.get("ends-row");
// this.properties.get("height");
- // this.properties.get("id");
+ setupID();
// this.properties.get("number-columns-spanned");
// this.properties.get("number-rows-spanned");
// this.properties.get("starts-row");
@@ -168,8 +167,6 @@
this.backgroundColor =
this.properties.get("background-color").getColorType();
-
- this.id = this.properties.get("id").getString();
bSepBorders = (this.properties.get("border-collapse").getEnum()
== BorderCollapse.SEPARATE);
1.24 +2 -2 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- TableColumn.java 22 Nov 2001 07:11:39 -0000 1.23
+++ TableColumn.java 23 May 2002 06:27:13 -0000 1.24
@@ -1,5 +1,5 @@
/*
- * $Id: TableColumn.java,v 1.23 2001/11/22 07:11:39 keiron Exp $
+ * $Id: TableColumn.java,v 1.24 2002/05/23 06:27:13 keiron 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.
@@ -84,7 +84,7 @@
this.columnWidth = columnWidthPropVal.mvalue();
// initialize id
- String id = this.properties.get("id").getString();
+ setupID();
area.getIDReferences().initializeID(id, area);
setup = true;
1.55 +2 -6 xml-fop/src/org/apache/fop/fo/flow/TableRow.java
Index: TableRow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableRow.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- TableRow.java 14 Nov 2001 13:45:44 -0000 1.54
+++ TableRow.java 23 May 2002 06:27:13 -0000 1.55
@@ -1,5 +1,5 @@
/*
- * -- $Id: TableRow.java,v 1.54 2001/11/14 13:45:44 keiron Exp $ --
+ * -- $Id: TableRow.java,v 1.55 2002/05/23 06:27:13 keiron 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.
@@ -24,7 +24,6 @@
int breakAfter;
ColorType backgroundColor;
- String id;
KeepValue keepWithNext;
KeepValue keepWithPrevious;
@@ -193,7 +192,7 @@
// this.properties.get("break-before");
// this.properties.get("break-after");
- // this.properties.get("id");
+ setupID();
// this.properties.get("height");
// this.properties.get("keep-together");
// this.properties.get("keep-with-next");
@@ -209,7 +208,6 @@
this.keepWithPrevious =
getKeepValue("keep-with-previous.within-column");
- this.id = this.properties.get("id").getString();
this.minHeight = this.properties.get("height").getLength().mvalue();
setup = true;
}
@@ -337,7 +335,6 @@
// if this row is at the top of the column area.
// Remove spanning cells from RowSpanMgr?
this.resetMarker();
- this.removeID(area.getIDReferences());
return new Status(Status.AREA_FULL_NONE);
} else if (status.getCode() == Status.AREA_FULL_SOME) {
/*
@@ -447,7 +444,6 @@
area.removeChild(areaContainer);
areaAdded = false;
this.resetMarker();
- this.removeID(area.getIDReferences());
}
public void resetMarker() {
1.48 +2 -2 xml-fop/src/org/apache/fop/fo/pagination/PageSequence.java
Index: PageSequence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/PageSequence.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- PageSequence.java 15 Nov 2001 12:40:31 -0000 1.47
+++ PageSequence.java 23 May 2002 06:27:14 -0000 1.48
@@ -1,5 +1,5 @@
/*
- * $Id: PageSequence.java,v 1.47 2001/11/15 12:40:31 keiron Exp $
+ * $Id: PageSequence.java,v 1.48 2002/05/23 06:27:14 keiron 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.
@@ -199,7 +199,7 @@
// this.properties.get("country");
// this.properties.get("language");
- // this.properties.get("id");
+ setupID();
}
1.15 +2 -2 xml-fop/src/org/apache/fop/layout/AreaTree.java
Index: AreaTree.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/AreaTree.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AreaTree.java 11 Nov 2001 22:19:01 -0000 1.14
+++ AreaTree.java 23 May 2002 06:27:14 -0000 1.15
@@ -1,5 +1,5 @@
/*
- * $Id: AreaTree.java,v 1.14 2001/11/11 22:19:01 klease Exp $
+ * $Id: AreaTree.java,v 1.15 2002/05/23 06:27:14 keiron 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.
@@ -87,7 +87,7 @@
}
public IDReferences getIDReferences() {
- return streamRenderer.getIDReferences();
+ return null;//streamRenderer.getIDReferences();
}
public void addExtension(ExtensionObj obj) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
