You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-commits@xmlgraphics.apache.org by ca...@apache.org on 2006/03/08 01:04:03 UTC
svn commit: r384062 [1/6] - in /xmlgraphics/batik/branches/anim: ./ lib/
resources/META-INF/services/
resources/org/apache/batik/apps/rasterizer/resources/
resources/org/apache/batik/apps/svgbrowser/resources/
resources/org/apache/batik/dom/svg/resourc...
Author: cam
Date: Tue Mar 7 16:03:46 2006
New Revision: 384062
URL: http://svn.apache.org/viewcvs?rev=384062&view=rev
Log:
Merged trunk changes r367274:384056 into anim branch.
Added:
xmlgraphics/batik/branches/anim/resources/META-INF/services/org.apache.batik.ext.awt.image.spi.ImageWriter (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/resources/META-INF/services/org.apache.batik.ext.awt.image.spi.ImageWriter
xmlgraphics/batik/branches/anim/resources/META-INF/services/org.apache.batik.ext.awt.image.spi.RegistryEntry (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/resources/META-INF/services/org.apache.batik.ext.awt.image.spi.RegistryEntry
xmlgraphics/batik/branches/anim/resources/org/apache/batik/swing/svg/resources/BrokenLink.svg
- copied unchanged from r384056, xmlgraphics/batik/trunk/resources/org/apache/batik/swing/svg/resources/BrokenLink.svg
xmlgraphics/batik/branches/anim/samples/tests/spec/scripting/primaryDoc.svg
- copied unchanged from r384056, xmlgraphics/batik/trunk/samples/tests/spec/scripting/primaryDoc.svg
xmlgraphics/batik/branches/anim/samples/tests/spec/scripting/resourceDocDynamic11.svg
- copied unchanged from r384056, xmlgraphics/batik/trunk/samples/tests/spec/scripting/resourceDocDynamic11.svg
xmlgraphics/batik/branches/anim/samples/tests/spec/scripting/resourceDocDynamic12.svg
- copied unchanged from r384056, xmlgraphics/batik/trunk/samples/tests/spec/scripting/resourceDocDynamic12.svg
xmlgraphics/batik/branches/anim/samples/tests/spec/scripting/resourceDocStatic11.svg
- copied unchanged from r384056, xmlgraphics/batik/trunk/samples/tests/spec/scripting/resourceDocStatic11.svg
xmlgraphics/batik/branches/anim/samples/tests/spec/scripting/resourceDocStatic12.svg
- copied unchanged from r384056, xmlgraphics/batik/trunk/samples/tests/spec/scripting/resourceDocStatic12.svg
xmlgraphics/batik/branches/anim/sources-1.4/org/apache/batik/ext/
- copied from r384056, xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/
xmlgraphics/batik/branches/anim/sources-1.4/org/apache/batik/ext/awt/
- copied from r384056, xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/
xmlgraphics/batik/branches/anim/sources-1.4/org/apache/batik/ext/awt/image/
- copied from r384056, xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/
xmlgraphics/batik/branches/anim/sources-1.4/org/apache/batik/ext/awt/image/codec/
- copied from r384056, xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/
xmlgraphics/batik/branches/anim/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/
- copied from r384056, xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/
xmlgraphics/batik/branches/anim/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/AbstractImageIORegistryEntry.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/AbstractImageIORegistryEntry.java
xmlgraphics/batik/branches/anim/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIODebugUtil.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIODebugUtil.java
xmlgraphics/batik/branches/anim/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOImageWriter.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOImageWriter.java
xmlgraphics/batik/branches/anim/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOJPEGImageWriter.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOJPEGImageWriter.java
xmlgraphics/batik/branches/anim/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOJPEGRegistryEntry.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOJPEGRegistryEntry.java
xmlgraphics/batik/branches/anim/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOPNGImageWriter.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOPNGImageWriter.java
xmlgraphics/batik/branches/anim/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOPNGRegistryEntry.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOPNGRegistryEntry.java
xmlgraphics/batik/branches/anim/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOTIFFImageWriter.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOTIFFImageWriter.java
xmlgraphics/batik/branches/anim/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOTIFFRegistryEntry.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOTIFFRegistryEntry.java
xmlgraphics/batik/branches/anim/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/PNGTranscoderImageIOWriteAdapter.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/PNGTranscoderImageIOWriteAdapter.java
xmlgraphics/batik/branches/anim/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/TIFFTranscoderImageIOWriteAdapter.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/TIFFTranscoderImageIOWriteAdapter.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/values/
xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/values/AnimatableColorValue.java (with props)
xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/values/AnimatableIntegerValue.java (with props)
xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/values/AnimatableLengthListValue.java (with props)
xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/values/AnimatableLengthValue.java (with props)
xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/values/AnimatableNumberListValue.java (with props)
xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/values/AnimatableNumberValue.java (with props)
xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/values/AnimatablePaintValue.java (with props)
xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/values/AnimatablePercentageValue.java (with props)
xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/values/AnimatablePointListValue.java (with props)
xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/values/AnimatableValue.java (with props)
xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/values/UninterpolableAnimatableValue.java (with props)
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/dom/CSSOMStoredStyleDeclaration.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/css/dom/CSSOMStoredStyleDeclaration.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/StyleDeclarationProvider.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/css/engine/StyleDeclarationProvider.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/jpeg/
- copied from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/jpeg/
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/jpeg/JPEGImageWriter.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/jpeg/JPEGImageWriter.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/jpeg/JPEGRegistryEntry.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/jpeg/JPEGRegistryEntry.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/
- copied from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGDecodeParam.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGDecodeParam.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGEncodeParam.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGEncodeParam.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGImageDecoder.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGImageDecoder.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGImageEncoder.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGImageEncoder.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGImageWriter.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGImageWriter.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGRed.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGRed.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGRegistryEntry.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGRegistryEntry.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGSuggestedPaletteEntry.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGSuggestedPaletteEntry.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGTranscoderInternalCodecWriteAdapter.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/png/PNGTranscoderInternalCodecWriteAdapter.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFRegistryEntry.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFRegistryEntry.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFTranscoderInternalCodecWriteAdapter.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFTranscoderInternalCodecWriteAdapter.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/
- copied from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/util/
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/FileCacheSeekableStream.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/util/FileCacheSeekableStream.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/ForwardSeekableStream.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/util/ForwardSeekableStream.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/ImageDecodeParam.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/util/ImageDecodeParam.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/ImageDecoder.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/util/ImageDecoder.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/ImageDecoderImpl.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/util/ImageDecoderImpl.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/ImageEncodeParam.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/util/ImageEncodeParam.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/ImageEncoder.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/util/ImageEncoder.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/ImageEncoderImpl.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/util/ImageEncoderImpl.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/MemoryCacheSeekableStream.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/util/MemoryCacheSeekableStream.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/PropertyUtil.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/util/PropertyUtil.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/SeekableOutputStream.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/util/SeekableOutputStream.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/SeekableStream.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/util/SeekableStream.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/SimpleRenderedImage.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/util/SimpleRenderedImage.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/SingleTileRenderedImage.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/codec/util/SingleTileRenderedImage.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/spi/ImageWriter.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/spi/ImageWriter.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/spi/ImageWriterParams.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/spi/ImageWriterParams.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/spi/ImageWriterRegistry.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/image/spi/ImageWriterRegistry.java
xmlgraphics/batik/branches/anim/test-sources/org/apache/batik/ext/awt/image/codec/png/
- copied from r384056, xmlgraphics/batik/trunk/test-sources/org/apache/batik/ext/awt/image/codec/png/
xmlgraphics/batik/branches/anim/test-sources/org/apache/batik/ext/awt/image/codec/png/Base64PNGEncoderTest.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/test-sources/org/apache/batik/ext/awt/image/codec/png/Base64PNGEncoderTest.java
xmlgraphics/batik/branches/anim/test-sources/org/apache/batik/ext/awt/image/codec/png/PNGEncoderTest.java (props changed)
- copied unchanged from r384056, xmlgraphics/batik/trunk/test-sources/org/apache/batik/ext/awt/image/codec/png/PNGEncoderTest.java
Removed:
xmlgraphics/batik/branches/anim/resources/org/apache/batik/swing/svg/BrokenLink.svg
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/FileCacheSeekableStream.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/ForwardSeekableStream.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/ImageDecodeParam.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/ImageDecoder.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/ImageDecoderImpl.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/ImageEncodeParam.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/ImageEncoder.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/ImageEncoderImpl.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/MemoryCacheSeekableStream.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/PNGDecodeParam.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/PNGEncodeParam.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/PNGImageDecoder.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/PNGImageEncoder.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/PNGRed.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/PNGSuggestedPaletteEntry.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/PropertyUtil.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/SeekableOutputStream.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/SeekableStream.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/SimpleRenderedImage.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/SingleTileRenderedImage.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/spi/JPEGRegistryEntry.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/spi/PNGRegistryEntry.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/spi/TIFFRegistryEntry.java
xmlgraphics/batik/branches/anim/test-sources/org/apache/batik/ext/awt/image/codec/Base64PNGEncoderTest.java
xmlgraphics/batik/branches/anim/test-sources/org/apache/batik/ext/awt/image/codec/PNGEncoderTest.java
Modified:
xmlgraphics/batik/branches/anim/build.xml
xmlgraphics/batik/branches/anim/lib/LICENSE.js.txt
xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/rasterizer/resources/Messages.properties
xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.bin.policy
xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy
xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/svgbrowser/resources/GUI.properties
xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.bin.policy
xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy
xmlgraphics/batik/branches/anim/resources/org/apache/batik/dom/svg/resources/Messages.properties
xmlgraphics/batik/branches/anim/resources/org/apache/batik/ext/awt/image/codec/properties
xmlgraphics/batik/branches/anim/resources/org/apache/batik/util/resources/XMLResourceDescriptor.properties
xmlgraphics/batik/branches/anim/samples/extensions/flowTextAlign.svg
xmlgraphics/batik/branches/anim/samples/tests/spec12/text/flowTextAlign.svg
xmlgraphics/batik/branches/anim/sources/batik-browser.mf
xmlgraphics/batik/branches/anim/sources/batik-rasterizer.mf
xmlgraphics/batik/branches/anim/sources/batik-slideshow.mf
xmlgraphics/batik/branches/anim/sources/batik.mf
xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/timing/InstanceTime.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/timing/Test.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/timing/TimedDocumentRoot.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/timing/TimedElement.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/timing/WallclockTimingSpecifier.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/apps/rasterizer/SVGConverter.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/apps/rasterizer/SVGConverterFileSource.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/apps/rasterizer/SVGConverterURLSource.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/apps/slideshow/Main.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/apps/svgbrowser/Main.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/bridge/AbstractGraphicsNodeBridge.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/bridge/AbstractSVGFilterPrimitiveElementBridge.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/bridge/AbstractSVGGradientElementBridge.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/bridge/AbstractSVGLightingElementBridge.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/bridge/Bridge.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/bridge/BridgeContext.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/bridge/GVTBuilder.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/bridge/GenericBridge.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/bridge/SVGAElementBridge.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/bridge/SVGBridgeExtension.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/bridge/SVGClipPathElementBridge.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/bridge/SVGDescElementBridge.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/bridge/SVGDescriptiveElementBridge.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/bridge/SVGFeComponentTransferElementBridge.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/bridge/SVGFeMergeElementBridge.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/bridge/SVGFilterElementBridge.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/bridge/SVGMarkerElementBridge.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/bridge/SVGMaskElementBridge.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/bridge/SVGPatternElementBridge.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/bridge/SVGTextElementBridge.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/bridge/SVGTextPathElementBridge.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/bridge/SVGTitleElementBridge.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/bridge/UpdateManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/bridge/UserAgent.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/bridge/svg12/SVG12BridgeContext.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/bridge/svg12/SVGMultiImageElementBridge.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/bridge/svg12/SVGSolidColorElementBridge.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/dom/CSSOMSVGStyleDeclaration.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/dom/CSSOMStyleDeclaration.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/CSSEngine.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/CSSNavigableDocumentListener.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/CSSStylableElement.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/StyleMap.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/AbstractAttributeCondition.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/AbstractCombinatorCondition.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/AbstractDescendantSelector.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/AbstractElementSelector.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/AbstractSiblingSelector.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/CSSAttributeCondition.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/CSSConditionalSelector.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/CSSLangCondition.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/sac/CSSPseudoClassCondition.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/ShorthandManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/ValueManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/ClipManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/CursorManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/DirectionManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/DisplayManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontFamilyManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontShorthandManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontSizeAdjustManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontSizeManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontStretchManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontStyleManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontVariantManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/FontWeightManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/OverflowManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/SrcManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/TextDecorationManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/UnicodeBidiManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/css2/VisibilityManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/AlignmentBaselineManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/BaselineShiftManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ClipPathManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ClipRuleManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ColorInterpolationManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ColorManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ColorProfileManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ColorRenderingManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/DominantBaselineManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/EnableBackgroundManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/FillRuleManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/FilterManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/GlyphOrientationManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ImageRenderingManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/KerningManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/MarkerManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/MarkerShorthandManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/MaskManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/OpacityManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/PointerEventsManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/SVGColorManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/SVGPaintManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/ShapeRenderingManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/SpacingManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/StrokeDasharrayManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/StrokeDashoffsetManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/StrokeLinecapManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/StrokeLinejoinManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/StrokeMiterlimitManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/StrokeWidthManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/TextAnchorManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/TextRenderingManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg/WritingModeManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg12/LineHeightManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg12/MarginLengthManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg12/MarginShorthandManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/css/engine/value/svg12/TextAlignManager.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/AbstractStylableDocument.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/events/DOMUIEvent.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/events/EventSupport.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMAnimationElement.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMDocument.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMElement.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMTransform.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGStylableElement.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGZoomAndPanSupport.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVGOMFlowDivElement.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVGOMFlowLineElement.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVGOMFlowParaElement.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVGOMFlowSpanElement.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/XBLEventSupport.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/XBLOMShadowTreeElement.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/util/DOMUtilities.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/util/SAXDocumentFactory.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFDecodeParam.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFDirectory.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFEncodeParam.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFImage.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFImageDecoder.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFImageEncoder.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/spi/ImageTagRegistry.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/spi/MagicNumberRegistryEntry.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/extension/StylableExtensionElement.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/extension/svg/BatikFlowTextElementBridge.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/FillShapePainter.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/StrokeShapePainter.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/flow/FlowGlyphLayout.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/flow/FlowRegions.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/flow/FlowTextNode.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/flow/FlowTextPainter.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/flow/TextLineBreaks.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/font/AWTGVTGlyphVector.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/renderer/StrokingTextPainter.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/text/ArabicTextHandler.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/text/GlyphLayout.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/script/rhino/RhinoClassLoader.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/svggen/CachedImageHandlerBase64Encoder.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/svggen/CachedImageHandlerJPEGEncoder.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/svggen/CachedImageHandlerPNGEncoder.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/svggen/ImageHandlerBase64Encoder.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/svggen/ImageHandlerJPEGEncoder.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/svggen/ImageHandlerPNGEncoder.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/swing/gvt/AbstractImageZoomInteractor.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/swing/gvt/AbstractJGVTComponent.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/swing/svg/AbstractJSVGComponent.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/transcoder/SVGAbstractTranscoder.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/transcoder/image/ImageTranscoder.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/transcoder/image/JPEGTranscoder.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/transcoder/image/PNGTranscoder.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/transcoder/image/TIFFTranscoder.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/transcoder/wmf/WMFConstants.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/util/SVGConstants.java
xmlgraphics/batik/branches/anim/sources/org/apache/batik/util/Service.java
xmlgraphics/batik/branches/anim/test-references/samples/extensions/flowTextAlign.png
xmlgraphics/batik/branches/anim/test-resources/org/apache/batik/bridge/IWasLoaded.jar
xmlgraphics/batik/branches/anim/test-resources/org/apache/batik/bridge/unitTesting.xml
xmlgraphics/batik/branches/anim/test-resources/org/apache/batik/ext/awt/image/codec/unitTesting.xml
xmlgraphics/batik/branches/anim/test-resources/org/apache/batik/swing/unitTesting.xml
xmlgraphics/batik/branches/anim/test-resources/org/apache/batik/test/samplesRendering.xml
xmlgraphics/batik/branches/anim/test-sources/org/apache/batik/swing/JSVGMemoryLeakTest.java
xmlgraphics/batik/branches/anim/test-sources/org/apache/batik/test/svg/AbstractRenderingAccuracyTest.java
xmlgraphics/batik/branches/anim/test-sources/org/apache/batik/test/util/ImageCompareTest.java
xmlgraphics/batik/branches/anim/test-sources/org/apache/batik/transcoder/TranscoderInputTest.java
xmlgraphics/batik/branches/anim/test-sources/org/apache/batik/transcoder/image/AbstractImageTranscoderTest.java
Modified: xmlgraphics/batik/branches/anim/build.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/build.xml?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/build.xml (original)
+++ xmlgraphics/batik/branches/anim/build.xml Tue Mar 7 16:03:46 2006
@@ -69,6 +69,8 @@
-->
<project default="help" basedir=".">
+ <!-- Configuring the build -->
+ <property file="${basedir}/build-local.properties"/>
<!-- Initializations .................................................... -->
<target name="init-args" unless="args">
@@ -90,10 +92,12 @@
<property name="deprecation" value="on"/>
<property name="src" value="sources"/>
+ <property name="src-internal-codec" value="sources-internal-codec"/>
<property name="resources" value="resources"/>
<property name="testsrc" value="test-sources"/>
<property name="testresources" value="test-resources"/>
<property name="dest" value="classes"/>
+ <property name="dest-internal-codec" value="classes-internal-codec"/>
<property name="build" value="${project}-${version}"/>
<property name="docs" value="${build}/docs"/>
<property name="lib" value="lib"/>
@@ -128,7 +132,18 @@
<classpath refid="libs-classpath"/>
</available>
<available property="jdk14.present" classname="java.lang.CharSequence"/>
-
+
+ <!-- When compiling Batik under GNU Classpath, the Sun codecs are not available. -->
+ <condition property="sun-codecs.present">
+ <and>
+ <available classname="com.sun.image.codec.jpeg.JPEGCodec"
+ classpathref="libs-classpath"/>
+ <not>
+ <equals arg1="${sun-codecs.disabled}" arg2="true"/>
+ </not>
+ </and>
+ </condition>
+
<condition property="src-jdk" value="sources-1.4">
<equals arg1="${jdk14.present}" arg2="true"/>
</condition>
@@ -425,29 +440,25 @@
</jar>
</target>
-
- <target name ="compile"
- depends ="init"
- description="Compiles the source files">
+ <target name ="compile-prepare"
+ depends ="init">
<mkdir dir="${dest}"/>
<echo message="debug ${debug}, optimize ${optimize}, deprecation ${deprecation}"/>
+ </target>
+
+ <target name ="compile"
+ depends ="init, compile-prepare">
<javac destdir="${dest}" deprecation="${deprecation}"
debug="${debug}" optimize="${optimize}">
<src path="${src}"/>
<src path="${src-jdk}"/>
<classpath refid="libs-classpath"/>
<exclude name="**/*.html"/>
- <exclude name="**/rhino/*" unless="rhino.present"/>
+ <exclude name="**/rhino/*" unless="rhino.present"/>
<exclude name="**/jpython/*" unless="jpython.present"/>
- <exclude name="**/jacl/*" unless="jacl.present"/>
- </javac>
- <javac srcdir="${src-jdk}" destdir="${dest}" deprecation="${deprecation}"
- debug="${debug}" optimize="${optimize}">
- <classpath refid="libs-classpath"/>
- <exclude name="**/*.html"/>
- <exclude name="**/rhino/*" unless="rhino.present"/>
- <exclude name="**/jpython/*" unless="jpython.present"/>
- <exclude name="**/jacl/*" unless="jacl.present"/>
+ <exclude name="**/jacl/*" unless="jacl.present"/>
+ <exclude name="${src}/${package-prefix}/ext/awt/image/codec/jpeg/*"
+ unless="sun-codecs.present"/>
</javac>
</target>
@@ -495,6 +506,7 @@
bridge-jar,
swing-jar,
anim-jar,
+ codec-jar,
extension-jar,
xml-jar,
root-jar,
@@ -632,6 +644,25 @@
</target>
+ <!-- Codecs (dependencies: awt-util, transcoder) -->
+ <target name="codec-jar" depends="compile, prepare-build" >
+ <jar jarfile="${build}/lib/${project}-codec.jar">
+ <fileset dir="${dest}" >
+ <include name="${package-prefix}/ext/awt/image/codec/util/*.class"/>
+ <include name="${package-prefix}/ext/awt/image/codec/png/*.class"/>
+ <include name="${package-prefix}/ext/awt/image/codec/tiff/*.class"/>
+ <include name="${package-prefix}/ext/awt/image/codec/jpeg/*.class"
+ if="sun-codecs.present"/>
+ <include name="${package-prefix}/ext/awt/image/codec/imageio/*.class"
+ if="jdk14.present"/>
+ </fileset>
+ <fileset dir="${resources}" excludes="**/.svn/" >
+ <include name="${package-prefix}/ext/awt/image/codec/**/properties"/>
+ </fileset>
+ </jar>
+ </target>
+
+
<!-- SVGGraphics2D (dependencies: util, awt-util) -->
<target name="svggen-jar" depends="compile, prepare-build">
<jar jarfile="${build}/lib/${project}-svggen.jar">
@@ -829,7 +860,7 @@
<target name="anim-jar" depends="compile, prepare-build">
<jar jarfile="${build}/lib/${project}-anim.jar">
<fileset dir="${dest}">
- <include name="${package-prefix}/anim/*.class"/>
+ <include name="${package-prefix}/anim/**/*.class"/>
</fileset>
<fileset dir="${resources}" excludes="**/.svn/">
<include name="${package-prefix}/anim/**/resources/*"/>
Modified: xmlgraphics/batik/branches/anim/lib/LICENSE.js.txt
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/lib/LICENSE.js.txt?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/lib/LICENSE.js.txt (original)
+++ xmlgraphics/batik/branches/anim/lib/LICENSE.js.txt Tue Mar 7 16:03:46 2006
@@ -8,6 +8,57 @@
Rhino is licensed under the NPL (Netscape Public License) which
is duplicated below.
+The Rhino jar also includes four classes:
+ org.mozilla.javascript.tools.debugger.downloaded.AbstractCellEditor.java
+ org.mozilla.javascript.tools.debugger.downloaded.JTreeTable.java
+ org.mozilla.javascript.tools.debugger.downloaded.TreeTableModel.java
+ org.mozilla.javascript.tools.debugger.downloaded.TreeTableModelAdapter.java
+Which comes from:
+ http://java.sun.com/products/jfc/tsc/articles/treetable2
+
+Under the following license:
+
+Code sample
+License
+Copyright 1994-2006 Sun Microsystems, Inc. All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+
+ * Redistribution of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistribution in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+
+Neither the name of Sun Microsystems, Inc. or the names of
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+This software is provided "AS IS," without a warranty of any kind. ALL
+EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
+ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
+SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+You acknowledge that this software is not designed, licensed or
+intended for use in the design, construction, operation or maintenance
+of any nuclear facility.
+
+
+
==============================================================================
AMENDMENTS
Propchange: xmlgraphics/batik/branches/anim/resources/META-INF/services/org.apache.batik.ext.awt.image.spi.ImageWriter
------------------------------------------------------------------------------
svn:executable = *
Propchange: xmlgraphics/batik/branches/anim/resources/META-INF/services/org.apache.batik.ext.awt.image.spi.RegistryEntry
------------------------------------------------------------------------------
svn:executable = *
Modified: xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/rasterizer/resources/Messages.properties
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/rasterizer/resources/Messages.properties?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/rasterizer/resources/Messages.properties (original)
+++ xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/rasterizer/resources/Messages.properties Tue Mar 7 16:03:46 2006
@@ -142,7 +142,7 @@
+ image/jpeg \n \
+ image/jpe \n \
+ image/png \n \
- + image/tiff \n\
+ + image/tiff \n \
+ application/pdf \n\n \
Example: -m image/jpeg \n \
Default: image/png
Modified: xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.bin.policy
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.bin.policy?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.bin.policy (original)
+++ xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.bin.policy Tue Mar 7 16:03:46 2006
@@ -14,234 +14,90 @@
// limitations under the License.
// -------------------------------------------------------------------------
-grant codeBase "${app.jar.base}/lib/xerces_2_5_0.jar" {
+grant codeBase "${app.jar.base}/lib/xml-apis-dom3.jar" {
permission java.security.AllPermission;
};
-
-
-
+grant codeBase "${app.jar.base}/lib/xerces_2_5_0.jar" {
+ permission java.security.AllPermission;
+};
grant codeBase "${app.jar.base}/batik-rasterizer.jar" {
-
-
permission java.security.AllPermission;
-
-
};
-
-
-
-
grant codeBase "${app.jar.base}/lib/batik-ext.jar" {
-
-
permission java.security.AllPermission;
-
-
};
-
-
-
-
grant codeBase "${app.jar.base}/lib/batik-dom.jar" {
-
-
permission java.security.AllPermission;
-
-
};
-
-
-
-
grant codeBase "${app.jar.base}/lib/batik-css.jar" {
-
-
permission java.security.AllPermission;
-
-
};
-
-
-
-
grant codeBase "${app.jar.base}/lib/batik-svg-dom.jar" {
-
-
permission java.security.AllPermission;
-
-
};
-
-
-
-
grant codeBase "${app.jar.base}/lib/batik-gvt.jar" {
-
-
permission java.security.AllPermission;
-
-
};
-
-
-
-
grant codeBase "${app.jar.base}/lib/batik-parser.jar" {
-
-
permission java.security.AllPermission;
-
-
};
-
-
-
-
grant codeBase "${app.jar.base}/lib/batik-script.jar" {
-
-
permission java.security.AllPermission;
-
-
};
-
-
-
-
grant codeBase "${app.jar.base}/lib/batik-bridge.jar" {
-
-
permission java.security.AllPermission;
-
-
};
-
-
-
-
grant codeBase "${app.jar.base}/lib/batik-swing.jar" {
-
-
permission java.security.AllPermission;
-
-
};
-
-
-
-
grant codeBase "${app.jar.base}/lib/batik-transcoder.jar" {
-
-
permission java.security.AllPermission;
-
-
};
grant codeBase "${app.jar.base}/lib/pdf-transcoder.jar" {
-
-
permission java.security.AllPermission;
-
-
};
grant codeBase "${app.jar.base}/lib/batik-gui-util.jar" {
-
-
permission java.security.AllPermission;
-
-
};
-
-
-
-
grant codeBase "${app.jar.base}/lib/batik-awt-util.jar" {
-
-
permission java.security.AllPermission;
-
-
};
-
-
-
-
grant codeBase "${app.jar.base}/lib/batik-util.jar" {
-
-
permission java.security.AllPermission;
-
-
};
-
-
-
-
grant codeBase "${app.jar.base}/lib/batik-xml.jar" {
-
-
permission java.security.AllPermission;
-
-
};
-
-
-
-
grant codeBase "${app.jar.base}/lib/js.jar" {
-
-
permission java.lang.RuntimePermission "createClassLoader";
-
-
permission java.net.SocketPermission "*", "listen, connect, resolve, accept";
-
-
permission java.lang.RuntimePermission "accessDeclaredMembers";
-
-
permission java.util.PropertyPermission "org.mozilla.javascript.JavaAdapter", "read";
-
-
permission java.util.PropertyPermission "org.mozilla.javascript.JavaAdapterClassName", "read";
-
-
permission java.io.FilePermission "<<ALL FILES>>", "read";
-
-
};
-
-
-
-
grant {
-
-
-
permission java.io.FilePermission "lib/batik-svg-dom.jar", "read";
-
-
};
-
Modified: xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy (original)
+++ xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy Tue Mar 7 16:03:46 2006
@@ -3,9 +3,9 @@
permission java.security.AllPermission;
};
-
-
-
+grant codeBase "${app.dev.base}/lib/xml-apis-dom3.jar" {
+ permission java.security.AllPermission;
+};
grant codeBase "${app.dev.base}/lib/xerces_2_5_0.jar" {
permission java.security.AllPermission;
@@ -17,50 +17,15 @@
grant codeBase "${app.dev.base}/lib/js.jar" {
-
-
permission java.lang.RuntimePermission "createClassLoader";
-
-
permission java.net.SocketPermission "*", "listen, connect, resolve, accept";
-
-
permission java.lang.RuntimePermission "accessDeclaredMembers";
-
-
permission java.util.PropertyPermission "org.mozilla.javascript.JavaAdapter", "read";
-
-
permission java.util.PropertyPermission "org.mozilla.javascript.JavaAdapterClassName", "read";
-
-
permission java.io.FilePermission "<<ALL FILES>>", "read";
-
-
};
-
-
-
-
grant {
-
-
permission java.io.FilePermission "resources/org/apache/batik/dom/svg/resources/svg10.dtd", "read";
-
-
permission java.io.FilePermission "resources/org/apache/batik/dom/svg/resources/UserAgentStyleSheet.css", "read";
-
-
};
-
-
-
-
-
-
-
-
-
-
-
Modified: xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/svgbrowser/resources/GUI.properties
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/svgbrowser/resources/GUI.properties?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/svgbrowser/resources/GUI.properties (original)
+++ xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/svgbrowser/resources/GUI.properties Tue Mar 7 16:03:46 2006
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright 2001-2004 The Apache Software Foundation
+# Copyright 2001-2005 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -604,7 +604,7 @@
AboutDialog.label.development.build = Development Build
AboutDialog.label.apache.batik.project = \
-An Apache XML Project, http://xml.apache.org/batik
+An Apache XML Graphics Project, http://xmlgraphics.apache.org/batik
AboutDialog.label.contributors = \n\
Committers: \n\
Modified: xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.bin.policy
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.bin.policy?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.bin.policy (original)
+++ xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.bin.policy Tue Mar 7 16:03:46 2006
@@ -14,6 +14,10 @@
// limitations under the License.
// -------------------------------------------------------------------------
+grant codeBase "${app.jar.base}/lib/xml-apis-dom3.jar" {
+ permission java.security.AllPermission;
+};
+
grant codeBase "${app.jar.base}/lib/xerces_2_5_0.jar" {
permission java.security.AllPermission;
};
Modified: xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy (original)
+++ xmlgraphics/batik/branches/anim/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy Tue Mar 7 16:03:46 2006
@@ -18,6 +18,10 @@
permission java.security.AllPermission;
};
+grant codeBase "${app.dev.base}/lib/xml-apis-dom3.jar" {
+ permission java.security.AllPermission;
+};
+
grant codeBase "${app.dev.base}/lib/xerces_2_5_0.jar" {
permission java.security.AllPermission;
};
Modified: xmlgraphics/batik/branches/anim/resources/org/apache/batik/dom/svg/resources/Messages.properties
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/resources/org/apache/batik/dom/svg/resources/Messages.properties?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/resources/org/apache/batik/dom/svg/resources/Messages.properties (original)
+++ xmlgraphics/batik/branches/anim/resources/org/apache/batik/dom/svg/resources/Messages.properties Tue Mar 7 16:03:46 2006
@@ -25,8 +25,8 @@
stylesheet.type = \
"{0}" represents an unsupported stylesheet type.
-zoom.and.pane = \
-The given value ({0}) represents an invalid SVGZoomAndPane value.
+zoom.and.pan = \
+The given value ({0}) represents an invalid SVGZoomAndPan value.
index.out.of.bounds = \
The given index ({0}) is out of bounds.
@@ -38,7 +38,7 @@
The CSS parser class {0} cannot be found.
css.parser.creation = \
-The CSS parser class '{0}' cannot be instanciated.
+The CSS parser class '{0}' cannot be instantiated.
css.parser.access = \
The CSS parser class '{0}' cannot be accessed.
@@ -52,3 +52,5 @@
readonly.point = \
This SVGPoint is readonly.
+animation.dur.indefinite = \
+The simple duration of the animation element is indefinite.
Modified: xmlgraphics/batik/branches/anim/resources/org/apache/batik/ext/awt/image/codec/properties
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/resources/org/apache/batik/ext/awt/image/codec/properties?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/resources/org/apache/batik/ext/awt/image/codec/properties (original)
+++ xmlgraphics/batik/branches/anim/resources/org/apache/batik/ext/awt/image/codec/properties Tue Mar 7 16:03:46 2006
@@ -1,88 +0,0 @@
-FileCacheSeekableStream0=pos < 0.
-FileSeekableStream0=pos < 0.
-FloatDoubleColorModel0=transferType must be DataBuffer.TYPE_FLOAT or DataBuffer.TYPE_DOUBLE.
-FloatDoubleColorModel10=elements required in the components array.
-FloatDoubleColorModel1=getRed(int) not supported by this ColorModel.
-FloatDoubleColorModel2=getGreen(int) not supported by this ColorModel.
-FloatDoubleColorModel3=getBlue(int) not supported by this ColorModel.
-FloatDoubleColorModel4=getAlpha(int) not supported by this ColorModel.
-FloatDoubleColorModel5=getRGB(int) not supported by this ColorModel.
-FloatDoubleColorModel6=raster transfer type must match that of this ColorModel.
-FloatDoubleColorModel7=Type of pixel does not match transfer type.
-FloatDoubleColorModel8=pixel array is not large enough to hold all color/alpha components.
-FloatDoubleColorModel9=Pixel values for FloatDoubleColorModel cannot be represented as a single integer.
-MemoryCacheSeekableStream0=pos < 0.
-PNGCodec0=PNG encoding not supported yet.
-PNGDecodeParam0=User exponent must not be negative.
-PNGDecodeParam1=Display exponent must not be negative.
-PNGEncodeParam0=Bad palette length.
-PNGEncodeParam10=Transparent RGB value has not been set.
-PNGEncodeParam11=Grayscale bit depth has not been set.
-PNGEncodeParam12=Chromaticity has not been set.
-PNGEncodeParam13=Gamma has not been set.
-PNGEncodeParam14=Palette histogram has not been set.
-PNGEncodeParam15=ICC profile has not been set.
-PNGEncodeParam16=Physical dimension information has not been set.
-PNGEncodeParam17=Suggested palette information has not been set.
-PNGEncodeParam18=Significant bits values have not been set.
-PNGEncodeParam19=sRGB rendereding intent has not been set.
-PNGEncodeParam1=Not divisible by 3.
-PNGEncodeParam20=Uncompressed text strings have not been set.
-PNGEncodeParam21=Modification time has not been set.
-PNGEncodeParam22=Compressed text strings have not been set.
-PNGEncodeParam23='unsetBackground' not implemented by the superclass 'PNGEncodeParam'.
-PNGEncodeParam24='isBackgroundSet' not implemented by the superclass 'PNGEncodeParam'.
-PNGEncodeParam2=Bit depth not equal to 1, 2, 4, or 8.
-PNGEncodeParam3=RGB palette has not been set.
-PNGEncodeParam4=background palette index has not been set.
-PNGEncodeParam5=Palette transparency has not been set.
-PNGEncodeParam6=Background gray level has not been set.
-PNGEncodeParam7=Transparent gray value has not been set.
-PNGEncodeParam8=Bit shift has not been set.
-PNGEncodeParam9=RGB background color has not been set.
-PNGImageDecoder0=PNG magic number not found.
-PNGImageDecoder10=Unsupported PNG filter method (not 0).
-PNGImageDecoder11=Unsupported PNG interlace method (not 0 or 1).
-PNGImageDecoder12=Unknown PNG pHYs unit specifier (not 0 or 1).
-PNGImageDecoder13=Illegal PNG sBit value (< 0 or > bit depth).
-PNGImageDecoder14=Too many PNG alpha palette entries.
-PNGImageDecoder15=PNG image already has alpha, can't have tRNS chunk.
-PNGImageDecoder16=Unknown PNG filter type (not 0-4).
-PNGImageDecoder17=Illegal tile requested from a PNG image.
-PNGImageDecoder18=PNG can't have hIST chunk without a PLTE chunk.
-PNGImageDecoder19=Illegal page requested from a PNG file.
-PNGImageDecoder1=Error reading PNG header.
-PNGImageDecoder2=I/O error reading PNG file.
-PNGImageDecoder3=Illegal bit depth for a PNG image.
-PNGImageDecoder4=Bad color type for a PNG image.
-PNGImageDecoder5=An RGB PNG image can't have a bit depth less than 8.
-PNGImageDecoder6=A palette-color PNG image can't have a bit depth of 16.
-PNGImageDecoder7=A PNG Gray+Alpha image can't have a bit depth less than 8.
-PNGImageDecoder8=A PNG RGB+Alpha image can't have a bit depth less than 8.
-PNGImageDecoder9=Unsupported PNG compression method (not 0).
-PNMImageDecoder0=Unrecognized magic value for PBM/PGM/PPM file.
-PNMImageDecoder1=IOException occured while processing PNM.
-PNMImageDecoder5=Illegal page requested from a PNM file.
-PNMImageEncoder0=Source image has float/double data type, unsuitable for PNM file format.
-PNMImageEncoder1=Image has an IndexColorModel whose map size is to small for the data type obtained from SampleModel.
-PNMImageEncoder1=Source image has unsuitable number of bands for PNM file format.
-PropertySet0=Not implemented.
-RasterFactory0=Number of bands must be greater than 0.
-RasterFactory10=parentY lies outside raster.
-RasterFactory11=(parentX + width) is outside raster.
-RasterFactory12=(parentY + height) is outside raster.
-RasterFactory13=Illegal value for transparency.
-RasterFactory14=Transparency cannot be opaque when useAlpha is true.
-RasterFactory15=bitsPerBands must be greater than 0.
-RasterFactory16=Size of array must be smaller than Integer.MAX_VALUE.
-RasterFactory1=Bank indices array is null.
-RasterFactory2=bankIndices.length != bandOffsets.length
-RasterFactory3=Unsupported data type.
-RasterFactory4=Band offsets array is null.
-RasterFactory5=Offsets between bands must be less than the scanline stride.
-RasterFactory6=Pixel stride times width must be less than the scanline stride.
-RasterFactory7=Pixel stride must be greater than or equal to the offset between bands.
-RasterFactory8=This method does not support the input data type.
-RasterFactory9=parentX lies outside raster.
-SegmentedSeekableStream0=Source stream does not support seeking backwards.
-SingleTileRenderedImage0=Illegal tile requested from a SingleTileRenderedImage.
Modified: xmlgraphics/batik/branches/anim/resources/org/apache/batik/util/resources/XMLResourceDescriptor.properties
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/resources/org/apache/batik/util/resources/XMLResourceDescriptor.properties?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/resources/org/apache/batik/util/resources/XMLResourceDescriptor.properties (original)
+++ xmlgraphics/batik/branches/anim/resources/org/apache/batik/util/resources/XMLResourceDescriptor.properties Tue Mar 7 16:03:46 2006
@@ -16,5 +16,5 @@
#
# Author: Thierry Kormann
-org.xml.sax.driver = org.apache.xerces.parsers.SAXParser
+#org.xml.sax.driver = org.apache.xerces.parsers.SAXParser
org.w3c.css.sac.driver = org.apache.batik.css.parser.Parser
Modified: xmlgraphics/batik/branches/anim/samples/extensions/flowTextAlign.svg
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/samples/extensions/flowTextAlign.svg?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/samples/extensions/flowTextAlign.svg (original)
+++ xmlgraphics/batik/branches/anim/samples/extensions/flowTextAlign.svg Tue Mar 7 16:03:46 2006
@@ -163,6 +163,21 @@
</g>
</g>
+ <!-- check a totally empty flow text element. -->
+ <g font-family="serif" transform="translate(0,405)" >
+ <g fill="rgb(220,220,255)">
+ <rect x="12.5" y="0" width="125" height="72"/>
+ </g>
+
+ <flowText xmlns="http://xml.apache.org/batik/ext"
+ font-size="24" xml:space="preserve">
+ <flowRegion vertical-align="top">
+ <rect x="12.5" y="0" width="125" height="72"/>
+ </flowRegion>
+ <flowPara/>
+ </flowText>
+ </g>
+
<!-- ============================================================= -->
<!-- Batik sample mark -->
<!-- ============================================================= -->
Modified: xmlgraphics/batik/branches/anim/samples/tests/spec12/text/flowTextAlign.svg
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/samples/tests/spec12/text/flowTextAlign.svg?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/samples/tests/spec12/text/flowTextAlign.svg (original)
+++ xmlgraphics/batik/branches/anim/samples/tests/spec12/text/flowTextAlign.svg Tue Mar 7 16:03:46 2006
@@ -43,8 +43,7 @@
<rect x="312.5" y="0" width="125" height="36"/>
</g>
- <flowText xmlns="http://xml.apache.org/batik/ext"
- font-size="24" xml:space="preserve">
+ <flowRoot font-size="24" xml:space="preserve">
<flowRegion vertical-align="top">
<rect x="12.5" y="0" width="125" height="36" visibility="hidden"/>
</flowRegion>
@@ -62,7 +61,7 @@
<flowRegionBreak justification="middle"
>Try bottom</flowRegionBreak>
</flowDiv>
- </flowText>
+ </flowRoot>
</g>
<g font-family="serif" transform="translate(0,120)" >
@@ -75,8 +74,7 @@
<rect x="312.5" y="40" width="125" height="36"/>
</g>
- <flowText xmlns="http://xml.apache.org/batik/ext"
- font-size="24" xml:space="preserve">
+ <flowRoot font-size="24" xml:space="preserve">
<flowRegion vertical-align="top">
<rect x="12.5" y="0" width="125" height="36" visibility="hidden"/>
<rect x="12.5" y="40" width="125" height="36" visibility="hidden"/>
@@ -97,7 +95,7 @@
<flowRegionBreak justification="middle"
>Bottom two lines</flowRegionBreak>
</flowDiv>
- </flowText>
+ </flowRoot>
</g>
<g font-family="serif" transform="translate(0,220)" >
@@ -107,8 +105,7 @@
<rect x="312.5" y="0" width="125" height="72"/>
</g>
- <flowText xmlns="http://xml.apache.org/batik/ext"
- font-size="24" xml:space="preserve">
+ <flowRoot font-size="24" xml:space="preserve">
<flowRegion vertical-align="top">
<rect x="12.5" y="0" width="125" height="72" visibility="hidden"/>
</flowRegion>
@@ -126,7 +123,7 @@
<flowRegionBreak justification="middle"
>Bottom two lines</flowRegionBreak>
</flowDiv>
- </flowText>
+ </flowRoot>
</g>
<g font-family="serif" transform="translate(0,320)" >
@@ -136,8 +133,7 @@
<rect x="312.5" y="0" width="125" height="72"/>
</g>
- <flowText xmlns="http://xml.apache.org/batik/ext"
- font-size="24" xml:space="preserve">
+ <flowRoot font-size="24" xml:space="preserve">
<flowRegion vertical-align="top">
<rect x="12.5" y="0" width="125" height="72" visibility="hidden"/>
</flowRegion>
@@ -161,12 +157,12 @@
<flowRegionBreak justification="middle"
>two lines</flowRegionBreak>
</flowDiv>
- </flowText>
+ </flowRoot>
</g>
</g>
<!-- ============================================================= -->
<!-- Batik sample mark -->
<!-- ============================================================= -->
- <use xlink:href="../batikLogo.svg#Batik_Tag_Box" />
+ <use xlink:href="../../../batikLogo.svg#Batik_Tag_Box" />
</svg>
Propchange: xmlgraphics/batik/branches/anim/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/AbstractImageIORegistryEntry.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: xmlgraphics/batik/branches/anim/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIODebugUtil.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: xmlgraphics/batik/branches/anim/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOImageWriter.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: xmlgraphics/batik/branches/anim/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOJPEGImageWriter.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: xmlgraphics/batik/branches/anim/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOJPEGRegistryEntry.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: xmlgraphics/batik/branches/anim/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOPNGImageWriter.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: xmlgraphics/batik/branches/anim/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOPNGRegistryEntry.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: xmlgraphics/batik/branches/anim/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOTIFFImageWriter.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: xmlgraphics/batik/branches/anim/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/ImageIOTIFFRegistryEntry.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: xmlgraphics/batik/branches/anim/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/PNGTranscoderImageIOWriteAdapter.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: xmlgraphics/batik/branches/anim/sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/TIFFTranscoderImageIOWriteAdapter.java
------------------------------------------------------------------------------
svn:executable = *
Modified: xmlgraphics/batik/branches/anim/sources/batik-browser.mf
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/batik-browser.mf?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/batik-browser.mf (original)
+++ xmlgraphics/batik/branches/anim/sources/batik-browser.mf Tue Mar 7 16:03:46 2006
@@ -12,8 +12,10 @@
lib/batik-transcoder.jar \
lib/batik-gui-util.jar \
lib/batik-awt-util.jar \
+ lib/batik-codec.jar \
lib/batik-util.jar \
lib/batik-xml.jar \
+ lib/batik-anim.jar \
lib/xerces_2_5_0.jar \
lib/xalan-2_6_0.jar \
lib/xml-apis-dom3.jar \
Modified: xmlgraphics/batik/branches/anim/sources/batik-rasterizer.mf
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/batik-rasterizer.mf?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/batik-rasterizer.mf (original)
+++ xmlgraphics/batik/branches/anim/sources/batik-rasterizer.mf Tue Mar 7 16:03:46 2006
@@ -10,8 +10,10 @@
lib/batik-bridge.jar \
lib/batik-transcoder.jar \
lib/batik-awt-util.jar \
+ lib/batik-codec.jar \
lib/batik-util.jar \
lib/batik-xml.jar \
+ lib/batik-anim.jar \
lib/xerces_2_5_0.jar \
lib/xalan-2_6_0.jar \
lib/xml-apis-dom3.jar \
Modified: xmlgraphics/batik/branches/anim/sources/batik-slideshow.mf
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/batik-slideshow.mf?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/batik-slideshow.mf (original)
+++ xmlgraphics/batik/branches/anim/sources/batik-slideshow.mf Tue Mar 7 16:03:46 2006
@@ -11,8 +11,10 @@
lib/batik-transcoder.jar \
lib/batik-gui-util.jar \
lib/batik-awt-util.jar \
+ lib/batik-codec.jar \
lib/batik-util.jar \
lib/batik-xml.jar \
+ lib/batik-anim.jar \
lib/xerces_2_5_0.jar \
lib/xalan-2_6_0.jar \
lib/xml-apis-dom3.jar \
Modified: xmlgraphics/batik/branches/anim/sources/batik.mf
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/batik.mf?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/batik.mf (original)
+++ xmlgraphics/batik/branches/anim/sources/batik.mf Tue Mar 7 16:03:46 2006
@@ -12,10 +12,12 @@
lib/batik-transcoder.jar \
lib/batik-gui-util.jar \
lib/batik-awt-util.jar \
+ lib/batik-codec.jar \
lib/batik-util.jar \
lib/batik-root.jar \
lib/batik-svggen.jar \
lib/batik-xml.jar \
+ lib/batik-anim.jar \
batik-squiggle.jar \
batik-rasterizer.jar \
batik-pp.jar \
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/timing/InstanceTime.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/timing/InstanceTime.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/timing/InstanceTime.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/timing/InstanceTime.java Tue Mar 7 16:03:46 2006
@@ -94,7 +94,9 @@
// time system into this time system. Not
// strictly necessary in SVG.
time = newTime;
- creator.handleTimebaseUpdate(this, time);
+ if (creator != null) {
+ creator.handleTimebaseUpdate(this, time);
+ }
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/timing/Test.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/timing/Test.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/timing/Test.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/timing/Test.java Tue Mar 7 16:03:46 2006
@@ -46,7 +46,7 @@
public org.apache.batik.dom.events.EventSupport getEventSupport() { return null; }
public org.apache.batik.dom.events.NodeEventTarget getParentNodeEventTarget() { return null; }
public Root() {
- super(Calendar.getInstance(), false, true);
+ super(false, true);
}
protected TimedElement getTimedElementById(String id) {
return (TimedElement) elements.get(id);
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/timing/TimedDocumentRoot.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/timing/TimedDocumentRoot.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/timing/TimedDocumentRoot.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/timing/TimedDocumentRoot.java Tue Mar 7 16:03:46 2006
@@ -61,16 +61,14 @@
/**
* Creates a new TimedDocumentRoot.
- * @param begin the document begin time
* @param useSVG11AccessKeys allows the use of accessKey() timing
* specifiers with a single character
* @param useSVG12Accesskeys allows the use of accessKey() with a
* DOM 3 key name
*/
- public TimedDocumentRoot(Calendar begin, boolean useSVG11AccessKeys,
+ public TimedDocumentRoot(boolean useSVG11AccessKeys,
boolean useSVG12AccessKeys) {
root = this;
- documentBeginTime = begin;
this.useSVG11AccessKeys = useSVG11AccessKeys;
this.useSVG12AccessKeys = useSVG12AccessKeys;
}
@@ -120,8 +118,12 @@
/**
* Resets the entire timegraph.
*/
- public void resetDocument() {
- documentBeginTime = Calendar.getInstance();
+ public void resetDocument(Calendar documentBeginTime) {
+ if (documentBeginTime == null) {
+ this.documentBeginTime = Calendar.getInstance();
+ } else {
+ this.documentBeginTime = documentBeginTime;
+ }
reset(true);
}
@@ -130,6 +132,15 @@
*/
public Calendar getDocumentBeginTime() {
return documentBeginTime;
+ }
+
+ /**
+ * Converts a wallclock time to document time.
+ */
+ public float convertWallclockTime(Calendar time) {
+ long begin = documentBeginTime.getTimeInMillis();
+ long t = time.getTimeInMillis();
+ return (t - begin) / 1000f;
}
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/timing/TimedElement.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/timing/TimedElement.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/timing/TimedElement.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/timing/TimedElement.java Tue Mar 7 16:03:46 2006
@@ -959,6 +959,44 @@
}
/**
+ * Adds a time to the begin time instance list that will cause
+ * the element to begin immediately (if restart semantics allow it).
+ */
+ public void beginElement() {
+ beginElement(0);
+ }
+
+ /**
+ * Adds a time to the begin time instance list that will cause
+ * the element to begin at some offset to the current time (if restart
+ * semantics allow it).
+ */
+ public void beginElement(float offset) {
+ float t = root.convertWallclockTime(Calendar.getInstance());
+ InstanceTime it = new InstanceTime(null, t + offset, null, true);
+ addInstanceTime(it, true);
+ }
+
+ /**
+ * Adds a time to the end time instance list that will cause
+ * the element to end immediately (if restart semantics allow it).
+ */
+ public void endElement() {
+ endElement(0);
+ }
+
+ /**
+ * Adds a time to the end time instance list that will cause
+ * the element to end at some offset to the current time (if restart
+ * semantics allow it).
+ */
+ public void endElement(float offset) {
+ float t = root.convertWallclockTime(Calendar.getInstance());
+ InstanceTime it = new InstanceTime(null, t + offset, null, true);
+ addInstanceTime(it, false);
+ }
+
+ /**
* Fires a TimeEvent of the given type on this element.
* @param eventType the type of TimeEvent ("beginEvent", "endEvent"
* or "repeatEvent").
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/timing/WallclockTimingSpecifier.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/timing/WallclockTimingSpecifier.java?rev=384062&r1=384061&r2=384062&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/timing/WallclockTimingSpecifier.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/timing/WallclockTimingSpecifier.java Tue Mar 7 16:03:46 2006
@@ -58,9 +58,8 @@
* to the owner's instance time list or setting up any event listeners.
*/
public void initialize() {
- long begin = owner.getRoot().getDocumentBeginTime().getTimeInMillis();
- long t = time.getTimeInMillis();
- instance = new InstanceTime(this, (t - begin) / 1000f, null, false);
+ float t = owner.getRoot().convertWallclockTime(time);
+ instance = new InstanceTime(this, t, null, false);
owner.addInstanceTime(instance, isBegin);
}
}
Added: xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/values/AnimatableColorValue.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/values/AnimatableColorValue.java?rev=384062&view=auto
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/values/AnimatableColorValue.java (added)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/values/AnimatableColorValue.java Tue Mar 7 16:03:46 2006
@@ -0,0 +1,71 @@
+package org.apache.batik.anim.values;
+
+import java.awt.Color;
+
+import org.apache.batik.anim.AnimationTarget;
+
+public class AnimatableColorValue extends AnimatableValue {
+
+ /**
+ * The color.
+ */
+ protected Color color;
+
+ /**
+ * Creates a new AnimatableColorValue.
+ */
+ protected AnimatableColorValue(AnimationTarget target) {
+ super(target);
+ }
+
+ /**
+ * Creates a new AnimatableColorValue.
+ */
+ public AnimatableColorValue(AnimationTarget target, Color c) {
+ super(target);
+ color = c;
+ }
+
+ /**
+ * Performs interpolation to the given value.
+ */
+ public AnimatableValue interpolate(AnimatableValue to,
+ float interpolation,
+ AnimatableValue accumulation) {
+ if ((to == null || interpolation == 0) && accumulation == null) {
+ return this;
+ }
+ float[] comp = this.getRGBColorComponents(null);
+ AnimatableColorValue toColor = (AnimatableColorValue) to;
+ AnimatableColorValue accColor = (AnimatableColorValue) accumulation;
+ // XXX Only sRGB colours, and only sRGB interpolation.
+ if (to != null) {
+ float[] comp2 = toColor.getRGBColorComponents(null);
+ comp[0] += interpolation * (comp2[0] - comp[0]);
+ comp[1] += interpolation * (comp2[1] - comp[1]);
+ comp[2] += interpolation * (comp2[2] - comp[2]);
+ }
+ if (accumulation != null) {
+ float[] comp2 = accColor.getRGBColorComponents(null);
+ comp[0] += interpolation * (comp2[0] - comp[0]);
+ comp[1] += interpolation * (comp2[1] - comp[1]);
+ comp[2] += interpolation * (comp2[2] - comp[2]);
+ }
+ return new AnimatableColorValue
+ (target, new Color(comp[0], comp[1], comp[2]));
+ }
+
+ /**
+ * Returns the sRGB color components of this color value.
+ */
+ public float[] getRGBColorComponents(float[] comp) {
+ return color.getRGBColorComponents(comp);
+ }
+
+ /**
+ * Returns a zero value of this AnimatableValue's type.
+ */
+ public AnimatableValue getZeroValue() {
+ return new AnimatableColorValue(target, Color.BLACK);
+ }
+}
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/values/AnimatableColorValue.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/values/AnimatableIntegerValue.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/values/AnimatableIntegerValue.java?rev=384062&view=auto
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/values/AnimatableIntegerValue.java (added)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/values/AnimatableIntegerValue.java Tue Mar 7 16:03:46 2006
@@ -0,0 +1,51 @@
+package org.apache.batik.anim.values;
+
+import org.apache.batik.anim.AnimationTarget;
+
+public class AnimatableIntegerValue extends AnimatableValue {
+
+ /**
+ * The value.
+ */
+ protected int value;
+
+ /**
+ * Creates a new AnimatableIntegerValue.
+ */
+ public AnimatableIntegerValue(AnimationTarget target, int v) {
+ super(target);
+ value = v;
+ }
+
+ /**
+ * Performs interpolation to the given value.
+ */
+ public AnimatableValue interpolate(AnimatableValue to,
+ float interpolation,
+ AnimatableValue accumulation) {
+ int v = value;
+ if (to != null) {
+ AnimatableIntegerValue toInteger = (AnimatableIntegerValue) to;
+ v += value + interpolation * (toInteger.getValue() - value);
+ }
+ if (accumulation != null) {
+ AnimatableIntegerValue accInteger = (AnimatableIntegerValue) accumulation;
+ v += accInteger.getValue();
+ }
+ return new AnimatableIntegerValue(target, v);
+ }
+
+ /**
+ * Returns the integer value.
+ */
+ public int getValue() {
+ return value;
+ }
+
+ /**
+ * Returns a zero value of this AnimatableValue's type.
+ */
+ public AnimatableValue getZeroValue() {
+ return new AnimatableIntegerValue(target, 0);
+ }
+}
Propchange: xmlgraphics/batik/branches/anim/sources/org/apache/batik/anim/values/AnimatableIntegerValue.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision