Author: acumiskey
Date: Thu Nov 20 09:52:34 2008
New Revision: 719307
URL: http://svn.apache.org/viewvc?rev=719307&view=rev
Log:
Improved plumbing :)
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPResourceManager.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPStreamer.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPRenderer.java
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPResourceManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPResourceManager.java?rev=719307&r1=719306&r2=719307&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPResourceManager.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPResourceManager.java
Thu Nov 20 09:52:34 2008
@@ -62,12 +62,16 @@
/**
* Sets the outputstream
*
- * @param state the AFP painting state
+ * @param paintingState the AFP painting state
* @param outputStream the outputstream
+ * @return a new AFP DataStream
+ * @throws IOException thrown if an I/O exception of some sort has occurred
*/
- public void createDataStream(AFPPaintingState state, OutputStream
outputStream) {
- this.dataStream = streamer.createDataStream(state);
+ public DataStream createDataStream(AFPPaintingState paintingState,
OutputStream outputStream)
+ throws IOException {
+ this.dataStream = streamer.createDataStream(paintingState);
streamer.setOutputStream(outputStream);
+ return this.dataStream;
}
/**
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPStreamer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPStreamer.java?rev=719307&r1=719306&r2=719307&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPStreamer.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPStreamer.java
Thu Nov 20 09:52:34 2008
@@ -83,19 +83,16 @@
/**
* Creates a new DataStream
*
- * @param state the AFP painting state
+ * @param paintingState the AFP painting state
* @return a new [EMAIL PROTECTED] DataStream}
+ * @throws IOException thrown if an I/O exception of some sort has occurred
*/
- public DataStream createDataStream(AFPPaintingState state) {
- try {
- this.tempFile =
File.createTempFile(AFPDATASTREAM_TEMP_FILE_PREFIX, null);
- this.documentFile = new RandomAccessFile(tempFile, "rw");
- this.documentOutputStream = new BufferedOutputStream(
- new FileOutputStream(documentFile.getFD()));
- this.dataStream = factory.createDataStream(state,
documentOutputStream);
- } catch (IOException e) {
- log.error(e.getMessage());
- }
+ public DataStream createDataStream(AFPPaintingState paintingState) throws
IOException {
+ this.tempFile = File.createTempFile(AFPDATASTREAM_TEMP_FILE_PREFIX,
null);
+ this.documentFile = new RandomAccessFile(tempFile, "rw");
+ this.documentOutputStream = new BufferedOutputStream(
+ new FileOutputStream(documentFile.getFD()));
+ this.dataStream = factory.createDataStream(paintingState,
documentOutputStream);
return dataStream;
}
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPRenderer.java?rev=719307&r1=719306&r2=719307&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPRenderer.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPRenderer.java
Thu Nov 20 09:52:34 2008
@@ -196,9 +196,7 @@
public void startRenderer(OutputStream outputStream) throws IOException {
paintingState.setColor(Color.WHITE);
- resourceManager.createDataStream(paintingState, outputStream);
-
- this.dataStream = resourceManager.getDataStream();
+ this.dataStream = resourceManager.createDataStream(paintingState,
outputStream);
this.borderPainter = new AFPBorderPainter(paintingState, dataStream);
this.rectanglePainter = new AFPRectanglePainter(paintingState,
dataStream);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
