You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by vh...@apache.org on 2010/04/09 19:05:35 UTC
svn commit: r932510 - in /xmlgraphics/fop/trunk: src/java/META-INF/services/
src/java/org/apache/fop/ src/java/org/apache/fop/accessibility/
src/java/org/apache/fop/afp/ src/java/org/apache/fop/area/
src/java/org/apache/fop/events/ src/java/org/apache/...
Author: vhennebert
Date: Fri Apr 9 17:05:34 2010
New Revision: 932510
URL: http://svn.apache.org/viewvc?rev=932510&view=rev
Log:
Now that the creation of event-model.xml has been standardised, the EventModelFactory mechanism is no longer needed. Removed all the factory classes.
Registration through META-INF/services also is no longer necessary.
Removed:
xmlgraphics/fop/trunk/src/java/META-INF/services/org.apache.fop.events.model.EventModelFactory
xmlgraphics/fop/trunk/src/java/org/apache/fop/events/model/AbstractEventModelFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/events/model/EventModelFactory.java
xmlgraphics/fop/trunk/test/java/META-INF/services/org.apache.fop.events.model.EventModelFactory
xmlgraphics/fop/trunk/test/java/org/apache/fop/events/FOPTestEventModelFactory.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/accessibility/AccessibilityEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/events/DefaultEventBroadcaster.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOValidationEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLevelEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/BitmapRendererEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGEventProducer.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.java?rev=932510&r1=932509&r2=932510&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.java Fri Apr 9 17:05:34 2010
@@ -30,8 +30,6 @@ import org.apache.xmlgraphics.image.load
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;
/**
* Event producer interface for resource events (missing images, fonts etc.).
@@ -54,16 +52,6 @@ public interface ResourceEventProducer e
}
}
- /** Event model factory for Accessibility. */
- public static class EventModelFactory extends AbstractEventModelFactory {
-
- /** {@inheritDoc} */
- public EventModel createEventModel() {
- return loadModel(getClass(), "event-model.xml");
- }
-
- }
-
/**
* Image not found.
* @param source the event source
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/accessibility/AccessibilityEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/accessibility/AccessibilityEventProducer.java?rev=932510&r1=932509&r2=932510&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/accessibility/AccessibilityEventProducer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/accessibility/AccessibilityEventProducer.java Fri Apr 9 17:05:34 2010
@@ -21,8 +21,6 @@ package org.apache.fop.accessibility;
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;
/**
* Event producer for accessibility-related events.
@@ -46,16 +44,6 @@ public interface AccessibilityEventProdu
}
}
- /** Event model factory for Accessibility. */
- public static class EventModelFactory extends AbstractEventModelFactory {
-
- /** {@inheritDoc} */
- public EventModel createEventModel() {
- return loadModel(getClass(), "event-model.xml");
- }
-
- }
-
/**
* The structure tree is missing in the XML file.
*
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPEventProducer.java?rev=932510&r1=932509&r2=932510&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPEventProducer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPEventProducer.java Fri Apr 9 17:05:34 2010
@@ -21,8 +21,6 @@ package org.apache.fop.afp;
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;
/**
* Event producer interface for AFP-specific events.
@@ -43,16 +41,6 @@ public interface AFPEventProducer extend
}
}
- /** Event model factory for AFP. */
- public static class EventModelFactory extends AbstractEventModelFactory {
-
- /** {@inheritDoc} */
- public EventModel createEventModel() {
- return loadModel(getClass(), "event-model.xml");
- }
-
- }
-
/**
* Warn about using default font setup.
*
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaEventProducer.java?rev=932510&r1=932509&r2=932510&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaEventProducer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaEventProducer.java Fri Apr 9 17:05:34 2010
@@ -21,8 +21,6 @@ package org.apache.fop.area;
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;
/**
* Event producer interface for events related to the area tree.
@@ -45,16 +43,6 @@ public interface AreaEventProducer exten
}
}
- /** Event model factory for Accessibility. */
- public static class EventModelFactory extends AbstractEventModelFactory {
-
- /** {@inheritDoc} */
- public EventModel createEventModel() {
- return loadModel(getClass(), "event-model.xml");
- }
-
- }
-
/**
* An unresolved ID reference was encountered.
* @param source the event source
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/events/DefaultEventBroadcaster.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/events/DefaultEventBroadcaster.java?rev=932510&r1=932509&r2=932510&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/events/DefaultEventBroadcaster.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/events/DefaultEventBroadcaster.java Fri Apr 9 17:05:34 2010
@@ -19,18 +19,23 @@
package org.apache.fop.events;
+import java.io.InputStream;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.MissingResourceException;
-import org.apache.xmlgraphics.util.Service;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.stream.StreamSource;
+
+import org.apache.commons.io.IOUtils;
import org.apache.fop.events.model.EventMethodModel;
import org.apache.fop.events.model.EventModel;
-import org.apache.fop.events.model.EventModelFactory;
+import org.apache.fop.events.model.EventModelParser;
import org.apache.fop.events.model.EventProducerModel;
import org.apache.fop.events.model.EventSeverity;
@@ -66,11 +71,27 @@ public class DefaultEventBroadcaster imp
private static List/*<EventModel>*/ eventModels = new java.util.ArrayList();
private Map proxies = new java.util.HashMap();
- static {
- Iterator iter = Service.providers(EventModelFactory.class, true);
- while (iter.hasNext()) {
- EventModelFactory factory = (EventModelFactory)iter.next();
- addEventModel(factory.createEventModel());
+ /**
+ * Loads an event model and returns its instance.
+ * @param resourceBaseClass base class to use for loading resources
+ * @return the newly loaded event model.
+ */
+ private static EventModel loadModel(Class resourceBaseClass) {
+ String resourceName = "event-model.xml";
+ InputStream in = resourceBaseClass.getResourceAsStream(resourceName);
+ if (in == null) {
+ throw new MissingResourceException(
+ "File " + resourceName + " not found",
+ DefaultEventBroadcaster.class.getName(), "");
+ }
+ try {
+ return EventModelParser.parse(new StreamSource(in));
+ } catch (TransformerException e) {
+ throw new MissingResourceException(
+ "Error reading " + resourceName + ": " + e.getMessage(),
+ DefaultEventBroadcaster.class.getName(), "");
+ } finally {
+ IOUtils.closeQuietly(in);
}
}
@@ -78,10 +99,23 @@ public class DefaultEventBroadcaster imp
* Adds a new {@link EventModel} to the list of registered event models.
* @param eventModel the event model instance
*/
- public static void addEventModel(EventModel eventModel) {
+ public static synchronized void addEventModel(EventModel eventModel) {
eventModels.add(eventModel);
}
+ private static synchronized EventProducerModel getEventProducerModel(Class clazz) {
+ for (int i = 0, c = eventModels.size(); i < c; i++) {
+ EventModel eventModel = (EventModel)eventModels.get(i);
+ EventProducerModel producerModel = eventModel.getProducer(clazz);
+ if (producerModel != null) {
+ return producerModel;
+ }
+ }
+ EventModel model = loadModel(clazz);
+ addEventModel(model);
+ return model.getProducer(clazz);
+ }
+
/** {@inheritDoc} */
public EventProducer getEventProducerFor(Class clazz) {
if (!EventProducer.class.isAssignableFrom(clazz)) {
@@ -98,17 +132,6 @@ public class DefaultEventBroadcaster imp
return producer;
}
- private EventProducerModel getEventProducerModel(Class clazz) {
- for (int i = 0, c = eventModels.size(); i < c; i++) {
- EventModel eventModel = (EventModel)eventModels.get(i);
- EventProducerModel producerModel = eventModel.getProducer(clazz);
- if (producerModel != null) {
- return producerModel;
- }
- }
- return null;
- }
-
/**
* Creates a dynamic proxy for the given EventProducer interface that will handle the
* conversion of the method call into the broadcasting of an event instance.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOValidationEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOValidationEventProducer.java?rev=932510&r1=932509&r2=932510&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOValidationEventProducer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOValidationEventProducer.java Fri Apr 9 17:05:34 2010
@@ -26,8 +26,6 @@ import org.apache.xmlgraphics.util.QName
import org.apache.fop.apps.FOPException;
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;
import org.apache.fop.fo.expr.PropertyException;
/**
@@ -53,16 +51,6 @@ public interface FOValidationEventProduc
}
}
- /** Event model factory for Accessibility. */
- public static class EventModelFactory extends AbstractEventModelFactory {
-
- /** {@inheritDoc} */
- public EventModel createEventModel() {
- return loadModel(getClass(), "event-model.xml");
- }
-
- }
-
/**
* Too many child nodes.
* @param source the event source
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableEventProducer.java?rev=932510&r1=932509&r2=932510&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableEventProducer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableEventProducer.java Fri Apr 9 17:05:34 2010
@@ -23,8 +23,6 @@ import org.xml.sax.Locator;
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;
import org.apache.fop.fo.ValidationException;
import org.apache.fop.fo.expr.PropertyException;
@@ -47,16 +45,6 @@ public interface TableEventProducer exte
}
}
- /** Event model factory for Accessibility. */
- public static class EventModelFactory extends AbstractEventModelFactory {
-
- /** {@inheritDoc} */
- public EventModel createEventModel() {
- return loadModel(getClass(), "event-model.xml");
- }
-
- }
-
/**
* A value other than "auto" has been specified on fo:table.
* @param source the event source
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventProducer.java?rev=932510&r1=932509&r2=932510&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventProducer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventProducer.java Fri Apr 9 17:05:34 2010
@@ -21,8 +21,6 @@ package org.apache.fop.fonts;
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;
/**
* Event producer for fonts-related events.
@@ -46,16 +44,6 @@ public interface FontEventProducer exten
}
}
- /** Event model factory for Accessibility. */
- public static class EventModelFactory extends AbstractEventModelFactory {
-
- /** {@inheritDoc} */
- public EventModel createEventModel() {
- return loadModel(getClass(), "event-model.xml");
- }
-
- }
-
/**
* Notifies about a font being substituted as the requested one isn't available.
* @param source the event source
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLevelEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLevelEventProducer.java?rev=932510&r1=932509&r2=932510&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLevelEventProducer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLevelEventProducer.java Fri Apr 9 17:05:34 2010
@@ -23,8 +23,6 @@ import org.xml.sax.Locator;
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;
import org.apache.fop.fo.pagination.PageProductionException;
/**
@@ -50,16 +48,6 @@ public interface BlockLevelEventProducer
}
}
- /** Event model factory for Accessibility. */
- public static class EventModelFactory extends AbstractEventModelFactory {
-
- /** {@inheritDoc} */
- public EventModel createEventModel() {
- return loadModel(getClass(), "event-model.xml");
- }
-
- }
-
/**
* The contents of a table-row are too big to fit in the constraints.
* @param source the event source
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.java?rev=932510&r1=932509&r2=932510&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.java Fri Apr 9 17:05:34 2010
@@ -23,8 +23,6 @@ import org.xml.sax.Locator;
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;
/**
* Event producer interface for inline-level layout managers.
@@ -47,16 +45,6 @@ public interface InlineLevelEventProduce
}
}
- /** Event model factory for Accessibility. */
- public static class EventModelFactory extends AbstractEventModelFactory {
-
- /** {@inheritDoc} */
- public EventModel createEventModel() {
- return loadModel(getClass(), "event-model.xml");
- }
-
- }
-
/**
* fo:leader with "use-content" but without children.
* @param source the event source
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=932510&r1=932509&r2=932510&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 Fri Apr 9 17:05:34 2010
@@ -23,8 +23,6 @@ import java.io.IOException;
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;
/**
* Event producer interface for rendering-specific events.
@@ -45,16 +43,6 @@ public interface RendererEventProducer e
}
}
- /** Event model factory for Accessibility. */
- public static class EventModelFactory extends AbstractEventModelFactory {
-
- /** {@inheritDoc} */
- public EventModel createEventModel() {
- return loadModel(getClass(), "event-model.xml");
- }
-
- }
-
/**
* I/O error while writing target file.
* @param source the event source
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/BitmapRendererEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/BitmapRendererEventProducer.java?rev=932510&r1=932509&r2=932510&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/BitmapRendererEventProducer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/BitmapRendererEventProducer.java Fri Apr 9 17:05:34 2010
@@ -23,8 +23,6 @@ import java.io.IOException;
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;
/**
* Event producer interface for events generated by the bitmap renderers.
@@ -45,16 +43,6 @@ public interface BitmapRendererEventProd
}
}
- /** Event model factory for this event producer. */
- public static class EventModelFactory extends AbstractEventModelFactory {
-
- /** {@inheritDoc} */
- public EventModel createEventModel() {
- return loadModel(getClass(), "event-model.xml");
- }
-
- }
-
/**
* No filename information available. Stopping early after the first page.
* @param source the event source
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLEventProducer.java?rev=932510&r1=932509&r2=932510&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLEventProducer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLEventProducer.java Fri Apr 9 17:05:34 2010
@@ -21,8 +21,6 @@ package org.apache.fop.render.pcl;
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;
/**
* Event producer interface for events generated by the PCL renderer.
@@ -43,16 +41,6 @@ public interface PCLEventProducer extend
}
}
- /** Event model factory for this event producer. */
- public static class EventModelFactory extends AbstractEventModelFactory {
-
- /** {@inheritDoc} */
- public EventModel createEventModel() {
- return loadModel(getClass(), "event-model.xml");
- }
-
- }
-
/**
* Paper type could not be determined. Falling back to another.
* @param source the event source
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFEventProducer.java?rev=932510&r1=932509&r2=932510&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFEventProducer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFEventProducer.java Fri Apr 9 17:05:34 2010
@@ -21,8 +21,6 @@ package org.apache.fop.render.pdf;
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;
/**
* Event producer interface for events generated by the PDF renderer.
@@ -48,16 +46,6 @@ public interface PDFEventProducer extend
}
}
- /** Event model factory for this event producer. */
- public static class EventModelFactory extends AbstractEventModelFactory {
-
- /** {@inheritDoc} */
- public EventModel createEventModel() {
- return loadModel(getClass(), "event-model.xml");
- }
-
- }
-
/**
* Some link targets haven't been fully resolved.
* @param source the event source
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSEventProducer.java?rev=932510&r1=932509&r2=932510&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSEventProducer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSEventProducer.java Fri Apr 9 17:05:34 2010
@@ -21,8 +21,6 @@ package org.apache.fop.render.ps;
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;
/**
* Event producer interface for events generated by the PostScript renderer.
@@ -43,16 +41,6 @@ public interface PSEventProducer extends
}
}
- /** Event model factory for this event producer. */
- public static class EventModelFactory extends AbstractEventModelFactory {
-
- /** {@inheritDoc} */
- public EventModel createEventModel() {
- return loadModel(getClass(), "event-model.xml");
- }
-
- }
-
/**
* A PostScript dictionary could not be parsed.
* @param source the event source
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFEventProducer.java?rev=932510&r1=932509&r2=932510&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFEventProducer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFEventProducer.java Fri Apr 9 17:05:34 2010
@@ -23,8 +23,6 @@ import org.xml.sax.Locator;
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;
import org.apache.fop.fo.FONode;
/**
@@ -46,16 +44,6 @@ public interface RTFEventProducer extend
}
}
- /** Event model factory for this event producer. */
- public static class EventModelFactory extends AbstractEventModelFactory {
-
- /** {@inheritDoc} */
- public EventModel createEventModel() {
- return loadModel(getClass(), "event-model.xml");
- }
-
- }
-
/**
* The RTF handler only supports simple-page-masters.
* @param source the event source
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGEventProducer.java?rev=932510&r1=932509&r2=932510&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGEventProducer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGEventProducer.java Fri Apr 9 17:05:34 2010
@@ -21,8 +21,6 @@ package org.apache.fop.svg;
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;
/**
* Event producer interface for SVG-related events.
@@ -45,16 +43,6 @@ public interface SVGEventProducer extend
}
}
- /** Event model factory for Accessibility. */
- public static class EventModelFactory extends AbstractEventModelFactory {
-
- /** {@inheritDoc} */
- public EventModel createEventModel() {
- return loadModel(getClass(), "event-model.xml");
- }
-
- }
-
/**
* Error during SVG processing. Either message or e must be set.
* @param source the event source
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org