Return-Path: Delivered-To: apmail-xmlgraphics-commits-archive@www.apache.org Received: (qmail 36161 invoked from network); 14 Jan 2009 15:40:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Jan 2009 15:40:37 -0000 Received: (qmail 74649 invoked by uid 500); 14 Jan 2009 15:40:37 -0000 Mailing-List: contact commits-help@xmlgraphics.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: general@xmlgraphics.apache.org Delivered-To: mailing list commits@xmlgraphics.apache.org Received: (qmail 74640 invoked by uid 99); 14 Jan 2009 15:40:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Jan 2009 07:40:37 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Jan 2009 15:40:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4753B23888F1; Wed, 14 Jan 2009 07:40:09 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r734420 - in /xmlgraphics/commons/trunk: ./ examples/java/image/writer/ examples/java/java2d/ps/ examples/java/ps/ src/java/org/apache/xmlgraphics/image/codec/util/ src/java/org/apache/xmlgraphics/image/loader/impl/ src/java/org/apache/xmlg... Date: Wed, 14 Jan 2009 15:39:20 -0000 To: commits@xmlgraphics.apache.org From: maxberger@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090114154009.4753B23888F1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: maxberger Date: Wed Jan 14 07:38:32 2009 New Revision: 734420 URL: http://svn.apache.org/viewvc?rev=734420&view=rev Log: Set linestyle to native, keywords to "Id" Added: xmlgraphics/commons/trunk/fixsvnprops.sh (with props) Modified: xmlgraphics/commons/trunk/examples/java/image/writer/ImageWriterExample1.java (props changed) xmlgraphics/commons/trunk/examples/java/image/writer/ImageWriterExample2.java (props changed) xmlgraphics/commons/trunk/examples/java/java2d/ps/EPSExample1.java (props changed) xmlgraphics/commons/trunk/examples/java/ps/DSCProcessingExample1.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageInputStreamSeekableStreamAdapter.java (contents, props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderFactoryInternalTIFF.java (contents, props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderInternalTIFF.java (contents, props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/AbstractImageWriter.java (contents, props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriter.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriterParams.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriterRegistry.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/MultiImageWriter.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/internal/JPEGImageWriter.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/internal/PNGImageWriter.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/internal/TIFFImageWriter.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/Graphics2DImagePainter.java (contents, props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/StrokingTextHandler.java (contents, props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/TextHandler.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ps/PSTextHandler.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSPageDeviceDictionary.java (contents, props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSProcSet.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/DSCCommentFactory.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/DSCException.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/DSCFilter.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/DSCHandler.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/DSCParser.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/DSCParserConstants.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/DefaultDSCHandler.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/DefaultNestedDocumentHandler.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/EventRecorder.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/NestedDocumentHandler.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/ResourceTracker.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/AbstractDSCComment.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/AbstractEvent.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/AbstractResourcesDSCComment.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/DSCAtend.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/DSCComment.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/DSCCommentBeginResource.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/DSCCommentDocumentNeededResources.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/DSCCommentDocumentSuppliedResources.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/DSCCommentEndComments.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/DSCCommentEndOfFile.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/DSCCommentLanguageLevel.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/DSCCommentPage.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/DSCCommentPageResources.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/DSCCommentPages.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/DSCEvent.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/DSCHeaderComment.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/PostScriptComment.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/PostScriptLine.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/UnparsedDSCComment.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/tools/DSCTools.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/tools/PageExtractor.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/ClasspathResource.java (props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/MimeConstants.java (contents, props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/QName.java (contents, props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/UnitConv.java (contents, props changed) xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/XMLizable.java (props changed) xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/StandardTestSuite.java (props changed) xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/image/writer/internal/TIFFImageWriterTest.java (props changed) xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/ps/PSEscapeTestCase.java (props changed) xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/ps/dsc/events/DSCValueParserTestCase.java (props changed) xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/ps/dsc/tools/DSCToolsTestCase.java (props changed) xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/util/ClasspathResourceTest.java (contents, props changed) xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/util/HexUtil.java (props changed) xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/util/ServiceTest.java (props changed) Propchange: xmlgraphics/commons/trunk/examples/java/image/writer/ImageWriterExample1.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/examples/java/image/writer/ImageWriterExample2.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/examples/java/java2d/ps/EPSExample1.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/examples/java/ps/DSCProcessingExample1.java ------------------------------------------------------------------------------ svn:keywords = Id Added: xmlgraphics/commons/trunk/fixsvnprops.sh URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/fixsvnprops.sh?rev=734420&view=auto ============================================================================== --- xmlgraphics/commons/trunk/fixsvnprops.sh (added) +++ xmlgraphics/commons/trunk/fixsvnprops.sh Wed Jan 14 07:38:32 2009 @@ -0,0 +1,11 @@ +#!/bin/bash + + +for i in $(find . -name \*.java) +do +svn pg svn:keywords $i | grep Id > /dev/null || svn ps svn:keywords "Id" $i +done + +find . -name \*.java -exec svn ps svn:eol-style native '{}' \; +find . -name \*.xsl -exec svn ps svn:eol-style native '{}' \; +find . -name \*.xml -exec svn ps svn:eol-style native '{}' \; Propchange: xmlgraphics/commons/trunk/fixsvnprops.sh ------------------------------------------------------------------------------ svn:executable = * Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageInputStreamSeekableStreamAdapter.java URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageInputStreamSeekableStreamAdapter.java?rev=734420&r1=734419&r2=734420&view=diff ============================================================================== --- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageInputStreamSeekableStreamAdapter.java (original) +++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageInputStreamSeekableStreamAdapter.java Wed Jan 14 07:38:32 2009 @@ -1,75 +1,75 @@ -/* - * 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.xmlgraphics.image.codec.util; - -import java.io.IOException; - -import javax.imageio.stream.ImageInputStream; - -/** - * A subclass of SeekableStream that may be used to wrap - * a regular ImageInputStream. - */ -public final class ImageInputStreamSeekableStreamAdapter extends SeekableStream { - - /** The source stream. */ - private ImageInputStream stream; - - /** - * Constructs a SeekableStream that takes - * its source data from a regular ImageInputStream. - * @param stream the underlying ImageInputStream to use - */ - public ImageInputStreamSeekableStreamAdapter(ImageInputStream stream) - throws IOException { - this.stream = stream; - } - - /** {@inheritDoc} */ - public boolean canSeekBackwards() { - return true; - } - - /** {@inheritDoc} */ - public long getFilePointer() throws IOException { - return stream.getStreamPosition(); - } - - /** {@inheritDoc} */ - public void seek(long pos) throws IOException { - stream.seek(pos); - } - - /** {@inheritDoc} */ - public int read() throws IOException { - return stream.read(); - } - - /** {@inheritDoc} */ - public int read(byte[] b, int off, int len) throws IOException { - return stream.read(b, off, len); - } - - /** {@inheritDoc} */ - public void close() throws IOException { - super.close(); - stream.close(); - } -} +/* + * 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.xmlgraphics.image.codec.util; + +import java.io.IOException; + +import javax.imageio.stream.ImageInputStream; + +/** + * A subclass of SeekableStream that may be used to wrap + * a regular ImageInputStream. + */ +public final class ImageInputStreamSeekableStreamAdapter extends SeekableStream { + + /** The source stream. */ + private ImageInputStream stream; + + /** + * Constructs a SeekableStream that takes + * its source data from a regular ImageInputStream. + * @param stream the underlying ImageInputStream to use + */ + public ImageInputStreamSeekableStreamAdapter(ImageInputStream stream) + throws IOException { + this.stream = stream; + } + + /** {@inheritDoc} */ + public boolean canSeekBackwards() { + return true; + } + + /** {@inheritDoc} */ + public long getFilePointer() throws IOException { + return stream.getStreamPosition(); + } + + /** {@inheritDoc} */ + public void seek(long pos) throws IOException { + stream.seek(pos); + } + + /** {@inheritDoc} */ + public int read() throws IOException { + return stream.read(); + } + + /** {@inheritDoc} */ + public int read(byte[] b, int off, int len) throws IOException { + return stream.read(b, off, len); + } + + /** {@inheritDoc} */ + public void close() throws IOException { + super.close(); + stream.close(); + } +} Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageInputStreamSeekableStreamAdapter.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/util/ImageInputStreamSeekableStreamAdapter.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderFactoryInternalTIFF.java URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderFactoryInternalTIFF.java?rev=734420&r1=734419&r2=734420&view=diff ============================================================================== --- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderFactoryInternalTIFF.java (original) +++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderFactoryInternalTIFF.java Wed Jan 14 07:38:32 2009 @@ -1,66 +1,66 @@ -/* - * 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: ImageLoaderFactoryEPS.java 606580 2007-12-23 17:45:02Z jeremias $ */ - -package org.apache.xmlgraphics.image.loader.impl; - -import org.apache.xmlgraphics.image.loader.ImageFlavor; -import org.apache.xmlgraphics.image.loader.spi.ImageLoader; -import org.apache.xmlgraphics.util.MimeConstants; - -/** - * Factory class for the ImageLoader for TIFF (based on Commons' internal TIFF codec). - */ -public class ImageLoaderFactoryInternalTIFF extends AbstractImageLoaderFactory { - - private static final String[] MIMES = new String[] { - MimeConstants.MIME_TIFF}; - - private static final ImageFlavor[] FLAVORS = new ImageFlavor[] { - ImageFlavor.RENDERED_IMAGE}; - - - /** {@inheritDoc} */ - public String[] getSupportedMIMETypes() { - return MIMES; - } - - /** {@inheritDoc} */ - public ImageFlavor[] getSupportedFlavors(String mime) { - if (MimeConstants.MIME_TIFF.equals(mime)) { - return FLAVORS; - } - throw new IllegalArgumentException("Unsupported MIME type: " + mime); - } - - /** {@inheritDoc} */ - public ImageLoader newImageLoader(ImageFlavor targetFlavor) { - return new ImageLoaderInternalTIFF(); - } - - /** {@inheritDoc} */ - public int getUsagePenalty(String mime, ImageFlavor flavor) { - return 10000; //Provide this only as a fallback - } - - /** {@inheritDoc} */ - public boolean isAvailable() { - return true; - } - -} +/* + * 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.xmlgraphics.image.loader.impl; + +import org.apache.xmlgraphics.image.loader.ImageFlavor; +import org.apache.xmlgraphics.image.loader.spi.ImageLoader; +import org.apache.xmlgraphics.util.MimeConstants; + +/** + * Factory class for the ImageLoader for TIFF (based on Commons' internal TIFF codec). + */ +public class ImageLoaderFactoryInternalTIFF extends AbstractImageLoaderFactory { + + private static final String[] MIMES = new String[] { + MimeConstants.MIME_TIFF}; + + private static final ImageFlavor[] FLAVORS = new ImageFlavor[] { + ImageFlavor.RENDERED_IMAGE}; + + + /** {@inheritDoc} */ + public String[] getSupportedMIMETypes() { + return MIMES; + } + + /** {@inheritDoc} */ + public ImageFlavor[] getSupportedFlavors(String mime) { + if (MimeConstants.MIME_TIFF.equals(mime)) { + return FLAVORS; + } + throw new IllegalArgumentException("Unsupported MIME type: " + mime); + } + + /** {@inheritDoc} */ + public ImageLoader newImageLoader(ImageFlavor targetFlavor) { + return new ImageLoaderInternalTIFF(); + } + + /** {@inheritDoc} */ + public int getUsagePenalty(String mime, ImageFlavor flavor) { + return 10000; //Provide this only as a fallback + } + + /** {@inheritDoc} */ + public boolean isAvailable() { + return true; + } + +} Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderFactoryInternalTIFF.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderFactoryInternalTIFF.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderInternalTIFF.java URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderInternalTIFF.java?rev=734420&r1=734419&r2=734420&view=diff ============================================================================== --- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderInternalTIFF.java (original) +++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderInternalTIFF.java Wed Jan 14 07:38:32 2009 @@ -1,77 +1,77 @@ -/* - * 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.xmlgraphics.image.loader.impl; - -import java.io.IOException; -import java.util.Map; - -import javax.imageio.stream.ImageInputStream; -import javax.xml.transform.Source; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.apache.xmlgraphics.image.codec.util.ImageInputStreamSeekableStreamAdapter; -import org.apache.xmlgraphics.image.codec.util.SeekableStream; -import org.apache.xmlgraphics.image.loader.Image; -import org.apache.xmlgraphics.image.loader.ImageException; -import org.apache.xmlgraphics.image.loader.ImageFlavor; -import org.apache.xmlgraphics.image.loader.ImageInfo; -import org.apache.xmlgraphics.image.loader.ImageSessionContext; -import org.apache.xmlgraphics.image.loader.impl.AbstractImageLoader; -import org.apache.xmlgraphics.image.loader.impl.ImageRendered; -import org.apache.xmlgraphics.image.loader.util.ImageUtil; - -/** - * An ImageLoader implementation based on Commons' internal TIFF codec. - */ -public class ImageLoaderInternalTIFF extends AbstractImageLoader { - - /** logger */ - protected static Log log = LogFactory.getLog(ImageLoaderInternalTIFF.class); - - /** - * Main constructor. - */ - public ImageLoaderInternalTIFF() { - //nop - } - - /** {@inheritDoc} */ - public ImageFlavor getTargetFlavor() { - return ImageFlavor.RENDERED_IMAGE; - } - - /** {@inheritDoc} */ - public Image loadImage(ImageInfo info, Map hints, ImageSessionContext session) - throws ImageException, IOException { - - Source src = session.needSource(info.getOriginalURI()); - ImageInputStream imgStream = ImageUtil.needImageInputStream(src); - - SeekableStream seekStream = new ImageInputStreamSeekableStreamAdapter(imgStream); - org.apache.xmlgraphics.image.codec.tiff.TIFFImage img - = new org.apache.xmlgraphics.image.codec.tiff.TIFFImage - (seekStream, null, 0); - - return new ImageRendered(info, img, null); - } - -} +/* + * 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.xmlgraphics.image.loader.impl; + +import java.io.IOException; +import java.util.Map; + +import javax.imageio.stream.ImageInputStream; +import javax.xml.transform.Source; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.apache.xmlgraphics.image.codec.util.ImageInputStreamSeekableStreamAdapter; +import org.apache.xmlgraphics.image.codec.util.SeekableStream; +import org.apache.xmlgraphics.image.loader.Image; +import org.apache.xmlgraphics.image.loader.ImageException; +import org.apache.xmlgraphics.image.loader.ImageFlavor; +import org.apache.xmlgraphics.image.loader.ImageInfo; +import org.apache.xmlgraphics.image.loader.ImageSessionContext; +import org.apache.xmlgraphics.image.loader.impl.AbstractImageLoader; +import org.apache.xmlgraphics.image.loader.impl.ImageRendered; +import org.apache.xmlgraphics.image.loader.util.ImageUtil; + +/** + * An ImageLoader implementation based on Commons' internal TIFF codec. + */ +public class ImageLoaderInternalTIFF extends AbstractImageLoader { + + /** logger */ + protected static Log log = LogFactory.getLog(ImageLoaderInternalTIFF.class); + + /** + * Main constructor. + */ + public ImageLoaderInternalTIFF() { + //nop + } + + /** {@inheritDoc} */ + public ImageFlavor getTargetFlavor() { + return ImageFlavor.RENDERED_IMAGE; + } + + /** {@inheritDoc} */ + public Image loadImage(ImageInfo info, Map hints, ImageSessionContext session) + throws ImageException, IOException { + + Source src = session.needSource(info.getOriginalURI()); + ImageInputStream imgStream = ImageUtil.needImageInputStream(src); + + SeekableStream seekStream = new ImageInputStreamSeekableStreamAdapter(imgStream); + org.apache.xmlgraphics.image.codec.tiff.TIFFImage img + = new org.apache.xmlgraphics.image.codec.tiff.TIFFImage + (seekStream, null, 0); + + return new ImageRendered(info, img, null); + } + +} Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderInternalTIFF.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderInternalTIFF.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/AbstractImageWriter.java URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/AbstractImageWriter.java?rev=734420&r1=734419&r2=734420&view=diff ============================================================================== --- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/AbstractImageWriter.java (original) +++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/AbstractImageWriter.java Wed Jan 14 07:38:32 2009 @@ -25,7 +25,7 @@ /** * Abstract base class for ImageWriter implementations. * - * @version $Id: ImageWriter.java 426584 2006-07-28 16:01:47Z jeremias $ + * @version $Id$ */ public abstract class AbstractImageWriter implements ImageWriter { Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/AbstractImageWriter.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriter.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriterParams.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/ImageWriterRegistry.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/MultiImageWriter.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/internal/JPEGImageWriter.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/internal/PNGImageWriter.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/writer/internal/TIFFImageWriter.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/Graphics2DImagePainter.java URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/Graphics2DImagePainter.java?rev=734420&r1=734419&r2=734420&view=diff ============================================================================== --- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/Graphics2DImagePainter.java (original) +++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/Graphics2DImagePainter.java Wed Jan 14 07:38:32 2009 @@ -1,45 +1,45 @@ -/* - * 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.xmlgraphics.java2d; - -import java.awt.Dimension; -import java.awt.Graphics2D; -import java.awt.geom.Rectangle2D; - -/** - * This interface is used to paint vector graphic images. Components that can paint using - * a Graphics2D instance (i.e. Java2D) can implement this interface to paint themselves. - */ -public interface Graphics2DImagePainter { - - /** - * Called to paint the image. Implementations should scale so the image is - * painted fully inside the given area indicated by then Rectangle2D object. - * @param g2d the Graphics2D instance to paint on - * @param area the target area for the image (in target device units) - */ - void paint(Graphics2D g2d, Rectangle2D area); - - /** - * @return the dimensions (intrinsic size) of the image to be painted in millipoints - */ - Dimension getImageSize(); - +/* + * 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.xmlgraphics.java2d; + +import java.awt.Dimension; +import java.awt.Graphics2D; +import java.awt.geom.Rectangle2D; + +/** + * This interface is used to paint vector graphic images. Components that can paint using + * a Graphics2D instance (i.e. Java2D) can implement this interface to paint themselves. + */ +public interface Graphics2DImagePainter { + + /** + * Called to paint the image. Implementations should scale so the image is + * painted fully inside the given area indicated by then Rectangle2D object. + * @param g2d the Graphics2D instance to paint on + * @param area the target area for the image (in target device units) + */ + void paint(Graphics2D g2d, Rectangle2D area); + + /** + * @return the dimensions (intrinsic size) of the image to be painted in millipoints + */ + Dimension getImageSize(); + } \ No newline at end of file Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/Graphics2DImagePainter.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/StrokingTextHandler.java URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/StrokingTextHandler.java?rev=734420&r1=734419&r2=734420&view=diff ============================================================================== --- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/StrokingTextHandler.java (original) +++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/StrokingTextHandler.java Wed Jan 14 07:38:32 2009 @@ -15,7 +15,7 @@ * limitations under the License. */ -/* $Id: $ */ +/* $Id$ */ package org.apache.xmlgraphics.java2d; Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/StrokingTextHandler.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/TextHandler.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ps/PSTextHandler.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/ps/PSTextHandler.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSPageDeviceDictionary.java URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSPageDeviceDictionary.java?rev=734420&r1=734419&r2=734420&view=diff ============================================================================== --- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSPageDeviceDictionary.java (original) +++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSPageDeviceDictionary.java Wed Jan 14 07:38:32 2009 @@ -15,7 +15,7 @@ * limitations under the License. */ -/* $Id: PSPageDeviceDictionary.java 627367 2008-02-13 12:03:30Z maxberger $ */ +/* $Id$ */ package org.apache.xmlgraphics.ps; Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSPageDeviceDictionary.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSPageDeviceDictionary.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/PSProcSet.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/DSCCommentFactory.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/DSCException.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/DSCFilter.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/DSCHandler.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/DSCParser.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/DSCParserConstants.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/DefaultDSCHandler.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/DefaultNestedDocumentHandler.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/EventRecorder.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/NestedDocumentHandler.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/ResourceTracker.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/AbstractDSCComment.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/AbstractEvent.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/AbstractResourcesDSCComment.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/DSCAtend.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/DSCComment.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/DSCCommentBeginResource.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/DSCCommentDocumentNeededResources.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/DSCCommentDocumentSuppliedResources.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/DSCCommentEndComments.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/DSCCommentEndOfFile.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/DSCCommentLanguageLevel.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/DSCCommentPage.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/DSCCommentPageResources.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/DSCCommentPages.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/DSCEvent.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/DSCHeaderComment.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/PostScriptComment.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/PostScriptLine.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/events/UnparsedDSCComment.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/tools/DSCTools.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/ps/dsc/tools/PageExtractor.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/ClasspathResource.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/MimeConstants.java URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/MimeConstants.java?rev=734420&r1=734419&r2=734420&view=diff ============================================================================== --- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/MimeConstants.java (original) +++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/MimeConstants.java Wed Jan 14 07:38:32 2009 @@ -1,89 +1,89 @@ -/* - * 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.xmlgraphics.util; - -/** - * Frequently used MIME types for various file formats used by the XML Graphics project. - */ -public interface MimeConstants { - - /** Portable Document Format */ - String MIME_PDF = "application/pdf"; - - /** PostScript */ - String MIME_POSTSCRIPT = "application/postscript"; - /** Encapsulated PostScript (same MIME type as PostScript) */ - String MIME_EPS = MIME_POSTSCRIPT; - - /** HP's PCL */ - String MIME_PCL = "application/x-pcl"; - /** HP's PCL (alternative MIME type) */ - String MIME_PCL_ALT = "application/vnd.hp-PCL"; - - /** IBM's AFP */ - String MIME_AFP = "application/x-afp"; - - /** IBM's AFP (alternative MIME type) */ - String MIME_AFP_ALT = "application/vnd.ibm.modcap"; - - /** IBM's AFP IOCA subset for bilevel raster image */ - String MIME_AFP_IOCA_FS10 = "image/x-afp+fs10"; - - /** IBM's AFP IOCA subset for grayscale and color raster image */ - String MIME_AFP_IOCA_FS11 = "image/x-afp+fs11"; - - /** IBM's AFP IOCA subset for grayscale and color tiled raster image */ - String MIME_AFP_IOCA_FS45 = "image/x-afp+fs45"; - - /** IBM's AFP GOCA subset for graphical objects */ - String MIME_AFP_GOCA = "image/x-afp+goca"; - - /** Plain text */ - String MIME_PLAIN_TEXT = "text/plain"; - - /** Rich text format */ - String MIME_RTF = "application/rtf"; - /** Rich text format (alternative 1) */ - String MIME_RTF_ALT1 = "text/richtext"; - /** Rich text format (alternative 2) */ - String MIME_RTF_ALT2 = "text/rtf"; - - /** FrameMaker's MIF */ - String MIME_MIF = "application/mif"; - - /** Structured Vector Graphics */ - String MIME_SVG = "image/svg+xml"; - - /** GIF images */ - String MIME_GIF = "image/gif"; - /** PNG images */ - String MIME_PNG = "image/png"; - /** JPEG images */ - String MIME_JPEG = "image/jpeg"; - /** TIFF images */ - String MIME_TIFF = "image/tiff"; - - /** Proposed but non-registered MIME type for XSL-FO */ - String MIME_XSL_FO = "text/xsl"; - - /** Microsoft's Enhanced Metafile */ - String MIME_EMF = "image/x-emf"; - -} +/* + * 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.xmlgraphics.util; + +/** + * Frequently used MIME types for various file formats used by the XML Graphics project. + */ +public interface MimeConstants { + + /** Portable Document Format */ + String MIME_PDF = "application/pdf"; + + /** PostScript */ + String MIME_POSTSCRIPT = "application/postscript"; + /** Encapsulated PostScript (same MIME type as PostScript) */ + String MIME_EPS = MIME_POSTSCRIPT; + + /** HP's PCL */ + String MIME_PCL = "application/x-pcl"; + /** HP's PCL (alternative MIME type) */ + String MIME_PCL_ALT = "application/vnd.hp-PCL"; + + /** IBM's AFP */ + String MIME_AFP = "application/x-afp"; + + /** IBM's AFP (alternative MIME type) */ + String MIME_AFP_ALT = "application/vnd.ibm.modcap"; + + /** IBM's AFP IOCA subset for bilevel raster image */ + String MIME_AFP_IOCA_FS10 = "image/x-afp+fs10"; + + /** IBM's AFP IOCA subset for grayscale and color raster image */ + String MIME_AFP_IOCA_FS11 = "image/x-afp+fs11"; + + /** IBM's AFP IOCA subset for grayscale and color tiled raster image */ + String MIME_AFP_IOCA_FS45 = "image/x-afp+fs45"; + + /** IBM's AFP GOCA subset for graphical objects */ + String MIME_AFP_GOCA = "image/x-afp+goca"; + + /** Plain text */ + String MIME_PLAIN_TEXT = "text/plain"; + + /** Rich text format */ + String MIME_RTF = "application/rtf"; + /** Rich text format (alternative 1) */ + String MIME_RTF_ALT1 = "text/richtext"; + /** Rich text format (alternative 2) */ + String MIME_RTF_ALT2 = "text/rtf"; + + /** FrameMaker's MIF */ + String MIME_MIF = "application/mif"; + + /** Structured Vector Graphics */ + String MIME_SVG = "image/svg+xml"; + + /** GIF images */ + String MIME_GIF = "image/gif"; + /** PNG images */ + String MIME_PNG = "image/png"; + /** JPEG images */ + String MIME_JPEG = "image/jpeg"; + /** TIFF images */ + String MIME_TIFF = "image/tiff"; + + /** Proposed but non-registered MIME type for XSL-FO */ + String MIME_XSL_FO = "text/xsl"; + + /** Microsoft's Enhanced Metafile */ + String MIME_EMF = "image/x-emf"; + +} Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/MimeConstants.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/QName.java URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/QName.java?rev=734420&r1=734419&r2=734420&view=diff ============================================================================== --- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/QName.java (original) +++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/QName.java Wed Jan 14 07:38:32 2009 @@ -1,138 +1,138 @@ -/* - * 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.xmlgraphics.util; - -import java.io.Serializable; - -/** - * Represents a qualified name of an XML element or an XML attribute. - *

