Author: vhennebert
Date: Fri Apr 9 16:34:29 2010
New Revision: 932497
URL: http://svn.apache.org/viewvc?rev=932497&view=rev
Log:
Moved ResourceEventProducer to org.apache.fop
Renamed event model used by FOPTestEventModelFactory to "event-model.xml"
Added:
xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.java
- copied, changed from r932481,
xmlgraphics/fop/trunk/src/java/org/apache/fop/events/ResourceEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.xml
- copied, changed from r932481,
xmlgraphics/fop/trunk/src/java/org/apache/fop/events/ResourceEventProducer.xml
Removed:
xmlgraphics/fop/trunk/src/java/org/apache/fop/events/ResourceEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/events/ResourceEventProducer.xml
Modified:
xmlgraphics/fop/trunk/build.xml
xmlgraphics/fop/trunk/examples/embedding/java/embedding/events/ExampleEvents.java
xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/events.xml
xmlgraphics/fop/trunk/src/java/META-INF/services/org.apache.fop.events.model.EventModelFactory
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeParser.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CachedRenderPagesModel.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ExternalDocumentLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/AbstractIFPainter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/ResourceHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFHandler.java
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPainter.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/events/EventProcessingTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/events/FOPTestEventModelFactory.java
Modified: xmlgraphics/fop/trunk/build.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/build.xml?rev=932497&r1=932496&r2=932497&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/build.xml (original)
+++ xmlgraphics/fop/trunk/build.xml Fri Apr 9 16:34:29 2010
@@ -366,10 +366,10 @@ list of possible build targets.
<include name="org/apache/fop/area/AreaEventProducer.java"/>
</fileset>
</eventResourceGenerator>
- <eventResourceGenerator
modelfile="${build.gensrc.dir}/org/apache/fop/events/event-model.xml"
-
translationfile="${src.java.dir}/org/apache/fop/events/ResourceEventProducer.xml">
+ <eventResourceGenerator
modelfile="${build.gensrc.dir}/org/apache/fop/event-model.xml"
+
translationfile="${src.java.dir}/org/apache/fop/ResourceEventProducer.xml">
<fileset dir="${src.java.dir}">
- <include name="org/apache/fop/events/ResourceEventProducer.java"/>
+ <include name="org/apache/fop/ResourceEventProducer.java"/>
</fileset>
</eventResourceGenerator>
<eventResourceGenerator
@@ -837,7 +837,8 @@ list of possible build targets.
</copy>
</target>
<target name="junit-compile-copy-resources" if="junit.present">
- <eventResourceGenerator
modelfile="${build.dir}/test-gensrc/org/apache/fop/events/test-event-model.xml">
+ <eventResourceGenerator
+
modelfile="${build.dir}/test-gensrc/org/apache/fop/events/event-model.xml">
<fileset dir="${test.dir}/java">
<include name="**/*.java"/>
</fileset>
Modified:
xmlgraphics/fop/trunk/examples/embedding/java/embedding/events/ExampleEvents.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/embedding/java/embedding/events/ExampleEvents.java?rev=932497&r1=932496&r2=932497&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/examples/embedding/java/embedding/events/ExampleEvents.java
(original)
+++
xmlgraphics/fop/trunk/examples/embedding/java/embedding/events/ExampleEvents.java
Fri Apr 9 16:34:29 2010
@@ -112,7 +112,7 @@ public class ExampleEvents {
private static class MyEventListener implements EventListener {
public void processEvent(Event event) {
- if ("org.apache.fop.events.ResourceEventProducer.imageNotFound"
+ if ("org.apache.fop.ResourceEventProducer.imageNotFound"
.equals(event.getEventID())) {
//Get the FileNotFoundException that's part of the event's
parameters
Modified: xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/events.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/events.xml?rev=932497&r1=932496&r2=932497&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/events.xml
(original)
+++ xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/events.xml Fri
Apr 9 16:34:29 2010
@@ -157,7 +157,7 @@ foUserAgent.getEventBroadcaster().addEve
<source><![CDATA[public class MyEventListener implements EventListener
{
public void processEvent(Event event) {
- if ("org.apache.fop.events.ResourceEventProducer".equals(
+ if ("org.apache.fop.ResourceEventProducer".equals(
event.getEventGroupID())) {
event.setSeverity(EventSeverity.FATAL);
} else {
@@ -178,7 +178,7 @@ foUserAgent.getEventBroadcaster().addEve
<source><![CDATA[public class MyEventListener implements EventListener
{
public void processEvent(Event event) {
- if ("org.apache.fop.events.ResourceEventProducer.imageNotFound"
+ if ("org.apache.fop.ResourceEventProducer.imageNotFound"
.equals(event.getEventID())) {
//Get the FileNotFoundException that's part of the event's
parameters
Modified:
xmlgraphics/fop/trunk/src/java/META-INF/services/org.apache.fop.events.model.EventModelFactory
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/META-INF/services/org.apache.fop.events.model.EventModelFactory?rev=932497&r1=932496&r2=932497&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/META-INF/services/org.apache.fop.events.model.EventModelFactory
(original)
+++
xmlgraphics/fop/trunk/src/java/META-INF/services/org.apache.fop.events.model.EventModelFactory
Fri Apr 9 16:34:29 2010
@@ -6,7 +6,7 @@ org.apache.fop.render.ps.PSEventProducer
org.apache.fop.render.rtf.RTFEventProducer$EventModelFactory
org.apache.fop.accessibility.AccessibilityEventProducer$EventModelFactory
org.apache.fop.area.AreaEventProducer$EventModelFactory
-org.apache.fop.events.ResourceEventProducer$EventModelFactory
+org.apache.fop.ResourceEventProducer$EventModelFactory
org.apache.fop.fo.FOValidationEventProducer$EventModelFactory
org.apache.fop.fo.flow.table.TableEventProducer$EventModelFactory
org.apache.fop.layoutmgr.BlockLevelEventProducer$EventModelFactory
Copied:
xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.java (from
r932481,
xmlgraphics/fop/trunk/src/java/org/apache/fop/events/ResourceEventProducer.java)
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.java?p2=xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.java&p1=xmlgraphics/fop/trunk/src/java/org/apache/fop/events/ResourceEventProducer.java&r1=932481&r2=932497&rev=932497&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/events/ResourceEventProducer.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.java
Fri Apr 9 16:34:29 2010
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.events;
+package org.apache.fop;
import java.io.File;
import java.io.FileNotFoundException;
@@ -28,6 +28,8 @@ import org.xml.sax.Locator;
import org.apache.xmlgraphics.image.loader.ImageException;
+import org.apache.fop.events.EventBroadcaster;
+import org.apache.fop.events.EventProducer;
import org.apache.fop.events.model.AbstractEventModelFactory;
import org.apache.fop.events.model.EventModel;
Copied: xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.xml
(from r932481,
xmlgraphics/fop/trunk/src/java/org/apache/fop/events/ResourceEventProducer.xml)
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.xml?p2=xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.xml&p1=xmlgraphics/fop/trunk/src/java/org/apache/fop/events/ResourceEventProducer.xml&r1=932481&r2=932497&rev=932497&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/events/ResourceEventProducer.xml
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.xml Fri
Apr 9 16:34:29 2010
@@ -18,15 +18,15 @@
<!-- $Id$ -->
<catalogue xml:lang="en">
<message key="locator">[ (See position {loc})| (See {#gatherContextInfo})|
(No context info available)]</message>
- <message
key="org.apache.fop.events.ResourceEventProducer.imageNotFound">Image not
found.[ URI: {uri}.]{{locator}}</message>
- <message key="org.apache.fop.events.ResourceEventProducer.imageError">Image
not available.[ URI: {uri}.] Reason:[ {reason}][ {e}]{{locator}}</message>
- <message key="org.apache.fop.events.ResourceEventProducer.imageIOError">I/O
error while loading image.[ URI: {uri}.][ Reason: {ioe}]{{locator}}</message>
- <message
key="org.apache.fop.events.ResourceEventProducer.ifoNoIntrinsicSize">The
intrinsic dimensions of an instream-foreign-object could not be
determined.{{locator}}</message>
- <message key="org.apache.fop.events.ResourceEventProducer.uriError">Error
while handling URI: {uri}. Reason: {e}{{locator}}</message>
- <message
key="org.apache.fop.events.ResourceEventProducer.foreignXMLProcessingError">Some
XML content will be ignored. Could not render XML in namespace
"{namespaceURI}".[ Reason: {e}]</message>
- <message
key="org.apache.fop.events.ResourceEventProducer.foreignXMLNoHandler">Some XML
content will be ignored. No handler defined for XML with namespace
"{namespaceURI}".</message>
- <message
key="org.apache.fop.events.ResourceEventProducer.imageWritingError">Error while
writing an image to the target file.[ Reason: {e}]</message>
- <message
key="org.apache.fop.events.ResourceEventProducer.cannotDeleteTempFile">Temporary
file could not be deleted: {tempFile}</message>
- <message
key="org.apache.fop.events.ResourceEventProducer.catalogResolverNotFound">Catalog
resolver not found along the classpath</message>
- <message
key="org.apache.fop.events.ResourceEventProducer.catalogResolverNotCreated">Error
creating the catalog resolver: {message}</message>
+ <message key="org.apache.fop.ResourceEventProducer.imageNotFound">Image not
found.[ URI: {uri}.]{{locator}}</message>
+ <message key="org.apache.fop.ResourceEventProducer.imageError">Image not
available.[ URI: {uri}.] Reason:[ {reason}][ {e}]{{locator}}</message>
+ <message key="org.apache.fop.ResourceEventProducer.imageIOError">I/O error
while loading image.[ URI: {uri}.][ Reason: {ioe}]{{locator}}</message>
+ <message key="org.apache.fop.ResourceEventProducer.ifoNoIntrinsicSize">The
intrinsic dimensions of an instream-foreign-object could not be
determined.{{locator}}</message>
+ <message key="org.apache.fop.ResourceEventProducer.uriError">Error while
handling URI: {uri}. Reason: {e}{{locator}}</message>
+ <message
key="org.apache.fop.ResourceEventProducer.foreignXMLProcessingError">Some XML
content will be ignored. Could not render XML in namespace "{namespaceURI}".[
Reason: {e}]</message>
+ <message key="org.apache.fop.ResourceEventProducer.foreignXMLNoHandler">Some
XML content will be ignored. No handler defined for XML with namespace
"{namespaceURI}".</message>
+ <message key="org.apache.fop.ResourceEventProducer.imageWritingError">Error
while writing an image to the target file.[ Reason: {e}]</message>
+ <message
key="org.apache.fop.ResourceEventProducer.cannotDeleteTempFile">Temporary file
could not be deleted: {tempFile}</message>
+ <message
key="org.apache.fop.ResourceEventProducer.catalogResolverNotFound">Catalog
resolver not found along the classpath</message>
+ <message
key="org.apache.fop.ResourceEventProducer.catalogResolverNotCreated">Error
creating the catalog resolver: {message}</message>
</catalogue>
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeParser.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeParser.java?rev=932497&r1=932496&r2=932497&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeParser.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeParser.java Fri
Apr 9 16:34:29 2010
@@ -57,6 +57,7 @@ import org.apache.xmlgraphics.image.load
import org.apache.xmlgraphics.image.loader.ImageSessionContext;
import org.apache.xmlgraphics.util.QName;
+import org.apache.fop.ResourceEventProducer;
import org.apache.fop.accessibility.AccessibilityEventProducer;
import org.apache.fop.accessibility.StructureTreeBuilder;
import org.apache.fop.apps.FOUserAgent;
@@ -74,7 +75,6 @@ import org.apache.fop.area.inline.SpaceA
import org.apache.fop.area.inline.TextArea;
import org.apache.fop.area.inline.Viewport;
import org.apache.fop.area.inline.WordArea;
-import org.apache.fop.events.ResourceEventProducer;
import org.apache.fop.fo.Constants;
import org.apache.fop.fo.ElementMappingRegistry;
import org.apache.fop.fo.expr.PropertyException;
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CachedRenderPagesModel.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CachedRenderPagesModel.java?rev=932497&r1=932496&r2=932497&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CachedRenderPagesModel.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CachedRenderPagesModel.java
Fri Apr 9 16:34:29 2010
@@ -36,9 +36,9 @@ import org.xml.sax.SAXException;
import org.apache.commons.io.IOUtils;
+import org.apache.fop.ResourceEventProducer;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
-import org.apache.fop.events.ResourceEventProducer;
import org.apache.fop.fonts.FontInfo;
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java?rev=932497&r1=932496&r2=932497&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java Fri Apr
9 16:34:29 2010
@@ -47,11 +47,11 @@ import org.xml.sax.XMLReader;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.fop.ResourceEventProducer;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
-import org.apache.fop.events.ResourceEventProducer;
import org.apache.fop.render.awt.viewer.Renderable;
/**
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ExternalGraphic.java?rev=932497&r1=932496&r2=932497&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
Fri Apr 9 16:34:29 2010
@@ -28,11 +28,11 @@ import org.apache.xmlgraphics.image.load
import org.apache.xmlgraphics.image.loader.ImageInfo;
import org.apache.xmlgraphics.image.loader.ImageManager;
+import org.apache.fop.ResourceEventProducer;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.datatypes.Length;
import org.apache.fop.datatypes.URISpecification;
-import org.apache.fop.events.ResourceEventProducer;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java?rev=932497&r1=932496&r2=932497&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java
Fri Apr 9 16:34:29 2010
@@ -25,9 +25,9 @@ import org.xml.sax.Locator;
import org.apache.xmlgraphics.util.QName;
+import org.apache.fop.ResourceEventProducer;
import org.apache.fop.apps.FOPException;
import org.apache.fop.datatypes.Length;
-import org.apache.fop.events.ResourceEventProducer;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.ValidationException;
import org.apache.fop.fo.XMLObj;
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java?rev=932497&r1=932496&r2=932497&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
Fri Apr 9 16:34:29 2010
@@ -28,11 +28,11 @@ import org.apache.xmlgraphics.image.load
import org.apache.xmlgraphics.image.loader.ImageManager;
import org.apache.xmlgraphics.image.loader.ImageSessionContext;
+import org.apache.fop.ResourceEventProducer;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.datatypes.Length;
import org.apache.fop.datatypes.PercentBaseContext;
import org.apache.fop.datatypes.URISpecification;
-import org.apache.fop.events.ResourceEventProducer;
import org.apache.fop.fo.Constants;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ExternalDocumentLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ExternalDocumentLayoutManager.java?rev=932497&r1=932496&r2=932497&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ExternalDocumentLayoutManager.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ExternalDocumentLayoutManager.java
Fri Apr 9 16:34:29 2010
@@ -34,6 +34,7 @@ import org.apache.xmlgraphics.image.load
import org.apache.xmlgraphics.image.loader.ImageManager;
import org.apache.xmlgraphics.image.loader.util.ImageUtil;
+import org.apache.fop.ResourceEventProducer;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.area.AreaTreeHandler;
import org.apache.fop.area.Block;
@@ -47,7 +48,6 @@ import org.apache.fop.area.inline.Image;
import org.apache.fop.area.inline.Viewport;
import org.apache.fop.datatypes.FODimension;
import org.apache.fop.datatypes.URISpecification;
-import org.apache.fop.events.ResourceEventProducer;
import org.apache.fop.fo.Constants;
import org.apache.fop.fo.extensions.ExternalDocument;
import org.apache.fop.layoutmgr.inline.ImageLayout;
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java?rev=932497&r1=932496&r2=932497&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java
Fri Apr 9 16:34:29 2010
@@ -34,6 +34,7 @@ import org.w3c.dom.Document;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.fop.ResourceEventProducer;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.area.Area;
@@ -66,7 +67,6 @@ import org.apache.fop.area.inline.SpaceA
import org.apache.fop.area.inline.TextArea;
import org.apache.fop.area.inline.Viewport;
import org.apache.fop.area.inline.WordArea;
-import org.apache.fop.events.ResourceEventProducer;
import org.apache.fop.fo.Constants;
import org.apache.fop.fonts.FontInfo;
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRenderer.java?rev=932497&r1=932496&r2=932497&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRenderer.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRenderer.java
Fri Apr 9 16:34:29 2010
@@ -41,6 +41,7 @@ import org.apache.xmlgraphics.image.load
import org.apache.xmlgraphics.image.loader.util.ImageUtil;
import org.apache.xmlgraphics.ps.ImageEncodingHelper;
+import org.apache.fop.ResourceEventProducer;
import org.apache.fop.afp.AFPBorderPainter;
import org.apache.fop.afp.AFPDataObjectInfo;
import org.apache.fop.afp.AFPDitheredRectanglePainter;
@@ -77,7 +78,6 @@ import org.apache.fop.area.inline.Image;
import org.apache.fop.area.inline.Leader;
import org.apache.fop.area.inline.TextArea;
import org.apache.fop.datatypes.URISpecification;
-import org.apache.fop.events.ResourceEventProducer;
import org.apache.fop.fo.extensions.ExtensionAttachment;
import org.apache.fop.fonts.Font;
import org.apache.fop.fonts.FontCollection;
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/AbstractIFPainter.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/AbstractIFPainter.java?rev=932497&r1=932496&r2=932497&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/AbstractIFPainter.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/AbstractIFPainter.java
Fri Apr 9 16:34:29 2010
@@ -43,9 +43,9 @@ import org.apache.xmlgraphics.image.load
import org.apache.xmlgraphics.image.loader.ImageSessionContext;
import org.apache.xmlgraphics.image.loader.util.ImageUtil;
+import org.apache.fop.ResourceEventProducer;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.FopFactory;
-import org.apache.fop.events.ResourceEventProducer;
import org.apache.fop.render.ImageHandler;
import org.apache.fop.render.ImageHandlerRegistry;
import org.apache.fop.render.ImageHandlerUtil;
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java?rev=932497&r1=932496&r2=932497&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
Fri Apr 9 16:34:29 2010
@@ -54,6 +54,7 @@ import org.apache.xmlgraphics.image.load
import org.apache.xmlgraphics.image.loader.impl.ImageXMLDOM;
import org.apache.xmlgraphics.image.loader.util.ImageUtil;
+import org.apache.fop.ResourceEventProducer;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.FopFactoryConfigurator;
@@ -67,7 +68,6 @@ import org.apache.fop.area.inline.SpaceA
import org.apache.fop.area.inline.TextArea;
import org.apache.fop.area.inline.WordArea;
import org.apache.fop.datatypes.URISpecification;
-import org.apache.fop.events.ResourceEventProducer;
import org.apache.fop.fo.Constants;
import org.apache.fop.fonts.Font;
import org.apache.fop.fonts.FontCollection;
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRenderer.java?rev=932497&r1=932496&r2=932497&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRenderer.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRenderer.java
Fri Apr 9 16:34:29 2010
@@ -58,6 +58,7 @@ import org.apache.xmlgraphics.java2d.Gra
import org.apache.xmlgraphics.java2d.Graphics2DImagePainter;
import org.apache.xmlgraphics.util.UnitConv;
+import org.apache.fop.ResourceEventProducer;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.MimeConstants;
@@ -79,7 +80,6 @@ import org.apache.fop.area.inline.TextAr
import org.apache.fop.area.inline.Viewport;
import org.apache.fop.area.inline.WordArea;
import org.apache.fop.datatypes.URISpecification;
-import org.apache.fop.events.ResourceEventProducer;
import org.apache.fop.fonts.Font;
import org.apache.fop.fonts.FontCollection;
import org.apache.fop.fonts.FontInfo;
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java?rev=932497&r1=932496&r2=932497&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java
Fri Apr 9 16:34:29 2010
@@ -44,6 +44,7 @@ import org.apache.xmlgraphics.image.load
import org.apache.xmlgraphics.image.loader.ImageSessionContext;
import org.apache.xmlgraphics.image.loader.util.ImageUtil;
+import org.apache.fop.ResourceEventProducer;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.MimeConstants;
@@ -68,7 +69,6 @@ import org.apache.fop.area.inline.TextAr
import org.apache.fop.area.inline.Viewport;
import org.apache.fop.area.inline.WordArea;
import org.apache.fop.datatypes.URISpecification;
-import org.apache.fop.events.ResourceEventProducer;
import org.apache.fop.fo.extensions.ExtensionAttachment;
import org.apache.fop.fo.extensions.xmp.XMPMetadata;
import org.apache.fop.fonts.Font;
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSRenderer.java?rev=932497&r1=932496&r2=932497&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSRenderer.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSRenderer.java Fri
Apr 9 16:34:29 2010
@@ -61,6 +61,7 @@ import org.apache.xmlgraphics.ps.dsc.Res
import org.apache.xmlgraphics.ps.dsc.events.DSCCommentBoundingBox;
import org.apache.xmlgraphics.ps.dsc.events.DSCCommentHiResBoundingBox;
+import org.apache.fop.ResourceEventProducer;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.area.Area;
@@ -79,7 +80,6 @@ import org.apache.fop.area.inline.SpaceA
import org.apache.fop.area.inline.TextArea;
import org.apache.fop.area.inline.WordArea;
import org.apache.fop.datatypes.URISpecification;
-import org.apache.fop.events.ResourceEventProducer;
import org.apache.fop.fo.extensions.ExtensionAttachment;
import org.apache.fop.fonts.Font;
import org.apache.fop.fonts.LazyFont;
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/ResourceHandler.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/ResourceHandler.java?rev=932497&r1=932496&r2=932497&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/ResourceHandler.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/ResourceHandler.java
Fri Apr 9 16:34:29 2010
@@ -63,8 +63,8 @@ import org.apache.xmlgraphics.ps.dsc.eve
import org.apache.xmlgraphics.ps.dsc.events.PostScriptLine;
import org.apache.xmlgraphics.ps.dsc.tools.DSCTools;
+import org.apache.fop.ResourceEventProducer;
import org.apache.fop.apps.FOUserAgent;
-import org.apache.fop.events.ResourceEventProducer;
import org.apache.fop.fonts.FontInfo;
import org.apache.fop.render.ImageHandler;
import org.apache.fop.render.ImageHandlerRegistry;
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFHandler.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFHandler.java?rev=932497&r1=932496&r2=932497&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFHandler.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFHandler.java
Fri Apr 9 16:34:29 2010
@@ -50,11 +50,11 @@ import org.apache.xmlgraphics.image.load
import org.apache.xmlgraphics.image.loader.impl.ImageXMLDOM;
import org.apache.xmlgraphics.image.loader.util.ImageUtil;
+import org.apache.fop.ResourceEventProducer;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.datatypes.LengthBase;
import org.apache.fop.datatypes.PercentBaseContext;
-import org.apache.fop.events.ResourceEventProducer;
import org.apache.fop.fo.Constants;
import org.apache.fop.fo.FOEventHandler;
import org.apache.fop.fo.FONode;
Modified:
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPainter.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPainter.java?rev=932497&r1=932496&r2=932497&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPainter.java
(original)
+++ xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPainter.java
Fri Apr 9 16:34:29 2010
@@ -44,7 +44,7 @@ import org.apache.xmlgraphics.image.load
import org.apache.xmlgraphics.xmp.Metadata;
import org.apache.fop.apps.MimeConstants;
-import org.apache.fop.events.ResourceEventProducer;
+import org.apache.fop.ResourceEventProducer;
import org.apache.fop.render.ImageHandlerUtil;
import org.apache.fop.render.RenderingContext;
import org.apache.fop.render.intermediate.AbstractIFPainter;
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/events/EventProcessingTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/events/EventProcessingTestCase.java?rev=932497&r1=932496&r2=932497&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/events/EventProcessingTestCase.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/events/EventProcessingTestCase.java
Fri Apr 9 16:34:29 2010
@@ -37,6 +37,7 @@ import org.apache.commons.io.output.Null
import org.apache.xmlgraphics.util.MimeConstants;
+import org.apache.fop.ResourceEventProducer;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/events/FOPTestEventModelFactory.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/events/FOPTestEventModelFactory.java?rev=932497&r1=932496&r2=932497&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/events/FOPTestEventModelFactory.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/events/FOPTestEventModelFactory.java
Fri Apr 9 16:34:29 2010
@@ -27,7 +27,7 @@ import org.apache.fop.events.model.Event
*/
public class FOPTestEventModelFactory extends AbstractEventModelFactory {
- private static final String EVENT_MODEL_FILENAME = "test-event-model.xml";
+ private static final String EVENT_MODEL_FILENAME = "event-model.xml";
/** {...@inheritdoc} */
public EventModel createEventModel() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
