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 ac...@apache.org on 2008/11/28 12:13:33 UTC
svn commit: r721430 [2/6] - in /xmlgraphics/fop/trunk: ./ conf/ lib/
src/documentation/content/xdocs/ src/documentation/content/xdocs/trunk/
src/java/META-INF/services/ src/java/org/apache/fop/afp/
src/java/org/apache/fop/afp/fonts/ src/java/org/apache...
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/StructuredData.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/StructuredData.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/StructuredData.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/StructuredData.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/PreparedAFPObject.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/PreparedAFPObject.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPFont.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPFont.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPFont.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFont.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/fonts/AFPFont.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/AFPFont.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPFontAttributes.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPFontAttributes.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPFontAttributes.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFontAttributes.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/AFPFontAttributes.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPFontAttributes.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPFontInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPFontInfo.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPFontInfo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFontInfo.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/fonts/AFPFontInfo.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/AFPFontInfo.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPFontReader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPFontReader.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPFontReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPFontReader.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/fonts/AFPFontReader.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/AFPFontReader.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPPageFonts.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPPageFonts.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPPageFonts.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/AFPPageFonts.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/AFPPageFonts.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPPageFonts.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/CharacterSet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/CharacterSet.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/CharacterSet.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/CharacterSet.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/fonts/CharacterSet.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/CharacterSet.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/CharacterSetOrientation.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/CharacterSetOrientation.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/CharacterSetOrientation.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/CharacterSetOrientation.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/fonts/CharacterSetOrientation.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/CharacterSetOrientation.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/FontRuntimeException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/FontRuntimeException.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/FontRuntimeException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/FontRuntimeException.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/exceptions/FontRuntimeException.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/exceptions/FontRuntimeException.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/fonts/FopCharacterSet.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/FopCharacterSet.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/OutlineFont.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/OutlineFont.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/OutlineFont.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/OutlineFont.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/fonts/OutlineFont.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/OutlineFont.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/RasterFont.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/RasterFont.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/RasterFont.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/fonts/RasterFont.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/fonts/RasterFont.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/fonts/RasterFont.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageCellPosition.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageCellPosition.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageCellPosition.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/ioca/ImageCellPosition.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/ioca/ImageCellPosition.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/ioca/ImageCellPosition.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageContent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageContent.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageContent.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/ioca/ImageContent.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/ioca/ImageContent.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/ioca/ImageContent.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageInputDescriptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageInputDescriptor.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageInputDescriptor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/ioca/ImageInputDescriptor.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/ioca/ImageInputDescriptor.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/ioca/ImageInputDescriptor.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageOutputControl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageOutputControl.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageOutputControl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/ioca/ImageOutputControl.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/ioca/ImageOutputControl.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/ioca/ImageOutputControl.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageRasterData.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageRasterData.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageRasterData.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/ioca/ImageRasterData.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/ioca/ImageRasterData.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/ioca/ImageRasterData.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageRasterPattern.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageRasterPattern.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageRasterPattern.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/ioca/ImageRasterPattern.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/ioca/ImageRasterPattern.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/ioca/ImageRasterPattern.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageSegment.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageSegment.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageSegment.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/ioca/ImageSegment.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/ioca/ImageSegment.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/ioca/ImageSegment.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageSizeParameter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageSizeParameter.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageSizeParameter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/ioca/ImageSizeParameter.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/ioca/ImageSizeParameter.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/ioca/ImageSizeParameter.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractAFPObject.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractAFPObject.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractAFPObject.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/AbstractAFPObject.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/AbstractAFPObject.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/AbstractAFPObject.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractDataObject.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractDataObject.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractDataObject.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/AbstractDataObject.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/AbstractDataObject.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/AbstractDataObject.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractDescriptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractDescriptor.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractDescriptor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/AbstractDescriptor.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/AbstractDescriptor.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/AbstractDescriptor.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractNamedAFPObject.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractNamedAFPObject.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractNamedAFPObject.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/AbstractNamedAFPObject.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/AbstractNamedAFPObject.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/AbstractNamedAFPObject.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractPageObject.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractPageObject.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractPageObject.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/AbstractPageObject.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/AbstractPageObject.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/AbstractPageObject.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractStructuredObject.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractStructuredObject.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractStructuredObject.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/AbstractStructuredObject.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/AbstractStructuredAFPObject.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/AbstractStructuredAFPObject.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ActiveEnvironmentGroup.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ActiveEnvironmentGroup.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ActiveEnvironmentGroup.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/ActiveEnvironmentGroup.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/ActiveEnvironmentGroup.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/ActiveEnvironmentGroup.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/Document.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/Document.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/Document.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/Document.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/Document.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/Document.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/GraphicsDataDescriptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/GraphicsDataDescriptor.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/GraphicsDataDescriptor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/GraphicsDataDescriptor.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/GraphicsDataDescriptor.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/GraphicsDataDescriptor.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/GraphicsObject.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/GraphicsObject.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/GraphicsObject.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/GraphicsObject.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/GraphicsObject.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/GraphicsObject.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ImageDataDescriptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ImageDataDescriptor.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ImageDataDescriptor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/ImageDataDescriptor.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/ImageDataDescriptor.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/ImageDataDescriptor.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ImageObject.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ImageObject.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ImageObject.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/ImageObject.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/ImageObject.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/ImageObject.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/IncludeObject.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/IncludeObject.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/IncludeObject.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/IncludeObject.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/IncludeObject.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/IncludeObject.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/IncludePageOverlay.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/IncludePageOverlay.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/IncludePageOverlay.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/IncludePageOverlay.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/IncludePageOverlay.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/IncludePageOverlay.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/IncludePageSegment.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/IncludePageSegment.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/IncludePageSegment.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/IncludePageSegment.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/IncludePageSegment.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/IncludePageSegment.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/InvokeMediumMap.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/InvokeMediumMap.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/InvokeMediumMap.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/InvokeMediumMap.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/InvokeMediumMap.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/InvokeMediumMap.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/MapCodedFont.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/MapCodedFont.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/MapCodedFont.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/MapCodedFont.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/MapCodedFont.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/MapCodedFont.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/MapPageOverlay.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/MapPageOverlay.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/MapPageOverlay.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/MapPageOverlay.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/MapPageOverlay.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/MapPageOverlay.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/MaximumSizeExceededException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/MaximumSizeExceededException.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/MaximumSizeExceededException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/MaximumSizeExceededException.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/MaximumSizeExceededException.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/MaximumSizeExceededException.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/NoOperation.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/NoOperation.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/NoOperation.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/NoOperation.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/NoOperation.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/NoOperation.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ObjectAreaDescriptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ObjectAreaDescriptor.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ObjectAreaDescriptor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/ObjectAreaDescriptor.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/ObjectAreaDescriptor.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/ObjectAreaDescriptor.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ObjectAreaPosition.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ObjectAreaPosition.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ObjectAreaPosition.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/ObjectAreaPosition.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/ObjectAreaPosition.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/ObjectAreaPosition.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ObjectEnvironmentGroup.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ObjectEnvironmentGroup.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ObjectEnvironmentGroup.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/ObjectEnvironmentGroup.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/ObjectEnvironmentGroup.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/ObjectEnvironmentGroup.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/Overlay.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/Overlay.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/Overlay.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/Overlay.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/Overlay.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/Overlay.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageDescriptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageDescriptor.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageDescriptor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/PageDescriptor.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/PageDescriptor.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/PageDescriptor.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageGroup.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageGroup.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageGroup.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/PageGroup.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/PageGroup.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/PageGroup.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageObject.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageObject.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageObject.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/PageObject.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/PageObject.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/PageObject.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PresentationTextData.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PresentationTextData.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PresentationTextData.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/PresentationTextData.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/PresentationTextData.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/PresentationTextData.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PresentationTextDescriptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PresentationTextDescriptor.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PresentationTextDescriptor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/PresentationTextDescriptor.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/PresentationTextDescriptor.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/PresentationTextDescriptor.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PresentationTextObject.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PresentationTextObject.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PresentationTextObject.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/PresentationTextObject.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/PresentationTextObject.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/PresentationTextObject.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ResourceGroup.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ResourceGroup.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ResourceGroup.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/ResourceGroup.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/ResourceGroup.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/ResourceGroup.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/TagLogicalElement.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/TagLogicalElement.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/TagLogicalElement.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/TagLogicalElement.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/TagLogicalElement.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/TagLogicalElement.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/TagLogicalElementBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/TagLogicalElementBean.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/TagLogicalElementBean.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/TagLogicalElementBean.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/modca/TagLogicalElementBean.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/modca/TagLogicalElementBean.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPGraphicsConfiguration.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPGraphicsConfiguration.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPGraphicsConfiguration.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/svg/AFPGraphicsConfiguration.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/AFPGraphicsConfiguration.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPGraphicsConfiguration.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPGraphicsDevice.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPGraphicsDevice.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPGraphicsDevice.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/svg/AFPGraphicsDevice.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/AFPGraphicsDevice.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPGraphicsDevice.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPTextElementBridge.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPTextElementBridge.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPTextElementBridge.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/svg/AFPTextElementBridge.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/AFPTextElementBridge.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPTextElementBridge.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPTextHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPTextHandler.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPTextHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/svg/AFPTextHandler.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/AFPTextHandler.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPTextHandler.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPTextPainter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPTextPainter.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPTextPainter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/svg/AFPTextPainter.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/AFPTextPainter.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPTextPainter.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/BinaryUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/BinaryUtils.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/BinaryUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/util/BinaryUtils.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/tools/BinaryUtils.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/tools/BinaryUtils.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/DTDEntityResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/DTDEntityResolver.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/DTDEntityResolver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/util/DTDEntityResolver.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/tools/DTDEntityResolver.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/tools/DTDEntityResolver.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/StringUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/StringUtils.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/StringUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/util/StringUtils.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/tools/StringUtils.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/tools/StringUtils.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/StructuredFieldReader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/StructuredFieldReader.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/StructuredFieldReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 28 03:13:12 2008
@@ -0,0 +1,3 @@
+/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/util/StructuredFieldReader.java:630874-721418
+/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/tools/StructuredFieldReader.java:684572,688085,688696
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/tools/StructuredFieldReader.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/MimeConstants.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/MimeConstants.java?rev=721430&r1=721429&r2=721430&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/MimeConstants.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/MimeConstants.java Fri Nov 28 03:13:12 2008
@@ -22,50 +22,7 @@
/**
* Frequently used MIME types for various file formats used when working with Apache FOP.
*/
-public interface MimeConstants {
-
- /** Portable Document Format */
- String MIME_PDF = "application/pdf";
-
- /** PostScript */
- String MIME_POSTSCRIPT = "application/postscript";
- /** Encapsulated PostScript (same MIME type as PostScript) */
- String MIME_EPS = MIME_POSTSCRIPT;
-
- /** HP's PCL */
- String MIME_PCL = "application/x-pcl";
- /** HP's PCL (alternative MIME type) */
- String MIME_PCL_ALT = "application/vnd.hp-PCL";
-
- /** IBM's AFP */
- String MIME_AFP = "application/x-afp";
- /** IBM's AFP (alternative MIME type) */
- String MIME_AFP_ALT = "application/vnd.ibm.modcap";
-
- /** Plain text */
- String MIME_PLAIN_TEXT = "text/plain";
-
- /** Rich text format */
- String MIME_RTF = "application/rtf";
- /** Rich text format (alternative 1) */
- String MIME_RTF_ALT1 = "text/richtext";
- /** Rich text format (alternative 2) */
- String MIME_RTF_ALT2 = "text/rtf";
-
- /** FrameMaker's MIF */
- String MIME_MIF = "application/mif";
-
- /** Scalable Vector Graphics */
- String MIME_SVG = "image/svg+xml";
-
- /** GIF images */
- String MIME_GIF = "image/gif";
- /** PNG images */
- String MIME_PNG = "image/png";
- /** JPEG images */
- String MIME_JPEG = "image/jpeg";
- /** TIFF images */
- String MIME_TIFF = "image/tiff";
+public interface MimeConstants extends org.apache.xmlgraphics.util.MimeConstants {
/** Apache FOP's AWT preview (non-standard MIME type) */
String MIME_FOP_AWT_PREVIEW = "application/X-fop-awt-preview";
@@ -74,7 +31,4 @@
/** Apache FOP's area tree XML */
String MIME_FOP_AREA_TREE = "application/X-fop-areatree";
- /** Proposed but non-registered MIME type for XSL-FO */
- String MIME_XSL_FO = "text/xsl";
-
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java?rev=721430&r1=721429&r2=721430&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java Fri Nov 28 03:13:12 2008
@@ -119,8 +119,10 @@
public static final int CLASS_MAX = CLASS_SIDE_FLOAT + 1;
private int areaClass = CLASS_NORMAL;
+
/** the area's inline-progression-dimension */
protected int ipd;
+
/** the area's block-progression-dimension */
protected int bpd;
@@ -141,7 +143,7 @@
* @return the area class
*/
public int getAreaClass() {
- return areaClass;
+ return this.areaClass;
}
/**
@@ -157,11 +159,11 @@
* Set the inline progression dimension of content rectangle
* for this area.
*
- * @param i the new inline progression dimension
- * @see <a href="http://www.w3.org/TR/xsl/slice4.html#area-common">ipd</a>
+ * @param ipd the new inline progression dimension
+ * @see <a href="http://www.w3.org/TR/xsl/#inline-progression-dimension">ipd</a>
*/
- public void setIPD(int i) {
- ipd = i;
+ public void setIPD(int ipd) {
+ this.ipd = ipd;
}
/**
@@ -169,10 +171,10 @@
* for this area.
*
* @return the inline progression dimension
- * @see <a href="http://www.w3.org/TR/xsl/slice4.html#area-common">ipd</a>
+ * @see <a href="http://www.w3.org/TR/xsl/#inline-progression-dimension">ipd</a>
*/
public int getIPD() {
- return ipd;
+ return this.ipd;
}
/**
@@ -180,7 +182,7 @@
* for this area.
*
* @param b the new block progression dimension
- * @see <a href="http://www.w3.org/TR/xsl/slice4.html#area-common">bpd</a>
+ * @see <a href="http://www.w3.org/TR/xsl/#block-progression-dimension">bpd</a>
*/
public void setBPD(int b) {
bpd = b;
@@ -191,7 +193,7 @@
* for this area.
*
* @return the block progression dimension
- * @see <a href="http://www.w3.org/TR/xsl/slice4.html#area-common">bpd</a>
+ * @see <a href="http://www.w3.org/TR/xsl/#block-progression-dimension">bpd</a>
*/
public int getBPD() {
return bpd;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeHandler.java?rev=721430&r1=721429&r2=721430&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeHandler.java Fri Nov 28 03:13:12 2008
@@ -101,12 +101,12 @@
setupModel(userAgent, outputFormat, stream);
- lmMaker = userAgent.getFactory().getLayoutManagerMakerOverride();
+ this.lmMaker = userAgent.getFactory().getLayoutManagerMakerOverride();
if (lmMaker == null) {
lmMaker = new LayoutManagerMapping();
}
- idTracker = new IDTracker();
+ this.idTracker = new IDTracker();
if (log.isDebugEnabled()) {
statistics = new Statistics();
@@ -124,7 +124,7 @@
*/
protected void setupModel(FOUserAgent userAgent, String outputFormat,
OutputStream stream) throws FOPException {
- model = new RenderPagesModel(userAgent, outputFormat, fontInfo, stream);
+ this.model = new RenderPagesModel(userAgent, outputFormat, fontInfo, stream);
}
/**
@@ -133,7 +133,7 @@
* @return AreaTreeModel the model being used for this area tree
*/
public AreaTreeModel getAreaTreeModel() {
- return model;
+ return this.model;
}
/**
@@ -143,7 +143,7 @@
* area tree
*/
public LayoutManagerMaker getLayoutManagerMaker() {
- return lmMaker;
+ return this.lmMaker;
}
/**
@@ -152,7 +152,7 @@
* @return IDTracker used to track reference ids for items in this area tree
*/
public IDTracker getIDTracker() {
- return idTracker;
+ return this.idTracker;
}
/**
@@ -207,9 +207,9 @@
}
private void wrapAndAddExtensionAttachments(List list) {
- Iterator i = list.iterator();
- while (i.hasNext()) {
- ExtensionAttachment attachment = (ExtensionAttachment) i.next();
+ Iterator it = list.iterator();
+ while (it.hasNext()) {
+ ExtensionAttachment attachment = (ExtensionAttachment) it.next();
addOffDocumentItem(new OffDocumentExtensionAttachment(attachment));
}
}
@@ -357,7 +357,7 @@
*
* @param id the property ID of the area
* @param pv a page viewport that contains the area with this ID
- * @deprecated use getIdTracker().associateIDWithPageViewport(id, pv) instead
+ * @deprecated use getIDTracker().associateIDWithPageViewport(id, pv) instead
*/
public void associateIDWithPageViewport(String id, PageViewport pv) {
idTracker.associateIDWithPageViewport(id, pv);
@@ -369,7 +369,7 @@
* know when an id can be resolved.
*
* @param id the id of the object being processed
- * @deprecated use getIdTracker().signalPendingID(id) instead
+ * @deprecated use getIDTracker().signalPendingID(id) instead
*/
public void signalPendingID(String id) {
idTracker.signalPendingID(id);
@@ -381,7 +381,7 @@
* ref-ids can be resolved.
*
* @param id the id of the formatting object which was just finished
- * @deprecated use getIdTracker().signalIDProcessed(id) instead
+ * @deprecated use getIDTracker().signalIDProcessed(id) instead
*/
public void signalIDProcessed(String id) {
idTracker.signalIDProcessed(id);
@@ -392,7 +392,7 @@
*
* @param id the id to check
* @return true if the ID has been resolved
- * @deprecated use getIdTracker().alreadyResolvedID(id) instead
+ * @deprecated use getIDTracker().alreadyResolvedID(id) instead
*/
public boolean alreadyResolvedID(String id) {
return idTracker.alreadyResolvedID(id);
@@ -402,7 +402,7 @@
* Tries to resolve all unresolved ID references on the given page.
*
* @param pv page viewport whose ID refs to resolve
- * @deprecated use getIdTracker().tryIDResolution(pv) instead
+ * @deprecated use getIDTracker().tryIDResolution(pv) instead
*/
public void tryIDResolution(PageViewport pv) {
idTracker.tryIDResolution(pv);
@@ -413,7 +413,7 @@
*
* @param id the id to lookup
* @return the list of PageViewports
- * @deprecated use getIdTracker().getPageViewportsContainingID(id) instead
+ * @deprecated use getIDTracker().getPageViewportsContainingID(id) instead
*/
public List getPageViewportsContainingID(String id) {
return idTracker.getPageViewportsContainingID(id);
@@ -424,7 +424,7 @@
*
* @param idref the idref whose target id has not yet been located
* @param res the Resolvable object needing the idref to be resolved
- * @deprecated use getIdTracker().addUnresolvedIDRef(idref, res) instead
+ * @deprecated use getIDTracker().addUnresolvedIDRef(idref, res) instead
*/
public void addUnresolvedIDRef(String idref, Resolvable res) {
idTracker.addUnresolvedIDRef(idref, res);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeModel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeModel.java?rev=721430&r1=721429&r2=721430&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeModel.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeModel.java Fri Nov 28 03:13:12 2008
@@ -36,11 +36,11 @@
* the life of the area tree model.
*/
public class AreaTreeModel {
- private List pageSequenceList = null;
+ private List/*<PageSequence>*/ pageSequenceList = null;
private int currentPageSequenceIndex = -1;
/** the current page sequence */
protected PageSequence currentPageSequence;
- private List offDocumentItems = new java.util.ArrayList();
+// private List offDocumentItems = new java.util.ArrayList();
/** logger instance */
protected static Log log = LogFactory.getLog(AreaTreeModel.class);
@@ -48,7 +48,7 @@
* Create a new store pages model
*/
public AreaTreeModel() {
- pageSequenceList = new java.util.ArrayList();
+ pageSequenceList = new java.util.ArrayList/*<PageSequence>*/();
}
/**
@@ -83,13 +83,13 @@
* Handle an OffDocumentItem
* @param ext the extension to handle
*/
- public void handleOffDocumentItem(OffDocumentItem ext) {};
+ public void handleOffDocumentItem(OffDocumentItem ext) { };
/**
* Signal the end of the document for any processing.
* @throws SAXException if a problem was encountered.
*/
- public void endDocument() throws SAXException {};
+ public void endDocument() throws SAXException { };
/**
* Returns the currently active page-sequence.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeObject.java?rev=721430&r1=721429&r2=721430&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeObject.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeObject.java Fri Nov 28 03:13:12 2008
@@ -21,6 +21,7 @@
import java.util.Collections;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import org.apache.xmlgraphics.util.QName;
@@ -33,6 +34,9 @@
/** Foreign attributes */
protected Map foreignAttributes = null;
+ /** Extension attachments */
+ protected List/*<ExtensionAttachment>*/ extensionAttachments = null;
+
/**
* Sets a foreign attribute.
* @param name the qualified name of the attribute
@@ -83,6 +87,21 @@
return Collections.EMPTY_MAP;
}
}
+
+ /**
+ * Set extension attachments from a List
+ * @param extensionAttachments a List with extension attachments
+ */
+ public void setExtensionAttachments(List extensionAttachments) {
+ this.extensionAttachments = extensionAttachments;
+ }
-
+ /** @return the extension attachments associated with this area */
+ public List getExtensionAttachments() {
+ if (this.foreignAttributes != null) {
+ return Collections.unmodifiableList(this.extensionAttachments);
+ } else {
+ return Collections.EMPTY_LIST;
+ }
+ }
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/IDTracker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/IDTracker.java?rev=721430&r1=721429&r2=721430&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/IDTracker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/IDTracker.java Fri Nov 28 03:13:12 2008
@@ -20,8 +20,6 @@
package org.apache.fop.area;
import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -36,20 +34,20 @@
*/
public class IDTracker {
- private static Log log = LogFactory.getLog(IDTracker.class);
+ private static final Log log = LogFactory.getLog(IDTracker.class);
// HashMap of ID's whose area is located on one or more consecutive
// PageViewports. Each ID has an arraylist of PageViewports that
// form the defined area of this ID
- private Map idLocations = new HashMap();
+ private Map idLocations = new java.util.HashMap();
// idref's whose target PageViewports have yet to be identified
// Each idref has a HashSet of Resolvable objects containing that idref
- private Map unresolvedIDRefs = new HashMap();
+ private Map unresolvedIDRefs = new java.util.HashMap();
- private Set unfinishedIDs = new HashSet();
+ private Set unfinishedIDs = new java.util.HashSet();
- private Set alreadyResolvedIDs = new HashSet();
+ private Set alreadyResolvedIDs = new java.util.HashSet();
/**
* Tie a PageViewport with an ID found on a child area of the PV. Note that
@@ -198,7 +196,7 @@
public void addUnresolvedIDRef(String idref, Resolvable res) {
Set todo = (Set) unresolvedIDRefs.get(idref);
if (todo == null) {
- todo = new HashSet();
+ todo = new java.util.HashSet();
unresolvedIDRefs.put(idref, todo);
}
// add Resolvable object to this HashSet
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/PageViewport.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/PageViewport.java?rev=721430&r1=721429&r2=721430&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/PageViewport.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/PageViewport.java Fri Nov 28 03:13:12 2008
@@ -89,7 +89,7 @@
//Arbitrary attachments to the page from extensions that need to pass information
//down to the renderers.
- private List extensionAttachments = null;
+ private List/*<ExtensionAttachment>*/ extensionAttachments = null;
/**
* logging instance
@@ -122,7 +122,8 @@
*/
public PageViewport(PageViewport original) {
if (original.extensionAttachments != null) {
- this.extensionAttachments = new java.util.ArrayList(original.extensionAttachments);
+ this.extensionAttachments
+ = new java.util.ArrayList/*<ExtensionAttachment>*/(original.extensionAttachments);
}
this.pageIndex = original.pageIndex;
this.pageNumber = original.pageNumber;
@@ -588,7 +589,7 @@
*/
public void addExtensionAttachment(ExtensionAttachment attachment) {
if (this.extensionAttachments == null) {
- this.extensionAttachments = new java.util.ArrayList();
+ this.extensionAttachments = new java.util.ArrayList/*<ExtensionAttachment>*/();
}
extensionAttachments.add(attachment);
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionReference.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionReference.java?rev=721430&r1=721429&r2=721430&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionReference.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RegionReference.java Fri Nov 28 03:13:12 2008
@@ -160,4 +160,13 @@
return rr;
}
+ /** {@inheritDoc} */
+ public String toString() {
+ StringBuffer sb = new StringBuffer(super.toString());
+ sb.append(" {regionName=").append(regionName);
+ sb.append(", regionClass=").append(regionClass);
+ sb.append(", ctm=").append(ctm);
+ sb.append("}");
+ return sb.toString();
+ }
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RenderPagesModel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RenderPagesModel.java?rev=721430&r1=721429&r2=721430&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RenderPagesModel.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/RenderPagesModel.java Fri Nov 28 03:13:12 2008
@@ -50,9 +50,9 @@
/**
* Pages that have been prepared but not rendered yet.
*/
- protected List prepared = new java.util.ArrayList();
- private List pendingODI = new java.util.ArrayList();
- private List endDocODI = new java.util.ArrayList();
+ protected List/*<PageViewport>*/ prepared = new java.util.ArrayList/*<PageViewport>*/();
+ private List/*<OffDocumentItem>*/ pendingODI = new java.util.ArrayList/*<OffDocumentItem>*/();
+ private List/*<OffDocumentItem>*/ endDocODI = new java.util.ArrayList/*<OffDocumentItem>*/();
/**
* Create a new render pages model with the given renderer.
@@ -66,7 +66,7 @@
FontInfo fontInfo, OutputStream stream) throws FOPException {
super();
- renderer = userAgent.getRendererFactory().createRenderer(
+ this.renderer = userAgent.getRendererFactory().createRenderer(
userAgent, outputFormat);
try {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/FilledArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/FilledArea.java?rev=721430&r1=721429&r2=721430&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/FilledArea.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/FilledArea.java Fri Nov 28 03:13:12 2008
@@ -70,10 +70,10 @@
/**
* Set the unit width for the areas to fill the full width.
*
- * @param w the unit width
+ * @param width the unit width
*/
- public void setUnitWidth(int w) {
- unitWidth = w;
+ public void setUnitWidth(int width) {
+ this.unitWidth = width;
}
/**
@@ -82,7 +82,7 @@
* @return the unit width
*/
public int getUnitWidth() {
- return unitWidth;
+ return this.unitWidth;
}
/**
@@ -117,7 +117,7 @@
}
/**
- * recursively apply the variation factor to all descendant areas
+ * Recursively apply the variation factor to all descendant areas
* @param variationFactor the variation factor that must be applied to adjustments
* @param lineStretch the total stretch of the line
* @param lineShrink the total shrink of the line
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Image.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Image.java?rev=721430&r1=721429&r2=721430&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Image.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Image.java Fri Nov 28 03:13:12 2008
@@ -28,14 +28,14 @@
*/
public class Image extends Area {
private String url;
-
+
/**
* Create a new image with the given url.
*
- * @param u the url of the image
+ * @param url the url of the image
*/
- public Image(String u) {
- url = u;
+ public Image(String url) {
+ this.url = url;
}
/**
@@ -45,7 +45,7 @@
* @return the url of this image
*/
public String getURL() {
- return url;
+ return this.url;
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java?rev=721430&r1=721429&r2=721430&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java Fri Nov 28 03:13:12 2008
@@ -221,7 +221,7 @@
notifyIPDVariation(ipdVariation);
}
- /**
+ /**
* notify the parent area about the ipd variation of this area
* or of a descendant area
* @param ipdVariation the difference between new and old ipd
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/TextArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/TextArea.java?rev=721430&r1=721429&r2=721430&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/TextArea.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/TextArea.java Fri Nov 28 03:13:12 2008
@@ -63,6 +63,7 @@
*
* @param word the word string
* @param offset the offset for the next area
+ * @param letterAdjust the letter adjustment array (may be null)
*/
public void addWord(String word, int offset, int[] letterAdjust) {
WordArea wordArea = new WordArea(word, offset, letterAdjust);
@@ -98,7 +99,7 @@
StringBuffer text = new StringBuffer();
InlineArea child;
// assemble the text
- for (int i = 0; i < inlines.size(); i ++) {
+ for (int i = 0; i < inlines.size(); i++) {
child = (InlineArea) inlines.get(i);
if (child instanceof WordArea) {
text.append(((WordArea) child).getWord());
@@ -109,5 +110,9 @@
return text.toString();
}
+ /** {@inheritDoc} */
+ public String toString() {
+ return "TextArea{text=" + getText() + "}";
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org