Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/rtf/RTFEventProducer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/rtf/RTFEventProducer.java?rev=647678&r1=647677&r2=647678&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/rtf/RTFEventProducer.java (original) +++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/rtf/RTFEventProducer.java Mon Apr 14 00:20:26 2008 @@ -32,15 +32,15 @@ */ 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); }
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/rtf/RTFHandler.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/rtf/RTFHandler.java?rev=647678&r1=647677&r2=647678&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/rtf/RTFHandler.java (original) +++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/rtf/RTFHandler.java Mon Apr 14 00:20:26 2008 @@ -166,7 +166,7 @@ * @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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ } if (rawData == null) { - ResourceEventProducer eventProducer = ResourceEventProducer.Factory.create( + ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get( getUserAgent().getEventBroadcaster()); eventProducer.imageWritingError(this, null); return; @@ -1635,7 +1635,7 @@ 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 @@ } } else { //TODO Implement implicit column setup handling! - RTFEventProducer eventProducer = RTFEventProducer.Factory.create( + RTFEventProducer eventProducer = RTFEventProducer.Provider.get( getUserAgent().getEventBroadcaster()); eventProducer.explicitTableColumnsRequired(this, table.getLocator()); } Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/svg/SVGEventProducer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/svg/SVGEventProducer.java?rev=647678&r1=647677&r2=647678&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/svg/SVGEventProducer.java (original) +++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/svg/SVGEventProducer.java Mon Apr 14 00:20:26 2008 @@ -28,16 +28,16 @@ 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); } Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/svg/SVGUserAgent.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/svg/SVGUserAgent.java?rev=647678&r1=647677&r2=647678&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/svg/SVGUserAgent.java (original) +++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/svg/SVGUserAgent.java Mon Apr 14 00:20:26 2008 @@ -38,7 +38,7 @@ */ public SVGUserAgent(FOUserAgent foUserAgent, AffineTransform at) { super(foUserAgent.getSourcePixelUnitToMillimeter(), at); - this.eventProducer = SVGEventProducer.Factory.create(foUserAgent.getEventBroadcaster()); + this.eventProducer = SVGEventProducer.Provider.get(foUserAgent.getEventBroadcaster()); } /** Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/events/BasicEventTestCase.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/events/BasicEventTestCase.java?rev=647678&r1=647677&r2=647678&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/events/BasicEventTestCase.java (original) +++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/events/BasicEventTestCase.java Mon Apr 14 00:20:26 2008 @@ -62,7 +62,7 @@ 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; Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/events/TestEventProducer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/events/TestEventProducer.java?rev=647678&r1=647677&r2=647678&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/events/TestEventProducer.java (original) +++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/events/TestEventProducer.java Mon Apr 14 00:20:26 2008 @@ -38,9 +38,9 @@ */ 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); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
