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 je...@apache.org on 2010/08/14 19:17:13 UTC
svn commit: r985537 [1/11] - in /xmlgraphics/fop/trunk: ./
src/codegen/java/org/apache/fop/tools/ src/codegen/unicode/data/
src/codegen/unicode/java/org/apache/fop/hyphenation/
src/codegen/unicode/java/org/apache/fop/text/linebreak/
src/codegen/unicode...
Author: jeremias
Date: Sat Aug 14 17:17:00 2010
New Revision: 985537
URL: http://svn.apache.org/viewvc?rev=985537&view=rev
Log:
Bugzilla #49733:
Resolved compilation (safe one), Checkstyle and many Javadoc warnings.
Submitted by: Glenn Adams <glenn.at.skynav.com>
Changes to patch:
- Restored the deprecated Graphics2DAdapter method (to be removed after Barcode4J 2.1 is released).
- Restored Renderer.startPageSequence(LineArea) pending discussion about removal.
- build.xml: set max VM to 1024MB instead of 2048MB to allow for 32-bit JVMs.
- build.xml: restored longer taskdef names.
- Restored Checkstyle 4 file for people running older IDEs.
Added:
xmlgraphics/fop/trunk/checkstyle-5.1.xml
- copied, changed from r985519, xmlgraphics/fop/trunk/checkstyle-5.0.xml
xmlgraphics/fop/trunk/checkstyle-suppressions.xml (with props)
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/FOPTextHandlerAdapter.java (with props)
Removed:
xmlgraphics/fop/trunk/checkstyle-5.0.xml
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRenderer_onthefly.java
Modified:
xmlgraphics/fop/trunk/build.xml
xmlgraphics/fop/trunk/src/codegen/java/org/apache/fop/tools/EventProducerCollectorTask.java
xmlgraphics/fop/trunk/src/codegen/unicode/data/LineBreakPairTable.txt
xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java
xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java
xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/util/License.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPBorderPainter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPDataObjectInfo.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPGraphics2D.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPLineDataInfo.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPRectanglePainter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPStreamer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AbstractAFPPainter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/DataStream.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/Factory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/Startable.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/CharacterSetOrientation.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/DoubleByteFont.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/goca/AbstractGraphicsCoord.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsCharacterString.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsFillet.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsSetMix.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsSetPatternSymbol.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/IDEStructureParameter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ioca/ImageRasterPattern.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractAFPObject.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractEnvironmentGroup.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractPageObject.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ActiveEnvironmentGroup.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/GraphicsObject.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ImageDataDescriptor.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/IncludeObject.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/MapCodedFont.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/ObjectContainer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageGroup.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PreprocessPresentationObject.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/CommentTriplet.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/ObjectClassificationTriplet.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/Triplet.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/ptoca/LineDataInfoProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPBridgeContext.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPGraphicsConfiguration.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPTextHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/svg/AFPTextPainter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/BinaryUtils.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/CubicBezierApproximator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/StringUtils.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeParser.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Block.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/DestinationData.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/IDTracker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/LineArea.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Trait.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/AbstractTextArea.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/SpaceArea.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/WordArea.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/Main.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/FODimension.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/Numeric.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/PercentBaseContext.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/URISpecification.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/events/EventExceptionManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/events/model/EventModelParser.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FONode.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/NullCharIterator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/PropertyListMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/StaticPropertyList.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ValidationException.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/BodyStartFunction.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/NumericOp.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyInfo.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/ExtensionObj.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/ExternalDocument.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/BatikExtensionElementMapping.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGDOMContentHandlerFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Block.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BlockContainer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Float.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Footnote.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Inline.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Leader.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListItem.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Marker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiCase.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiProperties.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiPropertySet.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiSwitch.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/MultiToggle.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/RetrieveTableMarker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Wrapper.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/ColumnNumberManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/ConditionalBorder.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/GridUnit.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/PendingSpan.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/PrimaryGridUnit.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableCaption.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableFObj.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TablePart.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/AbstractPageSequence.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBody.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Root.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/BackgroundPositionShorthand.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/BorderSpacingShorthandParser.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CharacterProperty.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ColorProperty.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonAbsolutePosition.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonAccessibility.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonAural.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonFont.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonHyphenation.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonMarginBlock.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonMarginInline.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonRelativePosition.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CondLengthProperty.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CorrespondingPropertyMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/DimensionPropertyMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/EnumLength.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/EnumNumber.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/EnumProperty.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/FixedLength.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/FontFamilyProperty.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/FontSizePropertyMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/FontWeightPropertyMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/KeepProperty.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LineHeightPropertyMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/NumberProperty.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PageDimensionMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PercentLength.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyCache.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ShorthandParser.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/SpaceProperty.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/SpacingPropertyMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/StringProperty.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TableBorderPrecedence.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TextDecorationProperty.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/VerticalAlignShorthandParser.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/XMLLangShorthandParser.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CIDFontType.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CIDSubset.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontSetup.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontType.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontUtil.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/Glyphs.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/MultiByteFont.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/FontFileReader.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFCmapEntry.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFile.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/PFBParser.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/ByteVector.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/CharVector.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphen.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphenation.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/HyphenationException.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/HyphenationTree.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/Hyphenator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/PatternConsumer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/PatternParser.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/TernaryTree.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/BatikUtil.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/PreloaderSVG.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/image/loader/batik/PreloaderWMF.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractPageSequenceLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AreaAdditionUtil.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLevelLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakElement.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ElementListObserver.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/Keep.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/KnuthGlue.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/KnuthPossPosIter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/KnuthSequence.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LMiter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutContext.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutException.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutManagerMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LeafPosition.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/NonLeafPosition.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageBreaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/Position.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PositionIterator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/SpaceResolver.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/SpaceSpecifier.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/TopLevelLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/TraitSetter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/BasicScaledBaselineTable.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/BidiLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/HyphContext.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ICLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLevelLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutPossibilities.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLastLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ScaledBaselineTableFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CellPart.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AlphaRasterImage.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/CMapBuilder.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/DestinationComparator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFCIDFont.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDocument.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFEmbeddedFile.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFEncryptionManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFileSpec.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFontDescriptor.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFunction.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFLaunch.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFMetadata.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPattern.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFShading.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/TransitionDictionary.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractGraphics2DAdapter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractImageHandlerGraphics2D.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ImageHandlerRegistry.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ImageHandlerUtil.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/Renderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPForeignAttributeReader.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandlerRenderedImage.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPImageHandlerSVG.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPInfo.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPPainter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRenderingContext.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/ImageProxyPanel.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/BitmapRendererEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/BorderPainter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFConstants.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFContentHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFDocumentNavigationHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFGraphicContext.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/IFState.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFUtil.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/CustomFontMetricsMapper.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/FontMetricsMapper.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DBorderPainter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DUtil.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/HardcodedFonts.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLPainter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRenderingContext.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/CTMHelper.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFBorderPainter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFContentGenerator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFLogicalStructureHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFEmbeddedFileElement.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/extensions/PDFEmbeddedFileExtensionAttachment.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSBorderPainter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSBridgeContext.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSFontUtils.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSImageHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSPainter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSRendererContextConstants.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSRenderingUtil.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSTextPainter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFile.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFootnote.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfGenerator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHyperLink.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfString.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStringConverter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTemplate.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfText.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/WhitespaceCollapser.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/tools/BuilderContext.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageConstants.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageUtil.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTStream.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/AbstractXMLRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/AbstractFOPBridgeContext.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/AbstractFOPImageElementBridge.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/FOPTextHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/GraphicsConfiguration.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/NativeImageHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/NativeTextPainter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFBridgeContext.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphics2D.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphicsConfiguration.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphicsDevice.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGUtilities.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/text/linebreak/LineBreakStatus.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/text/linebreak/LineBreakUtils.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/FileCompare.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/Fop.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/BorderProps.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/MinOptMax.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/SpaceVal.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/TraitEnum.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/AbstractPaintingState.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorExt.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorProfileUtil.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/CommandLineLogger.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ConversionUtils.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DataURIResolver.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DataURLUtil.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/DecimalFormatCache.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/LogUtil.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/UnitConv.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/WriterOutputStream.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/XMLUtil.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/bitmap/BitmapImageUtil.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/bitmap/DitherUtil.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/text/AdvancedMessageFormat.java
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/mif/MIFElement.java
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/mif/MIFFOEventHandlerMaker.java
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/mif/MIFFile.java
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/mif/MIFHandler.java
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/mif/PGFElement.java
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/mif/RefElement.java
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/mif/RulingElement.java
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGDataUrlImageHandler.java
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGPainter.java
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGRenderer.java
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGRendererMaker.java
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGUtil.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeUnitTester.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/memory/MemoryEater.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/visual/AbstractPSPDFBitmapProducer.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/visual/BitmapProducerJava2D.java
Modified: xmlgraphics/fop/trunk/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/build.xml?rev=985537&r1=985536&r2=985537&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/build.xml (original)
+++ xmlgraphics/fop/trunk/build.xml Sat Aug 14 17:17:00 2010
@@ -494,7 +494,7 @@ list of possible build targets.
</path>
<!-- If we decide to use retroweaver for the actual weaving, the mkdir and
destdir= will have to be removed. Also, the weaving task would additionally
- need to be defined even if no jdk 14 is available. -->
+ need to be defined even if no jdk 14 is available. -->
<mkdir dir="${build.dir}/temp"/>
<retroweaver srcdir="${build.classes.dir}" destdir="${build.dir}/temp"
classpath="${toString:verify-classpath}" lazy="false"
@@ -807,6 +807,7 @@ list of possible build targets.
<target name="junit-userconfig" depends="junit-compile" if="junit.present" description="Runs FOP's user config JUnit tests">
<echo message="Running user config tests"/>
<junit dir="${basedir}" haltonfailure="${junit.haltonfailure}" fork="${junit.fork}" errorproperty="fop.junit.error" failureproperty="fop.junit.failure">
+ <jvmarg value="-Xmx1024m"/>
<sysproperty key="basedir" value="${basedir}"/>
<sysproperty key="jawa.awt.headless" value="true"/>
<sysproperty key="fop.layoutengine.disabled" value="${layoutengine.disabled}"/>
@@ -1045,7 +1046,7 @@ NOTE:
<pathelement path="${src.sandbox.dir}"/>
<pathelement path="${build.gensrc.dir}"/>
</sourcepath>
- <tag name="todo" scope="all" description="To do:"/>
+ <tag name="asf.todo" scope="all" description="To do:"/>
<tag name="event.severity" scope="all" description="Event severity level:"/>
<group title="Control and Startup">
<package name="org.apache.fop"/>
@@ -1135,13 +1136,20 @@ NOTE:
</condition>
<target name="checkstyle-avail" unless="checkstyle.avail">
<echo message="Checkstyle support NOT present. Please download it from http://checkstyle.sf.net/ and"/>
- <echo message="..copy or link checkstyle-all-5.0.jar to ${lib-tools}"/>
+ <echo message="..copy or link checkstyle-all-5.1.jar to ${lib-tools}"/>
<echo message="..copy or link checkstyle-noframes.xsl to ${checkstyle.noframes.xslt}"/>
</target>
- <target name="checkstyle" depends="init, checkstyle-avail" if="checkstyle.avail" description="Runs Checkstyle for a code quality report">
+ <target name="checkstyle" depends="package, checkstyle-avail" if="checkstyle.avail" description="Runs Checkstyle for a code quality report">
<taskdef name="checkstyle" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask" classpathref="libs-tools-build-classpath"/>
- <checkstyle config="checkstyle-5.0.xml" failonviolation="false">
- <fileset dir="${src.java.dir}" includes="**/*.java"/>
+ <mkdir dir="${build.dir}"/>
+ <checkstyle config="checkstyle-5.1.xml" failonviolation="false">
+ <classpath>
+ <path refid="libs-build-classpath"/>
+ <pathelement location="${build.classes.dir}"/>
+ <pathelement location="${build.sandbox-classes.dir}"/>
+ <pathelement location="${build.codegen-classes.dir}"/>
+ </classpath>
+ <fileset dir="${src.dir}" includes="**/*.java"/>
<formatter type="xml" toFile="${build.dir}/report_checkstyle.xml"/>
</checkstyle>
<xslt in="${build.dir}/report_checkstyle.xml" out="${build.dir}/report_checkstyle.html" style="${checkstyle.noframes.xslt}"/>
Copied: xmlgraphics/fop/trunk/checkstyle-5.1.xml (from r985519, xmlgraphics/fop/trunk/checkstyle-5.0.xml)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/checkstyle-5.1.xml?p2=xmlgraphics/fop/trunk/checkstyle-5.1.xml&p1=xmlgraphics/fop/trunk/checkstyle-5.0.xml&r1=985519&r2=985537&rev=985537&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/checkstyle-5.0.xml (original)
+++ xmlgraphics/fop/trunk/checkstyle-5.1.xml Sat Aug 14 17:17:00 2010
@@ -175,6 +175,7 @@
<property name="severity" value="warning"/>
<property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN"/>
</module>
+ <module name="FileContentsHolder"/>
</module>
<module name="RegexpHeader">
<property name="headerFile" value="${samedir}/checkstyle.header"/>
@@ -187,4 +188,17 @@
<module name="FileTabCharacter">
<property name="severity" value="error"/>
</module>
+ <module name="SuppressionFilter">
+ <property name="file" value="${samedir}/checkstyle-suppressions.xml"/>
+ </module>
+ <module name="SuppressionCommentFilter">
+ <property name="offCommentFormat" value="CSOFF\: ([\w\|]+)"/>
+ <property name="onCommentFormat" value="CSON\: ([\w\|]+)"/>
+ <property name="checkFormat" value="$1"/>
+ </module>
+ <module name="SuppressWithNearbyCommentFilter">
+ <property name="commentFormat" value="CSOK\: ([\w\|]+)"/>
+ <property name="checkFormat" value="$1"/>
+ <property name="influenceFormat" value="0"/>
+ </module>
</module>
Added: xmlgraphics/fop/trunk/checkstyle-suppressions.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/checkstyle-suppressions.xml?rev=985537&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/checkstyle-suppressions.xml (added)
+++ xmlgraphics/fop/trunk/checkstyle-suppressions.xml Sat Aug 14 17:17:00 2010
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suppressions PUBLIC "-//Puppy Crawl//DTD Suppressions 1.1//EN" "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+<suppressions>
+ <suppress files="org/apache/fop/fo/FOPropertyMapping.java" checks="FileLengthCheck"/>
+ <suppress files="org/apache/fop/fonts/truetype/TTFFile.java" checks="FileLengthCheck"/>
+ <suppress files="org/apache/fop/Version.java" lines="40-50" checks="LineLengthCheck"/>
+</suppressions>
Propchange: xmlgraphics/fop/trunk/checkstyle-suppressions.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/checkstyle-suppressions.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: xmlgraphics/fop/trunk/src/codegen/java/org/apache/fop/tools/EventProducerCollectorTask.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/codegen/java/org/apache/fop/tools/EventProducerCollectorTask.java?rev=985537&r1=985536&r2=985537&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/codegen/java/org/apache/fop/tools/EventProducerCollectorTask.java (original)
+++ xmlgraphics/fop/trunk/src/codegen/java/org/apache/fop/tools/EventProducerCollectorTask.java Sat Aug 14 17:17:00 2010
@@ -117,6 +117,7 @@ public class EventProducerCollectorTask
/**
* Updates the translation file with new entries for newly found event producer methods.
+ * @param modelFile the model file to use
* @throws IOException if an I/O error occurs
*/
protected void updateTranslationFile(File modelFile) throws IOException {
Modified: xmlgraphics/fop/trunk/src/codegen/unicode/data/LineBreakPairTable.txt
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/codegen/unicode/data/LineBreakPairTable.txt?rev=985537&r1=985536&r2=985537&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/codegen/unicode/data/LineBreakPairTable.txt (original)
+++ xmlgraphics/fop/trunk/src/codegen/unicode/data/LineBreakPairTable.txt Sat Aug 14 17:17:00 2010
@@ -1,28 +1,29 @@
- OP CL QU GL NS EX SY IS PR PO NU AL ID IN HY BA BB B2 ZW CM WJ H2 H3 JL JV JT
-OP ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ @ ^ ^ ^ ^ ^ ^
-CL _ ^ % % ^ ^ ^ ^ % % % % _ _ % % _ _ ^ # ^ _ _ _ _ _
-QU ^ ^ % % % ^ ^ ^ % % % % % % % % % % ^ # ^ % % % % %
-GL % ^ % % % ^ ^ ^ % % % % % % % % % % ^ # ^ % % % % %
-NS _ ^ % % % ^ ^ ^ _ _ _ _ _ _ % % _ _ ^ # ^ _ _ _ _ _
-EX _ ^ % % % ^ ^ ^ _ _ _ _ _ _ % % _ _ ^ # ^ _ _ _ _ _
-SY _ ^ % % % ^ ^ ^ _ _ % _ _ _ % % _ _ ^ # ^ _ _ _ _ _
-IS _ ^ % % % ^ ^ ^ _ _ % % _ _ % % _ _ ^ # ^ _ _ _ _ _
-PR % ^ % % % ^ ^ ^ _ _ % % % _ % % _ _ ^ # ^ % % % % %
-PO % ^ % % % ^ ^ ^ _ _ % % _ _ % % _ _ ^ # ^ _ _ _ _ _
-NU % ^ % % % ^ ^ ^ % % % % _ % % % _ _ ^ # ^ _ _ _ _ _
-AL % ^ % % % ^ ^ ^ _ _ % % _ % % % _ _ ^ # ^ _ _ _ _ _
-ID _ ^ % % % ^ ^ ^ _ % _ _ _ % % % _ _ ^ # ^ _ _ _ _ _
-IN _ ^ % % % ^ ^ ^ _ _ _ _ _ % % % _ _ ^ # ^ _ _ _ _ _
-HY _ ^ % % % ^ ^ ^ _ _ % _ _ _ % % _ _ ^ # ^ _ _ _ _ _
-BA _ ^ % % % ^ ^ ^ _ _ _ _ _ _ % % _ _ ^ # ^ _ _ _ _ _
-BB % ^ % % % ^ ^ ^ % % % % % % % % % % ^ # ^ % % % % %
-B2 _ ^ % % % ^ ^ ^ _ _ _ _ _ _ % % _ ^ ^ # ^ _ _ _ _ _
-ZW _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ ^ _ _ _ _ _ _ _
-CM _ ^ % % % ^ ^ ^ _ _ % % _ % % % _ _ ^ # ^ _ _ _ _ _
-WJ % ^ % % % ^ ^ ^ % % % % % % % % % % ^ # ^ % % % % %
-H2 _ ^ % % % ^ ^ ^ _ % _ _ _ % % % _ _ ^ # ^ _ _ _ % %
-H3 _ ^ % % % ^ ^ ^ _ % _ _ _ % % % _ _ ^ # ^ _ _ _ _ %
-JL _ ^ % % % ^ ^ ^ _ % _ _ _ % % % _ _ ^ # ^ % % % % _
-JV _ ^ % % % ^ ^ ^ _ % _ _ _ % % % _ _ ^ # ^ _ _ _ % %
-JT _ ^ % % % ^ ^ ^ _ % _ _ _ % % % _ _ ^ # ^ _ _ _ _ %
+ OP CP CL QU GL NS EX SY IS PR PO NU AL ID IN HY BA BB B2 ZW CM WJ H2 H3 JL JV JT
+OP ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ @ ^ ^ ^ ^ ^ ^
+CP _ ^ ^ % % ^ ^ ^ ^ % % % % _ _ % % _ _ ^ # ^ _ _ _ _ _
+CL _ ^ ^ % % ^ ^ ^ ^ % % % % _ _ % % _ _ ^ # ^ _ _ _ _ _
+QU ^ ^ ^ % % % ^ ^ ^ % % % % % % % % % % ^ # ^ % % % % %
+GL % ^ ^ % % % ^ ^ ^ % % % % % % % % % % ^ # ^ % % % % %
+NS _ ^ ^ % % % ^ ^ ^ _ _ _ _ _ _ % % _ _ ^ # ^ _ _ _ _ _
+EX _ ^ ^ % % % ^ ^ ^ _ _ _ _ _ _ % % _ _ ^ # ^ _ _ _ _ _
+SY _ ^ ^ % % % ^ ^ ^ _ _ % _ _ _ % % _ _ ^ # ^ _ _ _ _ _
+IS _ ^ ^ % % % ^ ^ ^ _ _ % % _ _ % % _ _ ^ # ^ _ _ _ _ _
+PR % ^ ^ % % % ^ ^ ^ _ _ % % % _ % % _ _ ^ # ^ % % % % %
+PO % ^ ^ % % % ^ ^ ^ _ _ % % _ _ % % _ _ ^ # ^ _ _ _ _ _
+NU % ^ ^ % % % ^ ^ ^ % % % % _ % % % _ _ ^ # ^ _ _ _ _ _
+AL % ^ ^ % % % ^ ^ ^ _ _ % % _ % % % _ _ ^ # ^ _ _ _ _ _
+ID _ ^ ^ % % % ^ ^ ^ _ % _ _ _ % % % _ _ ^ # ^ _ _ _ _ _
+IN _ ^ ^ % % % ^ ^ ^ _ _ _ _ _ % % % _ _ ^ # ^ _ _ _ _ _
+HY _ ^ ^ % % % ^ ^ ^ _ _ % _ _ _ % % _ _ ^ # ^ _ _ _ _ _
+BA _ ^ ^ % % % ^ ^ ^ _ _ _ _ _ _ % % _ _ ^ # ^ _ _ _ _ _
+BB % ^ ^ % % % ^ ^ ^ % % % % % % % % % % ^ # ^ % % % % %
+B2 _ ^ ^ % % % ^ ^ ^ _ _ _ _ _ _ % % _ ^ ^ # ^ _ _ _ _ _
+ZW _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ ^ _ _ _ _ _ _ _
+CM _ ^ ^ % % % ^ ^ ^ _ _ % % _ % % % _ _ ^ # ^ _ _ _ _ _
+WJ % ^ ^ % % % ^ ^ ^ % % % % % % % % % % ^ # ^ % % % % %
+H2 _ ^ ^ % % % ^ ^ ^ _ % _ _ _ % % % _ _ ^ # ^ _ _ _ % %
+H3 _ ^ ^ % % % ^ ^ ^ _ % _ _ _ % % % _ _ ^ # ^ _ _ _ _ %
+JL _ ^ ^ % % % ^ ^ ^ _ % _ _ _ % % % _ _ ^ # ^ % % % % _
+JV _ ^ ^ % % % ^ ^ ^ _ % _ _ _ % % % _ _ ^ # ^ _ _ _ % %
+JT _ ^ ^ % % % ^ ^ ^ _ % _ _ _ % % % _ _ ^ # ^ _ _ _ _ %
Modified: xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java?rev=985537&r1=985536&r2=985537&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java (original)
+++ xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java Sat Aug 14 17:17:00 2010
@@ -51,7 +51,8 @@ import org.apache.fop.util.License;
*/
public final class UnicodeClasses {
- public static String UNICODE_DIR = "http://www.unicode.org/Public/UNIDATA/";
+ /** directory containing unicode properties files */
+ public static final String UNICODE_DIR = "http://www.unicode.org/Public/UNIDATA/";
/**
* Disallow constructor for this utility class
@@ -77,7 +78,7 @@ public final class UnicodeClasses {
* Generate classes.xml from Java's compiled-in Unicode Character Database
* @param hexcode whether to prefix each class with the hexcode (only for debugging purposes)
* @param outfilePath output file
- * @throws IOException
+ * @throws IOException if an I/O exception occurs
*/
public static void fromJava(boolean hexcode, String outfilePath) throws IOException {
File f = new File(outfilePath);
@@ -160,7 +161,6 @@ public final class UnicodeClasses {
* @param outfilePath output file
* @throws IOException if the input files are not found
* @throws URISyntaxException
- * @throws FOPException
*/
public static void fromUCD(boolean hexcode, String unidataPath, String outfilePath)
throws IOException, URISyntaxException {
@@ -286,7 +286,7 @@ public final class UnicodeClasses {
* @param hexcode whether to prefix each class with the hexcode (only for debugging purposes)
* @param lettersPath path to XeTeX's Unicode letters file unicode-letters-XeTeX.tex
* @param outfilePath output file
- * @throws IOException
+ * @throws IOException in case of an I/O exception
*/
public static void fromTeX(boolean hexcode, String lettersPath, String outfilePath)
throws IOException {
Modified: xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java?rev=985537&r1=985536&r2=985537&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java (original)
+++ xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java Sat Aug 14 17:17:00 2010
@@ -33,6 +33,8 @@ import java.util.Map;
import org.apache.fop.util.License;
+// CSOFF: LineLengthCheck
+
/**
* <p>Utility for generating a Java class representing line break properties
* from the Unicode property files.</p>
@@ -46,7 +48,10 @@ import org.apache.fop.util.License;
* </ul>
*
*/
-public class GenerateLineBreakUtils {
+public final class GenerateLineBreakUtils {
+
+ private GenerateLineBreakUtils() {
+ }
private static final int MAX_LINE_LENGTH = 110;
@@ -57,12 +62,14 @@ public class GenerateLineBreakUtils {
private static final byte PROHIBITED_BREAK = 4; // ^ in table
private static final byte EXPLICIT_BREAK = 5; // ! in rules
private static final String BREAK_CLASS_TOKENS = "_%#@^!";
- private static final String notInPairTable[] = { "AI", "BK", "CB", "CR", "LF", "NL", "SA", "SG", "SP", "XX" };
-
- private static final byte lineBreakProperties[] = new byte[0x10000];
- private static final Map lineBreakPropertyValues = new HashMap();
- private static final List lineBreakPropertyShortNames = new ArrayList();
- private static final List lineBreakPropertyLongNames = new ArrayList();
+ private static final String[] NOT_IN_PAIR_TABLE = {
+ "AI", "BK", "CB", "CR", "LF", "NL", "SA", "SG", "SP", "XX"
+ };
+
+ private static byte[] lineBreakProperties = new byte[0x10000];
+ private static Map lineBreakPropertyValues = new HashMap();
+ private static List lineBreakPropertyShortNames = new ArrayList();
+ private static List lineBreakPropertyLongNames = new ArrayList();
/**
* Generate a class managing line break properties for Unicode characters and a sample
@@ -76,7 +83,7 @@ public class GenerateLineBreakUtils {
* @param outFileName Name of the output file.
* @throws Exception in case anything goes wrong.
*/
- private static void convertLineBreakProperties(
+ private static void convertLineBreakProperties( // CSOK: MethodLength
String lineBreakFileName,
String propertyValueFileName,
String breakPairFileName,
@@ -86,21 +93,21 @@ public class GenerateLineBreakUtils {
readLineBreakProperties(lineBreakFileName, propertyValueFileName);
// read break pair table
int lineBreakPropertyValueCount = lineBreakPropertyValues.size();
- int tableSize = lineBreakPropertyValueCount - notInPairTable.length;
- Map notInPairTableMap = new HashMap(notInPairTable.length);
- for (int i = 0; i < notInPairTable.length; i++) {
- Object v = lineBreakPropertyValues.get(notInPairTable[i]);
+ int tableSize = lineBreakPropertyValueCount - NOT_IN_PAIR_TABLE.length;
+ Map notInPairTableMap = new HashMap(NOT_IN_PAIR_TABLE.length);
+ for (int i = 0; i < NOT_IN_PAIR_TABLE.length; i++) {
+ Object v = lineBreakPropertyValues.get(NOT_IN_PAIR_TABLE[i]);
if (v == null) {
- throw new Exception("'not in pair table' property not found: " + notInPairTable[i]);
+ throw new Exception("'not in pair table' property not found: " + NOT_IN_PAIR_TABLE[i]);
}
- notInPairTableMap.put(notInPairTable[i], v);
+ notInPairTableMap.put(NOT_IN_PAIR_TABLE[i], v);
}
- byte pairTable[][] = new byte[tableSize][];
- byte columnHeader[] = new byte[tableSize];
- byte rowHeader[] = new byte[tableSize];
- byte columnMap[] = new byte[lineBreakPropertyValueCount + 1];
+ byte[][] pairTable = new byte[tableSize][];
+ byte[] columnHeader = new byte[tableSize];
+ byte[] rowHeader = new byte[tableSize];
+ byte[] columnMap = new byte[lineBreakPropertyValueCount + 1];
Arrays.fill(columnMap, (byte)255);
- byte rowMap[] = new byte[lineBreakPropertyValueCount + 1];
+ byte[] rowMap = new byte[lineBreakPropertyValueCount + 1];
Arrays.fill(rowMap, (byte)255);
BufferedReader b = new BufferedReader(new FileReader(breakPairFileName));
String line = b.readLine();
@@ -224,7 +231,7 @@ public class GenerateLineBreakUtils {
// generate class
int rowsize = 512;
int blocksize = lineBreakProperties.length / rowsize;
- byte row[][] = new byte[rowsize][];
+ byte[][] row = new byte[rowsize][];
int idx = 0;
StringBuffer doStaticLinkCode = new StringBuffer();
PrintWriter out = new PrintWriter(new FileWriter(outFileName));
@@ -242,8 +249,15 @@ public class GenerateLineBreakUtils {
out.println(" * - commit BOTH changed files");
out.println(" */");
out.println();
+ out.println("// CSOFF: WhitespaceAfterCheck");
+ out.println("// CSOFF: LineLengthCheck");
+ out.println();
+ out.println("/** Line breaking utilities. */");
out.println("public final class LineBreakUtils {");
out.println();
+ out.println(" private LineBreakUtils() {");
+ out.println(" }");
+ out.println();
out.println(" /** Break class constant */");
out.println(" public static final byte DIRECT_BREAK = " + DIRECT_BREAK + ';');
out.println(" /** Break class constant */");
@@ -257,7 +271,7 @@ public class GenerateLineBreakUtils {
out.println(" /** Break class constant */");
out.println(" public static final byte EXPLICIT_BREAK = " + EXPLICIT_BREAK + ';');
out.println();
- out.println(" private static final byte PAIR_TABLE[][] = {");
+ out.println(" private static final byte[][] PAIR_TABLE = {");
boolean printComma = false;
for (int i = 1; i <= lineBreakPropertyValueCount; i++) {
if (printComma) {
@@ -283,9 +297,9 @@ public class GenerateLineBreakUtils {
}
out.println("};");
out.println();
- out.println(" private static byte lineBreakProperties[][] = new byte[" + rowsize + "][];");
+ out.println(" private static byte[][] lineBreakProperties = new byte[" + rowsize + "][];");
out.println();
- out.println(" private static void init_0() {");
+ out.println(" private static void init0() {");
int rowsPrinted = 0;
int initSections = 0;
for (int i = 0; i < rowsize; i++) {
@@ -315,7 +329,7 @@ public class GenerateLineBreakUtils {
out.println(" }");
out.println();
initSections++;
- out.println(" private static void init_" + initSections + "() {");
+ out.println(" private static void init" + initSections + "() {");
rowsPrinted = 0;
}
row[i] = new byte[blocksize];
@@ -339,7 +353,7 @@ public class GenerateLineBreakUtils {
out.println();
out.println(" static {");
for (int i = 0; i <= initSections; i++) {
- out.println(" init_" + i + "();");
+ out.println(" init" + i + "();");
}
out.print(doStaticLinkCode);
out.println(" }");
@@ -354,7 +368,7 @@ public class GenerateLineBreakUtils {
out.println(';');
}
out.println();
- final String shortNamePrefix = " private static String lineBreakPropertyShortNames[] = {";
+ final String shortNamePrefix = " private static String[] lineBreakPropertyShortNames = {";
out.print(shortNamePrefix);
int lineLength = shortNamePrefix.length();
printComma = false;
@@ -383,7 +397,7 @@ public class GenerateLineBreakUtils {
}
out.println("};");
out.println();
- final String longNamePrefix = " private static String lineBreakPropertyLongNames[] = {";
+ final String longNamePrefix = " private static String[] lineBreakPropertyLongNames = {";
out.print(longNamePrefix);
lineLength = longNamePrefix.length();
printComma = false;
@@ -600,11 +614,11 @@ public class GenerateLineBreakUtils {
for (int i = 0; i < 16; i++) {
int rowsize = 1 << i;
int blocksize = lineBreakProperties.length / (rowsize);
- byte row[][] = new byte[rowsize][];
+ byte[][] row = new byte[rowsize][];
int idx = 0;
int nrOfDistinctBlocks = 0;
for (int j = 0; j < rowsize; j++) {
- byte block[] = new byte[blocksize];
+ byte[] block = new byte[blocksize];
for (int k = 0; k < blocksize; k++) {
block[k] = lineBreakProperties[idx];
idx++;
@@ -638,6 +652,10 @@ public class GenerateLineBreakUtils {
}
}
+ /**
+ * Main entry point for running GenerateLineBreakUtils
+ * @param args array of command line arg
+ */
public static void main(String[] args) {
String lineBreakFileName = "http://www.unicode.org/Public/UNIDATA/LineBreak.txt";
String propertyValueFileName = "http://www.unicode.org/Public/UNIDATA/PropertyValueAliases.txt";
@@ -650,13 +668,13 @@ public class GenerateLineBreakUtils {
} else {
String opt = args[i];
if ("-l".equals(opt)) {
- lineBreakFileName = args[i+1];
+ lineBreakFileName = args[i + 1];
} else if ("-p".equals(opt)) {
- propertyValueFileName = args[i+1];
+ propertyValueFileName = args[i + 1];
} else if ("-b".equals(opt)) {
- breakPairFileName = args[i+1];
- } else if("-o".equals(opt)) {
- outFileName = args[i+1];
+ breakPairFileName = args[i + 1];
+ } else if ("-o".equals(opt)) {
+ outFileName = args[i + 1];
} else {
ok = false;
}
Modified: xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/util/License.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/util/License.java?rev=985537&r1=985536&r2=985537&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/util/License.java (original)
+++ xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/util/License.java Sat Aug 14 17:17:00 2010
@@ -29,10 +29,13 @@ import java.io.Writer;
*/
public final class License {
+ private License() {
+ }
+
/**
* The Apache license text as a string array
*/
- public static final String[] license
+ public static final String[] LICENSE
= {"Licensed to the Apache Software Foundation (ASF) under one or more",
"contributor license agreements. See the NOTICE file distributed with",
"this work for additional information regarding copyright ownership.",
@@ -52,21 +55,21 @@ public final class License {
/**
* The subversion Id keyword line
*/
- public static final String id = "$Id$";
+ public static final String ID = "$Id$";
/**
* Calculate the maximum line length in the Apache license text
* for use in formatting
*/
- private static int MAX_LENGTH;
+ private static int maxLength;
static {
int j = 0;
- for (int i = 0; i < license.length; ++i) {
- if (j < license[i].length()) {
- j = license[i].length();
+ for (int i = 0; i < LICENSE.length; ++i) {
+ if (j < LICENSE[i].length()) {
+ j = LICENSE[i].length();
}
}
- MAX_LENGTH = j;
+ maxLength = j;
}
/**
@@ -76,16 +79,16 @@ public final class License {
*/
public static void writeJavaLicenseId(Writer w) throws IOException {
w.write("/*\n");
- for (int i = 0; i < license.length; ++i) {
- if (license[i].equals("")) {
+ for (int i = 0; i < LICENSE.length; ++i) {
+ if (LICENSE[i].equals("")) {
w.write(" *\n");
} else {
- w.write(" * " + license[i] + "\n");
+ w.write(" * " + LICENSE[i] + "\n");
}
}
w.write(" */\n");
w.write("\n");
- w.write("/* " + id + " */\n");
+ w.write("/* " + ID + " */\n");
}
/**
@@ -94,11 +97,11 @@ public final class License {
* @throws IOException if the write operation fails
*/
public static void writeXMLLicenseId(Writer w) throws IOException {
- for (int i = 0; i < license.length; ++i) {
- w.write(String.format("<!-- %-" + MAX_LENGTH + "s -->\n", new Object[] {license[i]}));
+ for (int i = 0; i < LICENSE.length; ++i) {
+ w.write(String.format("<!-- %-" + maxLength + "s -->\n", new Object[] {LICENSE[i]}));
}
w.write("\n");
- w.write("<!-- " + id + " -->\n");
+ w.write("<!-- " + ID + " -->\n");
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.java?rev=985537&r1=985536&r2=985537&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/ResourceEventProducer.java Sat Aug 14 17:17:00 2010
@@ -39,7 +39,10 @@ public interface ResourceEventProducer e
/**
* Provider class for the event producer.
*/
- class Provider {
+ final class Provider {
+
+ private Provider() {
+ }
/**
* Returns an event producer.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPBorderPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPBorderPainter.java?rev=985537&r1=985536&r2=985537&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPBorderPainter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPBorderPainter.java Sat Aug 14 17:17:00 2010
@@ -40,7 +40,7 @@ public class AFPBorderPainter extends Ab
}
/** {@inheritDoc} */
- public void paint(PaintingInfo paintInfo) {
+ public void paint(PaintingInfo paintInfo) { // CSOK: MethodLength
BorderPaintingInfo borderPaintInfo = (BorderPaintingInfo)paintInfo;
float w = borderPaintInfo.getX2() - borderPaintInfo.getX1();
float h = borderPaintInfo.getY2() - borderPaintInfo.getY1();
@@ -60,6 +60,7 @@ public class AFPBorderPainter extends Ab
float y2 = unitConv.pt2units(borderPaintInfo.getY2());
switch (paintingState.getRotation()) {
+ default:
case 0:
x1 += at.getTranslateX();
y1 += at.getTranslateY();
@@ -89,8 +90,8 @@ public class AFPBorderPainter extends Ab
AFPLineDataInfo lineDataInfo = new AFPLineDataInfo();
lineDataInfo.setColor(borderPaintInfo.getColor());
lineDataInfo.setRotation(paintingState.getRotation());
- lineDataInfo.x1 = Math.round(x1);
- lineDataInfo.y1 = Math.round(y1);
+ lineDataInfo.setX1 ( Math.round(x1) );
+ lineDataInfo.setY1 ( Math.round(y1) );
float thickness;
if (borderPaintInfo.isHorizontal()) {
thickness = y2 - y1;
@@ -105,83 +106,91 @@ public class AFPBorderPainter extends Ab
int thickness3 = (int)Math.floor(thickness / 3f);
lineDataInfo.setThickness(thickness3);
if (borderPaintInfo.isHorizontal()) {
- lineDataInfo.x2 = Math.round(x2);
- lineDataInfo.y2 = lineDataInfo.y1;
+ lineDataInfo.setX2 ( Math.round(x2) );
+ lineDataInfo.setY2 ( lineDataInfo.getY1() );
dataStream.createLine(lineDataInfo);
int distance = thickness3 * 2;
lineDataInfo = new AFPLineDataInfo(lineDataInfo);
- lineDataInfo.y1 += distance;
- lineDataInfo.y2 += distance;
+ lineDataInfo.setY1 ( lineDataInfo.getY1() + distance );
+ lineDataInfo.setY2 ( lineDataInfo.getY2() + distance );
dataStream.createLine(lineDataInfo);
} else {
- lineDataInfo.x2 = lineDataInfo.x1;
- lineDataInfo.y2 = Math.round(y2);
+ lineDataInfo.setX2 ( lineDataInfo.getX1() );
+ lineDataInfo.setY2 ( Math.round(y2) );
dataStream.createLine(lineDataInfo);
int distance = thickness3 * 2;
lineDataInfo = new AFPLineDataInfo(lineDataInfo);
- lineDataInfo.x1 += distance;
- lineDataInfo.x2 += distance;
+ lineDataInfo.setX1 ( lineDataInfo.getX1() + distance );
+ lineDataInfo.setX2 ( lineDataInfo.getX2() + distance );
dataStream.createLine(lineDataInfo);
}
break;
case Constants.EN_DASHED:
- int thick = lineDataInfo.thickness * 3;
+ int thick = lineDataInfo.getThickness() * 3;
if (borderPaintInfo.isHorizontal()) {
- lineDataInfo.x2 = lineDataInfo.x1 + thick;
- lineDataInfo.y2 = lineDataInfo.y1;
+ lineDataInfo.setX2 ( lineDataInfo.getX1() + thick );
+ lineDataInfo.setY2 ( lineDataInfo.getY1() );
int ex2 = Math.round(x2);
- while (lineDataInfo.x1 + thick < ex2) {
+ while (lineDataInfo.getX1() + thick < ex2) {
dataStream.createLine(lineDataInfo);
- lineDataInfo.x1 += 2 * thick;
- lineDataInfo.x2 = lineDataInfo.x1 + thick;
+ lineDataInfo.setX1 ( lineDataInfo.getX1() + 2 * thick );
+ lineDataInfo.setX2 ( lineDataInfo.getX1() + thick );
}
} else {
- lineDataInfo.x2 = lineDataInfo.x1;
- lineDataInfo.y2 = lineDataInfo.y1 + thick;
+ lineDataInfo.setX2 ( lineDataInfo.getX1() );
+ lineDataInfo.setY2 ( lineDataInfo.getY1() + thick );
int ey2 = Math.round(y2);
- while (lineDataInfo.y1 + thick < ey2) {
+ while (lineDataInfo.getY1() + thick < ey2) {
dataStream.createLine(lineDataInfo);
- lineDataInfo.y1 += 2 * thick;
- lineDataInfo.y2 = lineDataInfo.y1 + thick;
+ lineDataInfo.setY1 ( lineDataInfo.getY1() + 2 * thick );
+ lineDataInfo.setY2 ( lineDataInfo.getY1() + thick );
}
}
break;
case Constants.EN_DOTTED:
if (borderPaintInfo.isHorizontal()) {
- lineDataInfo.x2 = lineDataInfo.x1 + lineDataInfo.thickness;
- lineDataInfo.y2 = lineDataInfo.y1;
+ lineDataInfo.setX2 ( lineDataInfo.getX1() + lineDataInfo.getThickness() );
+ lineDataInfo.setY2 ( lineDataInfo.getY1() );
int ex2 = Math.round(x2);
- while (lineDataInfo.x1 + lineDataInfo.thickness < ex2) {
+ while (lineDataInfo.getX1() + lineDataInfo.getThickness() < ex2) {
dataStream.createLine(lineDataInfo);
- lineDataInfo.x1 += 3 * lineDataInfo.thickness;
- lineDataInfo.x2 = lineDataInfo.x1 + lineDataInfo.thickness;
+ lineDataInfo.setX1 ( lineDataInfo.getX1() + 3 * lineDataInfo.getThickness() );
+ lineDataInfo.setX2 ( lineDataInfo.getX1() + lineDataInfo.getThickness() );
}
} else {
- lineDataInfo.x2 = lineDataInfo.x1;
- lineDataInfo.y2 = lineDataInfo.y1 + lineDataInfo.thickness;
+ lineDataInfo.setX2 ( lineDataInfo.getX1() );
+ lineDataInfo.setY2 ( lineDataInfo.getY1() + lineDataInfo.getThickness() );
int ey2 = Math.round(y2);
- while (lineDataInfo.y1 + lineDataInfo.thickness < ey2) {
+ while (lineDataInfo.getY1() + lineDataInfo.getThickness() < ey2) {
dataStream.createLine(lineDataInfo);
- lineDataInfo.y1 += 3 * lineDataInfo.thickness;
- lineDataInfo.y2 = lineDataInfo.y1 + lineDataInfo.thickness;
+ lineDataInfo.setY1 ( lineDataInfo.getY1() + 3 * lineDataInfo.getThickness() );
+ lineDataInfo.setY2 ( lineDataInfo.getY1() + lineDataInfo.getThickness() );
}
}
break;
case Constants.EN_GROOVE:
case Constants.EN_RIDGE:
//TODO
- lineDataInfo.x2 = Math.round(x2);
+ int yNew;
+ lineDataInfo.setX2 ( Math.round(x2) );
float colFactor = (borderPaintInfo.getStyle() == Constants.EN_GROOVE ? 0.4f : -0.4f);
float h3 = (y2 - y1) / 3;
- lineDataInfo.color = ColorUtil.lightenColor(borderPaintInfo.getColor(), -colFactor);
- lineDataInfo.thickness = Math.round(h3);
- lineDataInfo.y1 = lineDataInfo.y2 = Math.round(y1);
+ lineDataInfo.setColor
+ ( ColorUtil.lightenColor(borderPaintInfo.getColor(), -colFactor) );
+ lineDataInfo.setThickness ( Math.round(h3) );
+ yNew = Math.round(y1);
+ lineDataInfo.setY1 ( yNew );
+ lineDataInfo.setY2 ( yNew );
dataStream.createLine(lineDataInfo);
- lineDataInfo.color = borderPaintInfo.getColor();
- lineDataInfo.y1 = lineDataInfo.y2 = Math.round(y1 + h3);
+ lineDataInfo.setColor ( borderPaintInfo.getColor() );
+ yNew = Math.round(y1 + h3);
+ lineDataInfo.setY1 ( yNew );
+ lineDataInfo.setY2 ( yNew );
dataStream.createLine(lineDataInfo);
- lineDataInfo.color = ColorUtil.lightenColor(borderPaintInfo.getColor(), colFactor);
- lineDataInfo.y1 = lineDataInfo.y2 = Math.round(y1 + h3 + h3);
+ lineDataInfo.setColor ( ColorUtil.lightenColor(borderPaintInfo.getColor(), colFactor) );
+ yNew = Math.round(y1 + h3 + h3);
+ lineDataInfo.setY1 ( yNew );
+ lineDataInfo.setY2 ( yNew );
dataStream.createLine(lineDataInfo);
break;
case Constants.EN_HIDDEN:
@@ -191,11 +200,11 @@ public class AFPBorderPainter extends Ab
case Constants.EN_SOLID:
default:
if (borderPaintInfo.isHorizontal()) {
- lineDataInfo.x2 = Math.round(x2);
- lineDataInfo.y2 = lineDataInfo.y1;
+ lineDataInfo.setX2 ( Math.round(x2) );
+ lineDataInfo.setY2 ( lineDataInfo.getY1() );
} else {
- lineDataInfo.x2 = lineDataInfo.x1;
- lineDataInfo.y2 = Math.round(y2);
+ lineDataInfo.setX2 ( lineDataInfo.getX1() );
+ lineDataInfo.setY2 ( Math.round(y2) );
}
dataStream.createLine(lineDataInfo);
}
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=985537&r1=985536&r2=985537&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 Sat Aug 14 17:17:00 2010
@@ -29,7 +29,8 @@ import org.apache.fop.afp.modca.triplets
* A list of parameters associated with an AFP data objects
*/
public class AFPDataObjectInfo {
- private static final Log log = LogFactory.getLog("org.apache.xmlgraphics.afp");
+ private static final Log log // CSOK: ConstantName
+ = LogFactory.getLog("org.apache.xmlgraphics.afp");
/** the object area info */
private AFPObjectAreaInfo objectAreaInfo;
@@ -197,9 +198,9 @@ public class AFPDataObjectInfo {
}
/**
- * Sets the data width resolution
+ * Sets the data height resolution
*
- * @param dataWidthRes the data width resolution
+ * @param dataHeightRes the data height resolution
*/
public void setDataHeightRes(int dataHeightRes) {
this.dataHeightRes = dataHeightRes;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPEventProducer.java?rev=985537&r1=985536&r2=985537&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPEventProducer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPEventProducer.java Sat Aug 14 17:17:00 2010
@@ -28,7 +28,10 @@ import org.apache.fop.events.EventProduc
public interface AFPEventProducer extends EventProducer {
/** Provider class for the event producer. */
- class Provider {
+ static final class Provider {
+
+ private Provider() {
+ }
/**
* Returns an event producer.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPGraphics2D.java?rev=985537&r1=985536&r2=985537&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPGraphics2D.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPGraphics2D.java Sat Aug 14 17:17:00 2010
@@ -75,7 +75,7 @@ import org.apache.fop.svg.NativeImageHan
*/
public class AFPGraphics2D extends AbstractGraphics2D implements NativeImageHandler {
- private static final Log log = LogFactory.getLog(AFPGraphics2D.class);
+ private static final Log log = LogFactory.getLog(AFPGraphics2D.class); // CSOK: ConstantName
private static final int X = 0;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPLineDataInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPLineDataInfo.java?rev=985537&r1=985536&r2=985537&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPLineDataInfo.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPLineDataInfo.java Sat Aug 14 17:17:00 2010
@@ -25,25 +25,25 @@ import java.awt.Color;
public class AFPLineDataInfo {
/** the x1 coordinate */
- int x1;
+ private int x1;
/** the y1 coordinate */
- int y1;
+ private int y1;
/** the x2 coordinate */
- int x2;
+ private int x2;
/** the y2 coordinate */
- int y2;
+ private int y2;
/** the thickness */
- int thickness;
+ private int thickness;
/** the painting color */
- Color color;
+ private Color color;
/** the rotation */
- int rotation = 0;
+ private int rotation = 0;
/**
* Default constructor
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPRectanglePainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPRectanglePainter.java?rev=985537&r1=985536&r2=985537&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPRectanglePainter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPRectanglePainter.java Sat Aug 14 17:17:00 2010
@@ -42,6 +42,7 @@ public class AFPRectanglePainter extends
RectanglePaintingInfo rectanglePaintInfo = (RectanglePaintingInfo)paintInfo;
int pageWidth = dataStream.getCurrentPage().getWidth();
int pageHeight = dataStream.getCurrentPage().getHeight();
+ int yNew;
AFPUnitConverter unitConv = paintingState.getUnitConverter();
float width = unitConv.pt2units(rectanglePaintInfo.getWidth());
@@ -52,31 +53,39 @@ public class AFPRectanglePainter extends
AffineTransform at = paintingState.getData().getTransform();
AFPLineDataInfo lineDataInfo = new AFPLineDataInfo();
- lineDataInfo.color = paintingState.getColor();
- lineDataInfo.rotation = paintingState.getRotation();
- lineDataInfo.thickness = Math.round(height);
+ lineDataInfo.setColor ( paintingState.getColor() );
+ lineDataInfo.setRotation ( paintingState.getRotation() );
+ lineDataInfo.setThickness ( Math.round(height) );
- switch (lineDataInfo.rotation) {
+ switch (lineDataInfo.getRotation()) {
+ default:
case 0:
- lineDataInfo.x1 = Math.round((float)at.getTranslateX() + x);
- lineDataInfo.y1 = lineDataInfo.y2 = Math.round((float)at.getTranslateY() + y);
- lineDataInfo.x2 = Math.round((float)at.getTranslateX() + x + width);
+ lineDataInfo.setX1 ( Math.round((float)at.getTranslateX() + x) );
+ yNew = Math.round((float)at.getTranslateY() + y);
+ lineDataInfo.setY1 ( yNew );
+ lineDataInfo.setY2 ( yNew );
+ lineDataInfo.setX2 ( Math.round((float)at.getTranslateX() + x + width) );
break;
case 90:
- lineDataInfo.x1 = Math.round((float)at.getTranslateY() + x);
- lineDataInfo.y1 = lineDataInfo.y2
- = pageWidth - Math.round((float)at.getTranslateX()) + Math.round(y);
- lineDataInfo.x2 = Math.round(width + (float)at.getTranslateY() + x);
+ lineDataInfo.setX1 ( Math.round((float)at.getTranslateY() + x) );
+ yNew = pageWidth - Math.round((float)at.getTranslateX()) + Math.round(y);
+ lineDataInfo.setY1 ( yNew );
+ lineDataInfo.setY2 ( yNew );
+ lineDataInfo.setX2 ( Math.round(width + (float)at.getTranslateY() + x) );
break;
case 180:
- lineDataInfo.x1 = pageWidth - Math.round((float)at.getTranslateX() - x);
- lineDataInfo.y1 = lineDataInfo.y2 = pageHeight - Math.round((float)at.getTranslateY() - y);
- lineDataInfo.x2 = pageWidth - Math.round((float)at.getTranslateX() - x - width);
+ lineDataInfo.setX1 ( pageWidth - Math.round((float)at.getTranslateX() - x) );
+ yNew = pageHeight - Math.round((float)at.getTranslateY() - y);
+ lineDataInfo.setY1 ( yNew );
+ lineDataInfo.setY2 ( yNew );
+ lineDataInfo.setX2 ( pageWidth - Math.round((float)at.getTranslateX() - x - width) );
break;
case 270:
- lineDataInfo.x1 = pageHeight - Math.round((float)at.getTranslateY() - x);
- lineDataInfo.y1 = lineDataInfo.y2 = Math.round((float)at.getTranslateX() + y);
- lineDataInfo.x2 = pageHeight - Math.round((float)at.getTranslateY() - x - width);
+ lineDataInfo.setX1 ( pageHeight - Math.round((float)at.getTranslateY() - x) );
+ yNew = Math.round((float)at.getTranslateX() + y);
+ lineDataInfo.setY1 ( yNew );
+ lineDataInfo.setY2 ( yNew );
+ lineDataInfo.setX2 ( pageHeight - Math.round((float)at.getTranslateY() - x - width) );
break;
}
dataStream.createLine(lineDataInfo);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPStreamer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPStreamer.java?rev=985537&r1=985536&r2=985537&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPStreamer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPStreamer.java Sat Aug 14 17:17:00 2010
@@ -39,7 +39,7 @@ import org.apache.fop.afp.modca.Streamed
*/
public class AFPStreamer implements Streamable {
/** Static logging instance */
- private static final Log log = LogFactory.getLog(AFPStreamer.class);
+ private static final Log log = LogFactory.getLog(AFPStreamer.class); // CSOK: ConstantName
private static final String AFPDATASTREAM_TEMP_FILE_PREFIX = "AFPDataStream_";
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AbstractAFPPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AbstractAFPPainter.java?rev=985537&r1=985536&r2=985537&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AbstractAFPPainter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AbstractAFPPainter.java Sat Aug 14 17:17:00 2010
@@ -32,7 +32,9 @@ public abstract class AbstractAFPPainter
/** Static logging instance */
protected static Log log = LogFactory.getLog("org.apache.xmlgraphics.afp");
+ /** data stream */
protected final DataStream dataStream;
+ /** painting state */
protected final AFPPaintingState paintingState;
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/DataStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/DataStream.java?rev=985537&r1=985536&r2=985537&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/DataStream.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/DataStream.java Sat Aug 14 17:17:00 2010
@@ -65,7 +65,8 @@ import org.apache.fop.fonts.Font;
public class DataStream {
/** Static logging instance */
- protected static final Log log = LogFactory.getLog("org.apache.xmlgraphics.afp");
+ protected static final Log log // CSOK: ConstantName
+ = LogFactory.getLog("org.apache.xmlgraphics.afp");
/** Boolean completion indicator */
private boolean complete = false;
@@ -359,8 +360,9 @@ public class DataStream {
* @param charSet is the AFP Character Set to use with the text
* @throws UnsupportedEncodingException thrown if character encoding is not supported
*/
- public void createText(final AFPTextDataInfo textDataInfo, final int letterSpacing, final int wordSpacing,
- final Font font, final CharacterSet charSet) throws UnsupportedEncodingException {
+ public void createText
+ ( final AFPTextDataInfo textDataInfo, final int letterSpacing, final int wordSpacing,
+ final Font font, final CharacterSet charSet) throws UnsupportedEncodingException {
int rotation = paintingState.getRotation();
if (rotation != 0) {
textDataInfo.setRotation(rotation);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/Factory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/Factory.java?rev=985537&r1=985536&r2=985537&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/Factory.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/Factory.java Sat Aug 14 17:17:00 2010
@@ -66,7 +66,7 @@ import org.apache.fop.afp.util.StringUti
public class Factory {
/** Static logging instance */
- private static final Log log = LogFactory.getLog(Factory.class);
+ private static final Log log = LogFactory.getLog(Factory.class); // CSOK: ConstantName
private static final String OBJECT_ENVIRONMENT_GROUP_NAME_PREFIX = "OEG";
@@ -541,7 +541,10 @@ public class Factory {
/**
* Creates a new PTOCA {@link PresentationTextDescriptor}
- *
+ * @param width presentation width
+ * @param height presentation height
+ * @param widthRes resolution of presentation width
+ * @param heightRes resolution of presentation height
* @return a new {@link PresentationTextDescriptor}
*/
public PresentationTextDescriptor createPresentationTextDataDescriptor(
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/Startable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/Startable.java?rev=985537&r1=985536&r2=985537&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/Startable.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/Startable.java Sat Aug 14 17:17:00 2010
@@ -27,7 +27,7 @@ public interface Startable {
/**
* Sets whether or not this object has started or not
*
- * @param complete true if this object has started
+ * @param started true if this object has started
*/
void setStarted(boolean started);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/CharacterSet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/CharacterSet.java?rev=985537&r1=985536&r2=985537&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/CharacterSet.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/CharacterSet.java Sat Aug 14 17:17:00 2010
@@ -102,7 +102,8 @@ public class CharacterSet {
* @param encoding the encoding of the font
* @param name the character set name
* @param path the path to the installed afp fonts
- * @deprecated Please use {@link #CharacterSet(String, String, String, URI)} instead.
+ * @deprecated Please use
+ * {@link #CharacterSet(String, String, String, ResourceAccessor)} instead.
*/
public CharacterSet(String codePage, String encoding, String name, String path) {
this(codePage, encoding, name,
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org
Re: svn commit: r985537 [1/11] - in /xmlgraphics/fop/trunk: ./ src/codegen/java/org/apache/fop/tools/ src/codegen/unicode/data/ src/codegen/unicode/java/org/apache/fop/hyphenation/ src/codegen/unicode/java/org/apache/fop/text/linebreak/ src/codegen/unicode...
Posted by Jeremias Maerki <de...@jeremias-maerki.ch>.
The removal was intentional. The class is really an outdated duplicate
of the PNGRenderer. The functionality is basically the same. So I
thought it safe to just remove. I doubt anyone is using it. It's also
not tied into the MIME-based renderer lookup. We can always restore that
if someone disagrees.
On 14.08.2010 21:26:36 Simon Pepping wrote:
> On Sat, Aug 14, 2010 at 05:17:13PM -0000, jeremias@apache.org wrote:
> > Author: jeremias
> > Date: Sat Aug 14 17:17:00 2010
> > New Revision: 985537
> >
> > URL: http://svn.apache.org/viewvc?rev=985537&view=rev
> > Log:
> > Bugzilla #49733:
> > Resolved compilation (safe one), Checkstyle and many Javadoc warnings.
> > Submitted by: Glenn Adams <glenn.at.skynav.com>
> >
> > Removed:
> > xmlgraphics/fop/trunk/checkstyle-5.0.xml
> > xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRenderer_onthefly.java
>
> I think there should be a new file PNGRendererOnTheFly.java
>
> --
> Simon Pepping
> home page: http://www.leverkruid.eu
Jeremias Maerki
Re: svn commit: r985537 [1/11] - in /xmlgraphics/fop/trunk: ./
src/codegen/java/org/apache/fop/tools/ src/codegen/unicode/data/
src/codegen/unicode/java/org/apache/fop/hyphenation/
src/codegen/unicode/java/org/apache/fop/text/linebreak/
src/codegen/unicode...
Posted by Simon Pepping <sp...@leverkruid.eu>.
On Sat, Aug 14, 2010 at 05:17:13PM -0000, jeremias@apache.org wrote:
> Author: jeremias
> Date: Sat Aug 14 17:17:00 2010
> New Revision: 985537
>
> URL: http://svn.apache.org/viewvc?rev=985537&view=rev
> Log:
> Bugzilla #49733:
> Resolved compilation (safe one), Checkstyle and many Javadoc warnings.
> Submitted by: Glenn Adams <glenn.at.skynav.com>
>
> Removed:
> xmlgraphics/fop/trunk/checkstyle-5.0.xml
> xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRenderer_onthefly.java
I think there should be a new file PNGRendererOnTheFly.java
--
Simon Pepping
home page: http://www.leverkruid.eu