Author: phancock
Date: Mon Jun 20 09:51:42 2011
New Revision: 1137566
URL: http://svn.apache.org/viewvc?rev=1137566&view=rev
Log:
Added an IFDocumentHandler filter for triggering rendering events.
Created an Event that captures an end page event with the page number.
Added:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/EventProducingFilter.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererEventProducer.xml
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererFactory.java
xmlgraphics/fop/trunk/status.xml
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererEventProducer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererEventProducer.java?rev=1137566&r1=1137565&r2=1137566&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererEventProducer.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererEventProducer.java
Mon Jun 20 09:51:42 2011
@@ -53,4 +53,11 @@ public interface RendererEventProducer e
* @event.severity ERROR
*/
void ioError(Object source, IOException ioe);
+
+ /**
+ * Triggered at the end of page rendering.
+ * @param source the event source
+ * @param number the page number
+ */
+ void endPage(Object source, int number);
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererEventProducer.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererEventProducer.xml?rev=1137566&r1=1137565&r2=1137566&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererEventProducer.xml
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererEventProducer.xml
Mon Jun 20 09:51:42 2011
@@ -18,4 +18,5 @@
<!-- $Id$ -->
<catalogue xml:lang="en">
<message key="ioError">I/O error while writing to target file.[ Reason:
{ioe}]</message>
+ <message key="endPage">Rendered page #{number}.</message>
</catalogue>
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererFactory.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererFactory.java?rev=1137566&r1=1137565&r2=1137566&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererFactory.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererFactory.java
Mon Jun 20 09:51:42 2011
@@ -35,6 +35,7 @@ import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.area.AreaTreeHandler;
import org.apache.fop.fo.FOEventHandler;
import org.apache.fop.render.intermediate.AbstractIFDocumentHandlerMaker;
+import org.apache.fop.render.intermediate.EventProducingFilter;
import org.apache.fop.render.intermediate.IFDocumentHandler;
import org.apache.fop.render.intermediate.IFDocumentHandlerConfigurator;
import org.apache.fop.render.intermediate.IFRenderer;
@@ -389,7 +390,7 @@ public class RendererFactory {
if (configurator != null) {
configurator.configure(documentHandler);
}
- return documentHandler;
+ return new EventProducingFilter(documentHandler, userAgent);
}
/**
Added:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/EventProducingFilter.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/EventProducingFilter.java?rev=1137566&view=auto
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/EventProducingFilter.java
(added)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/EventProducingFilter.java
Mon Jun 20 09:51:42 2011
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id:$ */
+
+package org.apache.fop.render.intermediate;
+
+import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.render.RendererEventProducer;
+import org.apache.fop.render.intermediate.util.IFDocumentHandlerProxy;
+
+/**
+ * A filter that uses the Event Notification System to broadcast IF events.
+ *
+ */
+public class EventProducingFilter extends IFDocumentHandlerProxy {
+
+ private int pageNumberEnded;
+
+ private FOUserAgent userAgent;
+
+ /**
+ * Constructor
+ * @param ifDocumentHandler the IFDocumentHandler to filter
+ * @param userAgent the FOUerAgent
+ */
+ public EventProducingFilter(IFDocumentHandler ifDocumentHandler,
FOUserAgent userAgent) {
+ super(ifDocumentHandler);
+ this.userAgent = userAgent;
+ }
+
+ @Override
+ public void endPage() throws IFException {
+ super.endPage();
+ pageNumberEnded++;
+ RendererEventProducer.Provider.get(userAgent.getEventBroadcaster())
+ .endPage(this, pageNumberEnded);
+ }
+
+}
\ No newline at end of file
Modified: xmlgraphics/fop/trunk/status.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=1137566&r1=1137565&r2=1137566&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Mon Jun 20 09:51:42 2011
@@ -30,6 +30,7 @@
<person name="Andreas Delmelle" email="[email protected]" id="AD"/>
<person name="Luca Furini" email="[email protected]" id="LF"/>
<person name="Christian Geisert" email="[email protected]" id="CG"/>
+ <person name="Peter Hancock" email="[email protected]" id="PH"/>
<person name="Vincent Hennebert" email="[email protected]" id="VH"/>
<person name="Clay Leeds" email="[email protected]" id="CL"/>
<person name="Manuel Mall" email="[email protected]" id="MM"/>
@@ -59,6 +60,10 @@
documents. Example: the fix of marks layering will be such a case when
it's done.
-->
<release version="FOP Trunk" date="TBD">
+ <action context="Renderers" dev="PH" type="add">
+ Added an IFDocumentHandler filter for triggering rendering events.
Created an Event that
+ captures an end page event with the page number.
+ </action>
<action context="Renderers" dev="VH" type="fix">
Bugfix: alternative text not working in tagged PDF for TIFF images.
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