- * Note: This class allows to carry a namespace prefix but it is not used in the equals() and - * hashCode() methods. - */ -public class QName implements Serializable { - - private static final long serialVersionUID = -5225376740044770690L; - - private String namespaceURI; - private String localName; - private String prefix; - private int hashCode; - - /** - * Main constructor. - * @param namespaceURI the namespace URI - * @param prefix the namespace prefix, may be null - * @param localName the local name - */ - public QName(String namespaceURI, String prefix, String localName) { - if (localName == null) { - throw new NullPointerException("Parameter localName must not be null"); - } - if (localName.length() == 0) { - throw new IllegalArgumentException("Parameter localName must not be empty"); - } - this.namespaceURI = namespaceURI; - this.prefix = prefix; - this.localName = localName; - this.hashCode = toHashString().hashCode(); - } - - /** - * Main constructor. - * @param namespaceURI the namespace URI - * @param qName the qualified name - */ - public QName(String namespaceURI, String qName) { - if (qName == null) { - throw new NullPointerException("Parameter localName must not be null"); - } - if (qName.length() == 0) { - throw new IllegalArgumentException("Parameter localName must not be empty"); - } - this.namespaceURI = namespaceURI; - int p = qName.indexOf(':'); - if (p > 0) { - this.prefix = qName.substring(0, p); - this.localName = qName.substring(p + 1); - } else { - this.prefix = null; - this.localName = qName; - } - this.hashCode = toHashString().hashCode(); - } - - /** @return the namespace URI */ - public String getNamespaceURI() { - return this.namespaceURI; - } - - /** @return the namespace prefix */ - public String getPrefix() { - return this.prefix; - } - - /** @return the local name */ - public String getLocalName() { - return this.localName; - } - - /** @return the fully qualified name */ - public String getQName() { - return getPrefix() != null ? getPrefix() + ':' + getLocalName() : getLocalName(); - } - - /** @see java.lang.Object#hashCode() */ - public int hashCode() { - return this.hashCode; - } - - /** @see java.lang.Object#equals(java.lang.Object) */ - public boolean equals(Object obj) { - if (obj == null) { - return false; - } else if (obj == this) { - return true; - } else { - if (obj instanceof QName) { - QName other = (QName)obj; - if ((getNamespaceURI() == null && other.getNamespaceURI() == null) - || getNamespaceURI().equals(other.getNamespaceURI())) { - return getLocalName().equals(other.getLocalName()); - } - } - } - return false; - } - - /** @see java.lang.Object#toString() */ - public String toString() { - return prefix != null - ? (prefix + ":" + localName) - : toHashString(); - } - - private String toHashString() { - return (namespaceURI != null - ? ("{" + namespaceURI + "}" + localName) - : localName); - } - -} +/* + * 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.xmlgraphics.util; + +import java.io.Serializable; + +/** + * Represents a qualified name of an XML element or an XML attribute. + *

+ * Note: This class allows to carry a namespace prefix but it is not used in the equals() and + * hashCode() methods. + */ +public class QName implements Serializable { + + private static final long serialVersionUID = -5225376740044770690L; + + private String namespaceURI; + private String localName; + private String prefix; + private int hashCode; + + /** + * Main constructor. + * @param namespaceURI the namespace URI + * @param prefix the namespace prefix, may be null + * @param localName the local name + */ + public QName(String namespaceURI, String prefix, String localName) { + if (localName == null) { + throw new NullPointerException("Parameter localName must not be null"); + } + if (localName.length() == 0) { + throw new IllegalArgumentException("Parameter localName must not be empty"); + } + this.namespaceURI = namespaceURI; + this.prefix = prefix; + this.localName = localName; + this.hashCode = toHashString().hashCode(); + } + + /** + * Main constructor. + * @param namespaceURI the namespace URI + * @param qName the qualified name + */ + public QName(String namespaceURI, String qName) { + if (qName == null) { + throw new NullPointerException("Parameter localName must not be null"); + } + if (qName.length() == 0) { + throw new IllegalArgumentException("Parameter localName must not be empty"); + } + this.namespaceURI = namespaceURI; + int p = qName.indexOf(':'); + if (p > 0) { + this.prefix = qName.substring(0, p); + this.localName = qName.substring(p + 1); + } else { + this.prefix = null; + this.localName = qName; + } + this.hashCode = toHashString().hashCode(); + } + + /** @return the namespace URI */ + public String getNamespaceURI() { + return this.namespaceURI; + } + + /** @return the namespace prefix */ + public String getPrefix() { + return this.prefix; + } + + /** @return the local name */ + public String getLocalName() { + return this.localName; + } + + /** @return the fully qualified name */ + public String getQName() { + return getPrefix() != null ? getPrefix() + ':' + getLocalName() : getLocalName(); + } + + /** @see java.lang.Object#hashCode() */ + public int hashCode() { + return this.hashCode; + } + + /** @see java.lang.Object#equals(java.lang.Object) */ + public boolean equals(Object obj) { + if (obj == null) { + return false; + } else if (obj == this) { + return true; + } else { + if (obj instanceof QName) { + QName other = (QName)obj; + if ((getNamespaceURI() == null && other.getNamespaceURI() == null) + || getNamespaceURI().equals(other.getNamespaceURI())) { + return getLocalName().equals(other.getLocalName()); + } + } + } + return false; + } + + /** @see java.lang.Object#toString() */ + public String toString() { + return prefix != null + ? (prefix + ":" + localName) + : toHashString(); + } + + private String toHashString() { + return (namespaceURI != null + ? ("{" + namespaceURI + "}" + localName) + : localName); + } + +} Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/QName.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/QName.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/UnitConv.java URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/UnitConv.java?rev=734420&r1=734419&r2=734420&view=diff ============================================================================== --- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/UnitConv.java (original) +++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/UnitConv.java Wed Jan 14 07:38:32 2009 @@ -15,7 +15,7 @@ * limitations under the License. */ -/* $Id: FixedLength.java 279656 2005-09-08 22:06:48Z pietsch $ */ +/* $Id$ */ package org.apache.xmlgraphics.util; Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/UnitConv.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/util/XMLizable.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/StandardTestSuite.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/image/writer/internal/TIFFImageWriterTest.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/ps/PSEscapeTestCase.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/ps/dsc/events/DSCValueParserTestCase.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/ps/dsc/tools/DSCToolsTestCase.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/util/ClasspathResourceTest.java URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/util/ClasspathResourceTest.java?rev=734420&r1=734419&r2=734420&view=diff ============================================================================== --- xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/util/ClasspathResourceTest.java (original) +++ xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/util/ClasspathResourceTest.java Wed Jan 14 07:38:32 2009 @@ -15,7 +15,7 @@ * limitations under the License. */ -/* $Id: $ */ +/* $Id$ */ package org.apache.xmlgraphics.util; Propchange: xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/util/ClasspathResourceTest.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/util/HexUtil.java ------------------------------------------------------------------------------ svn:keywords = Id Propchange: xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/util/ServiceTest.java ------------------------------------------------------------------------------ svn:keywords = Id --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org For additional commands, e-mail: commits-help@xmlgraphics.apache.org