You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by me...@apache.org on 2012/07/03 11:47:25 UTC
svn commit: r1356646 [1/12] - in /xmlgraphics/fop/trunk: ./
examples/embedding/java/embedding/ examples/embedding/java/embedding/atxml/
examples/embedding/java/embedding/events/
examples/embedding/java/embedding/intermediate/ src/java/org/apache/fop/af...
Author: mehdi
Date: Tue Jul 3 09:46:41 2012
New Revision: 1356646
URL: http://svn.apache.org/viewvc?rev=1356646&view=rev
Log:
Merged Temp_URI_Unification branch back into trunk
Added:
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/AFPResourceAccessor.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/afp/util/AFPResourceAccessor.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/EnvironmentProfile.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/EnvironmentProfile.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/EnvironmentalProfileFactory.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/EnvironmentalProfileFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopConfParser.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/FopConfParser.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryBuilder.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/FopFactoryBuilder.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryConfig.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/FopFactoryConfig.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/io/
- copied from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/io/
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/io/InternalResourceResolver.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/io/InternalResourceResolver.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/io/Resource.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/io/Resource.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/io/ResourceResolver.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/io/ResourceResolver.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/io/ResourceResolverFactory.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/io/ResourceResolverFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/io/TempResourceResolver.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/io/TempResourceResolver.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/io/TempResourceURIGenerator.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/io/TempResourceURIGenerator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/io/package.html
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/apps/io/package.html
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/DefaultFontConfig.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/DefaultFontConfig.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/DefaultFontConfigurator.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/DefaultFontConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontCacheManager.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontCacheManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontCacheManagerFactory.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontCacheManagerFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontConfig.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontConfig.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontConfigurator.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontDetectorFactory.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/FontDetectorFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFCmapEntry.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/fonts/truetype/TTFCmapEntry.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/DefaultRendererConfigurator.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/DefaultRendererConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererConfig.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/RendererConfig.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererConfigOption.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/RendererConfigOption.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPFontConfig.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/afp/AFPFontConfig.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfig.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/afp/AFPRendererConfig.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererOption.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/afp/AFPRendererOption.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/BitmapRendererConfig.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/bitmap/BitmapRendererConfig.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/BitmapRendererOption.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/bitmap/BitmapRendererOption.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRendererConfig.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/bitmap/PNGRendererConfig.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFCompressionValues.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/bitmap/TIFFCompressionValues.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRendererConfig.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/bitmap/TIFFRendererConfig.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRendererConfig.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/intermediate/IFRendererConfig.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRendererConfig.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/java2d/Java2DRendererConfig.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRendererOption.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/java2d/Java2DRendererOption.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/Java2DRendererOption.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/pcl/Java2DRendererOption.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRendererConfig.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/pcl/PCLRendererConfig.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFEncryptionOption.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/pdf/PDFEncryptionOption.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererConfig.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/pdf/PDFRendererConfig.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererOption.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/pdf/PDFRendererOption.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererOptionsConfig.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/pdf/PDFRendererOptionsConfig.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSRendererConfig.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/ps/PSRendererConfig.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSRendererOption.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/ps/PSRendererOption.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/fonts/
- copied from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/ps/fonts/
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/fonts/PSTTFGenerator.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/ps/fonts/PSTTFGenerator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/fonts/PSTTFGlyphOutputStream.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/ps/fonts/PSTTFGlyphOutputStream.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/fonts/PSTTFOutputStream.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/ps/fonts/PSTTFOutputStream.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/fonts/PSTTFTableOutputStream.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/ps/fonts/PSTTFTableOutputStream.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TxtRendererConfig.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/src/java/org/apache/fop/render/txt/TxtRendererConfig.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/FOPTestUtils.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/FOPTestUtils.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/
- copied from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/apps/
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/AFPRendererConfBuilder.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/apps/AFPRendererConfBuilder.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/AbstractRendererConfigParserTester.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/apps/AbstractRendererConfigParserTester.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/AbstractRendererConfiguratorTest.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/apps/AbstractRendererConfiguratorTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/BitmapRendererConfBuilder.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/apps/BitmapRendererConfBuilder.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/EnvironmentalProfileFactoryTestCase.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/apps/EnvironmentalProfileFactoryTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/FontConfigurator.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/apps/FontConfigurator.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/FopConfBuilder.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/apps/FopConfBuilder.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/FopConfParserTestCase.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/apps/FopConfParserTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/FopFactoryBuilderTestCase.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/apps/FopFactoryBuilderTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/Java2DRendererConfBuilder.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/apps/Java2DRendererConfBuilder.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/PDFRendererConfBuilder.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/apps/PDFRendererConfBuilder.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/PSRendererConfBuilder.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/apps/PSRendererConfBuilder.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/TIFFRendererConfBuilder.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/apps/TIFFRendererConfBuilder.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/TxtRendererConfBuilder.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/apps/TxtRendererConfBuilder.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/
- copied from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/apps/io/
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/BaseURIResolutionTest.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/apps/io/BaseURIResolutionTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/FontURIResolver.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/apps/io/FontURIResolver.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/ResourceResolverFactoryTestCase.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/apps/io/ResourceResolverFactoryTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/TestingResourceResolver.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/apps/io/TestingResourceResolver.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/URIResolverWrapperTestCase.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/apps/io/URIResolverWrapperTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/SingleFopConfParseTestCase.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/config/SingleFopConfParseTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/EmbedFontInfoTestCase.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/fonts/EmbedFontInfoTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/FontManagerConfiguratorTestCase.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/fonts/FontManagerConfiguratorTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/FontsTestSuite.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/fonts/FontsTestSuite.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/afp/AFPRendererConfigParserTestCase.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/afp/AFPRendererConfigParserTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/bitmap/
- copied from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/bitmap/
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/bitmap/AbstractBitmapRendererConfigParserTester.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/bitmap/AbstractBitmapRendererConfigParserTester.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/bitmap/AbstractBitmapRendererConfiguratorTest.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/bitmap/AbstractBitmapRendererConfiguratorTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/bitmap/BitmapRendererConfigParserTestCase.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/bitmap/BitmapRendererConfigParserTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/bitmap/BitmapRendererConfiguratorTestCase.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/bitmap/BitmapRendererConfiguratorTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/bitmap/TIFFRendererConfigParserTestCase.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/bitmap/TIFFRendererConfigParserTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/bitmap/TIFFRendererConfiguratorTestCase.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/bitmap/TIFFRendererConfiguratorTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/java2d/
- copied from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/java2d/
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/java2d/Java2DRendererConfigParserTestcase.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/java2d/Java2DRendererConfigParserTestcase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pcl/
- copied from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pcl/
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pcl/PCLRendererConfBuilder.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pcl/PCLRendererConfBuilder.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pcl/PCLRendererConfigParserTestCase.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pcl/PCLRendererConfigParserTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pcl/PCLRendererConfiguratorTestCase.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pcl/PCLRendererConfiguratorTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFRendererConfigParserTestCase.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pdf/PDFRendererConfigParserTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFRendererOptionsConfigTestCase.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pdf/PDFRendererOptionsConfigTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/PSRendererConfigParserTestCase.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/ps/PSRendererConfigParserTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/PSRendererConfiguratorTestCase.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/ps/PSRendererConfiguratorTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/fonts/
- copied from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/ps/fonts/
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/fonts/PSTTFGeneratorTestCase.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/ps/fonts/PSTTFGeneratorTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/fonts/PSTTFGlyphOutputStreamTestCase.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/ps/fonts/PSTTFGlyphOutputStreamTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/fonts/PSTTFOutputStreamTestCase.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/ps/fonts/PSTTFOutputStreamTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/fonts/PSTTFTableOutputStreamTestCase.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/ps/fonts/PSTTFTableOutputStreamTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/txt/
- copied from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/txt/
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/txt/TxtRendererConfigParserTestCase.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/txt/TxtRendererConfigParserTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/svg/
- copied from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/svg/
xmlgraphics/fop/trunk/test/java/org/apache/fop/svg/PDFGraphics2DTestCase.java
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/svg/PDFGraphics2DTestCase.java
xmlgraphics/fop/trunk/test/xml/uri-testing/
- copied from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/xml/uri-testing/
xmlgraphics/fop/trunk/test/xml/uri-testing/custom-scheme/
- copied from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/xml/uri-testing/custom-scheme/
xmlgraphics/fop/trunk/test/xml/uri-testing/custom-scheme/only-scheme-specific-part-svg.fo
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/xml/uri-testing/custom-scheme/only-scheme-specific-part-svg.fo
xmlgraphics/fop/trunk/test/xml/uri-testing/custom-scheme/only-scheme-specific-part.fo
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/xml/uri-testing/custom-scheme/only-scheme-specific-part.fo
xmlgraphics/fop/trunk/test/xml/uri-testing/font.fo
- copied unchanged from r1356612, xmlgraphics/fop/branches/Temp_URI_Unification/test/xml/uri-testing/font.fo
Removed:
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/DefaultFOPResourceAccessor.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/ResourceAccessor.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/SimpleResourceAccessor.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOURIResolver.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfoConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontResolver.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/HyphenationTreeResolver.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/DefaultFontResolver.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFConstants.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFConfigurationConstants.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSConfigurationConstants.java
xmlgraphics/fop/trunk/test/config/test_font_embedurl_bad.xconf
xmlgraphics/fop/trunk/test/config/test_font_embedurl_malformed.xconf
xmlgraphics/fop/trunk/test/config/test_font_metricsurl_bad.xconf
xmlgraphics/fop/trunk/test/config/test_font_metricsurl_malformed.xconf
xmlgraphics/fop/trunk/test/config/test_font_tripletattribute_missing.xconf
xmlgraphics/fop/trunk/test/config/test_fontbase_bad.xconf
xmlgraphics/fop/trunk/test/config/test_fonts_autodetect.xconf
xmlgraphics/fop/trunk/test/config/test_fonts_directory_recursive.xconf
xmlgraphics/fop/trunk/test/config/test_fonts_substitution.xconf
xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractFOPTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FOURIResolverTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontBaseBadTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontEmbedUrlBadTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontEmbedUrlMalformedTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFRendererConfiguratorTestCase.java
xmlgraphics/fop/trunk/test/resources/org/apache/fop/render/pdf/above128.xconf
xmlgraphics/fop/trunk/test/resources/org/apache/fop/render/pdf/below40.xconf
xmlgraphics/fop/trunk/test/resources/org/apache/fop/render/pdf/correct.xconf
xmlgraphics/fop/trunk/test/resources/org/apache/fop/render/pdf/roundDown.xconf
xmlgraphics/fop/trunk/test/resources/org/apache/fop/render/pdf/roundUp.xconf
xmlgraphics/fop/trunk/test/xml/uri-resolution1.fo
xmlgraphics/fop/trunk/test/xml/uri-resolution2.fo
Modified:
xmlgraphics/fop/trunk/ (props changed)
xmlgraphics/fop/trunk/build.xml
xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleAWTViewer.java
xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleDOM2PDF.java
xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2JPSPrint.java
xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2OldStylePrint.java
xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2PDF.java
xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2PDFUsingSAXParser.java
xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2RTF.java
xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleObj2PDF.java
xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleXML2PDF.java
xmlgraphics/fop/trunk/examples/embedding/java/embedding/MultipleFO2PDF.java
xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleConcat.java
xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleStamp.java
xmlgraphics/fop/trunk/examples/embedding/java/embedding/events/ExampleEvents.java
xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/ExampleConcat.java
xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/ExampleStamp.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPDataObjectInfo.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPDitheredRectanglePainter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPResourceInfo.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPResourceLevel.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPResourceLevelDefaults.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPResourceManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPStreamer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPBase12FontCollection.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPFont.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AbstractOutlineFont.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/CharacterSet.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/CharacterSetType.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/CharactersetEncoder.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/DoubleByteFont.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/OutlineFont.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/RasterFont.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/IncludedResourceObject.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/AFPResourceUtil.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOUserAgent.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/Fop.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/MimeConstants.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeParser.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CachedRenderPagesModel.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/IFInputHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/PropertyList.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CIDFont.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CustomFont.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CustomFontCollection.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/EmbedFontInfo.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontAdder.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontCache.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontDetector.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontLoader.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontManagerConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontReader.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontSetup.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontTriplet.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/LazyFont.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/MultiByteFont.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/MutableFont.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/SingleByteFont.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/apps/TTFReader.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/FontInfoFinder.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/FontFileReader.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFile.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/PFBParser.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/PFMFile.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphenator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ExternalDocumentLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFAMode.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDocument.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFEncryptionParams.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFXMode.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/StreamCacheFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRendererConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRendererMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRendererConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/XMLHandlerConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPCustomizable.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPDocumentHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPDocumentHandlerMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPForeignAttributeReader.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandlerSVG.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPPainter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPShadingMode.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRendererMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/AbstractBitmapDocumentHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/BitmapRendererConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/BitmapRenderingSettings.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGDocumentHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGDocumentHandlerMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRendererMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFDocumentHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFDocumentHandlerMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRendererConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRendererMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/AbstractBinaryWritingIFDocumentHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/AbstractIFDocumentHandlerMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/AbstractIFPainter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/AbstractXMLWritingIFDocumentHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFDocumentHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFDocumentHandlerConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFParser.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFSerializer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFSerializerMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFUtil.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/util/IFDocumentHandlerProxy.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/ConfiguredFontCollection.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/CustomFontMetricsMapper.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DGraphicsState.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRendererConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderingSettings.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DUtil.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLDocumentHandlerMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLGenerator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLImageHandlerGraphics2D.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLPainter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRendererConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRenderingMode.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentHandlerMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PrintRendererMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSDocumentHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSDocumentHandlerMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSFontUtils.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSImageHandlerSVG.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSImageUtils.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSRendererConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSRenderingUtil.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSSVGHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSTextPainter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/ResourceHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTRendererConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTRendererMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRendererMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopServlet.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFTranscoder.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/TestConverter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/Fop.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/fontlist/FontListGenerator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/fontlist/FontListMain.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorSpaceCache.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/mif/MIFHandler.java
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/AbstractSVGDocumentHandler.java
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandlerMaker.java
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPainter.java
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandler.java
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPrintDocumentHandlerMaker.java
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGRendererMaker.java
xmlgraphics/fop/trunk/test/config/afp-invalid-characterset.xconf
xmlgraphics/fop/trunk/test/config/afp-invalid-config.xconf
xmlgraphics/fop/trunk/test/config/afp-raster-font-missing.xconf
xmlgraphics/fop/trunk/test/fotree/testcases/background-position-shorthand-test.fo
xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractBasicTranscoderTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicDriverTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicPDFTranscoderTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/StandardTestSuite.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPEventProcessingTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPResourceManagerTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPTestSuite.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/fonts/CharactersetEncoderTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseConstructiveUserConfigTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseDestructiveUserConfigTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseUserConfigTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontAttributesMissingTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontMetricsUrlBadTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontMetricsUrlMalformedTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontTripletAttributeMissingTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontsAutoDetectTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontsDirectoryRecursiveTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontsSubstitutionTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/UserConfigTestSuite.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/events/EventProcessingTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/FODocumentParser.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/FONodeMocks.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/DejaVuLGCSerifTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/FontEventProcessingTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/truetype/GlyfTableTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/truetype/TTFFileTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/truetype/TTFFontLoaderTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/image/loader/batik/ImagePreloaderTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIFTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIntermediateTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AreaTreeParserTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/IFMimickingTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/IFParserTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/TestAssistant.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/memory/MemoryEater.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFFactoryTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/AbstractRenderingTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/RendererFactoryTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/afp/AFPRendererConfiguratorTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/BasePDFTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFsRGBSettingsTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/RenderPDFTestSuite.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/PSPainterTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/threading/FOProcessorImpl.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/threading/IFProcessorImpl.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/util/ColorUtilTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/visual/AbstractBitmapProducer.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/visual/AbstractPSPDFBitmapProducer.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/visual/BatchDiffer.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/visual/BitmapProducerJava2D.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/visual/BitmapProducerPDF.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/visual/BitmapProducerPS.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/visual/ReferenceBitmapLoader.java
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/afp-extension_1.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/basic-link_background-image.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/basic-link_background-image_writing-mode_rl.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-container_background-image_background-position-relative.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-container_background-image_background-repeat.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/character_background-image.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/color_1.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_basic.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_bmp.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_border_padding.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_breaking.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_bug37815.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_content-height_content-width.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_content-height_content-width_2.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_display-align.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_emf.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_eps.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_gif.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_jpeg.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_overflow_hidden.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_oversized.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_png.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_rfc2397.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_size_1.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_size_2.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_src_uri.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_svg.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_svgz.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_tiff.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_wmf.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/flow_changing-ipd_image.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/fox_external-document_1.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/fox_external-document_2.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/fox_external-document_3.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline-level_id.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_background-image.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_block_nested_bug36248.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_vertical-align_2.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-block_background-image.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-item_background-image.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/list-item_padding_percentages.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/marker_white-space-treatment_bug42703.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation_background-image.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation_complex_2.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number_background-image.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-sequence-force-page-count-odd.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-sequence-force-page-count_bug42576.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_background-image.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_margin_region-body_margin_relative.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_region-body_margin_relative.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_writing-mode_rl_region-body_margin_relative.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_region-body_margin_relative.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_writing-mode_rl_region-body_margin_relative.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_region-body_margin_relative.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_writing-mode_rl_region-body_margin_relative.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_region-body_margin_relative.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_writing-mode_rl_region-body_writing-mode-lr.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-cell_background-image.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-row_background-image.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_background-image.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_backgrounds.xml
xmlgraphics/fop/trunk/test/test.xconf
xmlgraphics/fop/trunk/test/xml/pdf-a/with-cmyk-images.fo
xmlgraphics/fop/trunk/test/xml/pdf-a/with-rgb-images.fo
Propchange: xmlgraphics/fop/trunk/
------------------------------------------------------------------------------
Merged /xmlgraphics/fop/branches/Temp_URI_Unification:r1243479-1356612
Modified: xmlgraphics/fop/trunk/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/build.xml?rev=1356646&r1=1356645&r2=1356646&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/build.xml (original)
+++ xmlgraphics/fop/trunk/build.xml Tue Jul 3 09:46:41 2012
@@ -556,6 +556,7 @@ list of possible build targets.
<include name="org/apache/fop/accessibility/StructureTreeElement.class"/>
<include name="org/apache/fop/apps/Fop.class"/>
<include name="org/apache/fop/apps/FOPException.class"/>
+ <include name="org/apache/fop/apps/io/**"/>
<include name="org/apache/fop/complexscripts/fonts/*.class"/>
<include name="org/apache/fop/fo/Constants.class"/>
<include name="org/apache/fop/fo/FOTreeBuilder.class"/>
@@ -578,7 +579,7 @@ list of possible build targets.
<exclude name="org/apache/fop/render/pdf/PDFRenderer.class"/>
<exclude name="org/apache/fop/render/pdf/PDFXMLHandler*"/>
<include name="org/apache/fop/render/intermediate/IFDocumentHandlerConfigurator.class"/>
- <include name="org/apache/fop/render/**Configurator**"/>
+ <include name="org/apache/fop/render/**Config**"/>
<include name="org/apache/fop/util/AbstractPaintingState**"/>
<include name="org/apache/fop/pdf/**"/>
</patternset>
Modified: xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleAWTViewer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleAWTViewer.java?rev=1356646&r1=1356645&r2=1356646&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleAWTViewer.java (original)
+++ xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleAWTViewer.java Tue Jul 3 09:46:41 2012
@@ -23,19 +23,16 @@ package embedding;
import java.io.File;
import java.io.IOException;
-//JAXP
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
import javax.xml.transform.TransformerException;
-import javax.xml.transform.Source;
-import javax.xml.transform.Result;
-import javax.xml.transform.stream.StreamSource;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.stream.StreamSource;
-//Avalon
import org.apache.avalon.framework.ExceptionUtil;
-//FOP
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
@@ -47,7 +44,7 @@ import org.apache.fop.apps.MimeConstants
public class ExampleAWTViewer {
// configure fopFactory as desired
- private FopFactory fopFactory = FopFactory.newInstance();
+ private final FopFactory fopFactory = FopFactory.newInstance(new File(".").toURI());
/**
* Display an FO file in the AWT Preview.
Modified: xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleDOM2PDF.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleDOM2PDF.java?rev=1356646&r1=1356645&r2=1356646&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleDOM2PDF.java (original)
+++ xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleDOM2PDF.java Tue Jul 3 09:46:41 2012
@@ -22,25 +22,22 @@ package embedding;
// Java
import java.io.File;
import java.io.OutputStream;
-import javax.xml.parsers.DocumentBuilderFactory;
+
import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-
-//JAXP
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.Source;
-import javax.xml.transform.Result;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.sax.SAXResult;
-// DOM
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.Text;
-// FOP
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
@@ -54,7 +51,7 @@ import org.apache.fop.apps.MimeConstants
public class ExampleDOM2PDF {
// configure fopFactory as desired
- private FopFactory fopFactory = FopFactory.newInstance();
+ private final FopFactory fopFactory = FopFactory.newInstance(new File(".").toURI());
/** xsl-fo namespace URI */
protected static String foNS = "http://www.w3.org/1999/XSL/Format";
Modified: xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2JPSPrint.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2JPSPrint.java?rev=1356646&r1=1356645&r2=1356646&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2JPSPrint.java (original)
+++ xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2JPSPrint.java Tue Jul 3 09:46:41 2012
@@ -53,7 +53,7 @@ import org.apache.fop.render.print.Pagea
public class ExampleFO2JPSPrint {
// configure fopFactory as desired
- private FopFactory fopFactory = FopFactory.newInstance();
+ private final FopFactory fopFactory = FopFactory.newInstance(new File(".").toURI());
private DocPrintJob createDocPrintJob() {
PrintService[] services = PrintServiceLookup.lookupPrintServices(
Modified: xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2OldStylePrint.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2OldStylePrint.java?rev=1356646&r1=1356645&r2=1356646&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2OldStylePrint.java (original)
+++ xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2OldStylePrint.java Tue Jul 3 09:46:41 2012
@@ -43,7 +43,7 @@ import org.apache.fop.apps.MimeConstants
public class ExampleFO2OldStylePrint {
// configure fopFactory as desired
- private FopFactory fopFactory = FopFactory.newInstance();
+ private final FopFactory fopFactory = FopFactory.newInstance(new File(".").toURI());
/**
* Prints an FO file using an old-style PrinterJob.
Modified: xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2PDF.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2PDF.java?rev=1356646&r1=1356645&r2=1356646&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2PDF.java (original)
+++ xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2PDF.java Tue Jul 3 09:46:41 2012
@@ -26,19 +26,16 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-//JAXP
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.Source;
-import javax.xml.transform.Result;
-import javax.xml.transform.stream.StreamSource;
import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.stream.StreamSource;
-
-// FOP
+import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
-import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.FormattingResults;
import org.apache.fop.apps.MimeConstants;
@@ -50,7 +47,7 @@ import org.apache.fop.apps.PageSequenceR
public class ExampleFO2PDF {
// configure fopFactory as desired
- private FopFactory fopFactory = FopFactory.newInstance();
+ private final FopFactory fopFactory = FopFactory.newInstance(new File(".").toURI());
/**
* Converts an FO file to a PDF file using FOP
Modified: xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2PDFUsingSAXParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2PDFUsingSAXParser.java?rev=1356646&r1=1356645&r2=1356646&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2PDFUsingSAXParser.java (original)
+++ xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2PDFUsingSAXParser.java Tue Jul 3 09:46:41 2012
@@ -26,17 +26,14 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-//JAXP
-import javax.xml.parsers.SAXParserFactory;
import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.SAXParser;
import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
-//SAX
-import org.xml.sax.helpers.DefaultHandler;
import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
-// FOP
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
@@ -49,7 +46,7 @@ import org.apache.fop.apps.MimeConstants
public class ExampleFO2PDFUsingSAXParser {
// configure fopFactory as desired
- private FopFactory fopFactory = FopFactory.newInstance();
+ private final FopFactory fopFactory = FopFactory.newInstance(new File(".").toURI());
/**
* Converts an FO file to a PDF file using FOP
Modified: xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2RTF.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2RTF.java?rev=1356646&r1=1356645&r2=1356646&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2RTF.java (original)
+++ xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2RTF.java Tue Jul 3 09:46:41 2012
@@ -26,18 +26,16 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-//JAXP
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.Source;
-import javax.xml.transform.Result;
-import javax.xml.transform.stream.StreamSource;
import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.stream.StreamSource;
-// FOP
+import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
-import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.MimeConstants;
@@ -50,7 +48,7 @@ import org.apache.fop.apps.MimeConstants
public class ExampleFO2RTF {
// configure fopFactory as desired
- private FopFactory fopFactory = FopFactory.newInstance();
+ private final FopFactory fopFactory = FopFactory.newInstance(new File(".").toURI());
/**
* Converts an FO file to a RTF file using FOP
Modified: xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleObj2PDF.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleObj2PDF.java?rev=1356646&r1=1356645&r2=1356646&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleObj2PDF.java (original)
+++ xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleObj2PDF.java Tue Jul 3 09:46:41 2012
@@ -21,22 +21,20 @@ package embedding;
// Java
import java.io.File;
-import java.io.OutputStream;
import java.io.IOException;
+import java.io.OutputStream;
-// JAXP
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
import javax.xml.transform.TransformerException;
-import javax.xml.transform.Source;
-import javax.xml.transform.Result;
-import javax.xml.transform.stream.StreamSource;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.stream.StreamSource;
-// FOP
+import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
-import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.MimeConstants;
@@ -49,7 +47,7 @@ import embedding.model.ProjectTeam;
public class ExampleObj2PDF {
// configure fopFactory as desired
- private FopFactory fopFactory = FopFactory.newInstance();
+ private final FopFactory fopFactory = FopFactory.newInstance(new File(".").toURI());
/**
* Converts a ProjectTeam object to a PDF file.
Modified: xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleXML2PDF.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleXML2PDF.java?rev=1356646&r1=1356645&r2=1356646&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleXML2PDF.java (original)
+++ xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleXML2PDF.java Tue Jul 3 09:46:41 2012
@@ -23,15 +23,13 @@ package embedding;
import java.io.File;
import java.io.OutputStream;
-//JAXP
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.Source;
-import javax.xml.transform.Result;
-import javax.xml.transform.stream.StreamSource;
import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.stream.StreamSource;
-//FOP
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
@@ -69,7 +67,7 @@ public class ExampleXML2PDF {
System.out.println("Transforming...");
// configure fopFactory as desired
- FopFactory fopFactory = FopFactory.newInstance();
+ final FopFactory fopFactory = FopFactory.newInstance(new File(".").toURI());
FOUserAgent foUserAgent = fopFactory.newFOUserAgent();
// configure foUserAgent as desired
Modified: xmlgraphics/fop/trunk/examples/embedding/java/embedding/MultipleFO2PDF.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/embedding/java/embedding/MultipleFO2PDF.java?rev=1356646&r1=1356645&r2=1356646&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/embedding/java/embedding/MultipleFO2PDF.java (original)
+++ xmlgraphics/fop/trunk/examples/embedding/java/embedding/MultipleFO2PDF.java Tue Jul 3 09:46:41 2012
@@ -27,20 +27,19 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-//JAXP
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.Source;
-import javax.xml.transform.Result;
-import javax.xml.transform.stream.StreamSource;
import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.stream.StreamSource;
-// FOP
import org.apache.commons.io.IOUtils;
+
+import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
-import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.FormattingResults;
import org.apache.fop.apps.MimeConstants;
@@ -55,8 +54,6 @@ import org.apache.fop.apps.PageSequenceR
public class MultipleFO2PDF {
// configure fopFactory as desired
- private FopFactory fopFactory = FopFactory.newInstance();
-
// JAXP TransformerFactory can be reused, too
private TransformerFactory factory = TransformerFactory.newInstance();
@@ -71,6 +68,7 @@ public class MultipleFO2PDF {
*/
public FormattingResults convertFO2PDF(File fo, File pdf)
throws TransformerException, IOException, FOPException {
+ FopFactory fopFactory = FopFactory.newInstance(new File(".").toURI());
OutputStream out = null;
Fop fop;
Modified: xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleConcat.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleConcat.java?rev=1356646&r1=1356645&r2=1356646&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleConcat.java (original)
+++ xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleConcat.java Tue Jul 3 09:46:41 2012
@@ -57,7 +57,7 @@ import embedding.model.ProjectTeam;
public class ExampleConcat {
// configure fopFactory as desired
- private FopFactory fopFactory = FopFactory.newInstance();
+ private final FopFactory fopFactory = FopFactory.newInstance(new File(".").toURI());
/**
* Creates a sample ProjectTeam instance for this demo.
Modified: xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleStamp.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleStamp.java?rev=1356646&r1=1356645&r2=1356646&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleStamp.java (original)
+++ xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleStamp.java Tue Jul 3 09:46:41 2012
@@ -50,7 +50,7 @@ import embedding.model.ProjectTeam;
public class ExampleStamp {
// configure fopFactory as desired
- private FopFactory fopFactory = FopFactory.newInstance();
+ private final FopFactory fopFactory = FopFactory.newInstance(new File(".").toURI());
/**
* Stamps an area tree XML file and renders it to a PDF file.
Modified: xmlgraphics/fop/trunk/examples/embedding/java/embedding/events/ExampleEvents.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/embedding/java/embedding/events/ExampleEvents.java?rev=1356646&r1=1356645&r2=1356646&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/embedding/java/embedding/events/ExampleEvents.java (original)
+++ xmlgraphics/fop/trunk/examples/embedding/java/embedding/events/ExampleEvents.java Tue Jul 3 09:46:41 2012
@@ -56,7 +56,7 @@ import org.apache.fop.events.model.Event
public class ExampleEvents {
// configure fopFactory as desired
- private FopFactory fopFactory = FopFactory.newInstance();
+ private final FopFactory fopFactory = FopFactory.newInstance(new File(".").toURI());
/**
* Converts an FO file to a PDF file using FOP
Modified: xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/ExampleConcat.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/ExampleConcat.java?rev=1356646&r1=1356645&r2=1356646&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/ExampleConcat.java (original)
+++ xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/ExampleConcat.java Tue Jul 3 09:46:41 2012
@@ -58,7 +58,7 @@ import embedding.model.ProjectTeam;
public class ExampleConcat {
// configure fopFactory as desired
- private FopFactory fopFactory = FopFactory.newInstance();
+ private final FopFactory fopFactory = FopFactory.newInstance(new File(".").toURI());
/**
* Creates a sample ProjectTeam instance for this demo.
@@ -95,8 +95,7 @@ public class ExampleConcat {
userAgent, MimeConstants.MIME_PDF);
//Create the IFSerializer to write the intermediate format
- IFSerializer ifSerializer = new IFSerializer();
- ifSerializer.setContext(new IFContext(userAgent));
+ IFSerializer ifSerializer = new IFSerializer(new IFContext(userAgent));
//Tell the IFSerializer to mimic the target format
ifSerializer.mimicDocumentHandler(targetHandler);
Modified: xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/ExampleStamp.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/ExampleStamp.java?rev=1356646&r1=1356645&r2=1356646&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/ExampleStamp.java (original)
+++ xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/ExampleStamp.java Tue Jul 3 09:46:41 2012
@@ -51,7 +51,7 @@ import embedding.model.ProjectTeam;
public class ExampleStamp {
// configure fopFactory as desired
- private FopFactory fopFactory = FopFactory.newInstance();
+ private final FopFactory fopFactory = FopFactory.newInstance(new File(".").toURI());
/**
* Stamps an intermediate file and renders it to a PDF file.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPDataObjectInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPDataObjectInfo.java?rev=1356646&r1=1356645&r2=1356646&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPDataObjectInfo.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPDataObjectInfo.java Tue Jul 3 09:46:41 2012
@@ -57,6 +57,8 @@ public class AFPDataObjectInfo {
/** controls the mapping of the image data into the image area */
private byte mappingOption = MappingOptionTriplet.SCALE_TO_FILL;
+ public static final byte DEFAULT_MAPPING_OPTION = 0x00;
+
/**
* Default constructor
*/
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPDitheredRectanglePainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPDitheredRectanglePainter.java?rev=1356646&r1=1356645&r2=1356646&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPDitheredRectanglePainter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPDitheredRectanglePainter.java Tue Jul 3 09:46:41 2012
@@ -28,6 +28,7 @@ import java.io.IOException;
import org.apache.xmlgraphics.image.loader.ImageSize;
import org.apache.xmlgraphics.util.MimeConstants;
+import org.apache.fop.afp.AFPResourceLevel.ResourceType;
import org.apache.fop.afp.modca.triplets.MappingOptionTriplet;
import org.apache.fop.util.bitmap.DitherUtil;
@@ -66,7 +67,7 @@ public class AFPDitheredRectanglePainter
AFPImageObjectInfo imageObjectInfo = new AFPImageObjectInfo();
imageObjectInfo.setMimeType(MimeConstants.MIME_AFP_IOCA_FS10);
//imageObjectInfo.setCreatePageSegment(true);
- imageObjectInfo.getResourceInfo().setLevel(new AFPResourceLevel(AFPResourceLevel.INLINE));
+ imageObjectInfo.getResourceInfo().setLevel(new AFPResourceLevel(ResourceType.INLINE));
imageObjectInfo.getResourceInfo().setImageDimension(ditherSize);
imageObjectInfo.setBitsPerPixel(1);
imageObjectInfo.setColor(false);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPResourceInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPResourceInfo.java?rev=1356646&r1=1356645&r2=1356646&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPResourceInfo.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPResourceInfo.java Tue Jul 3 09:46:41 2012
@@ -21,6 +21,7 @@ package org.apache.fop.afp;
import java.awt.Dimension;
+import org.apache.fop.afp.AFPResourceLevel.ResourceType;
/**
* The level at which a resource is to reside in the AFP output
@@ -29,7 +30,7 @@ public class AFPResourceInfo {
/** the general default resource level */
public static final AFPResourceLevel DEFAULT_LEVEL
- = new AFPResourceLevel(AFPResourceLevel.PRINT_FILE);
+ = new AFPResourceLevel(ResourceType.PRINT_FILE);
/** the URI of this resource */
private String uri = null;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPResourceLevel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPResourceLevel.java?rev=1356646&r1=1356645&r2=1356646&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPResourceLevel.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPResourceLevel.java Tue Jul 3 09:46:41 2012
@@ -19,46 +19,56 @@
package org.apache.fop.afp;
+import java.net.URI;
+
+import static org.apache.fop.afp.AFPResourceLevel.ResourceType.DOCUMENT;
+import static org.apache.fop.afp.AFPResourceLevel.ResourceType.EXTERNAL;
+import static org.apache.fop.afp.AFPResourceLevel.ResourceType.INLINE;
+import static org.apache.fop.afp.AFPResourceLevel.ResourceType.PAGE;
+import static org.apache.fop.afp.AFPResourceLevel.ResourceType.PAGE_GROUP;
+import static org.apache.fop.afp.AFPResourceLevel.ResourceType.PRINT_FILE;
+
/**
* A resource level
*/
public class AFPResourceLevel {
+ public enum ResourceType {
+ /** directly in page **/
+ INLINE("inline"),
+ /** page level **/
+ PAGE("page"),
+ /** page group level **/
+ PAGE_GROUP("page-group"),
+ /** document level **/
+ DOCUMENT("document"),
+ /** print file level **/
+ PRINT_FILE("print-file"),
+ /** external level **/
+ EXTERNAL("external");
- /** directly in page **/
- public static final int INLINE = 0;
-
- /** page level **/
- public static final int PAGE = 1;
-
- /** page group level **/
- public static final int PAGE_GROUP = 2;
-
- /** document level **/
- public static final int DOCUMENT = 3;
-
- /** print file level **/
- public static final int PRINT_FILE = 4;
+ private final String name;
- /** external level **/
- public static final int EXTERNAL = 5;
-
- private static final String NAME_INLINE = "inline";
- private static final String NAME_PAGE = "page";
- private static final String NAME_PAGE_GROUP = "page-group";
- private static final String NAME_DOCUMENT = "document";
- private static final String NAME_PRINT_FILE = "print-file";
- private static final String NAME_EXTERNAL = "external";
-
- private static final String[] NAMES = new String[] {
- NAME_INLINE, NAME_PAGE, NAME_PAGE_GROUP, NAME_DOCUMENT, NAME_PRINT_FILE, NAME_EXTERNAL
- };
+ private ResourceType(String name) {
+ this.name = name;
+ }
+ public static ResourceType getValueOf(String levelString) {
+ for (ResourceType resType : ResourceType.values()) {
+ if (resType.name.equalsIgnoreCase(levelString)) {
+ return resType;
+ }
+ }
+ return null;
+ }
- /** where the resource will reside in the AFP output */
- private int level = PRINT_FILE; // default is print-file level (images)
+ public String getName() {
+ return name;
+ }
+ }
/** the external resource group file path */
- private String extFilePath = null;
+ private URI extUri = null;
+ private ResourceType resourceType;
/**
* Sets the resource placement level within the AFP output
@@ -67,18 +77,8 @@ public class AFPResourceLevel {
* @return true if the resource level was successfully set
*/
public static AFPResourceLevel valueOf(String levelString) {
- if (levelString != null) {
- levelString = levelString.toLowerCase();
- AFPResourceLevel resourceLevel = null;
- for (int i = 0; i < NAMES.length; i++) {
- if (NAMES[i].equals(levelString)) {
- resourceLevel = new AFPResourceLevel(i);
- break;
- }
- }
- return resourceLevel;
- }
- return null;
+ ResourceType resType = ResourceType.getValueOf(levelString);
+ return resType != null ? new AFPResourceLevel(resType) : null;
}
/**
@@ -86,17 +86,8 @@ public class AFPResourceLevel {
*
* @param level the resource level
*/
- public AFPResourceLevel(int level) {
- setLevel(level);
- }
-
- /**
- * Sets the resource level
- *
- * @param level the resource level
- */
- public void setLevel(int level) {
- this.level = level;
+ public AFPResourceLevel(ResourceType resourceType) {
+ this.resourceType = resourceType;
}
/**
@@ -105,7 +96,7 @@ public class AFPResourceLevel {
* @return true if this is at page level
*/
public boolean isPage() {
- return level == PAGE;
+ return resourceType == PAGE;
}
/**
@@ -114,7 +105,7 @@ public class AFPResourceLevel {
* @return true if this is at page group level
*/
public boolean isPageGroup() {
- return level == PAGE_GROUP;
+ return resourceType == PAGE_GROUP;
}
/**
@@ -123,7 +114,7 @@ public class AFPResourceLevel {
* @return true if this is at document level
*/
public boolean isDocument() {
- return level == DOCUMENT;
+ return resourceType == DOCUMENT;
}
/**
@@ -132,7 +123,7 @@ public class AFPResourceLevel {
* @return true if this is at external level
*/
public boolean isExternal() {
- return level == EXTERNAL;
+ return resourceType == EXTERNAL;
}
/**
@@ -141,7 +132,7 @@ public class AFPResourceLevel {
* @return true if this is at print-file level
*/
public boolean isPrintFile() {
- return level == PRINT_FILE;
+ return resourceType == PRINT_FILE;
}
/**
@@ -150,30 +141,30 @@ public class AFPResourceLevel {
* @return true if this resource level is inline
*/
public boolean isInline() {
- return level == INLINE;
+ return resourceType == INLINE;
}
/**
- * Returns the destination file path of the external resource group file
+ * Returns the URI of the external resource group.
*
- * @return the destination file path of the external resource group file
+ * @return the destination URI of the external resource group
*/
- public String getExternalFilePath() {
- return this.extFilePath;
+ public URI getExternalURI() {
+ return this.extUri;
}
/**
- * Sets the external destination of the resource
+ * Sets the URI of the external resource group.
*
- * @param filePath the external resource group file
+ * @param filePath the URI of the external resource group
*/
- public void setExternalFilePath(String filePath) {
- this.extFilePath = filePath;
+ public void setExternalUri(URI uri) {
+ this.extUri = uri;
}
/** {@inheritDoc} */
public String toString() {
- return NAMES[level] + (isExternal() ? ", file=" + extFilePath : "");
+ return resourceType + (isExternal() ? ", uri=" + extUri : "");
}
/** {@inheritDoc} */
@@ -186,16 +177,16 @@ public class AFPResourceLevel {
}
AFPResourceLevel rl = (AFPResourceLevel)obj;
- return (level == rl.level)
- && (extFilePath == rl.extFilePath
- || extFilePath != null && extFilePath.equals(rl.extFilePath));
+ return (resourceType == rl.resourceType)
+ && (extUri == rl.extUri
+ || extUri != null && extUri.equals(rl.extUri));
}
/** {@inheritDoc} */
public int hashCode() {
int hash = 7;
- hash = 31 * hash + level;
- hash = 31 * hash + (null == extFilePath ? 0 : extFilePath.hashCode());
+ hash = 31 * hash + resourceType.hashCode();
+ hash = 31 * hash + (null == extUri ? 0 : extUri.hashCode());
return hash;
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPResourceLevelDefaults.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPResourceLevelDefaults.java?rev=1356646&r1=1356645&r2=1356646&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPResourceLevelDefaults.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPResourceLevelDefaults.java Tue Jul 3 09:46:41 2012
@@ -22,6 +22,7 @@ package org.apache.fop.afp;
import java.util.Iterator;
import java.util.Map;
+import org.apache.fop.afp.AFPResourceLevel.ResourceType;
import org.apache.fop.afp.modca.ResourceObject;
/**
@@ -58,7 +59,7 @@ public class AFPResourceLevelDefaults {
// level not explicitly set/changed so default to inline for GOCA graphic objects
// (due to a bug in the IBM AFP Workbench Viewer (2.04.01.07), hard copy works just fine)
setDefaultResourceLevel(ResourceObject.TYPE_GRAPHIC,
- new AFPResourceLevel(AFPResourceLevel.INLINE));
+ new AFPResourceLevel(ResourceType.INLINE));
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org