From 8312edf81df1a2367eb738f920c825d7c0cca407 Mon Sep 17 00:00:00 2001 From: Jeremias Maerki <jeremias@apache.org> Date: Mon, 6 Mar 2006 07:59:52 +0000 Subject: Removed duplicate entry in Renderer list. Register FOEventHandlers using Service discovery, too. Removed superfluous discovery and registration methods. Renamed META-INF file to match the pattern established in the sandbox. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@383491 13f79535-47bb-0310-9956-ffa450edef68 --- .../META-INF/services/org.apache.fop.fo.FOEventHandler | 1 + .../org.apache.fop.render.AbstractRendererMaker | 9 --------- .../META-INF/services/org.apache.fop.render.Renderer | 8 ++++++++ src/java/org/apache/fop/render/RendererFactory.java | 18 +----------------- 4 files changed, 10 insertions(+), 26 deletions(-) create mode 100644 src/java/META-INF/services/org.apache.fop.fo.FOEventHandler delete mode 100644 src/java/META-INF/services/org.apache.fop.render.AbstractRendererMaker create mode 100644 src/java/META-INF/services/org.apache.fop.render.Renderer (limited to 'src/java') diff --git a/src/java/META-INF/services/org.apache.fop.fo.FOEventHandler b/src/java/META-INF/services/org.apache.fop.fo.FOEventHandler new file mode 100644 index 000000000..fdd42f993 --- /dev/null +++ b/src/java/META-INF/services/org.apache.fop.fo.FOEventHandler @@ -0,0 +1 @@ +org.apache.fop.render.rtf.RTFFOEventHandlerMaker \ No newline at end of file diff --git a/src/java/META-INF/services/org.apache.fop.render.AbstractRendererMaker b/src/java/META-INF/services/org.apache.fop.render.AbstractRendererMaker deleted file mode 100644 index 7a5cac9a9..000000000 --- a/src/java/META-INF/services/org.apache.fop.render.AbstractRendererMaker +++ /dev/null @@ -1,9 +0,0 @@ -org.apache.fop.render.pdf.PDFRendererMaker -org.apache.fop.render.ps.PSRendererMaker -org.apache.fop.render.txt.TXTRendererMaker -org.apache.fop.render.bitmap.PNGRendererMaker -org.apache.fop.render.bitmap.TIFFRendererMaker -org.apache.fop.render.bitmap.TIFFRendererMaker -org.apache.fop.render.xml.XMLRendererMaker -org.apache.fop.render.awt.AWTRendererMaker -org.apache.fop.render.print.PrintRendererMaker \ No newline at end of file diff --git a/src/java/META-INF/services/org.apache.fop.render.Renderer b/src/java/META-INF/services/org.apache.fop.render.Renderer new file mode 100644 index 000000000..fe943927d --- /dev/null +++ b/src/java/META-INF/services/org.apache.fop.render.Renderer @@ -0,0 +1,8 @@ +org.apache.fop.render.pdf.PDFRendererMaker +org.apache.fop.render.ps.PSRendererMaker +org.apache.fop.render.txt.TXTRendererMaker +org.apache.fop.render.bitmap.PNGRendererMaker +org.apache.fop.render.bitmap.TIFFRendererMaker +org.apache.fop.render.xml.XMLRendererMaker +org.apache.fop.render.awt.AWTRendererMaker +org.apache.fop.render.print.PrintRendererMaker \ No newline at end of file diff --git a/src/java/org/apache/fop/render/RendererFactory.java b/src/java/org/apache/fop/render/RendererFactory.java index 264d34edf..c6d4f479e 100644 --- a/src/java/org/apache/fop/render/RendererFactory.java +++ b/src/java/org/apache/fop/render/RendererFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2005 The Apache Software Foundation. + * Copyright 2004-2006 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,26 +54,10 @@ public class RendererFactory { * Main constructor. */ public RendererFactory() { - registerStandardRenderers(); discoverRenderers(); - - registerStandardEventHandlers(); discoverFOEventHandlers(); } - private void registerStandardRenderers() { - Iterator rendererMakers = Service.providers(AbstractRendererMaker.class); - if (rendererMakers != null) { - while (rendererMakers.hasNext()) { - addRendererMaker((String) rendererMakers.next()); - } - } - } - - private void registerStandardEventHandlers() { - addFOEventHandlerMaker(new org.apache.fop.render.rtf.RTFFOEventHandlerMaker()); - } - /** * Add a new RendererMaker. If another maker has already been registered for a * particular MIME type, this call overwrites the existing one. -- cgit v1.2.3