From 33d1d0300f3c5580b3f33abbb6827c259f03ec49 Mon Sep 17 00:00:00 2001 From: Adrian Cumiskey Date: Wed, 27 Aug 2008 12:46:38 +0000 Subject: [PATCH] Forgot to add Streamable. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AFPGOCAResources@689463 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/fop/render/afp/AFPStreamer.java | 2 +- .../org/apache/fop/render/afp/Streamable.java | 38 +++++++++++++++++++ .../render/afp/modca/AbstractAFPObject.java | 2 +- .../apache/fop/render/afp/modca/Document.java | 2 +- .../fop/render/afp/modca/ResourceGroup.java | 2 +- .../render/afp/modca/triplets/Triplet.java | 2 +- 6 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 src/java/org/apache/fop/render/afp/Streamable.java diff --git a/src/java/org/apache/fop/render/afp/AFPStreamer.java b/src/java/org/apache/fop/render/afp/AFPStreamer.java index ac8149dcf..84a7917aa 100644 --- a/src/java/org/apache/fop/render/afp/AFPStreamer.java +++ b/src/java/org/apache/fop/render/afp/AFPStreamer.java @@ -35,7 +35,7 @@ import org.apache.fop.render.afp.modca.DataStream; import org.apache.fop.render.afp.modca.Factory; import org.apache.fop.render.afp.modca.ResourceGroup; import org.apache.fop.render.afp.modca.StreamedResourceGroup; -import org.apache.fop.util.store.Streamable; +import org.apache.fop.render.afp.Streamable; /** * Manages the streaming of the AFP output diff --git a/src/java/org/apache/fop/render/afp/Streamable.java b/src/java/org/apache/fop/render/afp/Streamable.java new file mode 100644 index 000000000..cb2cd1bda --- /dev/null +++ b/src/java/org/apache/fop/render/afp/Streamable.java @@ -0,0 +1,38 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* $Id$ */ + +package org.apache.fop.render.afp; + +import java.io.IOException; +import java.io.OutputStream; + +/** + * Implementing object is able to write to an OutputStream + */ +public interface Streamable { + + /** + * DataStream objects must implement the writeToStream() + * method to write its data to the given OutputStream + * + * @param os the outputsteam stream + * @throws java.io.IOException an I/O exception of some sort has occurred. + */ + void writeToStream(OutputStream os) throws IOException; +} diff --git a/src/java/org/apache/fop/render/afp/modca/AbstractAFPObject.java b/src/java/org/apache/fop/render/afp/modca/AbstractAFPObject.java index 45e6c68e4..d46f6605e 100644 --- a/src/java/org/apache/fop/render/afp/modca/AbstractAFPObject.java +++ b/src/java/org/apache/fop/render/afp/modca/AbstractAFPObject.java @@ -26,7 +26,7 @@ import java.util.Iterator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.fop.util.store.Streamable; +import org.apache.fop.render.afp.Streamable; /** * This is the base class for all data stream objects. Page objects are diff --git a/src/java/org/apache/fop/render/afp/modca/Document.java b/src/java/org/apache/fop/render/afp/modca/Document.java index 04fb6c8c8..3c569d24d 100644 --- a/src/java/org/apache/fop/render/afp/modca/Document.java +++ b/src/java/org/apache/fop/render/afp/modca/Document.java @@ -23,7 +23,7 @@ import java.io.IOException; import java.io.OutputStream; import java.util.Iterator; -import org.apache.fop.util.store.Streamable; +import org.apache.fop.render.afp.Streamable; /** * The document is the highest level of the MO:DCA data-stream document diff --git a/src/java/org/apache/fop/render/afp/modca/ResourceGroup.java b/src/java/org/apache/fop/render/afp/modca/ResourceGroup.java index 9e89144f4..c412f85f7 100644 --- a/src/java/org/apache/fop/render/afp/modca/ResourceGroup.java +++ b/src/java/org/apache/fop/render/afp/modca/ResourceGroup.java @@ -24,7 +24,7 @@ import java.io.OutputStream; import java.util.Iterator; import java.util.Set; -import org.apache.fop.util.store.Streamable; +import org.apache.fop.render.afp.Streamable; /** * A Resource Group contains a set of overlays. diff --git a/src/java/org/apache/fop/render/afp/modca/triplets/Triplet.java b/src/java/org/apache/fop/render/afp/modca/triplets/Triplet.java index 94cb36707..9c88f6862 100644 --- a/src/java/org/apache/fop/render/afp/modca/triplets/Triplet.java +++ b/src/java/org/apache/fop/render/afp/modca/triplets/Triplet.java @@ -24,7 +24,7 @@ import java.io.OutputStream; import java.io.UnsupportedEncodingException; import org.apache.fop.render.afp.AFPConstants; -import org.apache.fop.util.store.Streamable; +import org.apache.fop.render.afp.Streamable; /** * A simple implementation of a MOD:CA triplet -- 2.39.5