cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr LayoutManagerLS.java
vmote 2003/08/21 12:01:24
Modified:src/java/org/apache/fop/extensions Outline.java
src/java/org/apache/fop/layoutmgr LayoutManagerLS.java
Log:
move extensions/Outline.getData() to layoutmgr/LayoutManagerLS.createBookmarkData()
Revision ChangesPath
1.4 +12 -19xml-fop/src/java/org/apache/fop/extensions/Outline.java
Index: Outline.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/extensions/Outline.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Outline.java 21 Aug 2003 18:17:49 - 1.3
+++ Outline.java 21 Aug 2003 19:01:24 - 1.4
@@ -57,7 +57,6 @@
import java.util.ArrayList;
import org.xml.sax.Attributes;
-import org.apache.fop.area.extensions.BookmarkData;
/**
* The outline object for the pdf bookmark extension.
@@ -116,23 +115,6 @@
}
/**
- * Get the bookmark data for this outline.
- * This creates a bookmark data with the destination
- * and adds all the data from child outlines.
- *
- * @return the new bookmark data
- */
-public BookmarkData getData() {
-BookmarkData data = new BookmarkData(internalDestination);
-data.setLabel(getLabel());
-for (int count = 0; count outlines.size(); count++) {
-Outline out = (Outline)outlines.get(count);
-data.addSubData(out.getData());
-}
-return data;
-}
-
-/**
* Get the label string.
* This gets the label string from the child label element.
*
@@ -146,5 +128,16 @@
fotv.serveVisitor(this);
}
-}
+public String getInternalDestination() {
+return internalDestination;
+}
+
+public String getExternalDestination() {
+return externalDestination;
+}
+public ArrayList getOutlines() {
+return outlines;
+}
+
+}
1.7 +19 -2 xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java
Index: LayoutManagerLS.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LayoutManagerLS.java 21 Aug 2003 18:17:49 - 1.6
+++ LayoutManagerLS.java 21 Aug 2003 19:01:24 - 1.7
@@ -141,7 +141,7 @@
BookmarkData data = new BookmarkData();
for (int count = 0; count document.getBookmarks().getOutlines().size();
count++) {
Outline out =
(Outline)(document.getBookmarks().getOutlines()).get(count);
-data.addSubData(out.getData());
+data.addSubData(createBookmarkData(out));
}
// add data to area tree for resolving and handling
if (document.getBookmarks().getFOInputHandler() instanceof FOTreeHandler) {
@@ -151,6 +151,23 @@
at.addTreeExtension(data);
data.setAreaTree(at);
}
+}
+
+/**
+ * Create and return the bookmark data for this outline.
+ * This creates a bookmark data with the destination
+ * and adds all the data from child outlines.
+ *
+ * @return the new bookmark data
+ */
+public BookmarkData createBookmarkData(Outline outline) {
+BookmarkData data = new BookmarkData(outline.getInternalDestination());
+data.setLabel(outline.getLabel());
+for (int count = 0; count outline.getOutlines().size(); count++) {
+Outline out = (Outline)(outline.getOutlines()).get(count);
+data.addSubData(createBookmarkData(out));
+}
+return data;
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/pagination Flow.java Region.java RegionAfter.java RegionBefore.java RegionBody.java RegionEnd.java RegionStart.java SimplePageMaster.java StaticContent.java Title.java
vmote 2003/08/21 23:27:35
Modified:src/java/org/apache/fop/fo FObjMixed.java
PropertyManager.java
src/java/org/apache/fop/fo/flow BasicLink.java
BidiOverride.java Block.java BlockContainer.java
Character.java ExternalGraphic.java
InlineContainer.java InstreamForeignObject.java
Leader.java ListBlock.java ListItemBody.java
ListItemLabel.java PageNumber.java
PageNumberCitation.java RetrieveMarker.java
Table.java TableBody.java TableCell.java
TableColumn.java TableRow.java
src/java/org/apache/fop/fo/pagination Flow.java Region.java
RegionAfter.java RegionBefore.java RegionBody.java
RegionEnd.java RegionStart.java
SimplePageMaster.java StaticContent.java Title.java
Log:
style changes only
Revision ChangesPath
1.10 +6 -6 xml-fop/src/java/org/apache/fop/fo/FObjMixed.java
Index: FObjMixed.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FObjMixed.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FObjMixed.java19 Aug 2003 05:19:21 - 1.9
+++ FObjMixed.java22 Aug 2003 06:27:34 - 1.10
@@ -50,12 +50,6 @@
*/
package org.apache.fop.fo;
-import org.apache.fop.fo.FOTreeControl;
-import org.apache.fop.layoutmgr.InlineStackingLayoutManager;
-import org.apache.fop.layoutmgr.LMiter;
-
-import java.util.List;
-
/**
* Base class for representation of mixed content formatting objects
* and their processing
@@ -113,6 +107,12 @@
return new RecursiveCharIterator(this);
}
+/**
+ * This is a hook for an FOTreeVisitor subclass to be able to access
+ * this object.
+ * @param fotv the FOTreeVisitor subclass that can access this object.
+ * @see org.apache.fop.fo.FOTreeVisitor
+ */
public void acceptVisitor(FOTreeVisitor fotv) {
fotv.serveVisitor(this);
}
1.9 +6 -4 xml-fop/src/java/org/apache/fop/fo/PropertyManager.java
Index: PropertyManager.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/PropertyManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PropertyManager.java 19 Aug 2003 05:19:21 - 1.8
+++ PropertyManager.java 22 Aug 2003 06:27:34 - 1.9
@@ -58,7 +58,6 @@
import org.apache.fop.area.CTM;
import org.apache.fop.datatypes.FODimension;
import org.apache.fop.fonts.Font;
-import org.apache.fop.fo.FOTreeControl;
import org.apache.fop.fo.properties.CommonBorderAndPadding;
import org.apache.fop.fo.properties.CommonMarginBlock;
import org.apache.fop.fo.properties.CommonMarginInline;
@@ -120,7 +119,8 @@
/**
* Sets the Document object telling the property manager which fonts are
* available.
- * @param doc Document containing font information
+ * @param foTreeControl foTreeControl implementation containing font
+ * information
*/
public void setFontInfo(FOTreeControl foTreeControl) {
this.foTreeControl = foTreeControl;
@@ -130,7 +130,8 @@
/**
* Constructs a FontState object. If it was constructed before it is
* reused.
- * @param doc Document containing the font information
+ * @param foTreeControl FOTreeControl implementation containing the font
+ * information
* @return a FontState object
*/
public Font getFontState(FOTreeControl foTreeControl) {
@@ -476,7 +477,8 @@
/**
* Constructs a TextInfo objects. If it was constructed before it is
* reused.
- * @param doc Document containing list of available fonts
+ * @param foTreeControl FOTreeControl implementation containing list of
+ * available fonts
* @return a TextInfo object
*/
public TextInfo getTextLayoutProps(FOTreeControl foTreeControl) {
1.5 +12 -12xml-fop/src/java/org/apache/fop/fo/flow/BasicLink.java
Index: BasicLink.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/BasicLink.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BasicLink.java19 Aug 2003 00:53:53 - 1.4
+++ BasicLink.java22 Aug 2003 06:27:34 - 1.5
@@ -50,10 +50,6 @@
*/
package org.apache.fop.fo.flow;
-// Java
-import java.util.List;
-import java.io.Serializable;
-
// FOP
import
cvs commit: xml-fop/src/java/org/apache/fop/tools/anttasks Fop.java
vmote 2003/08/22 10:42:42 Modified:src/java/org/apache/fop/apps Driver.java src/java/org/apache/fop/fo FONode.java FOTreeBuilder.java FObjMixed.java src/java/org/apache/fop/fo/flow ExternalGraphic.java ListItemBody.java ListItemLabel.java TableColumn.java src/java/org/apache/fop/fo/pagination StaticContent.java Title.java src/java/org/apache/fop/image AbstractFopImage.java BmpImage.java FopImage.java GifImage.java ImageCache.java ImageFactory.java ImageLoader.java JimiImage.java JpegImage.java src/java/org/apache/fop/image/analyser BMPReader.java EPSReader.java GIFReader.java ImageReader.java ImageReaderFactory.java JPEGReader.java PNGReader.java SVGReader.java TIFFReader.java XMLReader.java src/java/org/apache/fop/layoutmgr AbstractLayoutManager.java AddLMVisitor.java BlockLayoutManager.java ContentLayoutManager.java LayoutManager.java LayoutManagerLS.java PageLayoutManager.java src/java/org/apache/fop/layoutmgr/list ListItemLayoutManager.java src/java/org/apache/fop/layoutmgr/table Row.java TableLayoutManager.java src/java/org/apache/fop/pdf PDFEncryptionManager.java src/java/org/apache/fop/render AbstractRenderer.java Renderer.java RendererContext.java src/java/org/apache/fop/render/pdf PDFRenderer.java PDFXMLHandler.java src/java/org/apache/fop/render/ps PSRenderer.java PSXMLHandler.java src/java/org/apache/fop/render/svg SVGRenderer.java src/java/org/apache/fop/render/xml XMLRenderer.java src/java/org/apache/fop/svg SVGElement.java SVGUserAgent.java src/java/org/apache/fop/tools AreaTreeBuilder.java TestConverter.java src/java/org/apache/fop/tools/anttasks Fop.java Added: src/java/org/apache/fop/apps FOUserAgent.java Removed: src/java/org/apache/fop/fo FOUserAgent.java Log: move fo/FOUserAgent to apps/FOUserAgent, as it manages configuration information for the application as a whole Revision ChangesPath 1.35 +1 -1 xml-fop/src/java/org/apache/fop/apps/Driver.java Index: Driver.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Driver.java,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- Driver.java 22 Aug 2003 17:21:48 - 1.34 +++ Driver.java 22 Aug 2003 17:42:41 - 1.35 @@ -55,7 +55,7 @@ import org.apache.fop.fo.ElementMapping; import org.apache.fop.fo.FOTreeBuilder; -import org.apache.fop.fo.FOUserAgent; + import org.apache.fop.fo.FOInputHandler; import org.apache.fop.fo.FOTreeHandler; import org.apache.fop.mif.MIFHandler; 1.1 xml-fop/src/java/org/apache/fop/apps/FOUserAgent.java Index: FOUserAgent.java === /* * $Id: FOUserAgent.java,v 1.1 2003/08/22 17:42:41 vmote Exp $ * *The Apache Software License, Version 1.1 * * * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * * Redistribution and use in source and binary forms, with or without modifica- * tion, are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, *this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright notice, *this list of conditions and the following disclaimer in the documentation *and/or other materials provided with the distribution. * * 3. The end-user documentation included with the redistribution, if any, must *include the following acknowledgment: This product includes software *developed by the Apache Software Foundation (http://www.apache.org/). *Alternately, this acknowledgment may appear in the software itself, if *and wherever such third-party acknowledgments normally appear. * * 4. The names FOP and Apache Software Foundation must not be used to *endorse or promote products derived from this
Re: fop-0.20.4 download links?
Clay Leeds schrieb: Victor Mote wrote: Christian Geisert wrote: BTW any volunteer to write a nice readme.html for the download page like [..] Hehe... I didn't know how either. I just copied those from the examples, and created an HTML file and submitted it (along with the fop_logo.jpg file--as stated in the 'bug' post, we still don't have an SVG version yet). I made it fairly long, as I included the Running FOP info along with the Release Notes. Feel free to edit (read 'cut') at will! I submitted it as Bug 22627: http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22627 Patch applied, thank you! (just seperated in Header and Readme and removed some strange characters) I'd be interested in knowing as well. I especially like Cocoon's since it has content above ** below the file listing! It's quite simple, Apache HTTP Server just adds the html fragments bash-2.05a$ cat .htaccess IndexIgnore HEADER.html README.html images HeaderName HEADER.html ReadmeName README.html There are a lot of more options (like AddDescription, AddIcon), See http://httpd.apache.org/docs-2.0/mod/quickreference.html Web Maestro Clay Christian - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo FOTreeHandler.java
vmote 2003/08/22 10:21:48
Modified:src/java/org/apache/fop/apps Driver.java
src/java/org/apache/fop/fo FOTreeHandler.java
Log:
1. move renderer initialization work from FOTreeHandler to Driver
2. clean up related FOTreeHandler constructor
Revision ChangesPath
1.34 +12 -1 xml-fop/src/java/org/apache/fop/apps/Driver.java
Index: Driver.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Driver.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Driver.java 20 Aug 2003 19:46:47 - 1.33
+++ Driver.java 22 Aug 2003 17:21:48 - 1.34
@@ -534,7 +534,7 @@
throw new IllegalStateException(
Renderer not set when using standard foInputHandler);
}
-foInputHandler = new FOTreeHandler(currentDocument, stream, renderer,
true);
+foInputHandler = new FOTreeHandler(currentDocument, true);
}
foInputHandler.enableLogging(getLogger());
@@ -590,6 +590,17 @@
currentDocument.atModel = AreaTree.createRenderPagesModel(renderer);
//this.atModel = new CachedRenderPagesModel(renderer);
currentDocument.areaTree.setTreeModel(currentDocument.atModel);
+try {
+renderer.setupFontInfo(currentDocument);
+// check that the any,normal,400 font exists
+if (!currentDocument.isSetupValid()) {
+throw new SAXException(new FOPException(
+No default font defined by OutputConverter));
+}
+renderer.startRenderer(stream);
+} catch (IOException e) {
+throw new SAXException(e);
+}
}
/**
The following statement triggers virtually all of the processing
1.7 +2 -35 xml-fop/src/java/org/apache/fop/fo/FOTreeHandler.java
Index: FOTreeHandler.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FOTreeHandler.java19 Aug 2003 06:54:31 - 1.6
+++ FOTreeHandler.java22 Aug 2003 17:21:48 - 1.7
@@ -51,8 +51,6 @@
package org.apache.fop.fo;
// Java
-import java.io.IOException;
-import java.io.OutputStream;
import java.util.HashSet;
import java.util.Iterator;
@@ -73,7 +71,6 @@
import org.apache.fop.fo.flow.TableRow;
import org.apache.fop.fo.pagination.Flow;
import org.apache.fop.fo.pagination.PageSequence;
-import org.apache.fop.render.Renderer;
/**
* Defines how SAX events specific to XSL-FO input should be handled when
@@ -110,19 +107,6 @@
private long startTime;
/**
- * The stream to which this rendering is to be
- * written to. BNote/B that some renderers
- * do not render to a stream, and that this
- * member can therefore be null.
- */
-private OutputStream outputStream;
-
-/**
- * The renderer being used.
- */
-private Renderer renderer;
-
-/**
* Collection of objects that have registered to be notified about
* FOTreeEvent firings.
*/
@@ -132,20 +116,14 @@
* Main constructor
* @param foTreeControl the FOTreeControl implementation that governs this
* FO Tree
- * @param outputStream the stream that the result is rendered to
- * @param renderer the renderer to call
* @param store if true then use the store pages model and keep the
* area tree in memory
*/
-public FOTreeHandler(FOTreeControl foTreeControl, OutputStream outputStream,
- Renderer renderer, boolean store) {
+public FOTreeHandler(FOTreeControl foTreeControl, boolean store) {
super(foTreeControl);
if (collectStatistics) {
runtime = Runtime.getRuntime();
}
-this.outputStream = outputStream;
-this.renderer = renderer;
-
}
/**
@@ -164,17 +142,6 @@
initialMemory = runtime.totalMemory() - runtime.freeMemory();
startTime = System.currentTimeMillis();
-}
-try {
-renderer.setupFontInfo(foTreeControl);
-// check that the any,normal,400 font exists
-if (!foTreeControl.isSetupValid()) {
-throw new SAXException(new FOPException(
-No default font defined by OutputConverter));
-}
-
