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 je...@apache.org on 2008/04/14 09:20:58 UTC
svn commit: r647678 [1/2] - in
/xmlgraphics/fop/branches/Temp_ProcessingFeedback:
src/documentation/content/xdocs/trunk/ src/java/org/apache/fop/area/
src/java/org/apache/fop/events/ src/java/org/apache/fop/fo/
src/java/org/apache/fop/fo/flow/ src/java...
Author: jeremias
Date: Mon Apr 14 00:20:26 2008
New Revision: 647678
URL: http://svn.apache.org/viewvc?rev=647678&view=rev
Log:
Renamed *EventProducer.Factory.create() to *EventProducer.Provider.get() to better reflect what the method does (instances may be cached and reused).
Modified:
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/trunk/events.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/area/AreaEventProducer.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/area/AreaTreeHandler.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/area/CachedRenderPagesModel.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/area/RenderPagesModel.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/events/ResourceEventProducer.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/FONode.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/FOTreeBuilder.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/FOValidationEventProducer.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/Table.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableBody.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableCell.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableColumn.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableEventProducer.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableFObj.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/BlockLevelEventProducer.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/ExternalDocumentLayoutManager.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/PageBreaker.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/PageProvider.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/AbstractRenderer.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/RendererEventProducer.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/afp/AFPEventProducer.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/afp/AFPRenderer.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/bitmap/BitmapRendererEventProducer.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/bitmap/PNGRenderer.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/pcl/PCLEventProducer.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/pcl/PCLRenderer.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/pdf/PDFEventProducer.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/pdf/PDFRenderer.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/ps/PSEventProducer.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/ps/PSRenderer.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/ps/PSSVGHandler.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/ps/ResourceHandler.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/rtf/RTFEventProducer.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/rtf/RTFHandler.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/svg/SVGEventProducer.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/svg/SVGUserAgent.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/events/BasicEventTestCase.java
xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/events/TestEventProducer.java
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/trunk/events.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/trunk/events.xml?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/trunk/events.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/documentation/content/xdocs/trunk/events.xml Mon Apr 14 00:20:26 2008
@@ -229,16 +229,16 @@
</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 @@
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">
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/area/AreaEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/area/AreaEventProducer.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/area/AreaEventProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/area/AreaEventProducer.java Mon Apr 14 00:20:26 2008
@@ -28,16 +28,16 @@
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);
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/area/AreaTreeHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/area/AreaTreeHandler.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/area/AreaTreeHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/area/AreaTreeHandler.java Mon Apr 14 00:20:26 2008
@@ -325,7 +325,7 @@
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);
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/area/CachedRenderPagesModel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/area/CachedRenderPagesModel.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/area/CachedRenderPagesModel.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/area/CachedRenderPagesModel.java Mon Apr 14 00:20:26 2008
@@ -90,14 +90,14 @@
}
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 @@
}
} catch (IOException ioe) {
AreaEventProducer eventProducer
- = AreaEventProducer.Factory.create(
+ = AreaEventProducer.Provider.get(
renderer.getUserAgent().getEventBroadcaster());
eventProducer.pageSaveError(this, page.getPageNumberString(), ioe);
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/area/RenderPagesModel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/area/RenderPagesModel.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/area/RenderPagesModel.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/area/RenderPagesModel.java Mon Apr 14 00:20:26 2008
@@ -179,14 +179,14 @@
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);
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/events/ResourceEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/events/ResourceEventProducer.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/events/ResourceEventProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/events/ResourceEventProducer.java Mon Apr 14 00:20:26 2008
@@ -35,16 +35,16 @@
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);
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/FONode.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/FONode.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/FONode.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/FONode.java Mon Apr 14 00:20:26 2008
@@ -356,7 +356,7 @@
* @return an event producer for FO validation
*/
protected FOValidationEventProducer getFOValidationEventProducer() {
- return FOValidationEventProducer.Factory.create(
+ return FOValidationEventProducer.Provider.get(
getUserAgent().getEventBroadcaster());
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/FOTreeBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/FOTreeBuilder.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/FOTreeBuilder.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/FOTreeBuilder.java Mon Apr 14 00:20:26 2008
@@ -150,7 +150,7 @@
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 @@
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 @@
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),
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/FOValidationEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/FOValidationEventProducer.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/FOValidationEventProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/FOValidationEventProducer.java Mon Apr 14 00:20:26 2008
@@ -34,16 +34,16 @@
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);
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/ExternalGraphic.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/ExternalGraphic.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/ExternalGraphic.java Mon Apr 14 00:20:26 2008
@@ -79,15 +79,15 @@
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());
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java Mon Apr 14 00:20:26 2008
@@ -99,7 +99,7 @@
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());
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java Mon Apr 14 00:20:26 2008
@@ -120,14 +120,14 @@
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());
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/Table.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/Table.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/Table.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/Table.java Mon Apr 14 00:20:26 2008
@@ -127,7 +127,7 @@
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 @@
&& 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 @@
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());
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableBody.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableBody.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableBody.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableBody.java Mon Apr 14 00:20:26 2008
@@ -163,14 +163,14 @@
} 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());
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableCell.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableCell.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableCell.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableCell.java Mon Apr 14 00:20:26 2008
@@ -106,7 +106,7 @@
}
if ((startsRow() || endsRow())
&& getParent().getNameId() == FO_TABLE_ROW ) {
- TableEventProducer eventProducer = TableEventProducer.Factory.create(
+ TableEventProducer eventProducer = TableEventProducer.Provider.get(
getUserAgent().getEventBroadcaster());
eventProducer.startEndRowUnderTableRowWarning(this, getLocator());
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java Mon Apr 14 00:20:26 2008
@@ -46,7 +46,7 @@
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());
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableColumn.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableColumn.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableColumn.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableColumn.java Mon Apr 14 00:20:26 2008
@@ -82,13 +82,13 @@
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 @@
*/
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());
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableEventProducer.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableEventProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableEventProducer.java Mon Apr 14 00:20:26 2008
@@ -31,17 +31,15 @@
*/
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);
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableFObj.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableFObj.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableFObj.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/flow/table/TableFObj.java Mon Apr 14 00:20:26 2008
@@ -69,7 +69,7 @@
&& 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 @@
/* 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());
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java Mon Apr 14 00:20:26 2008
@@ -200,7 +200,7 @@
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 @@
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 @@
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());
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java Mon Apr 14 00:20:26 2008
@@ -238,7 +238,7 @@
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 @@
*/
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 @@
//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(),
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/BlockLevelEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/BlockLevelEventProducer.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/BlockLevelEventProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/BlockLevelEventProducer.java Mon Apr 14 00:20:26 2008
@@ -31,16 +31,16 @@
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);
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java Mon Apr 14 00:20:26 2008
@@ -201,7 +201,7 @@
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 @@
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());
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/ExternalDocumentLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/ExternalDocumentLayoutManager.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/ExternalDocumentLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/ExternalDocumentLayoutManager.java Mon Apr 14 00:20:26 2008
@@ -160,7 +160,7 @@
}
private ResourceEventProducer getResourceEventProducer() {
- return ResourceEventProducer.Factory.create(
+ return ResourceEventProducer.Provider.get(
getExternalDocument().getUserAgent().getEventBroadcaster());
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/PageBreaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/PageBreaker.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/PageBreaker.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/PageBreaker.java Mon Apr 14 00:20:26 2008
@@ -87,7 +87,7 @@
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);
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/PageProvider.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/PageProvider.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/PageProvider.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/PageProvider.java Mon Apr 14 00:20:26 2008
@@ -260,7 +260,7 @@
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());
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java Mon Apr 14 00:20:26 2008
@@ -244,7 +244,7 @@
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
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.java Mon Apr 14 00:20:26 2008
@@ -30,16 +30,16 @@
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);
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java Mon Apr 14 00:20:26 2008
@@ -159,7 +159,7 @@
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;
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java Mon Apr 14 00:20:26 2008
@@ -384,7 +384,7 @@
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());
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java Mon Apr 14 00:20:26 2008
@@ -191,7 +191,7 @@
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 @@
}
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(),
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java Mon Apr 14 00:20:26 2008
@@ -82,7 +82,7 @@
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;
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/AbstractRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/AbstractRenderer.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/AbstractRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/AbstractRenderer.java Mon Apr 14 00:20:26 2008
@@ -794,7 +794,7 @@
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 @@
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);
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/RendererEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/RendererEventProducer.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/RendererEventProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/RendererEventProducer.java Mon Apr 14 00:20:26 2008
@@ -29,15 +29,15 @@
*/
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);
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/afp/AFPEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/afp/AFPEventProducer.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/afp/AFPEventProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/afp/AFPEventProducer.java Mon Apr 14 00:20:26 2008
@@ -29,15 +29,15 @@
*/
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);
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/afp/AFPRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/afp/AFPRenderer.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/afp/AFPRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/afp/AFPRenderer.java Mon Apr 14 00:20:26 2008
@@ -292,7 +292,7 @@
}
}
} else {
- AFPEventProducer eventProducer = AFPEventProducer.Factory.create(
+ AFPEventProducer eventProducer = AFPEventProducer.Provider.get(
getUserAgent().getEventBroadcaster());
eventProducer.warnDefaultFontSetup(this);
}
@@ -1017,15 +1017,15 @@
}
} 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 @@
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);
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/bitmap/BitmapRendererEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/bitmap/BitmapRendererEventProducer.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/bitmap/BitmapRendererEventProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/bitmap/BitmapRendererEventProducer.java Mon Apr 14 00:20:26 2008
@@ -31,15 +31,15 @@
*/
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);
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/bitmap/PNGRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/bitmap/PNGRenderer.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/bitmap/PNGRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/bitmap/PNGRenderer.java Mon Apr 14 00:20:26 2008
@@ -75,7 +75,7 @@
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 @@
ImageWriter writer = ImageWriterRegistry.getInstance().getWriterFor(getMimeType());
if (writer == null) {
BitmapRendererEventProducer eventProducer
- = BitmapRendererEventProducer.Factory.create(
+ = BitmapRendererEventProducer.Provider.get(
getUserAgent().getEventBroadcaster());
eventProducer.noImageWriterFound(this, getMimeType());
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java Mon Apr 14 00:20:26 2008
@@ -130,7 +130,7 @@
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 @@
writer.writeImage((RenderedImage) pageImagesItr.next(), outputStream, writerParams);
if (pageImagesItr.hasNext()) {
BitmapRendererEventProducer eventProducer
- = BitmapRendererEventProducer.Factory.create(
+ = BitmapRendererEventProducer.Provider.get(
getUserAgent().getEventBroadcaster());
eventProducer.stoppingAfterFirstPageNoFilename(this);
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/java2d/Java2DRenderer.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/java2d/Java2DRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/java2d/Java2DRenderer.java Mon Apr 14 00:20:26 2008
@@ -931,15 +931,15 @@
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);
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java Mon Apr 14 00:20:26 2008
@@ -115,7 +115,7 @@
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 @@
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));
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/pcl/PCLEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/pcl/PCLEventProducer.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/pcl/PCLEventProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/pcl/PCLEventProducer.java Mon Apr 14 00:20:26 2008
@@ -29,15 +29,15 @@
*/
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);
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/pcl/PCLRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/pcl/PCLRenderer.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/pcl/PCLRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/pcl/PCLRenderer.java Mon Apr 14 00:20:26 2008
@@ -210,7 +210,7 @@
*/
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 @@
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 @@
}
} 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);
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/pdf/PDFEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/pdf/PDFEventProducer.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/pdf/PDFEventProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/pdf/PDFEventProducer.java Mon Apr 14 00:20:26 2008
@@ -29,15 +29,15 @@
*/
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);
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/pdf/PDFRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/pdf/PDFRenderer.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/pdf/PDFRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/pdf/PDFRenderer.java Mon Apr 14 00:20:26 2008
@@ -491,7 +491,7 @@
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 @@
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 @@
+ 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);
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java Mon Apr 14 00:20:26 2008
@@ -146,7 +146,7 @@
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 @@
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 @@
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));
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/ps/PSEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/ps/PSEventProducer.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/ps/PSEventProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/ps/PSEventProducer.java Mon Apr 14 00:20:26 2008
@@ -29,15 +29,15 @@
*/
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);
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/ps/PSRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/ps/PSRenderer.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/ps/PSRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/ps/PSRenderer.java Mon Apr 14 00:20:26 2008
@@ -298,7 +298,7 @@
*/
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 @@
}
} 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 @@
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 @@
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);
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/ps/PSSVGHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/ps/PSSVGHandler.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/ps/PSSVGHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/ps/PSSVGHandler.java Mon Apr 14 00:20:26 2008
@@ -255,7 +255,7 @@
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 @@
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 @@
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));
}
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/ps/ResourceHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/ps/ResourceHandler.java?rev=647678&r1=647677&r2=647678&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/ps/ResourceHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/render/ps/ResourceHandler.java Mon Apr 14 00:20:26 2008
@@ -322,7 +322,7 @@
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);
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org