Renamed *EventProducer.Factory.create() to *EventProducer.Provider.get() to better reflect what the method does (instances may be cached and reused).

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_ProcessingFeedback@647678 13f79535-47bb-0310-9956-ffa450edef68

src/documentation/content/xdocs/trunk/events.xml

@@ -229,16 +229,16 @@ broadcaster.broadcastEvent(ev);
         </p>
         <p>
           To simplify the code needed to get an instance of the event producer interface it is
-          suggested to create a public inner factory class inside the interface.
+          suggested to create a public inner provider class inside the interface.
         </p>
         <p>
           Here's an example of such an event producer interface:
         </p>
         <source><![CDATA[public interface MyEventProducer extends EventProducer {
 
-    public class Factory {
+    public class Provider {
         
-        public static MyEventProducer create(EventBroadcaster broadcaster) {
+        public static MyEventProducer get(EventBroadcaster broadcaster) {
             return (MyEventProducer)broadcaster.getEventProducerFor(MyEventProducer.class);
         }
     }
@@ -257,7 +257,7 @@ broadcaster.broadcastEvent(ev);
           To produce the same event as in the first example above, you'd use the following code:
         </p>
         <source><![CDATA[EventBroadcaster broadcaster = [get it from somewhere];
-TestEventProducer producer = TestEventProducer.Factory.create(broadcaster);
+TestEventProducer producer = TestEventProducer.Provider.get(broadcaster);
 producer.complain(this, "I'm tired", 23);]]></source>
       </section>
       <section id="event-model">

src/java/org/apache/fop/area/AreaEventProducer.java

@@ -28,16 +28,16 @@ import org.apache.fop.events.EventProducer;
 public interface AreaEventProducer extends EventProducer {
 
     /**
-     * Factory class for the event producer.
+     * Provider class for the event producer.
      */
-    class Factory {
+    class Provider {
         
         /**
-         * Creates a new event producer.
+         * Returns an event producer.
          * @param broadcaster the event broadcaster to use
-         * @return the new event producer
+         * @return the event producer
          */
-        public static AreaEventProducer create(EventBroadcaster broadcaster) {
+        public static AreaEventProducer get(EventBroadcaster broadcaster) {
             return (AreaEventProducer)broadcaster.getEventProducerFor(
                     AreaEventProducer.class);
         }

src/java/org/apache/fop/area/AreaTreeHandler.java

@@ -325,7 +325,7 @@ public class AreaTreeHandler extends FOEventHandler {
                 if (pageVPList != null) {
                     res.resolveIDRef(ids[count], pageVPList);
                 } else {
-                    AreaEventProducer eventProducer = AreaEventProducer.Factory.create(
+                    AreaEventProducer eventProducer = AreaEventProducer.Provider.get(
                             getUserAgent().getEventBroadcaster());
                     eventProducer.unresolvedIDReference(this, odi.getName(), ids[count]);
                     idTracker.addUnresolvedIDRef(ids[count], res);

src/java/org/apache/fop/area/CachedRenderPagesModel.java

@@ -90,14 +90,14 @@ public class CachedRenderPagesModel extends RenderPagesModel {
                         }
                         if (!tempFile.delete()) {
                             ResourceEventProducer eventProducer
-                                = ResourceEventProducer.Factory.create(
+                                = ResourceEventProducer.Provider.get(
                                         renderer.getUserAgent().getEventBroadcaster());
                             eventProducer.cannotDeleteTempFile(this, tempFile);
                         }
                         pageMap.remove(pageViewport);
                     } catch (Exception e) {
                         AreaEventProducer eventProducer
-                            = AreaEventProducer.Factory.create(
+                            = AreaEventProducer.Provider.get(
                                 renderer.getUserAgent().getEventBroadcaster());
                         eventProducer.pageLoadError(this, pageViewport.getPageNumberString(), e);
                     }
@@ -145,7 +145,7 @@ public class CachedRenderPagesModel extends RenderPagesModel {
             }
         } catch (IOException ioe) {
             AreaEventProducer eventProducer
-                = AreaEventProducer.Factory.create(
+                = AreaEventProducer.Provider.get(
                     renderer.getUserAgent().getEventBroadcaster());
             eventProducer.pageSaveError(this, page.getPageNumberString(), ioe);
         }

src/java/org/apache/fop/area/RenderPagesModel.java

@@ -179,14 +179,14 @@ public class RenderPagesModel extends AreaTreeModel {
             if (!pageViewport.isResolved()) {
                 String[] idrefs = pageViewport.getIDRefs();
                 for (int count = 0; count < idrefs.length; count++) {
-                    AreaEventProducer eventProducer = AreaEventProducer.Factory.create(
+                    AreaEventProducer eventProducer = AreaEventProducer.Provider.get(
                             renderer.getUserAgent().getEventBroadcaster());
                     eventProducer.unresolvedIDReferenceOnPage(this,
                             pageViewport.getPageNumberString(), idrefs[count]);
                 }
             }
         } catch (Exception e) {
-            AreaEventProducer eventProducer = AreaEventProducer.Factory.create(
+            AreaEventProducer eventProducer = AreaEventProducer.Provider.get(
                     renderer.getUserAgent().getEventBroadcaster());
             eventProducer.pageRenderingError(this,
                     pageViewport.getPageNumberString(), e);

src/java/org/apache/fop/events/ResourceEventProducer.java

@@ -35,16 +35,16 @@ import org.apache.xmlgraphics.image.loader.ImageException;
 public interface ResourceEventProducer extends EventProducer {
 
     /**
-     * Factory class for the event producer.
+     * Provider class for the event producer.
      */
-    class Factory {
+    class Provider {
         
         /**
-         * Creates a new event producer.
+         * Returns an event producer.
          * @param broadcaster the event broadcaster to use
-         * @return the new event producer
+         * @return the requested event producer
          */
-        public static ResourceEventProducer create(EventBroadcaster broadcaster) {
+        public static ResourceEventProducer get(EventBroadcaster broadcaster) {
             return (ResourceEventProducer)broadcaster.getEventProducerFor(
                     ResourceEventProducer.class);
         }

src/java/org/apache/fop/fo/FONode.java

@@ -356,7 +356,7 @@ public abstract class FONode implements Cloneable {
      * @return an event producer for FO validation
      */
     protected FOValidationEventProducer getFOValidationEventProducer() {
-        return FOValidationEventProducer.Factory.create(
+        return FOValidationEventProducer.Provider.get(
                 getUserAgent().getEventBroadcaster());
     }
     

src/java/org/apache/fop/fo/FOTreeBuilder.java

@@ -150,7 +150,7 @@ public class FOTreeBuilder extends DefaultHandler {
         this.delegate.endDocument();
         if (this.rootFObj == null && empty) {
             FOValidationEventProducer eventProducer
-                = FOValidationEventProducer.Factory.create(
+                = FOValidationEventProducer.Provider.get(
                     foEventHandler.getUserAgent().getEventBroadcaster());
             eventProducer.emptyDocument(this);
         }
@@ -253,7 +253,7 @@ public class FOTreeBuilder extends DefaultHandler {
                 if (!namespaceURI.equals(FOElementMapping.URI) 
                         || !localName.equals("root")) {
                     FOValidationEventProducer eventProducer
-                        = FOValidationEventProducer.Factory.create(
+                        = FOValidationEventProducer.Provider.get(
                                 foEventHandler.getUserAgent().getEventBroadcaster());
                     eventProducer.invalidFORoot(this, FONode.getNodeString(namespaceURI, localName),
                             getEffectiveLocator());
@@ -378,7 +378,7 @@ public class FOTreeBuilder extends DefaultHandler {
             Maker maker = elementMappingRegistry.findFOMaker(namespaceURI, localName, locator);
             if (maker instanceof UnknownXMLObj.Maker) {
                 FOValidationEventProducer eventProducer
-                    = FOValidationEventProducer.Factory.create(
+                    = FOValidationEventProducer.Provider.get(
                         foEventHandler.getUserAgent().getEventBroadcaster());
                 eventProducer.unknownFormattingObject(this, currentFObj.getName(),
                         new QName(namespaceURI, localName),

src/java/org/apache/fop/fo/FOValidationEventProducer.java

@@ -34,16 +34,16 @@ import org.apache.fop.fo.expr.PropertyException;
 public interface FOValidationEventProducer extends EventProducer {
 
     /**
-     * Factory class for the event producer.
+     * Provider class for the event producer.
      */
-    class Factory {
+    class Provider {
         
         /**
-         * Creates a new event producer.
+         * Returns an event producer.
          * @param broadcaster the event broadcaster to use
-         * @return the new event producer
+         * @return the event producer
          */
-        public static FOValidationEventProducer create(EventBroadcaster broadcaster) {
+        public static FOValidationEventProducer get(EventBroadcaster broadcaster) {
             return (FOValidationEventProducer)broadcaster.getEventProducerFor(
                     FOValidationEventProducer.class);
         }

src/java/org/apache/fop/fo/flow/ExternalGraphic.java

@@ -79,15 +79,15 @@ public class ExternalGraphic extends AbstractGraphics {
         try {
             info = manager.getImageInfo(url, userAgent.getImageSessionContext());
         } catch (ImageException e) {
-            ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+            ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.imageError(this, url, e, getLocator());
         } catch (FileNotFoundException fnfe) {
-            ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+            ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.imageNotFound(this, url, fnfe, getLocator());
         } catch (IOException ioe) {
-            ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+            ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.imageIOError(this, url, ioe, getLocator());
         }

src/java/org/apache/fop/fo/flow/InstreamForeignObject.java

@@ -99,7 +99,7 @@ public class InstreamForeignObject extends AbstractGraphics {
             Point2D csize = new Point2D.Float(-1, -1);
             intrinsicDimensions = child.getDimension(csize);
             if (intrinsicDimensions == null) {
-                ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+                ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                         getUserAgent().getEventBroadcaster());
                 eventProducer.ifoNoIntrinsicSize(this, getLocator());
             }

src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java

@@ -120,14 +120,14 @@ class FixedColRowGroupBuilder extends RowGroupBuilder {
     void endTableRow() {
         assert currentTableRow != null;
         if (currentRowIndex > 0 && currentTableRow.getBreakBefore() != Constants.EN_AUTO) {
-            TableEventProducer eventProducer = TableEventProducer.Factory.create(
+            TableEventProducer eventProducer = TableEventProducer.Provider.get(
                     currentTableRow.getUserAgent().getEventBroadcaster());
             eventProducer.breakIgnoredDueToRowSpanning(this, currentTableRow.getName(), true,
                     currentTableRow.getLocator());
         }
         if (currentRowIndex < rows.size() - 1
                 && currentTableRow.getBreakAfter() != Constants.EN_AUTO) {
-            TableEventProducer eventProducer = TableEventProducer.Factory.create(
+            TableEventProducer eventProducer = TableEventProducer.Provider.get(
                     currentTableRow.getUserAgent().getEventBroadcaster());
             eventProducer.breakIgnoredDueToRowSpanning(this, currentTableRow.getName(), false,
                     currentTableRow.getLocator());

src/java/org/apache/fop/fo/flow/table/Table.java

@@ -127,7 +127,7 @@ public class Table extends TableFObj implements ColumnNumberManagerHolder {
         orphanContentLimit = pList.get(PR_X_ORPHAN_CONTENT_LIMIT).getLength();
 
         if (!blockProgressionDimension.getOptimum(null).isAuto()) {
-            TableEventProducer eventProducer = TableEventProducer.Factory.create(
+            TableEventProducer eventProducer = TableEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.nonAutoBPDOnTable(this, getLocator());
             // Anyway, the bpd of a table is not used by the layout code
@@ -140,7 +140,7 @@ public class Table extends TableFObj implements ColumnNumberManagerHolder {
                 && getCommonBorderPaddingBackground().hasPadding(
                         ValidationPercentBaseContext.getPseudoContext())) {
             //See "17.6.2 The collapsing border model" in CSS2
-            TableEventProducer eventProducer = TableEventProducer.Factory.create(
+            TableEventProducer eventProducer = TableEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.noTablePaddingWithCollapsingBorderModel(this, getLocator());
         }
@@ -198,7 +198,7 @@ public class Table extends TableFObj implements ColumnNumberManagerHolder {
                     if (tableBodyFound) {
                         nodesOutOfOrderError(loc, "fo:table-footer", "(table-body+)", true);
                         if (!isSeparateBorderModel()) {
-                            TableEventProducer eventProducer = TableEventProducer.Factory.create(
+                            TableEventProducer eventProducer = TableEventProducer.Provider.get(
                                     getUserAgent().getEventBroadcaster());
                             eventProducer.footerOrderCannotRecover(this, getName(), getLocator());
                         }

src/java/org/apache/fop/fo/flow/table/TableBody.java

@@ -163,14 +163,14 @@ public class TableBody extends TableCellContainer {
             } else if (localName.equals("table-row")) {
                 tableRowsFound = true;
                 if (tableCellsFound) {
-                    TableEventProducer eventProducer = TableEventProducer.Factory.create(
+                    TableEventProducer eventProducer = TableEventProducer.Provider.get(
                             getUserAgent().getEventBroadcaster());
                     eventProducer.noMixRowsAndCells(this, getName(), getLocator());
                 }
             } else if (localName.equals("table-cell")) {
                 tableCellsFound = true;
                 if (tableRowsFound) {
-                    TableEventProducer eventProducer = TableEventProducer.Factory.create(
+                    TableEventProducer eventProducer = TableEventProducer.Provider.get(
                             getUserAgent().getEventBroadcaster());
                     eventProducer.noMixRowsAndCells(this, getName(), getLocator());
                 }

src/java/org/apache/fop/fo/flow/table/TableCell.java

@@ -106,7 +106,7 @@ public class TableCell extends TableFObj {
         }
         if ((startsRow() || endsRow())
                 && getParent().getNameId() == FO_TABLE_ROW ) {
-            TableEventProducer eventProducer = TableEventProducer.Factory.create(
+            TableEventProducer eventProducer = TableEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.startEndRowUnderTableRowWarning(this, getLocator());
         }

src/java/org/apache/fop/fo/flow/table/TableCellContainer.java

@@ -46,7 +46,7 @@ public abstract class TableCellContainer extends TableFObj implements ColumnNumb
         Table t = getTable();
         if (t.hasExplicitColumns()) {
             if (colNumber + colSpan - 1 > t.getNumberOfColumns()) {
-                TableEventProducer eventProducer = TableEventProducer.Factory.create(
+                TableEventProducer eventProducer = TableEventProducer.Provider.get(
                         getUserAgent().getEventBroadcaster());
                 eventProducer.tooManyCells(this, getLocator());
             }

src/java/org/apache/fop/fo/flow/table/TableColumn.java

@@ -82,13 +82,13 @@ public class TableColumn extends TableFObj {
         super.bind(pList);
 
         if (numberColumnsRepeated <= 0) {
-            TableEventProducer eventProducer = TableEventProducer.Factory.create(
+            TableEventProducer eventProducer = TableEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.valueMustBeBiggerGtEqOne(this,
                     "number-columns-repeated", numberColumnsRepeated, getLocator());
         }
         if (numberColumnsSpanned <= 0) {
-            TableEventProducer eventProducer = TableEventProducer.Factory.create(
+            TableEventProducer eventProducer = TableEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.valueMustBeBiggerGtEqOne(this,
                     "number-columns-spanned", numberColumnsSpanned, getLocator());
@@ -100,7 +100,7 @@ public class TableColumn extends TableFObj {
          */
         if (columnWidth.getEnum() == EN_AUTO) {
             if (!this.implicitColumn && !getTable().isAutoLayout()) {
-                TableEventProducer eventProducer = TableEventProducer.Factory.create(
+                TableEventProducer eventProducer = TableEventProducer.Provider.get(
                         getUserAgent().getEventBroadcaster());
                 eventProducer.warnImplicitColumns(this, getLocator());
             }

src/java/org/apache/fop/fo/flow/table/TableEventProducer.java

@@ -31,17 +31,15 @@ import org.apache.fop.fo.expr.PropertyException;
  */
 public interface TableEventProducer extends EventProducer {
 
-    /**
-     * Factory class for the event producer.
-     */
-    class Factory {
+    /** Provider class for the event producer. */
+    class Provider {
         
         /**
-         * Creates a new event producer.
+         * Returns an event producer.
          * @param broadcaster the event broadcaster to use
-         * @return the new event producer
+         * @return the event producer
          */
-        public static TableEventProducer create(EventBroadcaster broadcaster) {
+        public static TableEventProducer get(EventBroadcaster broadcaster) {
             return (TableEventProducer)broadcaster.getEventProducerFor(
                     TableEventProducer.class);
         }

src/java/org/apache/fop/fo/flow/table/TableFObj.java

@@ -69,7 +69,7 @@ public abstract class TableFObj extends FObj {
                 && getNameId() != FO_TABLE_CELL
                 && getCommonBorderPaddingBackground().hasPadding(
                         ValidationPercentBaseContext.getPseudoContext())) {
-            TableEventProducer eventProducer = TableEventProducer.Factory.create(
+            TableEventProducer eventProducer = TableEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.paddingNotApplicable(this, getName(), getLocator());
         }
@@ -179,7 +179,7 @@ public abstract class TableFObj extends FObj {
                     /* if column-number is already in use by another
                      * cell/column => error!
                      */
-                    TableEventProducer eventProducer = TableEventProducer.Factory.create(
+                    TableEventProducer eventProducer = TableEventProducer.Provider.get(
                             fo.getUserAgent().getEventBroadcaster());
                     eventProducer.cellOverlap(this, fo.getName(), columnIndex + 1, fo.getLocator());
                 }

src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java

@@ -200,7 +200,7 @@ public class PageSequenceMaster extends FObj {
         if (currentSubSequence == null) {
             currentSubSequence = getNextSubSequence();
             if (currentSubSequence == null) {
-                BlockLevelEventProducer eventProducer = BlockLevelEventProducer.Factory.create(
+                BlockLevelEventProducer eventProducer = BlockLevelEventProducer.Provider.get(
                         getUserAgent().getEventBroadcaster());
                 eventProducer.missingSubsequencesInPageSequenceMaster(this,
                         masterName, getLocator());
@@ -212,7 +212,7 @@ public class PageSequenceMaster extends FObj {
         while (pageMasterName == null) {
             SubSequenceSpecifier nextSubSequence = getNextSubSequence();
             if (nextSubSequence == null) {
-                BlockLevelEventProducer eventProducer = BlockLevelEventProducer.Factory.create(
+                BlockLevelEventProducer eventProducer = BlockLevelEventProducer.Provider.get(
                         getUserAgent().getEventBroadcaster());
                 eventProducer.pageSequenceMasterExhausted(this,
                         masterName, canRecover, getLocator());
@@ -227,7 +227,7 @@ public class PageSequenceMaster extends FObj {
         SimplePageMaster pageMaster = this.layoutMasterSet
             .getSimplePageMaster(pageMasterName);
         if (pageMaster == null) {
-            BlockLevelEventProducer eventProducer = BlockLevelEventProducer.Factory.create(
+            BlockLevelEventProducer eventProducer = BlockLevelEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.noMatchingPageMaster(this,
                     masterName, pageMasterName, getLocator());

src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java

@@ -238,7 +238,7 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager
 
         int availableIPD = referenceIPD - getIPIndents();
         if (getContentAreaIPD() > availableIPD) {
-            BlockLevelEventProducer eventProducer = BlockLevelEventProducer.Factory.create(
+            BlockLevelEventProducer eventProducer = BlockLevelEventProducer.Provider.get(
                     getBlockContainerFO().getUserAgent().getEventBroadcaster());
             eventProducer.objectTooWide(this, getBlockContainerFO().getName(),
                     getContentAreaIPD(), context.getRefIPD(),
@@ -377,7 +377,7 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager
             */
 
             if (contentOverflows) {
-                BlockLevelEventProducer eventProducer = BlockLevelEventProducer.Factory.create(
+                BlockLevelEventProducer eventProducer = BlockLevelEventProducer.Provider.get(
                         getBlockContainerFO().getUserAgent().getEventBroadcaster());
                 boolean canRecover = (getBlockContainerFO().getOverflow() != EN_ERROR_IF_OVERFLOW); 
                 eventProducer.viewportOverflow(this, getBlockContainerFO().getName(),
@@ -527,7 +527,7 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager
     
             //TODO Maybe check for page overflow when autoHeight=true
             if (!autoHeight & (contentOverflows)) {
-                BlockLevelEventProducer eventProducer = BlockLevelEventProducer.Factory.create(
+                BlockLevelEventProducer eventProducer = BlockLevelEventProducer.Provider.get(
                         getBlockContainerFO().getUserAgent().getEventBroadcaster());
                 boolean canRecover = (getBlockContainerFO().getOverflow() != EN_ERROR_IF_OVERFLOW); 
                 eventProducer.viewportOverflow(this, getBlockContainerFO().getName(),

src/java/org/apache/fop/layoutmgr/BlockLevelEventProducer.java

@@ -31,16 +31,16 @@ import org.apache.fop.events.EventProducer;
 public interface BlockLevelEventProducer extends EventProducer {
 
     /**
-     * Factory class for the event producer.
+     * Provider class for the event producer.
      */
-    class Factory {
+    class Provider {
         
         /**
-         * Creates a new event producer.
+         * Returns an event producer.
          * @param broadcaster the event broadcaster to use
-         * @return the new event producer
+         * @return the event producer
          */
-        public static BlockLevelEventProducer create(EventBroadcaster broadcaster) {
+        public static BlockLevelEventProducer get(EventBroadcaster broadcaster) {
             return (BlockLevelEventProducer)broadcaster.getEventProducerFor(
                     BlockLevelEventProducer.class);
         }

src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java

@@ -201,7 +201,7 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager
         if (ipd < 0) {
             //5.3.4, XSL 1.0, Overconstrained Geometry
             log.debug("Adjusting end-indent based on overconstrained geometry rules for " + fobj);
-            BlockLevelEventProducer eventProducer = BlockLevelEventProducer.Factory.create(
+            BlockLevelEventProducer eventProducer = BlockLevelEventProducer.Provider.get(
                     getFObj().getUserAgent().getEventBroadcaster());
             eventProducer.overconstrainedAdjustEndIndent(this,
                     getFObj().getName(), ipd, getFObj().getLocator());
@@ -224,7 +224,7 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager
         if (ipd < 0) {
             //5.3.4, XSL 1.0, Overconstrained Geometry
             log.debug("Adjusting end-indent based on overconstrained geometry rules for " + fobj);
-            BlockLevelEventProducer eventProducer = BlockLevelEventProducer.Factory.create(
+            BlockLevelEventProducer eventProducer = BlockLevelEventProducer.Provider.get(
                     getFObj().getUserAgent().getEventBroadcaster());
             eventProducer.overconstrainedAdjustEndIndent(this,
                     getFObj().getName(), ipd, getFObj().getLocator());

src/java/org/apache/fop/layoutmgr/ExternalDocumentLayoutManager.java

@@ -160,7 +160,7 @@ public class ExternalDocumentLayoutManager extends AbstractPageSequenceLayoutMan
     }
 
     private ResourceEventProducer getResourceEventProducer() {
-        return ResourceEventProducer.Factory.create(
+        return ResourceEventProducer.Provider.get(
                 getExternalDocument().getUserAgent().getEventBroadcaster());
     }
 

src/java/org/apache/fop/layoutmgr/PageBreaker.java

@@ -87,7 +87,7 @@ public class PageBreaker extends AbstractBreaker {
                             false, part, PageProvider.RELTO_CURRENT_ELEMENT_LIST);
                 RegionBody body = (RegionBody)p.getSimplePageMaster().getRegion(
                         Region.FO_REGION_BODY);
-                BlockLevelEventProducer eventProducer = BlockLevelEventProducer.Factory.create(
+                BlockLevelEventProducer eventProducer = BlockLevelEventProducer.Provider.get(
                         body.getUserAgent().getEventBroadcaster());
 
                 boolean canRecover = (body.getOverflow() != Constants.EN_ERROR_IF_OVERFLOW);

src/java/org/apache/fop/layoutmgr/PageProvider.java

@@ -260,7 +260,7 @@ public class PageProvider implements Constants {
             if (!pageSeq.getMainFlow().getFlowName().equals(body.getRegionName())) {
                 // this is fine by the XSL Rec (fo:flow's flow-name can be mapped to
                 // any region), but we don't support it yet.
-                BlockLevelEventProducer eventProducer = BlockLevelEventProducer.Factory.create(
+                BlockLevelEventProducer eventProducer = BlockLevelEventProducer.Provider.get(
                         pageSeq.getUserAgent().getEventBroadcaster());
                 eventProducer.flowNotMappingToRegionBody(this,
                         pageSeq.getMainFlow().getFlowName(), spm.getMasterName(), spm.getLocator());

src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java

@@ -244,7 +244,7 @@ public class StaticContentLayoutManager extends BlockStackingLayoutManager {
             if (!autoHeight) {
                 String page = getPSLM().getCurrentPage().getPageViewport().getPageNumberString();
                 
-                BlockLevelEventProducer eventProducer = BlockLevelEventProducer.Factory.create(
+                BlockLevelEventProducer eventProducer = BlockLevelEventProducer.Provider.get(
                         getStaticContentFO().getUserAgent().getEventBroadcaster());
                 boolean canRecover = (regionFO.getOverflow() != EN_ERROR_IF_OVERFLOW); 
                 boolean needClip = (regionFO.getOverflow() == Constants.EN_HIDDEN

src/java/org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.java

@@ -30,16 +30,16 @@ import org.apache.fop.events.EventProducer;
 public interface InlineLevelEventProducer extends EventProducer {
 
     /**
-     * Factory class for the event producer.
+     * Provider class for the event producer.
      */
-    class Factory {
+    class Provider {
         
         /**
-         * Creates a new event producer.
+         * Returns an event producer.
          * @param broadcaster the event broadcaster to use
-         * @return the new event producer
+         * @return the event producer
          */
-        public static InlineLevelEventProducer create(EventBroadcaster broadcaster) {
+        public static InlineLevelEventProducer get(EventBroadcaster broadcaster) {
             return (InlineLevelEventProducer)broadcaster.getEventProducerFor(
                     InlineLevelEventProducer.class);
         }

src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java

@@ -159,7 +159,7 @@ public class LeaderLayoutManager extends LeafNodeLayoutManager {
             leaderArea = fa;
         } else if (fobj.getLeaderPattern() == EN_USECONTENT) {
             if (fobj.getChildNodes() == null) {
-                InlineLevelEventProducer eventProducer = InlineLevelEventProducer.Factory.create(
+                InlineLevelEventProducer eventProducer = InlineLevelEventProducer.Provider.get(
                         getFObj().getUserAgent().getEventBroadcaster());
                 eventProducer.leaderWithoutContent(this, getFObj().getLocator());
                 return null;

src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java

@@ -384,7 +384,7 @@ public class LineLayoutManager extends InlineStackingLayoutManager
                 int lack = difference + bestActiveNode.availableShrink; 
                 if (lack < 0) {
                     InlineLevelEventProducer eventProducer
-                        = InlineLevelEventProducer.Factory.create(
+                        = InlineLevelEventProducer.Provider.get(
                             getFObj().getUserAgent().getEventBroadcaster());
                     eventProducer.lineOverflows(this, addedPositions + 1,
                             -lack, getFObj().getLocator());

src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java

@@ -191,7 +191,7 @@ public class TableLayoutManager extends BlockStackingLayoutManager
             updateContentAreaIPDwithOverconstrainedAdjust(contentIPD);
         } else {
             if (!getTable().isAutoLayout()) {
-                BlockLevelEventProducer eventProducer = BlockLevelEventProducer.Factory.create(
+                BlockLevelEventProducer eventProducer = BlockLevelEventProducer.Provider.get(
                         getTable().getUserAgent().getEventBroadcaster());
                 eventProducer.tableFixedAutoWidthNotSupported(this, getTable().getLocator());
             }
@@ -206,7 +206,7 @@ public class TableLayoutManager extends BlockStackingLayoutManager
         }
         int availableIPD = referenceIPD - getIPIndents();
         if (getContentAreaIPD() > availableIPD) {
-            BlockLevelEventProducer eventProducer = BlockLevelEventProducer.Factory.create(
+            BlockLevelEventProducer eventProducer = BlockLevelEventProducer.Provider.get(
                     getTable().getUserAgent().getEventBroadcaster());
             eventProducer.objectTooWide(this, getTable().getName(),
                     getContentAreaIPD(), context.getRefIPD(),

src/java/org/apache/fop/render/AbstractGenericSVGHandler.java

@@ -82,7 +82,7 @@ public abstract class AbstractGenericSVGHandler implements XMLHandler, RendererC
         try {
             root = builder.build(ctx, doc);
         } catch (Exception e) {
-            SVGEventProducer eventProducer = SVGEventProducer.Factory.create(
+            SVGEventProducer eventProducer = SVGEventProducer.Provider.get(
                     context.getUserAgent().getEventBroadcaster());
             eventProducer.svgNotBuilt(this, e, getDocumentURI(doc));
             return;

src/java/org/apache/fop/render/AbstractRenderer.java

@@ -794,7 +794,7 @@ public abstract class AbstractRenderer
                 handler.handleXML(ctx, doc, namespace);
             } catch (Exception e) {
                 // could not handle document
-                ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+                ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                         ctx.getUserAgent().getEventBroadcaster());
                 eventProducer.foreignXMLProcessingError(this, doc, namespace, e);
             }
@@ -805,7 +805,7 @@ public abstract class AbstractRenderer
             if (!warnedXMLHandlers.contains(namespace)) {
                 // no handler found for document
                 warnedXMLHandlers.add(namespace);
-                ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+                ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                         ctx.getUserAgent().getEventBroadcaster());
                 eventProducer.foreignXMLNoHandler(this, doc, namespace);
             }

src/java/org/apache/fop/render/RendererEventProducer.java

@@ -29,15 +29,15 @@ import org.apache.fop.events.EventProducer;
  */
 public interface RendererEventProducer extends EventProducer {
 
-    /** Factory class for the event producer. */
-    class Factory {
+    /** Provider class for the event producer. */
+    class Provider {
         
         /**
-         * Creates a new event producer.
+         * Returns an event producer.
          * @param broadcaster the event broadcaster to use
-         * @return the new event producer
+         * @return the event producer
          */
-        public static RendererEventProducer create(EventBroadcaster broadcaster) {
+        public static RendererEventProducer get(EventBroadcaster broadcaster) {
             return (RendererEventProducer)broadcaster.getEventProducerFor(
                     RendererEventProducer.class);
         }

src/java/org/apache/fop/render/afp/AFPEventProducer.java

@@ -29,15 +29,15 @@ import org.apache.fop.events.model.EventModel;
  */
 public interface AFPEventProducer extends EventProducer {
 
-    /** Factory class for the event producer. */
-    class Factory {
+    /** Provider class for the event producer. */
+    class Provider {
         
         /**
-         * Creates a new event producer.
+         * Returns an event producer.
          * @param broadcaster the event broadcaster to use
-         * @return the new event producer
+         * @return the event producer
          */
-        public static AFPEventProducer create(EventBroadcaster broadcaster) {
+        public static AFPEventProducer get(EventBroadcaster broadcaster) {
             return (AFPEventProducer)broadcaster.getEventProducerFor(
                     AFPEventProducer.class);
         }

src/java/org/apache/fop/render/afp/AFPRenderer.java

@@ -292,7 +292,7 @@ public class AFPRenderer extends AbstractPathOrientedRenderer {
                 }
             }
         } else {
-            AFPEventProducer eventProducer = AFPEventProducer.Factory.create(
+            AFPEventProducer eventProducer = AFPEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.warnDefaultFontSetup(this);
         }
@@ -1017,15 +1017,15 @@ public class AFPRenderer extends AbstractPathOrientedRenderer {
                 }
 
             } catch (ImageException ie) {
-                ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+                ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                         getUserAgent().getEventBroadcaster());
                 eventProducer.imageError(this, (info != null ? info.toString() : uri), ie, null);
             } catch (FileNotFoundException fe) {
-                ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+                ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                         getUserAgent().getEventBroadcaster());
                 eventProducer.imageNotFound(this, (info != null ? info.toString() : uri), fe, null);
             } catch (IOException ioe) {
-                ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+                ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                         getUserAgent().getEventBroadcaster());
                 eventProducer.imageIOError(this, (info != null ? info.toString() : uri), ioe, null);
             }
@@ -1202,7 +1202,7 @@ public class AFPRenderer extends AbstractPathOrientedRenderer {
                         image.getWidth(), image.getHeight(), this.bitsPerPixel);
             }
         } catch (IOException ioe) {
-            ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+            ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.imageWritingError(this, ioe);
         }

src/java/org/apache/fop/render/bitmap/BitmapRendererEventProducer.java

@@ -31,15 +31,15 @@ import org.apache.fop.events.model.EventModel;
  */
 public interface BitmapRendererEventProducer extends EventProducer {
 
-    /** Factory class for the event producer. */
-    class Factory {
+    /** Provider class for the event producer. */
+    class Provider {
         
         /**
-         * Creates a new event producer.
+         * Returns an event producer.
          * @param broadcaster the event broadcaster to use
-         * @return the new event producer
+         * @return the event producer
          */
-        public static BitmapRendererEventProducer create(EventBroadcaster broadcaster) {
+        public static BitmapRendererEventProducer get(EventBroadcaster broadcaster) {
             return (BitmapRendererEventProducer)broadcaster.getEventProducerFor(
                     BitmapRendererEventProducer.class);
         }

src/java/org/apache/fop/render/bitmap/PNGRenderer.java

@@ -75,7 +75,7 @@ public class PNGRenderer extends Java2DRenderer {
             OutputStream os = getCurrentOutputStream(i);
             if (os == null) {
                 BitmapRendererEventProducer eventProducer
-                    = BitmapRendererEventProducer.Factory.create(
+                    = BitmapRendererEventProducer.Provider.get(
                             getUserAgent().getEventBroadcaster());
                 eventProducer.stoppingAfterFirstPageNoFilename(this);
                 break;
@@ -107,7 +107,7 @@ public class PNGRenderer extends Java2DRenderer {
         ImageWriter writer = ImageWriterRegistry.getInstance().getWriterFor(getMimeType());
         if (writer == null) {
             BitmapRendererEventProducer eventProducer
-                = BitmapRendererEventProducer.Factory.create(
+                = BitmapRendererEventProducer.Provider.get(
                         getUserAgent().getEventBroadcaster());
             eventProducer.noImageWriterFound(this, getMimeType());
         }

src/java/org/apache/fop/render/bitmap/TIFFRenderer.java

@@ -130,7 +130,7 @@ public class TIFFRenderer extends Java2DRenderer {
         ImageWriter writer = ImageWriterRegistry.getInstance().getWriterFor(getMimeType());
         if (writer == null) {
             BitmapRendererEventProducer eventProducer
-                = BitmapRendererEventProducer.Factory.create(
+                = BitmapRendererEventProducer.Provider.get(
                         getUserAgent().getEventBroadcaster());
             eventProducer.noImageWriterFound(this, getMimeType());
         }
@@ -149,7 +149,7 @@ public class TIFFRenderer extends Java2DRenderer {
             writer.writeImage((RenderedImage) pageImagesItr.next(), outputStream, writerParams);
             if (pageImagesItr.hasNext()) {
                 BitmapRendererEventProducer eventProducer
-                    = BitmapRendererEventProducer.Factory.create(
+                    = BitmapRendererEventProducer.Provider.get(
                             getUserAgent().getEventBroadcaster());
                 eventProducer.stoppingAfterFirstPageNoFilename(this);
             }

src/java/org/apache/fop/render/java2d/Java2DRenderer.java

@@ -931,15 +931,15 @@ public abstract class Java2DRenderer extends AbstractPathOrientedRenderer implem
                         pos, foreignAttributes);
             }
         } catch (ImageException ie) {
-            ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+            ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.imageError(this, (info != null ? info.toString() : uri), ie, null);
         } catch (FileNotFoundException fe) {
-            ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+            ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.imageNotFound(this, (info != null ? info.toString() : uri), fe, null);
         } catch (IOException ioe) {
-            ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+            ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.imageIOError(this, (info != null ? info.toString() : uri), ioe, null);
         }

src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java

@@ -115,7 +115,7 @@ public class Java2DSVGHandler extends AbstractGenericSVGHandler
         try {
             root = builder.build(ctx, doc);
         } catch (Exception e) {
-            SVGEventProducer eventProducer = SVGEventProducer.Factory.create(
+            SVGEventProducer eventProducer = SVGEventProducer.Provider.get(
                     context.getUserAgent().getEventBroadcaster());
             eventProducer.svgNotBuilt(this, e, getDocumentURI(doc));
             return;
@@ -144,7 +144,7 @@ public class Java2DSVGHandler extends AbstractGenericSVGHandler
         try {
             root.paint(info.state.getGraph());
         } catch (Exception e) {
-            SVGEventProducer eventProducer = SVGEventProducer.Factory.create(
+            SVGEventProducer eventProducer = SVGEventProducer.Provider.get(
                     context.getUserAgent().getEventBroadcaster());
             eventProducer.svgRenderingError(this, e, getDocumentURI(doc));
         }

src/java/org/apache/fop/render/pcl/PCLEventProducer.java

@@ -29,15 +29,15 @@ import org.apache.fop.events.model.EventModel;
  */
 public interface PCLEventProducer extends EventProducer {
 
-    /** Factory class for the event producer. */
-    class Factory {
+    /** Provider class for the event producer. */
+    class Provider {
         
         /**
-         * Creates a new event producer.
+         * Returns an event producer.
          * @param broadcaster the event broadcaster to use
-         * @return the new event producer
+         * @return the event producer
          */
-        public static PCLEventProducer create(EventBroadcaster broadcaster) {
+        public static PCLEventProducer get(EventBroadcaster broadcaster) {
             return (PCLEventProducer)broadcaster.getEventProducerFor(
                     PCLEventProducer.class);
         }

src/java/org/apache/fop/render/pcl/PCLRenderer.java

@@ -210,7 +210,7 @@ public class PCLRenderer extends PrintRenderer {
      */
     protected void handleIOTrouble(IOException ioe) {
         if (!ioTrouble) {
-            RendererEventProducer eventProducer = RendererEventProducer.Factory.create(
+            RendererEventProducer eventProducer = RendererEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.ioError(this, ioe);
             ioTrouble = true;
@@ -421,7 +421,7 @@ public class PCLRenderer extends PrintRenderer {
         
         if (this.currentPageDefinition == null) {
             this.currentPageDefinition = PCLPageDefinition.getDefaultPageDefinition();
-            PCLEventProducer eventProducer = PCLEventProducer.Factory.create(
+            PCLEventProducer eventProducer = PCLEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.paperTypeUnavailable(this, pagewidth, pageheight,
                     this.currentPageDefinition.getName());
@@ -1115,15 +1115,15 @@ public class PCLRenderer extends PrintRenderer {
             }
 
         } catch (ImageException ie) {
-            ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+            ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.imageError(this, (info != null ? info.toString() : uri), ie, null);
         } catch (FileNotFoundException fe) {
-            ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+            ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.imageNotFound(this, (info != null ? info.toString() : uri), fe, null);
         } catch (IOException ioe) {
-            ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+            ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.imageIOError(this, (info != null ? info.toString() : uri), ioe, null);
         }

src/java/org/apache/fop/render/pdf/PDFEventProducer.java

@@ -29,15 +29,15 @@ import org.apache.fop.events.model.EventModel;
  */
 public interface PDFEventProducer extends EventProducer {
 
-    /** Factory class for the event producer. */
-    class Factory {
+    /** Provider class for the event producer. */
+    class Provider {
         
         /**
-         * Creates a new event producer.
+         * Returns an event producer.
          * @param broadcaster the event broadcaster to use
-         * @return the new event producer
+         * @return the event producer
          */
-        public static PDFEventProducer create(EventBroadcaster broadcaster) {
+        public static PDFEventProducer get(EventBroadcaster broadcaster) {
             return (PDFEventProducer)broadcaster.getEventProducerFor(
                     PDFEventProducer.class);
         }

src/java/org/apache/fop/render/pdf/PDFRenderer.java

@@ -491,7 +491,7 @@ public class PDFRenderer extends AbstractPathOrientedRenderer {
                 PDFGoTo gt = (PDFGoTo) unfinishedGoTos.get(0);
                 finishIDGoTo(gt, defaultPos);
             }
-            PDFEventProducer eventProducer = PDFEventProducer.Factory.create(
+            PDFEventProducer eventProducer = PDFEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.nonFullyResolvedLinkTargets(this, count);
             // dysfunctional if pageref is null
@@ -1663,7 +1663,7 @@ public class PDFRenderer extends AbstractPathOrientedRenderer {
                             x, y, posInt.width, posInt.height, foreignAttributes);
                     handler.generateImage(context, img, origin, posInt);
                 } catch (IOException ioe) {
-                    ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+                    ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                             getUserAgent().getEventBroadcaster());
                     eventProducer.imageWritingError(this, ioe);
                     return;
@@ -1674,15 +1674,15 @@ public class PDFRenderer extends AbstractPathOrientedRenderer {
                             + info + " (" + img.getClass().getName() + ")");
             }
         } catch (ImageException ie) {
-            ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+            ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.imageError(this, (info != null ? info.toString() : uri), ie, null);
         } catch (FileNotFoundException fe) {
-            ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+            ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.imageNotFound(this, (info != null ? info.toString() : uri), fe, null);
         } catch (IOException ioe) {
-            ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+            ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.imageIOError(this, (info != null ? info.toString() : uri), ioe, null);
         }

src/java/org/apache/fop/render/pdf/PDFSVGHandler.java

@@ -146,7 +146,7 @@ public class PDFSVGHandler extends AbstractGenericSVGHandler
             try {
                 super.renderSVGDocument(context, doc);
             } catch (IOException ioe) {
-                SVGEventProducer eventProducer = SVGEventProducer.Factory.create(
+                SVGEventProducer eventProducer = SVGEventProducer.Provider.get(
                         context.getUserAgent().getEventBroadcaster());
                 eventProducer.svgRenderingError(this, ioe, getDocumentURI(doc));
             }
@@ -189,7 +189,7 @@ public class PDFSVGHandler extends AbstractGenericSVGHandler
             root = builder.build(ctx, doc);
             builder = null;
         } catch (Exception e) {
-            SVGEventProducer eventProducer = SVGEventProducer.Factory.create(
+            SVGEventProducer eventProducer = SVGEventProducer.Provider.get(
                     context.getUserAgent().getEventBroadcaster());
             eventProducer.svgNotBuilt(this, e, getDocumentURI(doc));
             return;
@@ -263,7 +263,7 @@ public class PDFSVGHandler extends AbstractGenericSVGHandler
             root.paint(graphics);
             pdfInfo.currentStream.add(graphics.getString());
         } catch (Exception e) {
-            SVGEventProducer eventProducer = SVGEventProducer.Factory.create(
+            SVGEventProducer eventProducer = SVGEventProducer.Provider.get(
                     context.getUserAgent().getEventBroadcaster());
             eventProducer.svgRenderingError(this, e, getDocumentURI(doc));
         }

src/java/org/apache/fop/render/ps/PSEventProducer.java

@@ -29,15 +29,15 @@ import org.apache.fop.events.model.EventModel;
  */
 public interface PSEventProducer extends EventProducer {
 
-    /** Factory class for the event producer. */
-    class Factory {
+    /** Provider class for the event producer. */
+    class Provider {
         
         /**
-         * Creates a new event producer.
+         * Returns an event producer.
          * @param broadcaster the event broadcaster to use
-         * @return the new event producer
+         * @return the event producer
          */
-        public static PSEventProducer create(EventBroadcaster broadcaster) {
+        public static PSEventProducer get(EventBroadcaster broadcaster) {
             return (PSEventProducer)broadcaster.getEventProducerFor(
                     PSEventProducer.class);
         }

src/java/org/apache/fop/render/ps/PSRenderer.java

@@ -298,7 +298,7 @@ public class PSRenderer extends AbstractPathOrientedRenderer
      */
     protected void handleIOTrouble(IOException ioe) {
         if (!ioTrouble) {
-            RendererEventProducer eventProducer = RendererEventProducer.Factory.create(
+            RendererEventProducer eventProducer = RendererEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.ioError(this, ioe);
             ioTrouble = true;
@@ -526,15 +526,15 @@ public class PSRenderer extends AbstractPathOrientedRenderer
             }
 
         } catch (ImageException ie) {
-            ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+            ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.imageError(this, (info != null ? info.toString() : uri), ie, null);
         } catch (FileNotFoundException fe) {
-            ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+            ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.imageNotFound(this, (info != null ? info.toString() : uri), fe, null);
         } catch (IOException ioe) {
-            ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+            ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.imageIOError(this, (info != null ? info.toString() : uri), ioe, null);
         }
@@ -1079,7 +1079,7 @@ public class PSRenderer extends AbstractPathOrientedRenderer
                             try {
                                 this.pageDeviceDictionary.putAll(PSDictionary.valueOf(content));
                             } catch (PSDictionaryFormatException e) {
-                                PSEventProducer eventProducer = PSEventProducer.Factory.create(
+                                PSEventProducer eventProducer = PSEventProducer.Provider.get(
                                         getUserAgent().getEventBroadcaster());
                                 eventProducer.postscriptDictionaryParseError(this, content, e);
                             }
@@ -1179,7 +1179,7 @@ public class PSRenderer extends AbstractPathOrientedRenderer
                         try {
                             pageDeviceDictionary.putAll(PSDictionary.valueOf(content));
                         } catch (PSDictionaryFormatException e) {
-                            PSEventProducer eventProducer = PSEventProducer.Factory.create(
+                            PSEventProducer eventProducer = PSEventProducer.Provider.get(
                                     getUserAgent().getEventBroadcaster());
                             eventProducer.postscriptDictionaryParseError(this, content, e);
                         }

src/java/org/apache/fop/render/ps/PSSVGHandler.java

@@ -255,7 +255,7 @@ public class PSSVGHandler extends AbstractGenericSVGHandler
         try {
             root = builder.build(ctx, doc);
         } catch (Exception e) {
-            SVGEventProducer eventProducer = SVGEventProducer.Factory.create(
+            SVGEventProducer eventProducer = SVGEventProducer.Provider.get(
                     context.getUserAgent().getEventBroadcaster());
             eventProducer.svgNotBuilt(this, e, getDocumentURI(doc));
             return;
@@ -305,7 +305,7 @@ public class PSSVGHandler extends AbstractGenericSVGHandler
             try {
                 root.paint(graphics);
             } catch (Exception e) {
-                SVGEventProducer eventProducer = SVGEventProducer.Factory.create(
+                SVGEventProducer eventProducer = SVGEventProducer.Provider.get(
                         context.getUserAgent().getEventBroadcaster());
                 eventProducer.svgRenderingError(this, e, getDocumentURI(doc));
             }
@@ -313,7 +313,7 @@ public class PSSVGHandler extends AbstractGenericSVGHandler
             gen.restoreGraphicsState();
             gen.commentln("%FOPEndSVG");
         } catch (IOException ioe) {
-            SVGEventProducer eventProducer = SVGEventProducer.Factory.create(
+            SVGEventProducer eventProducer = SVGEventProducer.Provider.get(
                     context.getUserAgent().getEventBroadcaster());
             eventProducer.svgRenderingError(this, ioe, getDocumentURI(doc));
         }

src/java/org/apache/fop/render/ps/ResourceHandler.java

@@ -322,7 +322,7 @@ public class ResourceHandler implements DSCParserConstants, PSSupportedFlavors {
                     throw new UnsupportedOperationException("Unsupported image type: " + img);
                 }
             } catch (ImageException ie) {
-                ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+                ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                         userAgent.getEventBroadcaster());
                 eventProducer.imageError(resTracker, (info != null ? info.toString() : uri),
                         ie, null);

src/java/org/apache/fop/render/rtf/RTFEventProducer.java

@@ -32,15 +32,15 @@ import org.apache.fop.fo.FONode;
  */
 public interface RTFEventProducer extends EventProducer {
 
-    /** Factory class for the event producer. */
-    class Factory {
+    /** Provider class for the event producer. */
+    class Provider {
         
         /**
-         * Creates a new event producer.
+         * Returns an event producer.
          * @param broadcaster the event broadcaster to use
-         * @return the new event producer
+         * @return the event producer
          */
-        public static RTFEventProducer create(EventBroadcaster broadcaster) {
+        public static RTFEventProducer get(EventBroadcaster broadcaster) {
             return (RTFEventProducer)broadcaster.getEventProducerFor(
                     RTFEventProducer.class);
         }

src/java/org/apache/fop/render/rtf/RTFHandler.java

@@ -166,7 +166,7 @@ public class RTFHandler extends FOEventHandler {
      * @param ioe IOException to handle
      */
     protected void handleIOTrouble(IOException ioe) {
-        RendererEventProducer eventProducer = RendererEventProducer.Factory.create(
+        RendererEventProducer eventProducer = RendererEventProducer.Provider.get(
                 getUserAgent().getEventBroadcaster());
         eventProducer.ioError(this, ioe);
     }
@@ -208,7 +208,7 @@ public class RTFHandler extends FOEventHandler {
                 this.pagemaster
                         = pageSeq.getRoot().getLayoutMasterSet().getSimplePageMaster(reference);
                 if (this.pagemaster == null) {
-                    RTFEventProducer eventProducer = RTFEventProducer.Factory.create(
+                    RTFEventProducer eventProducer = RTFEventProducer.Provider.get(
                             getUserAgent().getEventBroadcaster());
                     eventProducer.onlySPMSupported(this, reference, pageSeq.getLocator());
                     PageSequenceMaster master 
@@ -231,7 +231,7 @@ public class RTFHandler extends FOEventHandler {
                     PageAttributesConverter.convertPageAttributes(
                             pagemaster));
             } else {
-                RTFEventProducer eventProducer = RTFEventProducer.Factory.create(
+                RTFEventProducer eventProducer = RTFEventProducer.Provider.get(
                         getUserAgent().getEventBroadcaster());
                 eventProducer.noSPMFound(this, pageSeq.getLocator());
             }
@@ -1126,15 +1126,15 @@ public class RTFHandler extends FOEventHandler {
             
             putGraphic(eg, info);
         } catch (ImageException ie) {
-            ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+            ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.imageError(this, (info != null ? info.toString() : uri), ie, null);
         } catch (FileNotFoundException fe) {
-            ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+            ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.imageNotFound(this, (info != null ? info.toString() : uri), fe, null);
         } catch (IOException ioe) {
-            ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+            ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.imageIOError(this, (info != null ? info.toString() : uri), ioe, null);
         }
@@ -1163,7 +1163,7 @@ public class RTFHandler extends FOEventHandler {
             Point2D csize = new Point2D.Float(-1, -1);
             Point2D intrinsicDimensions = child.getDimension(csize);
             if (intrinsicDimensions == null) {
-                ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+                ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                         getUserAgent().getEventBroadcaster());
                 eventProducer.ifoNoIntrinsicSize(this, child.getLocator());
                 return;
@@ -1182,11 +1182,11 @@ public class RTFHandler extends FOEventHandler {
             putGraphic(ifo, converted);
             
         } catch (ImageException ie) {
-            ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+            ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.imageError(this, null, ie, null);
         } catch (IOException ioe) {
-            ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+            ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.imageIOError(this, null, ioe, null);
         }
@@ -1213,7 +1213,7 @@ public class RTFHandler extends FOEventHandler {
 
             putGraphic(abstractGraphic, image);
         } catch (ImageException ie) {
-            ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+            ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.imageError(this, null, ie, null);
         }
@@ -1242,7 +1242,7 @@ public class RTFHandler extends FOEventHandler {
         }
 
         if (rawData == null) {
-            ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create(
+            ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.imageWritingError(this, null);
             return;
@@ -1635,7 +1635,7 @@ public class RTFHandler extends FOEventHandler {
                 endCell( (TableCell) foNode);
             }
         } else {
-            RTFEventProducer eventProducer = RTFEventProducer.Factory.create(
+            RTFEventProducer eventProducer = RTFEventProducer.Provider.get(
                     getUserAgent().getEventBroadcaster());
             eventProducer.ignoredDeferredEvent(this, foNode, bStart, foNode.getLocator());
         }
@@ -1681,7 +1681,7 @@ public class RTFHandler extends FOEventHandler {
                 }
             } else {
                 //TODO Implement implicit column setup handling!
-                RTFEventProducer eventProducer = RTFEventProducer.Factory.create(
+                RTFEventProducer eventProducer = RTFEventProducer.Provider.get(
                         getUserAgent().getEventBroadcaster());
                 eventProducer.explicitTableColumnsRequired(this, table.getLocator());
             }

src/java/org/apache/fop/svg/SVGEventProducer.java

@@ -28,16 +28,16 @@ import org.apache.fop.events.EventProducer;
 public interface SVGEventProducer extends EventProducer {
 
     /**
-     * Factory class for the event producer.
+     * Provider class for the event producer.
      */
-    class Factory {
+    class Provider {
         
         /**
-         * Creates a new event producer.
+         * Returns an event producer.
          * @param broadcaster the event broadcaster to use
-         * @return the new event producer
+         * @return the event producer
          */
-        public static SVGEventProducer create(EventBroadcaster broadcaster) {
+        public static SVGEventProducer get(EventBroadcaster broadcaster) {
             return (SVGEventProducer)broadcaster.getEventProducerFor(
                     SVGEventProducer.class);
         }

src/java/org/apache/fop/svg/SVGUserAgent.java

@@ -38,7 +38,7 @@ public class SVGUserAgent extends SimpleSVGUserAgent {
      */
     public SVGUserAgent(FOUserAgent foUserAgent, AffineTransform at) {
         super(foUserAgent.getSourcePixelUnitToMillimeter(), at);
-        this.eventProducer = SVGEventProducer.Factory.create(foUserAgent.getEventBroadcaster());
+        this.eventProducer = SVGEventProducer.Provider.get(foUserAgent.getEventBroadcaster());
     }
 
     /**

test/java/org/apache/fop/events/BasicEventTestCase.java

@@ -62,7 +62,7 @@ public class BasicEventTestCase extends TestCase {
         assertTrue(broadcaster.hasEventListeners());
         
         
-        TestEventProducer producer = TestEventProducer.Factory.create(broadcaster);
+        TestEventProducer producer = TestEventProducer.Provider.get(broadcaster);
         producer.complain(this, "I'm tired", 23);
         
         Event ev = listener.event;

test/java/org/apache/fop/events/TestEventProducer.java

@@ -38,9 +38,9 @@ public interface TestEventProducer extends EventProducer {
      */
     void enjoy(Object source, String what);
  
-    public class Factory {
+    public class Provider {
         
-        public static TestEventProducer create(EventBroadcaster broadcaster) {
+        public static TestEventProducer get(EventBroadcaster broadcaster) {
             return (TestEventProducer)broadcaster.getEventProducerFor(TestEventProducer.class);
         }
     }