From 2a5f9ef54c1db785e84ad5a03bc7c1dcc5b94070 Mon Sep 17 00:00:00 2001 From: Maximilian Berger Date: Mon, 25 Aug 2008 08:19:13 +0000 Subject: [PATCH] Re-added moved class as deprecated git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@688652 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/fop/util/DataURIResolver.java | 43 +++++++++ src/java/org/apache/fop/util/DataURLUtil.java | 53 +++++++++++ .../apache/fop/util/WriterOutputStream.java | 95 +++++++++++++++++++ 3 files changed, 191 insertions(+) create mode 100644 src/java/org/apache/fop/util/DataURIResolver.java create mode 100644 src/java/org/apache/fop/util/DataURLUtil.java create mode 100644 src/java/org/apache/fop/util/WriterOutputStream.java diff --git a/src/java/org/apache/fop/util/DataURIResolver.java b/src/java/org/apache/fop/util/DataURIResolver.java new file mode 100644 index 000000000..99a8318c8 --- /dev/null +++ b/src/java/org/apache/fop/util/DataURIResolver.java @@ -0,0 +1,43 @@ +/* + * 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.util; + +import javax.xml.transform.Source; +import javax.xml.transform.TransformerException; +import javax.xml.transform.URIResolver; + +/** + * @deprecated + * @see org.apache.xmlgraphics.util.uri.DataURIResolver + */ +public class DataURIResolver implements URIResolver { + + private final URIResolver newResolver = new org.apache.xmlgraphics.util.uri.DataURIResolver(); + + /** + * @deprecated + * @see org.apache.xmlgraphics.util.uri.DataURIResolver#resolve(String, + * String) + */ + public Source resolve(String href, String base) throws TransformerException { + return newResolver.resolve(href, base); + } + +} diff --git a/src/java/org/apache/fop/util/DataURLUtil.java b/src/java/org/apache/fop/util/DataURLUtil.java new file mode 100644 index 000000000..8568df274 --- /dev/null +++ b/src/java/org/apache/fop/util/DataURLUtil.java @@ -0,0 +1,53 @@ +/* + * 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.util; + +import java.io.IOException; +import java.io.InputStream; +import java.io.Writer; + +/** + * @deprecated + * @see org.apache.xmlgraphics.util.uri.DataURLUtil + */ +public class DataURLUtil { + + /** + * @deprecated + * @see org.apache.xmlgraphics.util.uri.DataURLUtil#createDataURL(InputStream, + * String) + */ + public static String createDataURL(InputStream in, String mediatype) + throws IOException { + return org.apache.xmlgraphics.util.uri.DataURLUtil.createDataURL(in, + mediatype); + } + + /** + * @deprecated + * @see org.apache.xmlgraphics.util.uri.DataURLUtil#writeDataURL(InputStream, + * String, Writer) + */ + public static void writeDataURL(InputStream in, String mediatype, + Writer writer) throws IOException { + org.apache.xmlgraphics.util.uri.DataURLUtil.writeDataURL(in, mediatype, + writer); + } +} diff --git a/src/java/org/apache/fop/util/WriterOutputStream.java b/src/java/org/apache/fop/util/WriterOutputStream.java new file mode 100644 index 000000000..e08109ab0 --- /dev/null +++ b/src/java/org/apache/fop/util/WriterOutputStream.java @@ -0,0 +1,95 @@ +/* + * 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.util; + +import java.io.IOException; +import java.io.OutputStream; +import java.io.Writer; + +/** + * @deprecated + * @see org.apache.xmlgraphics.util.WriterOutputStream + */ +public class WriterOutputStream extends OutputStream { + + private final org.apache.xmlgraphics.util.WriterOutputStream writerOutputStream; + + /** + * @deprecated + * @see org.apache.xmlgraphics.util.WriterOutputStream#WriterOutputStream(Writer) + * String) + */ + public WriterOutputStream(Writer writer) { + writerOutputStream = new org.apache.xmlgraphics.util.WriterOutputStream( + writer); + } + + /** + * @deprecated + * @see org.apache.xmlgraphics.util.WriterOutputStream#WriterOutputStream(Writer, + * String) String) + */ + public WriterOutputStream(Writer writer, String encoding) { + writerOutputStream = new org.apache.xmlgraphics.util.WriterOutputStream( + writer, encoding); + } + + /** + * @deprecated + * @see org.apache.xmlgraphics.util.WriterOutputStream#close() + */ + public void close() throws IOException { + writerOutputStream.close(); + } + + /** + * @deprecated + * @see org.apache.xmlgraphics.util.WriterOutputStream#flush() + */ + public void flush() throws IOException { + writerOutputStream.flush(); + } + + /** + * @deprecated + * @see org.apache.xmlgraphics.util.WriterOutputStream#write(byte[], int, + * int) + */ + public void write(byte[] buf, int offset, int length) throws IOException { + writerOutputStream.write(buf, offset, length); + } + + /** + * @deprecated + * @see org.apache.xmlgraphics.util.WriterOutputStream#write(byte[]) + */ + public void write(byte[] buf) throws IOException { + writerOutputStream.write(buf); + } + + /** + * @deprecated + * @see org.apache.xmlgraphics.util.WriterOutputStream#write(int) + */ + public void write(int b) throws IOException { + writerOutputStream.write(b); + } + +} -- 2.39.5