Renamed event model used by FOPTestEventModelFactory to "event-model.xml" git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@932497 13f79535-47bb-0310-9956-ffa450edef68tags/fop-1_0
@@ -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> |
@@ -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 |
@@ -157,7 +157,7 @@ foUserAgent.getEventBroadcaster().addEventListener(new SysOutEventListener());]] | |||
<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().addEventListener(new SysOutEventListener());]] | |||
<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 |
@@ -6,7 +6,7 @@ org.apache.fop.render.ps.PSEventProducer$EventModelFactory | |||
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 |
@@ -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; | |||
@@ -0,0 +1,32 @@ | |||
<?xml version="1.0" encoding="UTF-8"?> | |||
<!-- | |||
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$ --> | |||
<catalogue xml:lang="en"> | |||
<message key="locator">[ (See position {loc})| (See {#gatherContextInfo})| (No context info available)]</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> |
@@ -57,6 +57,7 @@ import org.apache.xmlgraphics.image.loader.ImageManager; | |||
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.SpaceArea; | |||
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; |
@@ -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; | |||
/** |
@@ -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; | |||
/** |
@@ -1,32 +0,0 @@ | |||
<?xml version="1.0" encoding="UTF-8"?> | |||
<!-- | |||
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$ --> | |||
<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> | |||
</catalogue> |
@@ -28,11 +28,11 @@ import org.apache.xmlgraphics.image.loader.ImageException; | |||
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; |
@@ -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; |
@@ -28,11 +28,11 @@ import org.apache.xmlgraphics.image.loader.ImageInfo; | |||
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; |
@@ -34,6 +34,7 @@ import org.apache.xmlgraphics.image.loader.ImageInfo; | |||
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; |
@@ -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.SpaceArea; | |||
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; | |||
@@ -41,6 +41,7 @@ import org.apache.xmlgraphics.image.loader.ImageSessionContext; | |||
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; |
@@ -43,9 +43,9 @@ import org.apache.xmlgraphics.image.loader.ImageManager; | |||
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; |
@@ -54,6 +54,7 @@ import org.apache.xmlgraphics.image.loader.impl.ImageRendered; | |||
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.SpaceArea; | |||
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; |
@@ -58,6 +58,7 @@ import org.apache.xmlgraphics.java2d.GraphicContext; | |||
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.TextArea; | |||
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; |
@@ -44,6 +44,7 @@ import org.apache.xmlgraphics.image.loader.ImageManager; | |||
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.TextArea; | |||
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; |
@@ -61,6 +61,7 @@ import org.apache.xmlgraphics.ps.dsc.ResourceTracker; | |||
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.SpaceArea; | |||
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; |
@@ -63,8 +63,8 @@ import org.apache.xmlgraphics.ps.dsc.events.PostScriptComment; | |||
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; |
@@ -50,11 +50,11 @@ import org.apache.xmlgraphics.image.loader.impl.ImageRawStream; | |||
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; |
@@ -44,7 +44,7 @@ import org.apache.xmlgraphics.image.loader.ImageSessionContext; | |||
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; |
@@ -37,6 +37,7 @@ import org.apache.commons.io.output.NullOutputStream; | |||
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; |
@@ -27,7 +27,7 @@ import org.apache.fop.events.model.EventModel; | |||
*/ | |||
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() { |