You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by ma...@apache.org on 2025/11/02 01:27:36 UTC
(xmlgraphics-fop) branch temp/matthias-FOP-3281 updated (d90013d49 -> 9c3c8f3b3)
This is an automated email from the ASF dual-hosted git repository.
matthias pushed a change to branch temp/matthias-FOP-3281
in repository https://gitbox.apache.org/repos/asf/xmlgraphics-fop.git
discard d90013d49 FOP-3281: Remove some extra line breaks introduced by my previous commits
discard b49d7cb34 FOP-3281: Reconfigure the ImportOrder check, so that static imports are grouped together with non-static imports
discard 2d6dbe6d4 FOP-3281: allow both lf and crlf as new line characters
discard ba5780537 FOP-3281: use system specific line endings
discard 483a2d577 FOP-3281: fix checkstyle issue in auto generated Java files
discard 7c58c6a01 FOP-3281: update checkstyle.xml and fix some new checkstyle issues in several Java files
discard 7c73ec6ed FOP-3281: upgrade the maven checkstyle plugin from 2.14 to 3.6.0
new 9c3c8f3b3 FOP-3281: upgrade the maven checkstyle plugin from 2.14 to 3.6.0
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (d90013d49)
\
N -- N -- N refs/heads/temp/matthias-FOP-3281 (9c3c8f3b3)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org
(xmlgraphics-fop) 01/01: FOP-3281: upgrade the maven checkstyle plugin from 2.14 to 3.6.0
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
matthias pushed a commit to branch temp/matthias-FOP-3281
in repository https://gitbox.apache.org/repos/asf/xmlgraphics-fop.git
commit 9c3c8f3b37d0545478c0173f77f1519fb7cc7762
Author: Matthias Reischenbacher <ma...@apache.org>
AuthorDate: Mon Oct 27 21:32:03 2025 -0300
FOP-3281: upgrade the maven checkstyle plugin from 2.14 to 3.6.0
---
fop-core/src/main/codegen/fonts/font-file.xsl | 6 +-
.../fop/afp/goca/GraphicsSetPatternSymbol.java | 2 +-
.../afp/ptoca/TransparentDataControlSequence.java | 1 -
.../java/org/apache/fop/area/AreaTreeParser.java | 1 -
.../src/main/java/org/apache/fop/area/CTM.java | 1 -
.../main/java/org/apache/fop/area/LineArea.java | 1 -
.../src/main/java/org/apache/fop/area/Page.java | 1 -
.../java/org/apache/fop/area/PageViewport.java | 1 -
.../src/main/java/org/apache/fop/area/Trait.java | 1 -
.../complexscripts/bidi/DelimitedTextRange.java | 1 +
.../apache/fop/complexscripts/bidi/InlineRun.java | 2 +
.../complexscripts/bidi/UnicodeBidiAlgorithm.java | 1 +
.../complexscripts/fonts/GlyphCoverageTable.java | 1 +
.../fonts/GlyphDefinitionSubtable.java | 1 +
.../complexscripts/fonts/GlyphMappingTable.java | 1 +
.../fonts/GlyphPositioningTable.java | 1 +
.../fonts/GlyphSubstitutionTable.java | 1 +
.../fop/complexscripts/fonts/GlyphSubtable.java | 4 +-
.../fop/complexscripts/fonts/GlyphTable.java | 1 +
.../fonts/OTFAdvancedTypographicTableReader.java | 1 +
.../scripts/DevanagariScriptProcessor.java | 1 +
.../scripts/GujaratiScriptProcessor.java | 1 +
.../scripts/GurmukhiScriptProcessor.java | 1 +
.../scripts/IndicScriptProcessor.java | 1 +
.../complexscripts/scripts/ScriptProcessor.java | 1 +
.../scripts/TamilScriptProcessor.java | 1 +
.../fop/complexscripts/util/CharAssociation.java | 2 +
.../apache/fop/complexscripts/util/CharScript.java | 1 +
.../org/apache/fop/complexscripts/util/UTF32.java | 1 +
.../fop/fo/flow/table/BorderSpecification.java | 28 +-
.../org/apache/fop/fo/properties/CommonFont.java | 39 +-
.../org/apache/fop/fo/properties/URIProperty.java | 1 -
.../java/org/apache/fop/fonts/GlyphMapping.java | 2 -
.../org/apache/fop/fonts/cff/CFFDataReader.java | 25 +-
.../apache/fop/fonts/truetype/OTFSubSetFile.java | 1 -
.../apache/fop/fonts/type1/Type1SubsetFile.java | 12 +-
.../fop/layoutmgr/PageBreakingAlgorithm.java | 2 +
.../apache/fop/pdf/CMSProcessableInputStream.java | 1 +
.../main/java/org/apache/fop/pdf/PDFFactory.java | 2 +
.../java/org/apache/fop/pdf/PDFStructElem.java | 1 -
.../src/main/java/org/apache/fop/pdf/PDFText.java | 1 -
.../java/org/apache/fop/pdf/PDFToUnicodeCMap.java | 1 -
.../main/java/org/apache/fop/pdf/RefPDFFont.java | 1 +
.../org/apache/fop/render/AbstractRenderer.java | 3 +-
.../apache/fop/render/afp/AFPRendererConfig.java | 1 -
.../fop/render/bitmap/BitmapRendererConfig.java | 1 -
.../fop/render/bitmap/BitmapRenderingSettings.java | 1 -
.../org/apache/fop/render/bitmap/TIFFRenderer.java | 1 -
.../fop/render/bitmap/TIFFRendererConfig.java | 1 -
.../render/bitmap/TIFFRendererConfigurator.java | 1 -
.../org/apache/fop/render/gradient/Shading.java | 19 +-
.../fop/render/intermediate/GraphicsPainter.java | 4 +-
.../extensions/DocumentNavigationHandler.java | 1 -
.../apache/fop/render/java2d/Java2DRenderer.java | 1 -
.../fop/render/java2d/Java2DRendererConfig.java | 1 -
.../apache/fop/render/pcl/PCLRendererConfig.java | 1 -
.../apache/fop/render/pdf/ImageRawPNGAdapter.java | 578 ++++++++++-----------
.../apache/fop/render/pdf/PDFRendererConfig.java | 1 -
.../fop/render/pdf/PDFRendererOptionsConfig.java | 1 -
.../apache/fop/render/pdf/PDFRenderingUtil.java | 1 -
.../java/org/apache/fop/render/ps/DataOutput.java | 1 +
.../org/apache/fop/render/ps/PSRendererConfig.java | 1 -
.../org/apache/fop/render/ps/PSRenderingUtil.java | 1 -
.../fop/render/ps/Type1CharStringFormatter.java | 1 +
.../apache/fop/render/ps/Type1FontFormatter.java | 1 +
.../rtflib/rtfdoc/RtfBookmarkContainerImpl.java | 3 +-
.../fop/render/rtf/rtflib/rtfdoc/RtfTable.java | 2 +-
.../fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java | 2 +-
.../java/org/apache/fop/tools/anttasks/Fop.java | 23 +-
.../java/org/apache/fop/BasicDriverTestCase.java | 2 -
.../java/org/apache/fop/DigestFilterTestCase.java | 1 -
.../java/org/apache/fop/HyphenationTestCase.java | 1 -
.../org/apache/fop/KnuthAlgorithmTestCase.java | 1 -
.../java/org/apache/fop/URIResolutionTestCase.java | 2 -
.../accessibility/fo/ArtifactImageBugTestCase.java | 1 -
.../fop/accessibility/fo/PDFUAWarningTestCase.java | 1 -
.../fo/StructureTreeEventTriggerTestCase.java | 1 -
.../pdf/FootnoteSeparatorTestCase.java | 1 -
.../pdf/MissingLanguageWarningTestCase.java | 1 -
.../org/apache/fop/afp/AFPGraphics2DTestCase.java | 1 -
.../afp/AFPImageHandlerRenderedImageTestCase.java | 3 -
.../apache/fop/afp/AFPObjectAreaInfoTestCase.java | 1 -
.../apache/fop/afp/AFPPaintingStateTestCase.java | 1 -
.../apache/fop/afp/AFPResourceManagerTestCase.java | 1 -
.../apache/fop/afp/AFPResourceUtilTestCase.java | 1 -
.../org/apache/fop/afp/DataStreamTestCase.java | 2 -
.../fop/afp/fonts/CharactersetEncoderTestCase.java | 1 -
.../fop/afp/fonts/IntegerKeyStoreTestCase.java | 1 -
.../afp/goca/GraphicsCharacterStringTestCase.java | 2 +-
.../GraphicsSetFractionalLineWidthTestCase.java | 1 -
.../fop/afp/goca/GraphicsSetLineWidthTestCase.java | 1 -
.../fop/afp/modca/AbstractAFPObjectTest.java | 1 -
.../fop/afp/modca/AbstractNamedAFPObjectTest.java | 1 -
.../modca/AbstractTripletStructuredObjectTest.java | 1 -
.../fop/afp/modca/IncludeObjectTestCase.java | 1 -
.../apache/fop/afp/parser/MODCAParserTestCase.java | 1 -
.../TransparentDataControlSequenceTestCase.java | 2 -
.../fop/afp/util/AFPResourceAccessorTestCase.java | 1 -
.../apache/fop/apps/AFPRendererConfBuilder.java | 1 -
.../fop/apps/AbstractRendererConfiguratorTest.java | 1 -
.../apache/fop/apps/BitmapRendererConfBuilder.java | 1 -
.../apps/EnvironmentalProfileFactoryTestCase.java | 1 -
.../org/apache/fop/apps/FopConfParserTestCase.java | 1 -
.../apache/fop/apps/FopFactoryBuilderTestCase.java | 1 -
.../org/apache/fop/apps/FopFactoryTestCase.java | 1 -
.../apache/fop/apps/Java2DRendererConfBuilder.java | 1 -
.../apache/fop/apps/PDFRendererConfBuilder.java | 1 -
.../org/apache/fop/apps/PSRendererConfBuilder.java | 1 -
.../apache/fop/apps/TxtRendererConfBuilder.java | 1 -
.../apache/fop/apps/io/BaseURIResolutionTest.java | 2 -
.../org/apache/fop/apps/io/FontURIResolver.java | 1 -
.../apps/io/ResourceResolverFactoryTestCase.java | 1 -
.../fop/apps/io/URIResolverWrapperTestCase.java | 1 -
.../java/org/apache/fop/area/TraitTestCase.java | 1 -
.../fop/area/inline/InlineParentTestCase.java | 1 -
.../fop/cli/CommandLineOptions2TestCase.java | 1 -
.../apache/fop/cli/CommandLineOptionsTestCase.java | 1 -
.../complexscripts/bidi/BidiAlgorithmTestCase.java | 1 -
.../fop/complexscripts/bidi/BidiClassTestCase.java | 1 -
.../fop/complexscripts/bidi/BidiTestData.java | 2 +
.../fop/complexscripts/fonts/GDEFTestCase.java | 1 -
.../fop/complexscripts/fonts/GPOSTestCase.java | 1 -
.../fop/complexscripts/fonts/GSUBTestCase.java | 1 -
.../fop/complexscripts/fonts/ttx/TTXFile.java | 1 +
.../complexscripts/fonts/ttx/TTXFileTestCase.java | 1 -
.../layout/ComplexScriptsLayoutTestCase.java | 1 -
.../fop/complexscripts/scripts/KhmerTestCase.java | 1 -
.../scripts/arabic/ArabicJoinersTestCase.java | 1 -
.../scripts/arabic/ArabicWordFormsTestCase.java | 1 -
.../util/NumberConverterTestCase.java | 1 -
.../fop/config/BaseConstructiveUserConfigTest.java | 1 -
.../org/apache/fop/config/BaseUserConfigTest.java | 1 -
.../DefaultConfigurationTestCase.java | 93 ++--
.../fop/datatypes/URISpecificationTestCase.java | 1 -
.../fop/events/FlowNamedNotMappedTestCase.java | 1 -
.../fop/fo/DelegatingFOEventHandlerTestCase.java | 1 -
.../org/apache/fop/fo/flow/MarkersTestCase.java | 1 -
.../table/CollapsedConditionalBorderTestCase.java | 1 -
.../fop/fo/flow/table/HeaderColumnTestCase.java | 1 -
.../fop/fo/flow/table/PrimaryGridUnitTestCase.java | 1 -
.../fop/fo/flow/table/RowGroupBuilderTestCase.java | 1 -
.../table/TableColumnColumnNumberTestCase.java | 1 -
.../fop/fo/pagination/LayoutMasterSetTestCase.java | 1 -
.../fo/pagination/PageSequenceMasterTestCase.java | 1 -
.../RepeatablePageMasterAlternativesTestCase.java | 1 -
.../fop/fo/properties/AltTextHolderTestCase.java | 1 -
.../CommonAccessibilityHolderTestCase.java | 1 -
.../fo/properties/CommonHyphenationTestCase.java | 1 -
.../java/org/apache/fop/fonts/CIDFullTestCase.java | 1 -
.../org/apache/fop/fonts/CIDSubsetTestCase.java | 2 -
.../apache/fop/fonts/DejaVuLGCSerifTestCase.java | 1 -
.../apache/fop/fonts/EmbedFontInfoTestCase.java | 1 -
.../org/apache/fop/fonts/EncodingModeTestCase.java | 1 -
.../fop/fonts/FontManagerConfiguratorTestCase.java | 2 -
.../org/apache/fop/fonts/FontManagerTestCase.java | 1 -
.../org/apache/fop/fonts/FontSelectorTestCase.java | 1 -
.../fonts/autodetect/FontFileFinderTestCase.java | 1 -
.../fop/fonts/cff/CFFDataReaderTestCase.java | 1 -
.../fop/fonts/truetype/FontFileReaderTestCase.java | 1 -
.../fop/fonts/truetype/GlyfTableTestCase.java | 1 -
.../apache/fop/fonts/truetype/OTFFileTestCase.java | 1 -
.../fop/fonts/truetype/OTFSubSetFileTestCase.java | 1 -
.../apache/fop/fonts/truetype/TTFFileTestCase.java | 1 -
.../fop/fonts/truetype/TTFFontLoaderTestCase.java | 1 -
.../fop/fonts/truetype/TTFSubSetFileTestCase.java | 1 -
.../fop/fonts/truetype/TTFTableNameTestCase.java | 1 -
.../apache/fop/fonts/type1/AFMParserTestCase.java | 1 -
.../fonts/type1/AdobeStandardEncodingTestCase.java | 1 -
.../fonts/type1/CharMetricsHandlerTestCase.java | 1 -
.../fop/fonts/type1/PostscriptParserTestCase.java | 1 -
.../fop/fonts/type1/Type1SubsetFileTestCase.java | 1 -
.../batik/Graphics2DImagePainterImplTestCase.java | 1 -
.../image/loader/batik/ImageLoaderTestCase.java | 1 -
.../image/loader/batik/ImagePreloaderTestCase.java | 1 -
.../fop/intermediate/IFMimickingTestCase.java | 1 -
.../fop/layoutengine/LayoutEngineTestCase.java | 1 -
.../apache/fop/layoutmgr/BreakElementTestCase.java | 1 -
.../PageSequenceLayoutManagerTestCase.java | 1 -
...rieveTableMarkerLayoutManagerMakerTestCase.java | 1 -
.../RetrieveTableMarkerLayoutManagerTestCase.java | 1 -
.../table/TableCellLayoutManagerTestCase.java | 1 -
.../table/TableContentLayoutManagerTestCase.java | 1 -
.../table/TableLayoutManagerTestCase.java | 1 -
.../apache/fop/pdf/AbstractPDFStreamTestCase.java | 1 -
.../apache/fop/pdf/FileIDGeneratorTestCase.java | 1 -
.../fop/pdf/ObjectStreamManagerTestCase.java | 1 -
.../org/apache/fop/pdf/ObjectStreamTestCase.java | 1 -
.../java/org/apache/fop/pdf/PDFAModeTestCase.java | 1 -
.../java/org/apache/fop/pdf/PDFArrayTestCase.java | 1 -
.../org/apache/fop/pdf/PDFDictionaryTestCase.java | 1 -
.../fop/pdf/PDFDocumentGraphics2DTestCase.java | 1 -
.../org/apache/fop/pdf/PDFDocumentTestCase.java | 1 -
.../org/apache/fop/pdf/PDFEncodingTestCase.java | 1 -
.../apache/fop/pdf/PDFEncryptionJCETestCase.java | 1 -
.../org/apache/fop/pdf/PDFFileSpecTestCase.java | 73 ++-
.../org/apache/fop/pdf/PDFFilterListTestCase.java | 1 -
.../java/org/apache/fop/pdf/PDFGoToTestCase.java | 68 +--
.../apache/fop/pdf/PDFImageXObjectTestCase.java | 1 -
.../fop/pdf/PDFJavaScriptLaunchActionTestCase.java | 1 -
.../java/org/apache/fop/pdf/PDFLinkTestCase.java | 1 -
.../java/org/apache/fop/pdf/PDFNameTestCase.java | 1 -
.../java/org/apache/fop/pdf/PDFNullTestCase.java | 1 -
.../java/org/apache/fop/pdf/PDFNumberTestCase.java | 1 -
.../java/org/apache/fop/pdf/PDFObjectTestCase.java | 1 -
.../org/apache/fop/pdf/PDFPageLabelsTestCase.java | 1 -
.../org/apache/fop/pdf/PDFPagePieceTestCase.java | 3 -
.../org/apache/fop/pdf/PDFParentTreeTestCase.java | 1 -
.../org/apache/fop/pdf/PDFRectangleTestCase.java | 1 -
.../org/apache/fop/pdf/PDFReferenceTestCase.java | 1 -
.../org/apache/fop/pdf/PDFResourcesTestCase.java | 383 +++++++-------
.../java/org/apache/fop/pdf/PDFStreamTestCase.java | 1 -
.../apache/fop/pdf/PDFToUnicodeCMapTestCase.java | 1 -
.../java/org/apache/fop/pdf/PDFVTTestCase.java | 1 -
.../apache/fop/pdf/TableHeaderScopeTestCase.java | 1 -
.../apache/fop/pdf/VersionControllerTestCase.java | 1 -
.../java/org/apache/fop/pdf/VersionTestCase.java | 1 -
.../xref/CompressedObjectReferenceTestCase.java | 1 -
.../fop/pdf/xref/CrossReferenceObjectTest.java | 1 -
.../xref/UncompressedObjectReferenceTestCase.java | 1 -
.../AbstractPathOrientedRendererTestCase.java | 1 -
.../apache/fop/render/ConserveMemoryTestCase.java | 2 +-
.../apache/fop/render/RendererFactoryTestCase.java | 1 -
.../fop/render/afp/AFPBorderPainterTestCase.java | 1 -
.../fop/render/afp/AFPImageHandlerSVGTestCase.java | 1 -
.../apache/fop/render/afp/AFPPainterTestCase.java | 1 -
.../afp/AFPRendererConfigParserTestCase.java | 2 -
.../afp/AFPRendererConfiguratorTestCase.java | 1 -
.../apache/fop/render/afp/AFPTrueTypeTestCase.java | 1 -
.../render/afp/AddToPreviousPageGroupTestCase.java | 1 +
.../apache/fop/render/afp/NoOperationTestCase.java | 1 -
.../AbstractBitmapRendererConfigParserTester.java | 2 -
.../AbstractBitmapRendererConfiguratorTest.java | 2 -
.../bitmap/TIFFCompressionValueTestCase.java | 1 -
.../bitmap/TIFFRendererConfigParserTestCase.java | 1 -
.../bitmap/TIFFRendererConfiguratorTestCase.java | 2 -
.../DocumentNavigationHandlerTestCase.java | 1 -
.../prepress/PageBoundariesTestCase.java | 1 -
.../extensions/prepress/PageScaleTestCase.java | 1 -
.../fop/render/gradient/GradientTestCase.java | 1 -
.../intermediate/AbstractIFPainterTestCase.java | 1 -
.../ArcToBezierCurveTransformerTestCase.java | 1 -
.../render/intermediate/BorderPainterTestCase.java | 1 -
.../render/intermediate/IFRendererTestCase.java | 1 -
.../render/intermediate/IFSerializerTestCase.java | 1 -
.../IFStructureTreeBuilderTestCase.java | 1 -
.../intermediate/SAXEventRecorderTestCase.java | 1 -
.../java2d/Java2DRendererConfigParserTestcase.java | 1 -
.../fop/render/java2d/Java2DUtilTestCase.java | 2 -
.../fop/render/pcl/PCLRendererConfBuilder.java | 1 -
.../pcl/PCLRendererConfigParserTestCase.java | 1 -
.../pcl/PCLRendererConfiguratorTestCase.java | 1 -
.../pcl/fonts/PCLByteWriterUtilTestCase.java | 1 -
.../pcl/fonts/PCLFontReaderFactoryTestCase.java | 1 -
.../render/pcl/fonts/PCLTTFFontReaderTestCase.java | 1 -
.../truetype/PCLTTFCharacterWriterTestCase.java | 1 -
.../fop/render/pdf/ImageRawPNGAdapterTestCase.java | 1 -
.../render/pdf/ImageRenderedAdapterTestCase.java | 1 -
.../fop/render/pdf/PDFAConformanceTestCase.java | 1 -
.../fop/render/pdf/PDFAMetadataTestCase.java | 1 -
.../fop/render/pdf/PDFBorderPainterTestCase.java | 1 -
.../org/apache/fop/render/pdf/PDFCMapTestCase.java | 1 -
.../apache/fop/render/pdf/PDFEncodingTestCase.java | 2 -
.../fop/render/pdf/PDFGraphicsPainterTestCase.java | 1 -
.../apache/fop/render/pdf/PDFPainterTestCase.java | 1 -
.../pdf/PDFRendererConfigParserTestCase.java | 1 -
.../pdf/PDFRendererOptionsConfigTestCase.java | 2 -
.../pdf/PDFStructureTreeBuilderTestCase.java | 2 -
.../fop/render/pdf/PDFsRGBSettingsTestCase.java | 1 -
.../PDFEmbeddedFileAttachmentTestCase.java | 83 ++-
.../fop/render/ps/ImageEncoderPNGTestCase.java | 1 -
.../fop/render/ps/ImageHandlingTestCase.java | 2 -
.../fop/render/ps/PSBorderPainterTestCase.java | 1 -
.../fop/render/ps/PSGraphics2DAdapterTestCase.java | 1 +
.../apache/fop/render/ps/PSPainterTestCase.java | 2 +-
.../fop/render/ps/PSPainterUtilTestCase.java | 1 +
.../render/ps/PSRendererConfigParserTestCase.java | 1 -
.../render/ps/PSRendererConfiguratorTestCase.java | 1 -
.../fop/render/ps/PSRenderingUtilTestCase.java | 1 -
.../render/ps/ResourceOptimizationTestCase.java | 1 -
.../render/ps/fonts/PSTTFGeneratorTestCase.java | 1 -
.../ps/fonts/PSTTFGlyphOutputStreamTestCase.java | 1 -
.../render/ps/fonts/PSTTFOutputStreamTestCase.java | 1 -
.../ps/fonts/PSTTFTableOutputStreamTestCase.java | 1 -
.../apache/fop/render/ps/svg/GradientTestCase.java | 1 -
.../rtf/rtflib/testdocs/ParagraphAlignment.java | 3 +-
.../txt/TxtRendererConfigParserTestCase.java | 1 -
.../fop/svg/AbstractBasicTranscoderTest.java | 1 -
.../org/apache/fop/svg/PDFGraphics2DTestCase.java | 1 -
.../org/apache/fop/svg/PDFTextPainterTestCase.java | 1 -
.../apache/fop/svg/SimpleSVGUserAgentTestCase.java | 1 -
.../fop/svg/font/BasicGlyphVectorTestCase.java | 1 -
.../svg/font/FOPFontFamilyResolverTestCase.java | 1 -
.../apache/fop/svg/font/FOPGVTFontTestCase.java | 1 -
.../apache/fop/svg/font/GlyphLayoutTestCase.java | 1 -
.../fop/svg/font/KerningGlyphLayoutTestCase.java | 181 ++++---
.../text/linebreak/LineBreakStatusTestCase.java | 1 -
.../fop/text/linebreak/LineBreakUtilsTestCase.java | 1 -
.../org/apache/fop/threading/FOProcessorImpl.java | 1 -
.../org/apache/fop/threading/IFProcessorImpl.java | 1 -
.../org/apache/fop/traits/BorderPropsTestCase.java | 1 -
.../org/apache/fop/traits/MinOptMaxTestCase.java | 1 -
.../fop/util/AdvancedMessageFormatTestCase.java | 1 -
.../apache/fop/util/BitmapImageUtilTestCase.java | 1 -
.../org/apache/fop/util/CharUtilitiesTestCase.java | 1 -
.../org/apache/fop/util/ColorUtilTestCase.java | 1 -
.../org/apache/fop/util/CompareUtilTestCase.java | 1 -
.../apache/fop/util/ElementListUtilsTestCase.java | 1 -
.../org/apache/fop/util/HexEncoderTestCase.java | 1 -
.../org/apache/fop/util/LanguageTagsTestCase.java | 1 -
.../apache/fop/util/XMLResourceBundleTestCase.java | 1 -
.../src/tools/resources/checkstyle/checkstyle.xml | 33 +-
.../src/main/java/org/apache/fop/events/Event.java | 6 +-
.../org/apache/fop/events/BasicEventTestCase.java | 1 -
pom.xml | 2 +-
314 files changed, 906 insertions(+), 1087 deletions(-)
diff --git a/fop-core/src/main/codegen/fonts/font-file.xsl b/fop-core/src/main/codegen/fonts/font-file.xsl
index ff7ced9b4..19a799d7c 100644
--- a/fop-core/src/main/codegen/fonts/font-file.xsl
+++ b/fop-core/src/main/codegen/fonts/font-file.xsl
@@ -52,10 +52,8 @@
package org.apache.fop.fonts.base14;
import java.awt.Rectangle;
-import java.net.URI;
-<xsl:if test="count(kerning) > 0">
-import java.util.Map;
-</xsl:if>
+import java.net.URI;<xsl:if test="count(kerning) > 0">
+import java.util.Map;</xsl:if>
import java.util.Set;
import org.apache.fop.fonts.Base14Font;
diff --git a/fop-core/src/main/java/org/apache/fop/afp/goca/GraphicsSetPatternSymbol.java b/fop-core/src/main/java/org/apache/fop/afp/goca/GraphicsSetPatternSymbol.java
index a4c91efce..1bff5817e 100644
--- a/fop-core/src/main/java/org/apache/fop/afp/goca/GraphicsSetPatternSymbol.java
+++ b/fop-core/src/main/java/org/apache/fop/afp/goca/GraphicsSetPatternSymbol.java
@@ -107,7 +107,7 @@ public class GraphicsSetPatternSymbol extends AbstractGraphicsDrawingOrder {
/** {@inheritDoc} */
public String toString() {
return "GraphicsSetPatternSymbol(fill="
- + (pattern == SOLID_FILL ? true : false) + ")";
+ + (pattern == SOLID_FILL) + ")";
}
/** {@inheritDoc} */
diff --git a/fop-core/src/main/java/org/apache/fop/afp/ptoca/TransparentDataControlSequence.java b/fop-core/src/main/java/org/apache/fop/afp/ptoca/TransparentDataControlSequence.java
index 4b4276880..cb274179c 100644
--- a/fop-core/src/main/java/org/apache/fop/afp/ptoca/TransparentDataControlSequence.java
+++ b/fop-core/src/main/java/org/apache/fop/afp/ptoca/TransparentDataControlSequence.java
@@ -28,7 +28,6 @@ import java.util.List;
import org.apache.fop.afp.fonts.CharactersetEncoder.EncodedChars;
import org.apache.fop.afp.ptoca.TransparentDataControlSequence.TransparentData;
-
import static org.apache.fop.afp.ptoca.PtocaConstants.TRANSPARENT_DATA_MAX_SIZE;
/**
diff --git a/fop-core/src/main/java/org/apache/fop/area/AreaTreeParser.java b/fop-core/src/main/java/org/apache/fop/area/AreaTreeParser.java
index ca4e097ef..a6afe8214 100644
--- a/fop-core/src/main/java/org/apache/fop/area/AreaTreeParser.java
+++ b/fop-core/src/main/java/org/apache/fop/area/AreaTreeParser.java
@@ -91,7 +91,6 @@ import org.apache.fop.util.LanguageTags;
import org.apache.fop.util.XMLConstants;
import org.apache.fop.util.XMLUtil;
import org.apache.fop.utils.DefaultErrorListener;
-
import static org.apache.fop.fo.Constants.FO_REGION_AFTER;
import static org.apache.fop.fo.Constants.FO_REGION_BEFORE;
import static org.apache.fop.fo.Constants.FO_REGION_BODY;
diff --git a/fop-core/src/main/java/org/apache/fop/area/CTM.java b/fop-core/src/main/java/org/apache/fop/area/CTM.java
index 80172be8b..06d63bce4 100644
--- a/fop-core/src/main/java/org/apache/fop/area/CTM.java
+++ b/fop-core/src/main/java/org/apache/fop/area/CTM.java
@@ -26,7 +26,6 @@ import java.io.Serializable;
import org.apache.fop.datatypes.FODimension;
import org.apache.fop.traits.WritingMode;
-
import static org.apache.fop.fo.Constants.EN_LR_TB;
import static org.apache.fop.fo.Constants.EN_RL_TB;
import static org.apache.fop.fo.Constants.EN_TB_LR;
diff --git a/fop-core/src/main/java/org/apache/fop/area/LineArea.java b/fop-core/src/main/java/org/apache/fop/area/LineArea.java
index 3c1ae5217..19035efad 100644
--- a/fop-core/src/main/java/org/apache/fop/area/LineArea.java
+++ b/fop-core/src/main/java/org/apache/fop/area/LineArea.java
@@ -24,7 +24,6 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.fop.area.inline.InlineArea;
-
import static org.apache.fop.fo.Constants.EN_CENTER;
import static org.apache.fop.fo.Constants.EN_END;
import static org.apache.fop.fo.Constants.EN_JUSTIFY;
diff --git a/fop-core/src/main/java/org/apache/fop/area/Page.java b/fop-core/src/main/java/org/apache/fop/area/Page.java
index 71de13852..069a7056e 100644
--- a/fop-core/src/main/java/org/apache/fop/area/Page.java
+++ b/fop-core/src/main/java/org/apache/fop/area/Page.java
@@ -34,7 +34,6 @@ import org.apache.fop.fo.pagination.SimplePageMaster;
import org.apache.fop.fo.properties.CommonMarginBlock;
import org.apache.fop.layoutmgr.TraitSetter;
import org.apache.fop.traits.WritingModeTraitsGetter;
-
import static org.apache.fop.fo.Constants.EN_ERROR_IF_OVERFLOW;
import static org.apache.fop.fo.Constants.EN_HIDDEN;
import static org.apache.fop.fo.Constants.FO_REGION_AFTER;
diff --git a/fop-core/src/main/java/org/apache/fop/area/PageViewport.java b/fop-core/src/main/java/org/apache/fop/area/PageViewport.java
index a7353d36a..48df17319 100644
--- a/fop-core/src/main/java/org/apache/fop/area/PageViewport.java
+++ b/fop-core/src/main/java/org/apache/fop/area/PageViewport.java
@@ -38,7 +38,6 @@ import org.apache.fop.fo.flow.Marker;
import org.apache.fop.fo.flow.Markers;
import org.apache.fop.fo.pagination.SimplePageMaster;
import org.apache.fop.traits.WritingModeTraitsGetter;
-
import static org.apache.fop.fo.Constants.FO_REGION_BODY;
/**
diff --git a/fop-core/src/main/java/org/apache/fop/area/Trait.java b/fop-core/src/main/java/org/apache/fop/area/Trait.java
index 5f846f3b4..972d1d7f4 100644
--- a/fop-core/src/main/java/org/apache/fop/area/Trait.java
+++ b/fop-core/src/main/java/org/apache/fop/area/Trait.java
@@ -30,7 +30,6 @@ import org.apache.fop.traits.Direction;
import org.apache.fop.traits.Visibility;
import org.apache.fop.traits.WritingMode;
import org.apache.fop.util.ColorUtil;
-
import static org.apache.fop.fo.Constants.EN_NOREPEAT;
import static org.apache.fop.fo.Constants.EN_REPEAT;
import static org.apache.fop.fo.Constants.EN_REPEATX;
diff --git a/fop-core/src/main/java/org/apache/fop/complexscripts/bidi/DelimitedTextRange.java b/fop-core/src/main/java/org/apache/fop/complexscripts/bidi/DelimitedTextRange.java
index 75de90b5e..1b1f984cb 100644
--- a/fop-core/src/main/java/org/apache/fop/complexscripts/bidi/DelimitedTextRange.java
+++ b/fop-core/src/main/java/org/apache/fop/complexscripts/bidi/DelimitedTextRange.java
@@ -34,6 +34,7 @@ import org.apache.fop.traits.WritingModeTraitsGetter;
import org.apache.fop.util.CharUtilities;
// CSOFF: LineLengthCheck
+// CSOFF: InnerAssignment
/**
* The <code>DelimitedTextRange</code> class implements the "delimited text range" as described
diff --git a/fop-core/src/main/java/org/apache/fop/complexscripts/bidi/InlineRun.java b/fop-core/src/main/java/org/apache/fop/complexscripts/bidi/InlineRun.java
index 2fafbe233..2f4f5af9d 100644
--- a/fop-core/src/main/java/org/apache/fop/complexscripts/bidi/InlineRun.java
+++ b/fop-core/src/main/java/org/apache/fop/complexscripts/bidi/InlineRun.java
@@ -35,6 +35,8 @@ import org.apache.fop.area.inline.UnresolvedPageNumber;
import org.apache.fop.area.inline.WordArea;
import org.apache.fop.util.CharUtilities;
+// CSOFF: InnerAssignment
+
/**
* The <code>InlineRun</code> class is a utility class, the instances of which are used
* to capture a sequence of reordering levels associated with an inline area.
diff --git a/fop-core/src/main/java/org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.java b/fop-core/src/main/java/org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.java
index 29516df15..9857ae8f7 100644
--- a/fop-core/src/main/java/org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.java
+++ b/fop-core/src/main/java/org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.java
@@ -26,6 +26,7 @@ import org.apache.fop.traits.Direction;
import org.apache.fop.util.CharUtilities;
// CSOFF: LineLengthCheck
+// CSOFF: InnerAssignment
/**
* <p>The <code>UnicodeBidiAlgorithm</code> class implements functionality prescribed by
diff --git a/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java b/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java
index aecebc3f0..f38940c67 100644
--- a/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java
+++ b/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java
@@ -26,6 +26,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
// CSOFF: LineLengthCheck
+// CSOFF: InnerAssignment
/**
* <p>.Base class implementation of glyph coverage table.</p>
diff --git a/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphDefinitionSubtable.java b/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphDefinitionSubtable.java
index 3ef9a0152..8c4411c71 100644
--- a/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphDefinitionSubtable.java
+++ b/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphDefinitionSubtable.java
@@ -20,6 +20,7 @@
package org.apache.fop.complexscripts.fonts;
// CSOFF: LineLengthCheck
+// CSOFF: InnerAssignment
/**
* <p>The <code>GlyphDefinitionSubtable</code> implements an abstract base of a glyph definition subtable,
diff --git a/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphMappingTable.java b/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphMappingTable.java
index 5511670b8..cc89e67e9 100644
--- a/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphMappingTable.java
+++ b/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphMappingTable.java
@@ -23,6 +23,7 @@ import java.util.Arrays;
import java.util.List;
// CSOFF: LineLengthCheck
+// CSOFF: InnerAssignment
/**
* <p>Base class implementation of glyph mapping table. This base
diff --git a/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java b/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java
index 3657330aa..d91e389b7 100644
--- a/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java
+++ b/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java
@@ -33,6 +33,7 @@ import org.apache.fop.complexscripts.util.GlyphSequence;
import org.apache.fop.complexscripts.util.GlyphTester;
// CSOFF: LineLengthCheck
+// CSOFF: InnerAssignment
/**
* <p>The <code>GlyphPositioningTable</code> class is a glyph table that implements
diff --git a/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java b/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java
index 43a3bcb4a..246926ced 100644
--- a/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java
+++ b/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java
@@ -34,6 +34,7 @@ import org.apache.fop.complexscripts.util.GlyphTester;
import org.apache.fop.fonts.MultiByteFont;
// CSOFF: LineLengthCheck
+// CSOFF: InnerAssignment
/**
* <p>The <code>GlyphSubstitutionTable</code> class is a glyph table that implements
diff --git a/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphSubtable.java b/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphSubtable.java
index 6a245af7c..b7210f9a8 100644
--- a/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphSubtable.java
+++ b/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphSubtable.java
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.Map;
// CSOFF: LineLengthCheck
+// CSOFF: InnerAssignment
/**
* <p>The <code>GlyphSubtable</code> implements an abstract glyph subtable that
@@ -71,8 +72,7 @@ public abstract class GlyphSubtable implements Comparable {
* @param format subtable format
* @param mapping subtable mapping table
*/
- protected GlyphSubtable(String lookupId, int sequence, int flags, int format, GlyphMappingTable mapping)
- {
+ protected GlyphSubtable(String lookupId, int sequence, int flags, int format, GlyphMappingTable mapping) {
if ((lookupId == null) || (lookupId.length() == 0)) {
throw new AdvancedTypographicTableFormatException("invalid lookup identifier, must be non-empty string");
} else if (mapping == null) {
diff --git a/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphTable.java b/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphTable.java
index 42e0fab75..f9a3d07ea 100644
--- a/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphTable.java
+++ b/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphTable.java
@@ -38,6 +38,7 @@ import org.apache.fop.complexscripts.util.GlyphSequence;
import org.apache.fop.complexscripts.util.ScriptContextTester;
// CSOFF: LineLengthCheck
+// CSOFF: InnerAssignment
/**
* <p>Base class for all advanced typographic glyph tables.</p>
diff --git a/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/OTFAdvancedTypographicTableReader.java b/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/OTFAdvancedTypographicTableReader.java
index 0607f998e..386766e4d 100644
--- a/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/OTFAdvancedTypographicTableReader.java
+++ b/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/OTFAdvancedTypographicTableReader.java
@@ -35,6 +35,7 @@ import org.apache.fop.fonts.truetype.OFTableName;
import org.apache.fop.fonts.truetype.OpenFont;
// CSOFF: LineLengthCheck
+// CSOFF: InnerAssignment
/**
* <p>OpenType Font (OTF) advanced typographic table reader. Used by @{Link org.apache.fop.fonts.truetype.TTFFile}
diff --git a/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/DevanagariScriptProcessor.java b/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/DevanagariScriptProcessor.java
index 82058dcf2..a8f1295b1 100644
--- a/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/DevanagariScriptProcessor.java
+++ b/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/DevanagariScriptProcessor.java
@@ -26,6 +26,7 @@ import org.apache.fop.complexscripts.util.CharAssociation;
import org.apache.fop.complexscripts.util.GlyphSequence;
// CSOFF: LineLengthCheck
+// CSOFF: InnerAssignment
/**
* <p>The <code>DevanagariScriptProcessor</code> class implements a script processor for
diff --git a/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/GujaratiScriptProcessor.java b/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/GujaratiScriptProcessor.java
index c65a4c982..87df868b5 100644
--- a/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/GujaratiScriptProcessor.java
+++ b/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/GujaratiScriptProcessor.java
@@ -26,6 +26,7 @@ import org.apache.fop.complexscripts.util.CharAssociation;
import org.apache.fop.complexscripts.util.GlyphSequence;
// CSOFF: LineLengthCheck
+// CSOFF: InnerAssignment
/**
* <p>The <code>GujaratiScriptProcessor</code> class implements a script processor for
diff --git a/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/GurmukhiScriptProcessor.java b/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/GurmukhiScriptProcessor.java
index 29b086cd3..630558582 100644
--- a/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/GurmukhiScriptProcessor.java
+++ b/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/GurmukhiScriptProcessor.java
@@ -26,6 +26,7 @@ import org.apache.fop.complexscripts.util.CharAssociation;
import org.apache.fop.complexscripts.util.GlyphSequence;
// CSOFF: LineLengthCheck
+// CSOFF: InnerAssignment
/**
* <p>The <code>GurmukhiScriptProcessor</code> class implements a script processor for
diff --git a/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/IndicScriptProcessor.java b/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/IndicScriptProcessor.java
index 76e1df397..81464d7c1 100644
--- a/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/IndicScriptProcessor.java
+++ b/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/IndicScriptProcessor.java
@@ -39,6 +39,7 @@ import org.apache.fop.complexscripts.util.GlyphSequence;
import org.apache.fop.complexscripts.util.ScriptContextTester;
// CSOFF: LineLengthCheck
+// CSOFF: InnerAssignment
/**
* <p>The <code>IndicScriptProcessor</code> class implements a script processor for
diff --git a/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/ScriptProcessor.java b/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/ScriptProcessor.java
index 497320291..3a6103c07 100644
--- a/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/ScriptProcessor.java
+++ b/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/ScriptProcessor.java
@@ -34,6 +34,7 @@ import org.apache.fop.complexscripts.util.ScriptContextTester;
import org.apache.fop.fonts.MultiByteFont;
// CSOFF: LineLengthCheck
+// CSOFF: InnerAssignment
/**
* <p>Abstract script processor base class for which an implementation of the substitution and positioning methods
diff --git a/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/TamilScriptProcessor.java b/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/TamilScriptProcessor.java
index 3d02ce017..d272ff212 100644
--- a/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/TamilScriptProcessor.java
+++ b/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/TamilScriptProcessor.java
@@ -26,6 +26,7 @@ import org.apache.fop.complexscripts.util.CharAssociation;
import org.apache.fop.complexscripts.util.GlyphSequence;
// CSOFF: LineLengthCheck
+// CSOFF: InnerAssignment
/**
* <p>The <code>TamilScriptProcessor</code> class implements a script processor for
diff --git a/fop-core/src/main/java/org/apache/fop/complexscripts/util/CharAssociation.java b/fop-core/src/main/java/org/apache/fop/complexscripts/util/CharAssociation.java
index c4de16546..c35d6df91 100644
--- a/fop-core/src/main/java/org/apache/fop/complexscripts/util/CharAssociation.java
+++ b/fop-core/src/main/java/org/apache/fop/complexscripts/util/CharAssociation.java
@@ -22,6 +22,8 @@ package org.apache.fop.complexscripts.util;
import java.util.HashMap;
import java.util.Map;
+// CSOFF: InnerAssignment
+
/**
* A structure class encapsulating an interval of characters expressed as an offset and count of
* Unicode scalar values (in an IntBuffer). A <code>CharAssociation</code> is used to maintain a
diff --git a/fop-core/src/main/java/org/apache/fop/complexscripts/util/CharScript.java b/fop-core/src/main/java/org/apache/fop/complexscripts/util/CharScript.java
index 8da8a7a32..12bc6be2e 100644
--- a/fop-core/src/main/java/org/apache/fop/complexscripts/util/CharScript.java
+++ b/fop-core/src/main/java/org/apache/fop/complexscripts/util/CharScript.java
@@ -35,6 +35,7 @@ import org.apache.fop.util.CharUtilities;
public final class CharScript {
// CSOFF: LineLength
+ // CSOFF: InnerAssignment
//
// The following script codes are based on ISO 15924. Codes less than 1000 are
diff --git a/fop-core/src/main/java/org/apache/fop/complexscripts/util/UTF32.java b/fop-core/src/main/java/org/apache/fop/complexscripts/util/UTF32.java
index b0f92eb88..91a9e7958 100644
--- a/fop-core/src/main/java/org/apache/fop/complexscripts/util/UTF32.java
+++ b/fop-core/src/main/java/org/apache/fop/complexscripts/util/UTF32.java
@@ -21,6 +21,7 @@ package org.apache.fop.complexscripts.util;
import org.apache.fop.util.CharUtilities;
+// CSOFF: InnerAssignment
/**
* <p>UTF32 related utilities.</p>
diff --git a/fop-core/src/main/java/org/apache/fop/fo/flow/table/BorderSpecification.java b/fop-core/src/main/java/org/apache/fop/fo/flow/table/BorderSpecification.java
index 3fa3eb15b..da988b961 100644
--- a/fop-core/src/main/java/org/apache/fop/fo/flow/table/BorderSpecification.java
+++ b/fop-core/src/main/java/org/apache/fop/fo/flow/table/BorderSpecification.java
@@ -79,13 +79,27 @@ public/*TODO*/ class BorderSpecification {
public String toString() {
String holderName = "";
switch (holder) {
- case Constants.FO_TABLE: holderName = "table"; break;
- case Constants.FO_TABLE_COLUMN: holderName = "table-column"; break;
- case Constants.FO_TABLE_HEADER: holderName = "table-header"; break;
- case Constants.FO_TABLE_FOOTER: holderName = "table-footer"; break;
- case Constants.FO_TABLE_BODY: holderName = "table-body"; break;
- case Constants.FO_TABLE_ROW: holderName = "table-row"; break;
- case Constants.FO_TABLE_CELL: holderName = "table-cell"; break;
+ case Constants.FO_TABLE:
+ holderName = "table";
+ break;
+ case Constants.FO_TABLE_COLUMN:
+ holderName = "table-column";
+ break;
+ case Constants.FO_TABLE_HEADER:
+ holderName = "table-header";
+ break;
+ case Constants.FO_TABLE_FOOTER:
+ holderName = "table-footer";
+ break;
+ case Constants.FO_TABLE_BODY:
+ holderName = "table-body";
+ break;
+ case Constants.FO_TABLE_ROW:
+ holderName = "table-row";
+ break;
+ case Constants.FO_TABLE_CELL:
+ holderName = "table-cell";
+ break;
default: assert false;
}
return "{" + borderInfo + ", " + holderName + "}";
diff --git a/fop-core/src/main/java/org/apache/fop/fo/properties/CommonFont.java b/fop-core/src/main/java/org/apache/fop/fo/properties/CommonFont.java
index a22fc4d04..02b1f3262 100644
--- a/fop-core/src/main/java/org/apache/fop/fo/properties/CommonFont.java
+++ b/fop-core/src/main/java/org/apache/fop/fo/properties/CommonFont.java
@@ -191,16 +191,35 @@ public final class CommonFont {
public FontTriplet[] getFontState(FontInfo fontInfo) {
int fw;
switch (fontWeight.getEnum()) {
- case Constants.EN_100: fw = 100; break;
- case Constants.EN_200: fw = 200; break;
- case Constants.EN_300: fw = 300; break;
- case Constants.EN_400: fw = 400; break;
- case Constants.EN_500: fw = 500; break;
- case Constants.EN_600: fw = 600; break;
- case Constants.EN_700: fw = 700; break;
- case Constants.EN_800: fw = 800; break;
- case Constants.EN_900: fw = 900; break;
- default: fw = 400;
+ case Constants.EN_100:
+ fw = 100;
+ break;
+ case Constants.EN_200:
+ fw = 200;
+ break;
+ case Constants.EN_300:
+ fw = 300;
+ break;
+ case Constants.EN_400:
+ fw = 400;
+ break;
+ case Constants.EN_500:
+ fw = 500;
+ break;
+ case Constants.EN_600:
+ fw = 600;
+ break;
+ case Constants.EN_700:
+ fw = 700;
+ break;
+ case Constants.EN_800:
+ fw = 800;
+ break;
+ case Constants.EN_900:
+ fw = 900;
+ break;
+ default:
+ fw = 400;
}
String style;
diff --git a/fop-core/src/main/java/org/apache/fop/fo/properties/URIProperty.java b/fop-core/src/main/java/org/apache/fop/fo/properties/URIProperty.java
index 0538af369..40d1f3e61 100644
--- a/fop-core/src/main/java/org/apache/fop/fo/properties/URIProperty.java
+++ b/fop-core/src/main/java/org/apache/fop/fo/properties/URIProperty.java
@@ -27,7 +27,6 @@ import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.util.CompareUtil;
-
import static org.apache.fop.fo.Constants.PR_X_XML_BASE;
/**
diff --git a/fop-core/src/main/java/org/apache/fop/fonts/GlyphMapping.java b/fop-core/src/main/java/org/apache/fop/fonts/GlyphMapping.java
index 8eedafffa..33e4c770e 100644
--- a/fop-core/src/main/java/org/apache/fop/fonts/GlyphMapping.java
+++ b/fop-core/src/main/java/org/apache/fop/fonts/GlyphMapping.java
@@ -31,8 +31,6 @@ import org.apache.fop.complexscripts.util.CharScript;
import org.apache.fop.traits.MinOptMax;
import org.apache.fop.util.CharUtilities;
-import static org.apache.fop.fonts.type1.AdobeStandardEncoding.i;
-
/**
* Stores the mapping of a text fragment to glyphs, along with various information.
*/
diff --git a/fop-core/src/main/java/org/apache/fop/fonts/cff/CFFDataReader.java b/fop-core/src/main/java/org/apache/fop/fonts/cff/CFFDataReader.java
index 5f6802696..a56c9c7f1 100644
--- a/fop-core/src/main/java/org/apache/fop/fonts/cff/CFFDataReader.java
+++ b/fop-core/src/main/java/org/apache/fop/fonts/cff/CFFDataReader.java
@@ -209,13 +209,24 @@ public class CFFDataReader {
realNumber.append(nibble);
} else {
switch (nibble) {
- case 0xa: realNumber.append("."); break;
- case 0xb: realNumber.append("E"); break;
- case 0xc: realNumber.append("E-"); break;
- case 0xd: break;
- case 0xe: realNumber.append("-"); break;
- case 0xf: return true;
- default: throw new AssertionError("Unexpected nibble value");
+ case 0xa:
+ realNumber.append(".");
+ break;
+ case 0xb:
+ realNumber.append("E");
+ break;
+ case 0xc:
+ realNumber.append("E-");
+ break;
+ case 0xd:
+ break;
+ case 0xe:
+ realNumber.append("-");
+ break;
+ case 0xf:
+ return true;
+ default:
+ throw new AssertionError("Unexpected nibble value");
}
}
return false;
diff --git a/fop-core/src/main/java/org/apache/fop/fonts/truetype/OTFSubSetFile.java b/fop-core/src/main/java/org/apache/fop/fonts/truetype/OTFSubSetFile.java
index 40185abed..cfe0ce1cf 100644
--- a/fop-core/src/main/java/org/apache/fop/fonts/truetype/OTFSubSetFile.java
+++ b/fop-core/src/main/java/org/apache/fop/fonts/truetype/OTFSubSetFile.java
@@ -37,7 +37,6 @@ import java.util.Map.Entry;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.fontbox.cff.CFFStandardString;
import org.apache.fontbox.cff.CFFType1Font;
import org.apache.fontbox.cff.CharStringCommand;
diff --git a/fop-core/src/main/java/org/apache/fop/fonts/type1/Type1SubsetFile.java b/fop-core/src/main/java/org/apache/fop/fonts/type1/Type1SubsetFile.java
index f7d818aad..ea154449a 100644
--- a/fop-core/src/main/java/org/apache/fop/fonts/type1/Type1SubsetFile.java
+++ b/fop-core/src/main/java/org/apache/fop/fonts/type1/Type1SubsetFile.java
@@ -554,10 +554,14 @@ public class Type1SubsetFile {
if (isSpace) {
spaceCount++;
switch (spaceCount - 1) {
- case 1: charIndex = Integer.parseInt(encodingEntry.substring(lastSpaceIndex + 1,
- i)); break;
- case 2: charName = encodingEntry.substring(lastSpaceIndex + 1, i); break;
- default: break;
+ case 1:
+ charIndex = Integer.parseInt(encodingEntry.substring(lastSpaceIndex + 1, i));
+ break;
+ case 2:
+ charName = encodingEntry.substring(lastSpaceIndex + 1, i);
+ break;
+ default:
+ break;
}
}
if (isSpace) {
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
index f8bb162f3..925f69ea8 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
@@ -35,6 +35,8 @@ import org.apache.fop.layoutmgr.WhitespaceManagementPenalty.Variant;
import org.apache.fop.traits.MinOptMax;
import org.apache.fop.util.ListUtil;
+// CSOFF: InnerAssignment
+
class PageBreakingAlgorithm extends BreakingAlgorithm {
/** the logger for the class */
diff --git a/fop-core/src/main/java/org/apache/fop/pdf/CMSProcessableInputStream.java b/fop-core/src/main/java/org/apache/fop/pdf/CMSProcessableInputStream.java
index 1d1343a5e..127208b77 100644
--- a/fop-core/src/main/java/org/apache/fop/pdf/CMSProcessableInputStream.java
+++ b/fop-core/src/main/java/org/apache/fop/pdf/CMSProcessableInputStream.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.fop.pdf;
import java.io.IOException;
diff --git a/fop-core/src/main/java/org/apache/fop/pdf/PDFFactory.java b/fop-core/src/main/java/org/apache/fop/pdf/PDFFactory.java
index 16b1e80bc..1fbe066c9 100644
--- a/fop-core/src/main/java/org/apache/fop/pdf/PDFFactory.java
+++ b/fop-core/src/main/java/org/apache/fop/pdf/PDFFactory.java
@@ -68,6 +68,8 @@ import org.apache.fop.fonts.type1.PFBData;
import org.apache.fop.fonts.type1.PFBParser;
import org.apache.fop.fonts.type1.Type1SubsetFile;
+// CSOFF: InnerAssignment
+
/**
* This class provides method to create and register PDF objects.
*/
diff --git a/fop-core/src/main/java/org/apache/fop/pdf/PDFStructElem.java b/fop-core/src/main/java/org/apache/fop/pdf/PDFStructElem.java
index 1cc348ac2..4d654f33b 100644
--- a/fop-core/src/main/java/org/apache/fop/pdf/PDFStructElem.java
+++ b/fop-core/src/main/java/org/apache/fop/pdf/PDFStructElem.java
@@ -21,7 +21,6 @@ package org.apache.fop.pdf;
import java.io.IOException;
import java.io.OutputStream;
-
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/fop-core/src/main/java/org/apache/fop/pdf/PDFText.java b/fop-core/src/main/java/org/apache/fop/pdf/PDFText.java
index d088f355f..58b62bd0a 100644
--- a/fop-core/src/main/java/org/apache/fop/pdf/PDFText.java
+++ b/fop-core/src/main/java/org/apache/fop/pdf/PDFText.java
@@ -20,7 +20,6 @@
package org.apache.fop.pdf;
import java.io.ByteArrayOutputStream;
-
import java.nio.charset.StandardCharsets;
import java.util.Locale;
diff --git a/fop-core/src/main/java/org/apache/fop/pdf/PDFToUnicodeCMap.java b/fop-core/src/main/java/org/apache/fop/pdf/PDFToUnicodeCMap.java
index 654d40e0b..ad41e03de 100644
--- a/fop-core/src/main/java/org/apache/fop/pdf/PDFToUnicodeCMap.java
+++ b/fop-core/src/main/java/org/apache/fop/pdf/PDFToUnicodeCMap.java
@@ -21,7 +21,6 @@ package org.apache.fop.pdf;
import java.io.IOException;
import java.io.Writer;
-
import static java.lang.Character.isHighSurrogate;
import org.apache.fop.events.EventBroadcaster;
diff --git a/fop-core/src/main/java/org/apache/fop/pdf/RefPDFFont.java b/fop-core/src/main/java/org/apache/fop/pdf/RefPDFFont.java
index 5870cdcb7..75ff9a378 100644
--- a/fop-core/src/main/java/org/apache/fop/pdf/RefPDFFont.java
+++ b/fop-core/src/main/java/org/apache/fop/pdf/RefPDFFont.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.fop.pdf;
public interface RefPDFFont {
diff --git a/fop-core/src/main/java/org/apache/fop/render/AbstractRenderer.java b/fop-core/src/main/java/org/apache/fop/render/AbstractRenderer.java
index e8ab76d53..c28a30f83 100644
--- a/fop-core/src/main/java/org/apache/fop/render/AbstractRenderer.java
+++ b/fop-core/src/main/java/org/apache/fop/render/AbstractRenderer.java
@@ -753,8 +753,7 @@ public abstract class AbstractRenderer
handleBlockTraits(block);
- if (children != null && block.getTrait(Trait.VISIBILITY) != Visibility.HIDDEN)
- {
+ if (children != null && block.getTrait(Trait.VISIBILITY) != Visibility.HIDDEN) {
renderBlocks(block, children);
}
diff --git a/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererConfig.java b/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererConfig.java
index f0fd72296..2ff9bed97 100644
--- a/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererConfig.java
+++ b/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererConfig.java
@@ -42,7 +42,6 @@ import org.apache.fop.fonts.FontManager;
import org.apache.fop.render.RendererConfig;
import org.apache.fop.render.afp.AFPFontConfig.AFPFontInfoConfigParser;
import org.apache.fop.util.LogUtil;
-
import static org.apache.fop.render.afp.AFPRendererConfig.ImagesModeOptions.MODE_COLOR;
import static org.apache.fop.render.afp.AFPRendererConfig.ImagesModeOptions.MODE_GRAYSCALE;
import static org.apache.fop.render.afp.AFPRendererOption.DEFAULT_RESOURCE_LEVELS;
diff --git a/fop-core/src/main/java/org/apache/fop/render/bitmap/BitmapRendererConfig.java b/fop-core/src/main/java/org/apache/fop/render/bitmap/BitmapRendererConfig.java
index 99bc14960..835972129 100644
--- a/fop-core/src/main/java/org/apache/fop/render/bitmap/BitmapRendererConfig.java
+++ b/fop-core/src/main/java/org/apache/fop/render/bitmap/BitmapRendererConfig.java
@@ -33,7 +33,6 @@ import org.apache.fop.render.RendererConfig;
import org.apache.fop.render.java2d.Java2DRendererConfig;
import org.apache.fop.render.java2d.Java2DRendererConfig.Java2DRendererConfigParser;
import org.apache.fop.util.ColorUtil;
-
import static org.apache.fop.render.bitmap.BitmapRendererOption.ANTI_ALIASING;
import static org.apache.fop.render.bitmap.BitmapRendererOption.BACKGROUND_COLOR;
import static org.apache.fop.render.bitmap.BitmapRendererOption.COLOR_MODE;
diff --git a/fop-core/src/main/java/org/apache/fop/render/bitmap/BitmapRenderingSettings.java b/fop-core/src/main/java/org/apache/fop/render/bitmap/BitmapRenderingSettings.java
index 4363f1d5e..102a0f840 100644
--- a/fop-core/src/main/java/org/apache/fop/render/bitmap/BitmapRenderingSettings.java
+++ b/fop-core/src/main/java/org/apache/fop/render/bitmap/BitmapRenderingSettings.java
@@ -22,7 +22,6 @@ package org.apache.fop.render.bitmap;
import org.apache.xmlgraphics.image.writer.ImageWriterParams;
import org.apache.fop.render.java2d.Java2DRenderingSettings;
-
import static org.apache.fop.render.bitmap.BitmapRendererOption.ANTI_ALIASING;
import static org.apache.fop.render.bitmap.BitmapRendererOption.COLOR_MODE;
import static org.apache.fop.render.bitmap.BitmapRendererOption.RENDERING_QUALITY;
diff --git a/fop-core/src/main/java/org/apache/fop/render/bitmap/TIFFRenderer.java b/fop-core/src/main/java/org/apache/fop/render/bitmap/TIFFRenderer.java
index 09b4530b5..3ba6f0d54 100644
--- a/fop-core/src/main/java/org/apache/fop/render/bitmap/TIFFRenderer.java
+++ b/fop-core/src/main/java/org/apache/fop/render/bitmap/TIFFRenderer.java
@@ -45,7 +45,6 @@ import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.MimeConstants;
import org.apache.fop.render.java2d.Java2DRenderer;
-
import static org.apache.fop.render.bitmap.TIFFCompressionValue.CCITT_T4;
import static org.apache.fop.render.bitmap.TIFFCompressionValue.CCITT_T6;
import static org.apache.fop.render.bitmap.TIFFCompressionValue.PACKBITS;
diff --git a/fop-core/src/main/java/org/apache/fop/render/bitmap/TIFFRendererConfig.java b/fop-core/src/main/java/org/apache/fop/render/bitmap/TIFFRendererConfig.java
index c339e02d1..fc7973229 100644
--- a/fop-core/src/main/java/org/apache/fop/render/bitmap/TIFFRendererConfig.java
+++ b/fop-core/src/main/java/org/apache/fop/render/bitmap/TIFFRendererConfig.java
@@ -31,7 +31,6 @@ import org.apache.fop.fonts.DefaultFontConfig;
import org.apache.fop.fonts.DefaultFontConfig.DefaultFontConfigParser;
import org.apache.fop.fonts.FontEventAdapter;
import org.apache.fop.render.RendererConfigOption;
-
import static org.apache.fop.render.bitmap.TIFFCompressionValue.PACKBITS;
/**
diff --git a/fop-core/src/main/java/org/apache/fop/render/bitmap/TIFFRendererConfigurator.java b/fop-core/src/main/java/org/apache/fop/render/bitmap/TIFFRendererConfigurator.java
index fb24fa7bf..3397287d6 100644
--- a/fop-core/src/main/java/org/apache/fop/render/bitmap/TIFFRendererConfigurator.java
+++ b/fop-core/src/main/java/org/apache/fop/render/bitmap/TIFFRendererConfigurator.java
@@ -30,7 +30,6 @@ import org.apache.fop.render.Renderer;
import org.apache.fop.render.RendererConfig.RendererConfigParser;
import org.apache.fop.render.bitmap.TIFFRendererConfig.TIFFRendererConfigParser;
import org.apache.fop.render.intermediate.IFDocumentHandler;
-
import static org.apache.fop.render.bitmap.TIFFCompressionValue.NONE;
/**
diff --git a/fop-core/src/main/java/org/apache/fop/render/gradient/Shading.java b/fop-core/src/main/java/org/apache/fop/render/gradient/Shading.java
index 843081b4a..751309d5c 100644
--- a/fop-core/src/main/java/org/apache/fop/render/gradient/Shading.java
+++ b/fop-core/src/main/java/org/apache/fop/render/gradient/Shading.java
@@ -165,20 +165,29 @@ public class Shading {
switch (shadingType) {
// Function based shading
- case 1: outputShadingType1(out, doubleFormatter, functionRenderer); break;
+ case 1:
+ outputShadingType1(out, doubleFormatter, functionRenderer);
+ break;
// Axial shading
case 2:
// Radial shading
- case 3: outputShadingType2or3(out, doubleFormatter, functionRenderer); break;
+ case 3:
+ outputShadingType2or3(out, doubleFormatter, functionRenderer);
+ break;
// Free-form Gouraud-shaded triangle meshes
case 4:
// Coons patch meshes
case 6:
// Tensor product patch meshes
- case 7: outputShadingType4or6or7(out, doubleFormatter, functionRenderer); break;
+ case 7:
+ outputShadingType4or6or7(out, doubleFormatter, functionRenderer);
+ break;
// Lattice Free form gouraud-shaded triangle mesh
- case 5: outputShadingType5(out, doubleFormatter, functionRenderer); break;
- default: throw new UnsupportedOperationException("Shading type " + shadingType);
+ case 5:
+ outputShadingType5(out, doubleFormatter, functionRenderer);
+ break;
+ default:
+ throw new UnsupportedOperationException("Shading type " + shadingType);
}
out.append(">>");
diff --git a/fop-core/src/main/java/org/apache/fop/render/intermediate/GraphicsPainter.java b/fop-core/src/main/java/org/apache/fop/render/intermediate/GraphicsPainter.java
index 369cacd43..b21e04721 100644
--- a/fop-core/src/main/java/org/apache/fop/render/intermediate/GraphicsPainter.java
+++ b/fop-core/src/main/java/org/apache/fop/render/intermediate/GraphicsPainter.java
@@ -93,8 +93,8 @@ public interface GraphicsPainter {
* @param height the extent of the ellipse in the y direction
* @throws IOException if an I/O error occurs
*/
- void arcTo(final double startAngle, final double endAngle, final int cx, final int cy,
- final int width, final int height) throws IOException;
+ void arcTo(double startAngle, double endAngle, int cx, int cy,
+ int width, int height) throws IOException;
/**
* Rotate the coordinate frame
diff --git a/fop-core/src/main/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationHandler.java b/fop-core/src/main/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationHandler.java
index 0abcd8acd..5dfce2fa2 100644
--- a/fop-core/src/main/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationHandler.java
+++ b/fop-core/src/main/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationHandler.java
@@ -37,7 +37,6 @@ import org.apache.fop.render.intermediate.IFDocumentNavigationHandler;
import org.apache.fop.render.intermediate.IFException;
import org.apache.fop.render.intermediate.PageIndexContext;
import org.apache.fop.util.XMLUtil;
-
import static org.apache.fop.render.intermediate.IFConstants.EL_ID;
/**
diff --git a/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DRenderer.java b/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DRenderer.java
index ca74068d8..df79460a3 100644
--- a/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DRenderer.java
+++ b/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DRenderer.java
@@ -81,7 +81,6 @@ import org.apache.fop.render.extensions.prepress.PageScale;
import org.apache.fop.render.pdf.CTMHelper;
import org.apache.fop.util.CharUtilities;
import org.apache.fop.util.ColorUtil;
-
import static org.apache.fop.render.java2d.Java2DRendererOption.JAVA2D_TRANSPARENT_PAGE_BACKGROUND;
/**
diff --git a/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DRendererConfig.java b/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DRendererConfig.java
index 14d31e1c8..c2b3fc12a 100644
--- a/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DRendererConfig.java
+++ b/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DRendererConfig.java
@@ -28,7 +28,6 @@ import org.apache.fop.fonts.DefaultFontConfig;
import org.apache.fop.fonts.DefaultFontConfig.DefaultFontConfigParser;
import org.apache.fop.fonts.FontEventAdapter;
import org.apache.fop.render.RendererConfig;
-
import static org.apache.fop.render.java2d.Java2DRendererOption.JAVA2D_TRANSPARENT_PAGE_BACKGROUND;
/**
diff --git a/fop-core/src/main/java/org/apache/fop/render/pcl/PCLRendererConfig.java b/fop-core/src/main/java/org/apache/fop/render/pcl/PCLRendererConfig.java
index 1a1c3727e..23e2c1dbf 100644
--- a/fop-core/src/main/java/org/apache/fop/render/pcl/PCLRendererConfig.java
+++ b/fop-core/src/main/java/org/apache/fop/render/pcl/PCLRendererConfig.java
@@ -30,7 +30,6 @@ import org.apache.fop.fonts.DefaultFontConfig;
import org.apache.fop.fonts.DefaultFontConfig.DefaultFontConfigParser;
import org.apache.fop.fonts.FontEventAdapter;
import org.apache.fop.render.RendererConfig;
-
import static org.apache.fop.render.pcl.Java2DRendererOption.DISABLE_PJL;
import static org.apache.fop.render.pcl.Java2DRendererOption.MODE_COLOR;
import static org.apache.fop.render.pcl.Java2DRendererOption.OPTIMIZE_RESOURCES;
diff --git a/fop-core/src/main/java/org/apache/fop/render/pdf/ImageRawPNGAdapter.java b/fop-core/src/main/java/org/apache/fop/render/pdf/ImageRawPNGAdapter.java
index 8704c5e5d..7984e0fa2 100644
--- a/fop-core/src/main/java/org/apache/fop/render/pdf/ImageRawPNGAdapter.java
+++ b/fop-core/src/main/java/org/apache/fop/render/pdf/ImageRawPNGAdapter.java
@@ -1,289 +1,289 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* $Id$ */
-
-// Original author: Matthias Reichenbacher
-
-package org.apache.fop.render.pdf;
-
-import java.awt.image.ColorModel;
-import java.awt.image.IndexColorModel;
-import java.io.BufferedOutputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.zip.Deflater;
-import java.util.zip.DeflaterOutputStream;
-import java.util.zip.Inflater;
-import java.util.zip.InflaterInputStream;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.output.ByteArrayOutputStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.apache.xmlgraphics.image.loader.impl.ImageRawPNG;
-import org.apache.xmlgraphics.image.loader.impl.ImageRawStream;
-
-import org.apache.fop.pdf.BitmapImage;
-import org.apache.fop.pdf.FlateFilter;
-import org.apache.fop.pdf.PDFColor;
-import org.apache.fop.pdf.PDFDeviceColorSpace;
-import org.apache.fop.pdf.PDFDictionary;
-import org.apache.fop.pdf.PDFDocument;
-import org.apache.fop.pdf.PDFFilter;
-import org.apache.fop.pdf.PDFFilterException;
-import org.apache.fop.pdf.PDFFilterList;
-import org.apache.fop.pdf.PDFName;
-import org.apache.fop.pdf.PDFReference;
-
-public class ImageRawPNGAdapter extends AbstractImageAdapter {
-
- /** logging instance */
- private static Log log = LogFactory.getLog(ImageRawPNGAdapter.class);
-
- private static final PDFName RI_PERCEPTUAL = new PDFName("Perceptual");
- private static final PDFName RI_RELATIVE_COLORIMETRIC = new PDFName("RelativeColorimetric");
- private static final PDFName RI_SATURATION = new PDFName("Saturation");
- private static final PDFName RI_ABSOLUTE_COLORIMETRIC = new PDFName("AbsoluteColorimetric");
-
- private PDFFilter pdfFilter;
- private String maskRef;
- private PDFReference softMask;
- private int numberOfInterleavedComponents;
-
- /**
- * Creates a new PDFImage from an Image instance.
- * @param image the image
- * @param key XObject key
- */
- public ImageRawPNGAdapter(ImageRawPNG image, String key) {
- super(image, key);
- }
-
- /** {@inheritDoc} */
- public void setup(PDFDocument doc) {
- super.setup(doc);
- ColorModel cm = ((ImageRawPNG) this.image).getColorModel();
- if (cm instanceof IndexColorModel) {
- numberOfInterleavedComponents = 1;
- } else {
- // this can be 1 (gray), 2 (gray + alpha), 3 (rgb) or 4 (rgb + alpha)
- // numberOfInterleavedComponents = (cm.hasAlpha() ? 1 : 0) + cm.getNumColorComponents();
- numberOfInterleavedComponents = cm.getNumComponents();
- }
-
- // set up image compression for non-alpha channel
- FlateFilter flate;
- try {
- flate = new FlateFilter();
- flate.setApplied(true);
- flate.setPredictor(FlateFilter.PREDICTION_PNG_OPT);
- if (numberOfInterleavedComponents < 3) {
- // means palette (1) or gray (1) or gray + alpha (2)
- flate.setColors(1);
- } else {
- // means rgb (3) or rgb + alpha (4)
- flate.setColors(3);
- }
- flate.setColumns(image.getSize().getWidthPx());
- flate.setBitsPerComponent(this.getBitsPerComponent());
- } catch (PDFFilterException e) {
- throw new RuntimeException("FlateFilter configuration error", e);
- }
- this.pdfFilter = flate;
- this.disallowMultipleFilters();
-
- // Handle transparency channel if applicable; note that for palette images the transparency is
- // not TRANSLUCENT
- if (cm.hasAlpha() && cm.getTransparency() == ColorModel.TRANSLUCENT) {
- doc.getProfile().verifyTransparencyAllowed(image.getInfo().getOriginalURI());
- // TODO: Implement code to combine image with background color if transparency is not allowed
- // here we need to inflate the PNG pixel data, which includes alpha, separate the alpha channel
- // and then deflate it back again
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- InputStream in = null;
- DataInputStream dataStream = null;
- try (BufferedOutputStream dos = new BufferedOutputStream(
- new DeflaterOutputStream(baos, new Deflater()))) {
- in = ((ImageRawStream) image).createInputStream();
- dataStream = new DataInputStream(new InflaterInputStream(in, new Inflater()));
- // offset is the byte offset of the alpha component
- int offset = numberOfInterleavedComponents - 1; // 1 for GA, 3 for RGBA
- int numColumns = image.getSize().getWidthPx();
- int bytesPerRow = numberOfInterleavedComponents * numColumns;
- int filter;
- // read line by line; the first byte holds the filter
- while ((filter = dataStream.read()) != -1) {
- byte[] bytes = new byte[bytesPerRow];
- dataStream.readFully(bytes, 0, bytesPerRow);
- dos.write((byte) filter);
- for (int j = 0; j < numColumns; j++) {
- dos.write(bytes, offset, 1);
- offset += numberOfInterleavedComponents;
- }
- offset = numberOfInterleavedComponents - 1;
- }
- } catch (IOException e) {
- throw new RuntimeException("Error processing transparency channel: " + getKey(), e);
- } finally {
- IOUtils.closeQuietly(in);
- IOUtils.closeQuietly(dataStream);
- }
- // set up alpha channel compression
- FlateFilter transFlate;
- try {
- transFlate = new FlateFilter();
- transFlate.setApplied(true);
- transFlate.setPredictor(FlateFilter.PREDICTION_PNG_OPT);
- transFlate.setColors(1);
- transFlate.setColumns(image.getSize().getWidthPx());
- transFlate.setBitsPerComponent(this.getBitsPerComponent());
- } catch (PDFFilterException e) {
- throw new RuntimeException("FlateFilter configuration error", e);
- }
- BitmapImage alphaMask = new BitmapImage("Mask:" + this.getKey(), image.getSize().getWidthPx(),
- image.getSize().getHeightPx(), baos.toByteArray(), null);
- alphaMask.setPDFFilter(transFlate);
- alphaMask.disallowMultipleFilters();
- alphaMask.setColorSpace(new PDFDeviceColorSpace(PDFDeviceColorSpace.DEVICE_GRAY));
- softMask = doc.addImage(null, alphaMask).makeReference();
- }
- }
-
- /** {@inheritDoc} */
- public PDFDeviceColorSpace getColorSpace() {
- // DeviceGray, DeviceRGB, or DeviceCMYK
- return toPDFColorSpace(image.getColorSpace());
- }
-
- /** {@inheritDoc} */
- public int getBitsPerComponent() {
- return ((ImageRawPNG) this.image).getBitDepth();
- }
-
- /** {@inheritDoc} */
- public boolean isTransparent() {
- return ((ImageRawPNG) this.image).isTransparent();
- }
-
- /** {@inheritDoc} */
- public PDFColor getTransparentColor() {
- return new PDFColor(((ImageRawPNG) this.image).getTransparentColor());
- }
-
- /** {@inheritDoc} */
- public String getMask() {
- return maskRef;
- }
-
- /** {@inheritDoc} */
- public String getSoftMask() {
- return softMask.toString();
- }
-
- /** {@inheritDoc} */
- public PDFReference getSoftMaskReference() {
- return softMask;
- }
-
- /** {@inheritDoc} */
- public PDFFilter getPDFFilter() {
- return pdfFilter;
- }
-
- /** {@inheritDoc} */
- public void outputContents(OutputStream out) throws IOException {
- InputStream in = ((ImageRawStream) image).createInputStream();
-
- DataInputStream dataStream = null;
- try {
- if (numberOfInterleavedComponents == 1 || numberOfInterleavedComponents == 3) {
- // means we have Gray, RGB, or Palette
- IOUtils.copy(in, out);
- } else {
- // means we have Gray + alpha or RGB + alpha
- // TODO: since we have alpha here do this when the alpha channel is extracted
- int numBytes = numberOfInterleavedComponents - 1; // 1 for Gray, 3 for RGB
- int numColumns = image.getSize().getWidthPx();
- dataStream = new DataInputStream(new InflaterInputStream(in, new Inflater()));
-
- int offset = 0;
- int bytesPerRow = numberOfInterleavedComponents * numColumns;
- int filter;
- // here we need to inflate the PNG pixel data, which includes alpha, separate the alpha
- // channel and then deflate the RGB channels back again
- BufferedOutputStream dos = new BufferedOutputStream(new DeflaterOutputStream(out, new Deflater()));
- while ((filter = dataStream.read()) != -1) {
- byte[] bytes = new byte[bytesPerRow];
- dataStream.readFully(bytes, 0, bytesPerRow);
- dos.write((byte) filter);
- for (int j = 0; j < numColumns; j++) {
- dos.write(bytes, offset, numBytes);
- offset += numberOfInterleavedComponents;
- }
- offset = 0;
- }
- dos.close();
- }
- } finally {
- IOUtils.closeQuietly(in);
- IOUtils.closeQuietly(dataStream);
- }
- }
-
- /** {@inheritDoc} */
- public String getFilterHint() {
- return PDFFilterList.PRECOMPRESSED_FILTER;
- }
-
- public void populateXObjectDictionary(PDFDictionary dict) {
- int renderingIntent = ((ImageRawPNG) image).getRenderingIntent();
- if (renderingIntent != -1) {
- switch (renderingIntent) {
- case 0:
- dict.put("Intent", RI_PERCEPTUAL);
- break;
- case 1:
- dict.put("Intent", RI_RELATIVE_COLORIMETRIC);
- break;
- case 2:
- dict.put("Intent", RI_SATURATION);
- break;
- case 3:
- dict.put("Intent", RI_ABSOLUTE_COLORIMETRIC);
- break;
- default:
- // ignore
- }
- }
- ColorModel cm = ((ImageRawPNG) image).getColorModel();
- if (cm instanceof IndexColorModel) {
- IndexColorModel icm = (IndexColorModel) cm;
- super.populateXObjectDictionaryForIndexColorModel(dict, icm);
- }
- }
-
- protected boolean issRGB() {
- if (((ImageRawPNG) image).getRenderingIntent() != -1) {
- return true;
- }
- return false;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+// Original author: Matthias Reichenbacher
+
+package org.apache.fop.render.pdf;
+
+import java.awt.image.ColorModel;
+import java.awt.image.IndexColorModel;
+import java.io.BufferedOutputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.zip.Deflater;
+import java.util.zip.DeflaterOutputStream;
+import java.util.zip.Inflater;
+import java.util.zip.InflaterInputStream;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.output.ByteArrayOutputStream;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.xmlgraphics.image.loader.impl.ImageRawPNG;
+import org.apache.xmlgraphics.image.loader.impl.ImageRawStream;
+
+import org.apache.fop.pdf.BitmapImage;
+import org.apache.fop.pdf.FlateFilter;
+import org.apache.fop.pdf.PDFColor;
+import org.apache.fop.pdf.PDFDeviceColorSpace;
+import org.apache.fop.pdf.PDFDictionary;
+import org.apache.fop.pdf.PDFDocument;
+import org.apache.fop.pdf.PDFFilter;
+import org.apache.fop.pdf.PDFFilterException;
+import org.apache.fop.pdf.PDFFilterList;
+import org.apache.fop.pdf.PDFName;
+import org.apache.fop.pdf.PDFReference;
+
+public class ImageRawPNGAdapter extends AbstractImageAdapter {
+
+ /** logging instance */
+ private static Log log = LogFactory.getLog(ImageRawPNGAdapter.class);
+
+ private static final PDFName RI_PERCEPTUAL = new PDFName("Perceptual");
+ private static final PDFName RI_RELATIVE_COLORIMETRIC = new PDFName("RelativeColorimetric");
+ private static final PDFName RI_SATURATION = new PDFName("Saturation");
+ private static final PDFName RI_ABSOLUTE_COLORIMETRIC = new PDFName("AbsoluteColorimetric");
+
+ private PDFFilter pdfFilter;
+ private String maskRef;
+ private PDFReference softMask;
+ private int numberOfInterleavedComponents;
+
+ /**
+ * Creates a new PDFImage from an Image instance.
+ * @param image the image
+ * @param key XObject key
+ */
+ public ImageRawPNGAdapter(ImageRawPNG image, String key) {
+ super(image, key);
+ }
+
+ /** {@inheritDoc} */
+ public void setup(PDFDocument doc) {
+ super.setup(doc);
+ ColorModel cm = ((ImageRawPNG) this.image).getColorModel();
+ if (cm instanceof IndexColorModel) {
+ numberOfInterleavedComponents = 1;
+ } else {
+ // this can be 1 (gray), 2 (gray + alpha), 3 (rgb) or 4 (rgb + alpha)
+ // numberOfInterleavedComponents = (cm.hasAlpha() ? 1 : 0) + cm.getNumColorComponents();
+ numberOfInterleavedComponents = cm.getNumComponents();
+ }
+
+ // set up image compression for non-alpha channel
+ FlateFilter flate;
+ try {
+ flate = new FlateFilter();
+ flate.setApplied(true);
+ flate.setPredictor(FlateFilter.PREDICTION_PNG_OPT);
+ if (numberOfInterleavedComponents < 3) {
+ // means palette (1) or gray (1) or gray + alpha (2)
+ flate.setColors(1);
+ } else {
+ // means rgb (3) or rgb + alpha (4)
+ flate.setColors(3);
+ }
+ flate.setColumns(image.getSize().getWidthPx());
+ flate.setBitsPerComponent(this.getBitsPerComponent());
+ } catch (PDFFilterException e) {
+ throw new RuntimeException("FlateFilter configuration error", e);
+ }
+ this.pdfFilter = flate;
+ this.disallowMultipleFilters();
+
+ // Handle transparency channel if applicable; note that for palette images the transparency is
+ // not TRANSLUCENT
+ if (cm.hasAlpha() && cm.getTransparency() == ColorModel.TRANSLUCENT) {
+ doc.getProfile().verifyTransparencyAllowed(image.getInfo().getOriginalURI());
+ // TODO: Implement code to combine image with background color if transparency is not allowed
+ // here we need to inflate the PNG pixel data, which includes alpha, separate the alpha channel
+ // and then deflate it back again
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ InputStream in = null;
+ DataInputStream dataStream = null;
+ try (BufferedOutputStream dos = new BufferedOutputStream(
+ new DeflaterOutputStream(baos, new Deflater()))) {
+ in = ((ImageRawStream) image).createInputStream();
+ dataStream = new DataInputStream(new InflaterInputStream(in, new Inflater()));
+ // offset is the byte offset of the alpha component
+ int offset = numberOfInterleavedComponents - 1; // 1 for GA, 3 for RGBA
+ int numColumns = image.getSize().getWidthPx();
+ int bytesPerRow = numberOfInterleavedComponents * numColumns;
+ int filter;
+ // read line by line; the first byte holds the filter
+ while ((filter = dataStream.read()) != -1) {
+ byte[] bytes = new byte[bytesPerRow];
+ dataStream.readFully(bytes, 0, bytesPerRow);
+ dos.write((byte) filter);
+ for (int j = 0; j < numColumns; j++) {
+ dos.write(bytes, offset, 1);
+ offset += numberOfInterleavedComponents;
+ }
+ offset = numberOfInterleavedComponents - 1;
+ }
+ } catch (IOException e) {
+ throw new RuntimeException("Error processing transparency channel: " + getKey(), e);
+ } finally {
+ IOUtils.closeQuietly(in);
+ IOUtils.closeQuietly(dataStream);
+ }
+ // set up alpha channel compression
+ FlateFilter transFlate;
+ try {
+ transFlate = new FlateFilter();
+ transFlate.setApplied(true);
+ transFlate.setPredictor(FlateFilter.PREDICTION_PNG_OPT);
+ transFlate.setColors(1);
+ transFlate.setColumns(image.getSize().getWidthPx());
+ transFlate.setBitsPerComponent(this.getBitsPerComponent());
+ } catch (PDFFilterException e) {
+ throw new RuntimeException("FlateFilter configuration error", e);
+ }
+ BitmapImage alphaMask = new BitmapImage("Mask:" + this.getKey(), image.getSize().getWidthPx(),
+ image.getSize().getHeightPx(), baos.toByteArray(), null);
+ alphaMask.setPDFFilter(transFlate);
+ alphaMask.disallowMultipleFilters();
+ alphaMask.setColorSpace(new PDFDeviceColorSpace(PDFDeviceColorSpace.DEVICE_GRAY));
+ softMask = doc.addImage(null, alphaMask).makeReference();
+ }
+ }
+
+ /** {@inheritDoc} */
+ public PDFDeviceColorSpace getColorSpace() {
+ // DeviceGray, DeviceRGB, or DeviceCMYK
+ return toPDFColorSpace(image.getColorSpace());
+ }
+
+ /** {@inheritDoc} */
+ public int getBitsPerComponent() {
+ return ((ImageRawPNG) this.image).getBitDepth();
+ }
+
+ /** {@inheritDoc} */
+ public boolean isTransparent() {
+ return ((ImageRawPNG) this.image).isTransparent();
+ }
+
+ /** {@inheritDoc} */
+ public PDFColor getTransparentColor() {
+ return new PDFColor(((ImageRawPNG) this.image).getTransparentColor());
+ }
+
+ /** {@inheritDoc} */
+ public String getMask() {
+ return maskRef;
+ }
+
+ /** {@inheritDoc} */
+ public String getSoftMask() {
+ return softMask.toString();
+ }
+
+ /** {@inheritDoc} */
+ public PDFReference getSoftMaskReference() {
+ return softMask;
+ }
+
+ /** {@inheritDoc} */
+ public PDFFilter getPDFFilter() {
+ return pdfFilter;
+ }
+
+ /** {@inheritDoc} */
+ public void outputContents(OutputStream out) throws IOException {
+ InputStream in = ((ImageRawStream) image).createInputStream();
+
+ DataInputStream dataStream = null;
+ try {
+ if (numberOfInterleavedComponents == 1 || numberOfInterleavedComponents == 3) {
+ // means we have Gray, RGB, or Palette
+ IOUtils.copy(in, out);
+ } else {
+ // means we have Gray + alpha or RGB + alpha
+ // TODO: since we have alpha here do this when the alpha channel is extracted
+ int numBytes = numberOfInterleavedComponents - 1; // 1 for Gray, 3 for RGB
+ int numColumns = image.getSize().getWidthPx();
+ dataStream = new DataInputStream(new InflaterInputStream(in, new Inflater()));
+
+ int offset = 0;
+ int bytesPerRow = numberOfInterleavedComponents * numColumns;
+ int filter;
+ // here we need to inflate the PNG pixel data, which includes alpha, separate the alpha
+ // channel and then deflate the RGB channels back again
+ BufferedOutputStream dos = new BufferedOutputStream(new DeflaterOutputStream(out, new Deflater()));
+ while ((filter = dataStream.read()) != -1) {
+ byte[] bytes = new byte[bytesPerRow];
+ dataStream.readFully(bytes, 0, bytesPerRow);
+ dos.write((byte) filter);
+ for (int j = 0; j < numColumns; j++) {
+ dos.write(bytes, offset, numBytes);
+ offset += numberOfInterleavedComponents;
+ }
+ offset = 0;
+ }
+ dos.close();
+ }
+ } finally {
+ IOUtils.closeQuietly(in);
+ IOUtils.closeQuietly(dataStream);
+ }
+ }
+
+ /** {@inheritDoc} */
+ public String getFilterHint() {
+ return PDFFilterList.PRECOMPRESSED_FILTER;
+ }
+
+ public void populateXObjectDictionary(PDFDictionary dict) {
+ int renderingIntent = ((ImageRawPNG) image).getRenderingIntent();
+ if (renderingIntent != -1) {
+ switch (renderingIntent) {
+ case 0:
+ dict.put("Intent", RI_PERCEPTUAL);
+ break;
+ case 1:
+ dict.put("Intent", RI_RELATIVE_COLORIMETRIC);
+ break;
+ case 2:
+ dict.put("Intent", RI_SATURATION);
+ break;
+ case 3:
+ dict.put("Intent", RI_ABSOLUTE_COLORIMETRIC);
+ break;
+ default:
+ // ignore
+ }
+ }
+ ColorModel cm = ((ImageRawPNG) image).getColorModel();
+ if (cm instanceof IndexColorModel) {
+ IndexColorModel icm = (IndexColorModel) cm;
+ super.populateXObjectDictionaryForIndexColorModel(dict, icm);
+ }
+ }
+
+ protected boolean issRGB() {
+ if (((ImageRawPNG) image).getRenderingIntent() != -1) {
+ return true;
+ }
+ return false;
+ }
+}
diff --git a/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRendererConfig.java b/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRendererConfig.java
index d9a55b272..d27114fa3 100644
--- a/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRendererConfig.java
+++ b/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRendererConfig.java
@@ -43,7 +43,6 @@ import org.apache.fop.pdf.PDFSignParams;
import org.apache.fop.render.RendererConfig;
import org.apache.fop.render.RendererConfigOption;
import org.apache.fop.util.LogUtil;
-
import static org.apache.fop.render.pdf.PDFEncryptionOption.ENCRYPTION_LENGTH;
import static org.apache.fop.render.pdf.PDFEncryptionOption.ENCRYPTION_PARAMS;
import static org.apache.fop.render.pdf.PDFEncryptionOption.ENCRYPT_METADATA;
diff --git a/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRendererOptionsConfig.java b/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRendererOptionsConfig.java
index d5b41c4fb..95fd6d932 100644
--- a/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRendererOptionsConfig.java
+++ b/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRendererOptionsConfig.java
@@ -32,7 +32,6 @@ import org.apache.fop.pdf.PDFUAMode;
import org.apache.fop.pdf.PDFVTMode;
import org.apache.fop.pdf.PDFXMode;
import org.apache.fop.pdf.Version;
-
import static org.apache.fop.render.pdf.PDFRendererOption.DISABLE_SRGB_COLORSPACE;
import static org.apache.fop.render.pdf.PDFRendererOption.FILTER_LIST;
import static org.apache.fop.render.pdf.PDFRendererOption.FORM_XOBJECT;
diff --git a/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRenderingUtil.java b/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRenderingUtil.java
index 857e9bd82..e212a7b3a 100644
--- a/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRenderingUtil.java
+++ b/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRenderingUtil.java
@@ -89,7 +89,6 @@ import org.apache.fop.render.pdf.extensions.PDFEmbeddedFileAttachment;
import org.apache.fop.render.pdf.extensions.PDFObjectType;
import org.apache.fop.render.pdf.extensions.PDFPageExtension;
import org.apache.fop.render.pdf.extensions.PDFReferenceExtension;
-
import static org.apache.fop.render.pdf.PDFEncryptionOption.ENCRYPTION_PARAMS;
import static org.apache.fop.render.pdf.PDFEncryptionOption.NO_ACCESSCONTENT;
import static org.apache.fop.render.pdf.PDFEncryptionOption.NO_ANNOTATIONS;
diff --git a/fop-core/src/main/java/org/apache/fop/render/ps/DataOutput.java b/fop-core/src/main/java/org/apache/fop/render/ps/DataOutput.java
index f1a168a5d..142b1241a 100644
--- a/fop-core/src/main/java/org/apache/fop/render/ps/DataOutput.java
+++ b/fop-core/src/main/java/org/apache/fop/render/ps/DataOutput.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.fop.render.ps;
import java.io.ByteArrayOutputStream;
diff --git a/fop-core/src/main/java/org/apache/fop/render/ps/PSRendererConfig.java b/fop-core/src/main/java/org/apache/fop/render/ps/PSRendererConfig.java
index c0d28ff96..9dec02369 100644
--- a/fop-core/src/main/java/org/apache/fop/render/ps/PSRendererConfig.java
+++ b/fop-core/src/main/java/org/apache/fop/render/ps/PSRendererConfig.java
@@ -35,7 +35,6 @@ import org.apache.fop.fonts.DefaultFontConfig.DefaultFontConfigParser;
import org.apache.fop.fonts.FontEventAdapter;
import org.apache.fop.render.RendererConfig;
import org.apache.fop.util.LogUtil;
-
import static org.apache.fop.render.ps.PSRendererOption.ACROBAT_DOWNSAMPLE;
import static org.apache.fop.render.ps.PSRendererOption.AUTO_ROTATE_LANDSCAPE;
import static org.apache.fop.render.ps.PSRendererOption.DSC_COMPLIANT;
diff --git a/fop-core/src/main/java/org/apache/fop/render/ps/PSRenderingUtil.java b/fop-core/src/main/java/org/apache/fop/render/ps/PSRenderingUtil.java
index 13d54fb3b..a2ba28c70 100644
--- a/fop-core/src/main/java/org/apache/fop/render/ps/PSRenderingUtil.java
+++ b/fop-core/src/main/java/org/apache/fop/render/ps/PSRenderingUtil.java
@@ -32,7 +32,6 @@ import org.apache.fop.render.ps.extensions.PSCommentAfter;
import org.apache.fop.render.ps.extensions.PSCommentBefore;
import org.apache.fop.render.ps.extensions.PSExtensionAttachment;
import org.apache.fop.render.ps.extensions.PSSetupCode;
-
import static org.apache.fop.render.ps.PSRendererOption.ACROBAT_DOWNSAMPLE;
import static org.apache.fop.render.ps.PSRendererOption.AUTO_ROTATE_LANDSCAPE;
import static org.apache.fop.render.ps.PSRendererOption.LANGUAGE_LEVEL;
diff --git a/fop-core/src/main/java/org/apache/fop/render/ps/Type1CharStringFormatter.java b/fop-core/src/main/java/org/apache/fop/render/ps/Type1CharStringFormatter.java
index beaf913e1..cd428f6cd 100644
--- a/fop-core/src/main/java/org/apache/fop/render/ps/Type1CharStringFormatter.java
+++ b/fop-core/src/main/java/org/apache/fop/render/ps/Type1CharStringFormatter.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.fop.render.ps;
import java.io.ByteArrayOutputStream;
diff --git a/fop-core/src/main/java/org/apache/fop/render/ps/Type1FontFormatter.java b/fop-core/src/main/java/org/apache/fop/render/ps/Type1FontFormatter.java
index e9ca96091..ab04f681d 100644
--- a/fop-core/src/main/java/org/apache/fop/render/ps/Type1FontFormatter.java
+++ b/fop-core/src/main/java/org/apache/fop/render/ps/Type1FontFormatter.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.fop.render.ps;
import java.io.IOException;
diff --git a/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmarkContainerImpl.java b/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmarkContainerImpl.java
index 124b6e838..25edaa6c5 100644
--- a/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmarkContainerImpl.java
+++ b/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmarkContainerImpl.java
@@ -72,8 +72,7 @@ public class RtfBookmarkContainerImpl extends RtfContainer implements IRtfBookma
*
* @exception IOException On error
*/
- RtfBookmarkContainerImpl(RtfContainer parent, Writer w, RtfAttributes attr) throws IOException
- {
+ RtfBookmarkContainerImpl(RtfContainer parent, Writer w, RtfAttributes attr) throws IOException {
super(parent, w, attr);
}
diff --git a/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java b/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java
index c07c2fe57..18eaf5351 100644
--- a/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java
+++ b/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java
@@ -143,7 +143,7 @@ public class RtfTable extends RtfContainer {
* @return true if id is the highestRow
*/
public boolean isHighestRow(int id) {
- return (highestRow == id) ? true : false;
+ return highestRow == id;
}
/**
diff --git a/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java b/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java
index be6614394..23bf07113 100644
--- a/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java
+++ b/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java
@@ -372,7 +372,7 @@ public class RtfTableRow extends RtfContainer implements ITableAttributes {
* @return true if the cell is the highest cell
*/
public boolean isHighestCell(int cellId) {
- return (highestCell == cellId) ? true : false;
+ return highestCell == cellId;
}
/**
diff --git a/fop-core/src/main/java/org/apache/fop/tools/anttasks/Fop.java b/fop-core/src/main/java/org/apache/fop/tools/anttasks/Fop.java
index c4b9f281e..589967e5b 100644
--- a/fop-core/src/main/java/org/apache/fop/tools/anttasks/Fop.java
+++ b/fop-core/src/main/java/org/apache/fop/tools/anttasks/Fop.java
@@ -354,12 +354,23 @@ public class Fop extends Task {
public void execute() throws BuildException {
int logLevel = SimpleLog.LOG_LEVEL_INFO;
switch (getMessageType()) {
- case Project.MSG_DEBUG : logLevel = SimpleLog.LOG_LEVEL_DEBUG; break;
- case Project.MSG_INFO : logLevel = SimpleLog.LOG_LEVEL_INFO; break;
- case Project.MSG_WARN : logLevel = SimpleLog.LOG_LEVEL_WARN; break;
- case Project.MSG_ERR : logLevel = SimpleLog.LOG_LEVEL_ERROR; break;
- case Project.MSG_VERBOSE: logLevel = SimpleLog.LOG_LEVEL_DEBUG; break;
- default: logLevel = SimpleLog.LOG_LEVEL_INFO;
+ case Project.MSG_DEBUG:
+ logLevel = SimpleLog.LOG_LEVEL_DEBUG;
+ break;
+ case Project.MSG_INFO:
+ logLevel = SimpleLog.LOG_LEVEL_INFO;
+ break;
+ case Project.MSG_WARN:
+ logLevel = SimpleLog.LOG_LEVEL_WARN;
+ break;
+ case Project.MSG_ERR:
+ logLevel = SimpleLog.LOG_LEVEL_ERROR;
+ break;
+ case Project.MSG_VERBOSE:
+ logLevel = SimpleLog.LOG_LEVEL_DEBUG;
+ break;
+ default:
+ logLevel = SimpleLog.LOG_LEVEL_INFO;
}
SimpleLog logger = new SimpleLog("FOP/Anttask");
logger.setLevel(logLevel);
diff --git a/fop-core/src/test/java/org/apache/fop/BasicDriverTestCase.java b/fop-core/src/test/java/org/apache/fop/BasicDriverTestCase.java
index e89a1c558..c5c85ba1b 100644
--- a/fop-core/src/test/java/org/apache/fop/BasicDriverTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/BasicDriverTestCase.java
@@ -29,7 +29,6 @@ import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.stream.StreamSource;
import org.junit.Test;
-
import static org.junit.Assert.assertTrue;
import org.apache.commons.io.output.ByteArrayOutputStream;
@@ -40,7 +39,6 @@ import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.MimeConstants;
import org.apache.fop.cli.InputHandler;
-
import static org.apache.fop.FOPTestUtils.getBaseDir;
/**
diff --git a/fop-core/src/test/java/org/apache/fop/DigestFilterTestCase.java b/fop-core/src/test/java/org/apache/fop/DigestFilterTestCase.java
index 17aae6776..cd3a8b80d 100644
--- a/fop-core/src/test/java/org/apache/fop/DigestFilterTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/DigestFilterTestCase.java
@@ -31,7 +31,6 @@ import org.junit.Test;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
-
import static org.junit.Assert.assertTrue;
import org.apache.fop.util.DigestFilter;
diff --git a/fop-core/src/test/java/org/apache/fop/HyphenationTestCase.java b/fop-core/src/test/java/org/apache/fop/HyphenationTestCase.java
index 87ea7d4c1..5cbf5d949 100644
--- a/fop-core/src/test/java/org/apache/fop/HyphenationTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/HyphenationTestCase.java
@@ -27,7 +27,6 @@ import java.util.HashMap;
import java.util.Map;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
diff --git a/fop-core/src/test/java/org/apache/fop/KnuthAlgorithmTestCase.java b/fop-core/src/test/java/org/apache/fop/KnuthAlgorithmTestCase.java
index aa92191de..b5132fee9 100644
--- a/fop-core/src/test/java/org/apache/fop/KnuthAlgorithmTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/KnuthAlgorithmTestCase.java
@@ -23,7 +23,6 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import org.apache.fop.layoutmgr.BlockKnuthSequence;
diff --git a/fop-core/src/test/java/org/apache/fop/URIResolutionTestCase.java b/fop-core/src/test/java/org/apache/fop/URIResolutionTestCase.java
index 40eb72212..408b03534 100644
--- a/fop-core/src/test/java/org/apache/fop/URIResolutionTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/URIResolutionTestCase.java
@@ -44,7 +44,6 @@ import javax.xml.xpath.XPathFactory;
import org.junit.BeforeClass;
import org.junit.Test;
import org.w3c.dom.Document;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -62,7 +61,6 @@ import org.apache.fop.apps.FopFactoryBuilder;
import org.apache.fop.apps.MimeConstants;
import org.apache.fop.apps.io.ResourceResolverFactory;
import org.apache.fop.render.xml.XMLRenderer;
-
import static org.apache.fop.FOPTestUtils.getBaseDir;
/**
diff --git a/fop-core/src/test/java/org/apache/fop/accessibility/fo/ArtifactImageBugTestCase.java b/fop-core/src/test/java/org/apache/fop/accessibility/fo/ArtifactImageBugTestCase.java
index 97b37e05f..22589696d 100644
--- a/fop-core/src/test/java/org/apache/fop/accessibility/fo/ArtifactImageBugTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/accessibility/fo/ArtifactImageBugTestCase.java
@@ -34,7 +34,6 @@ import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.stream.StreamSource;
import org.junit.Test;
-
import org.xml.sax.SAXException;
import org.apache.fop.apps.FOUserAgent;
diff --git a/fop-core/src/test/java/org/apache/fop/accessibility/fo/PDFUAWarningTestCase.java b/fop-core/src/test/java/org/apache/fop/accessibility/fo/PDFUAWarningTestCase.java
index 6dba10924..bd84a4d50 100644
--- a/fop-core/src/test/java/org/apache/fop/accessibility/fo/PDFUAWarningTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/accessibility/fo/PDFUAWarningTestCase.java
@@ -25,7 +25,6 @@ import java.io.IOException;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-
import org.xml.sax.helpers.AttributesImpl;
import org.apache.fop.pdf.PDFDocument;
diff --git a/fop-core/src/test/java/org/apache/fop/accessibility/fo/StructureTreeEventTriggerTestCase.java b/fop-core/src/test/java/org/apache/fop/accessibility/fo/StructureTreeEventTriggerTestCase.java
index 75ea9005e..e7115a4e7 100644
--- a/fop-core/src/test/java/org/apache/fop/accessibility/fo/StructureTreeEventTriggerTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/accessibility/fo/StructureTreeEventTriggerTestCase.java
@@ -20,7 +20,6 @@
package org.apache.fop.accessibility.fo;
import org.junit.Test;
-
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
diff --git a/fop-core/src/test/java/org/apache/fop/accessibility/pdf/FootnoteSeparatorTestCase.java b/fop-core/src/test/java/org/apache/fop/accessibility/pdf/FootnoteSeparatorTestCase.java
index 9bb29498e..410f2a2f3 100644
--- a/fop-core/src/test/java/org/apache/fop/accessibility/pdf/FootnoteSeparatorTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/accessibility/pdf/FootnoteSeparatorTestCase.java
@@ -23,7 +23,6 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import org.junit.Test;
-
import org.xml.sax.helpers.AttributesImpl;
import static org.junit.Assert.assertEquals;
diff --git a/fop-core/src/test/java/org/apache/fop/accessibility/pdf/MissingLanguageWarningTestCase.java b/fop-core/src/test/java/org/apache/fop/accessibility/pdf/MissingLanguageWarningTestCase.java
index 7a95300fa..fb8fc4718 100644
--- a/fop-core/src/test/java/org/apache/fop/accessibility/pdf/MissingLanguageWarningTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/accessibility/pdf/MissingLanguageWarningTestCase.java
@@ -31,7 +31,6 @@ import javax.xml.transform.stream.StreamSource;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/afp/AFPGraphics2DTestCase.java b/fop-core/src/test/java/org/apache/fop/afp/AFPGraphics2DTestCase.java
index 7768800e6..46f6edd09 100644
--- a/fop-core/src/test/java/org/apache/fop/afp/AFPGraphics2DTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/afp/AFPGraphics2DTestCase.java
@@ -34,7 +34,6 @@ import javax.imageio.ImageIO;
import org.junit.Assert;
import org.junit.Test;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
diff --git a/fop-core/src/test/java/org/apache/fop/afp/AFPImageHandlerRenderedImageTestCase.java b/fop-core/src/test/java/org/apache/fop/afp/AFPImageHandlerRenderedImageTestCase.java
index a1fc9f39c..6545c08ea 100644
--- a/fop-core/src/test/java/org/apache/fop/afp/AFPImageHandlerRenderedImageTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/afp/AFPImageHandlerRenderedImageTestCase.java
@@ -21,14 +21,12 @@ package org.apache.fop.afp;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -38,7 +36,6 @@ import org.apache.xmlgraphics.image.loader.impl.ImageRendered;
import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.apps.io.ResourceResolverFactory;
-
import org.apache.fop.render.afp.AFPImageHandlerRenderedImage;
import org.apache.fop.render.afp.AFPParser;
import org.apache.fop.render.afp.AFPRenderingContext;
diff --git a/fop-core/src/test/java/org/apache/fop/afp/AFPObjectAreaInfoTestCase.java b/fop-core/src/test/java/org/apache/fop/afp/AFPObjectAreaInfoTestCase.java
index e9134a90b..da34705d4 100644
--- a/fop-core/src/test/java/org/apache/fop/afp/AFPObjectAreaInfoTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/afp/AFPObjectAreaInfoTestCase.java
@@ -21,7 +21,6 @@ package org.apache.fop.afp;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
/**
diff --git a/fop-core/src/test/java/org/apache/fop/afp/AFPPaintingStateTestCase.java b/fop-core/src/test/java/org/apache/fop/afp/AFPPaintingStateTestCase.java
index e9806f944..335f07b91 100644
--- a/fop-core/src/test/java/org/apache/fop/afp/AFPPaintingStateTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/afp/AFPPaintingStateTestCase.java
@@ -21,7 +21,6 @@ package org.apache.fop.afp;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
/**
diff --git a/fop-core/src/test/java/org/apache/fop/afp/AFPResourceManagerTestCase.java b/fop-core/src/test/java/org/apache/fop/afp/AFPResourceManagerTestCase.java
index 2387692c9..3d115def7 100644
--- a/fop-core/src/test/java/org/apache/fop/afp/AFPResourceManagerTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/afp/AFPResourceManagerTestCase.java
@@ -29,7 +29,6 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/afp/AFPResourceUtilTestCase.java b/fop-core/src/test/java/org/apache/fop/afp/AFPResourceUtilTestCase.java
index 178e5c6ad..eae37c960 100644
--- a/fop-core/src/test/java/org/apache/fop/afp/AFPResourceUtilTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/afp/AFPResourceUtilTestCase.java
@@ -26,7 +26,6 @@ import java.io.OutputStream;
import java.util.Arrays;
import org.junit.Test;
-
import static org.junit.Assert.assertTrue;
import org.apache.commons.io.IOUtils;
diff --git a/fop-core/src/test/java/org/apache/fop/afp/DataStreamTestCase.java b/fop-core/src/test/java/org/apache/fop/afp/DataStreamTestCase.java
index 0f83e08b2..bc728af44 100644
--- a/fop-core/src/test/java/org/apache/fop/afp/DataStreamTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/afp/DataStreamTestCase.java
@@ -27,11 +27,9 @@ import java.io.ByteArrayOutputStream;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-
import org.apache.fop.afp.fonts.CharacterSet;
import org.apache.fop.afp.fonts.CharacterSetBuilder;
import org.apache.fop.afp.modca.InterchangeSet;
diff --git a/fop-core/src/test/java/org/apache/fop/afp/fonts/CharactersetEncoderTestCase.java b/fop-core/src/test/java/org/apache/fop/afp/fonts/CharactersetEncoderTestCase.java
index ee2fd7876..04500554a 100644
--- a/fop-core/src/test/java/org/apache/fop/afp/fonts/CharactersetEncoderTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/afp/fonts/CharactersetEncoderTestCase.java
@@ -25,7 +25,6 @@ import java.nio.charset.CharacterCodingException;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/afp/fonts/IntegerKeyStoreTestCase.java b/fop-core/src/test/java/org/apache/fop/afp/fonts/IntegerKeyStoreTestCase.java
index 96c0618a7..2c69fbdf6 100644
--- a/fop-core/src/test/java/org/apache/fop/afp/fonts/IntegerKeyStoreTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/afp/fonts/IntegerKeyStoreTestCase.java
@@ -20,7 +20,6 @@
package org.apache.fop.afp.fonts;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
diff --git a/fop-core/src/test/java/org/apache/fop/afp/goca/GraphicsCharacterStringTestCase.java b/fop-core/src/test/java/org/apache/fop/afp/goca/GraphicsCharacterStringTestCase.java
index edd777a1c..edf15894d 100644
--- a/fop-core/src/test/java/org/apache/fop/afp/goca/GraphicsCharacterStringTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/afp/goca/GraphicsCharacterStringTestCase.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.fop.afp.goca;
import java.io.ByteArrayOutputStream;
@@ -21,7 +22,6 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import org.apache.fop.afp.fonts.CharacterSet;
diff --git a/fop-core/src/test/java/org/apache/fop/afp/goca/GraphicsSetFractionalLineWidthTestCase.java b/fop-core/src/test/java/org/apache/fop/afp/goca/GraphicsSetFractionalLineWidthTestCase.java
index f34275de0..d39392d61 100644
--- a/fop-core/src/test/java/org/apache/fop/afp/goca/GraphicsSetFractionalLineWidthTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/afp/goca/GraphicsSetFractionalLineWidthTestCase.java
@@ -24,7 +24,6 @@ import java.io.IOException;
import java.util.Arrays;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/afp/goca/GraphicsSetLineWidthTestCase.java b/fop-core/src/test/java/org/apache/fop/afp/goca/GraphicsSetLineWidthTestCase.java
index c0a18a551..2ad3825e6 100644
--- a/fop-core/src/test/java/org/apache/fop/afp/goca/GraphicsSetLineWidthTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/afp/goca/GraphicsSetLineWidthTestCase.java
@@ -24,7 +24,6 @@ import java.io.IOException;
import java.util.Arrays;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/afp/modca/AbstractAFPObjectTest.java b/fop-core/src/test/java/org/apache/fop/afp/modca/AbstractAFPObjectTest.java
index 621b4ba3b..20973dee1 100644
--- a/fop-core/src/test/java/org/apache/fop/afp/modca/AbstractAFPObjectTest.java
+++ b/fop-core/src/test/java/org/apache/fop/afp/modca/AbstractAFPObjectTest.java
@@ -27,7 +27,6 @@ import java.util.Arrays;
import java.util.List;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
diff --git a/fop-core/src/test/java/org/apache/fop/afp/modca/AbstractNamedAFPObjectTest.java b/fop-core/src/test/java/org/apache/fop/afp/modca/AbstractNamedAFPObjectTest.java
index 0593ae637..2bd132687 100644
--- a/fop-core/src/test/java/org/apache/fop/afp/modca/AbstractNamedAFPObjectTest.java
+++ b/fop-core/src/test/java/org/apache/fop/afp/modca/AbstractNamedAFPObjectTest.java
@@ -22,7 +22,6 @@ package org.apache.fop.afp.modca;
import java.util.Arrays;
import org.junit.Test;
-
import static org.junit.Assert.assertTrue;
/**
diff --git a/fop-core/src/test/java/org/apache/fop/afp/modca/AbstractTripletStructuredObjectTest.java b/fop-core/src/test/java/org/apache/fop/afp/modca/AbstractTripletStructuredObjectTest.java
index fe25996bb..c3db013f0 100644
--- a/fop-core/src/test/java/org/apache/fop/afp/modca/AbstractTripletStructuredObjectTest.java
+++ b/fop-core/src/test/java/org/apache/fop/afp/modca/AbstractTripletStructuredObjectTest.java
@@ -28,7 +28,6 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/afp/modca/IncludeObjectTestCase.java b/fop-core/src/test/java/org/apache/fop/afp/modca/IncludeObjectTestCase.java
index 7e096f98b..1750d6a56 100644
--- a/fop-core/src/test/java/org/apache/fop/afp/modca/IncludeObjectTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/afp/modca/IncludeObjectTestCase.java
@@ -25,7 +25,6 @@ import java.util.Arrays;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertTrue;
import org.apache.fop.afp.util.BinaryUtils;
diff --git a/fop-core/src/test/java/org/apache/fop/afp/parser/MODCAParserTestCase.java b/fop-core/src/test/java/org/apache/fop/afp/parser/MODCAParserTestCase.java
index 176344618..7c9580f55 100644
--- a/fop-core/src/test/java/org/apache/fop/afp/parser/MODCAParserTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/afp/parser/MODCAParserTestCase.java
@@ -26,7 +26,6 @@ import java.io.InputStream;
import java.util.Arrays;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/afp/ptoca/TransparentDataControlSequenceTestCase.java b/fop-core/src/test/java/org/apache/fop/afp/ptoca/TransparentDataControlSequenceTestCase.java
index 8d6c79d05..5bf868d6a 100644
--- a/fop-core/src/test/java/org/apache/fop/afp/ptoca/TransparentDataControlSequenceTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/afp/ptoca/TransparentDataControlSequenceTestCase.java
@@ -23,7 +23,6 @@ import java.io.IOException;
import java.io.OutputStream;
import org.junit.Test;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -31,7 +30,6 @@ import static org.mockito.Mockito.when;
import org.apache.fop.afp.fonts.CharactersetEncoder.EncodedChars;
import org.apache.fop.afp.ptoca.TransparentDataControlSequence.TransparentData;
-
import static org.apache.fop.afp.ptoca.PtocaConstants.TRANSPARENT_DATA_MAX_SIZE;
public class TransparentDataControlSequenceTestCase {
diff --git a/fop-core/src/test/java/org/apache/fop/afp/util/AFPResourceAccessorTestCase.java b/fop-core/src/test/java/org/apache/fop/afp/util/AFPResourceAccessorTestCase.java
index d729d336d..3d0cca5a4 100644
--- a/fop-core/src/test/java/org/apache/fop/afp/util/AFPResourceAccessorTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/afp/util/AFPResourceAccessorTestCase.java
@@ -23,7 +23,6 @@ import java.net.URISyntaxException;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
diff --git a/fop-core/src/test/java/org/apache/fop/apps/AFPRendererConfBuilder.java b/fop-core/src/test/java/org/apache/fop/apps/AFPRendererConfBuilder.java
index 4376c8f7d..9947425d3 100644
--- a/fop-core/src/test/java/org/apache/fop/apps/AFPRendererConfBuilder.java
+++ b/fop-core/src/test/java/org/apache/fop/apps/AFPRendererConfBuilder.java
@@ -27,7 +27,6 @@ import org.apache.fop.apps.FopConfBuilder.RendererConfBuilder;
import org.apache.fop.render.afp.AFPRendererConfig;
import org.apache.fop.render.afp.AFPRendererOption;
import org.apache.fop.render.afp.AFPShadingMode;
-
import static org.apache.fop.render.afp.AFPRendererConfig.ImagesModeOptions.MODE_GRAYSCALE;
import static org.apache.fop.render.afp.AFPRendererOption.DEFAULT_RESOURCE_LEVELS;
import static org.apache.fop.render.afp.AFPRendererOption.GOCA;
diff --git a/fop-core/src/test/java/org/apache/fop/apps/AbstractRendererConfiguratorTest.java b/fop-core/src/test/java/org/apache/fop/apps/AbstractRendererConfiguratorTest.java
index b0dbf440c..7d34b57d1 100644
--- a/fop-core/src/test/java/org/apache/fop/apps/AbstractRendererConfiguratorTest.java
+++ b/fop-core/src/test/java/org/apache/fop/apps/AbstractRendererConfiguratorTest.java
@@ -23,7 +23,6 @@ import java.io.File;
import java.io.IOException;
import org.xml.sax.SAXException;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/fop-core/src/test/java/org/apache/fop/apps/BitmapRendererConfBuilder.java b/fop-core/src/test/java/org/apache/fop/apps/BitmapRendererConfBuilder.java
index 9ea2a4e9e..9bce44be4 100644
--- a/fop-core/src/test/java/org/apache/fop/apps/BitmapRendererConfBuilder.java
+++ b/fop-core/src/test/java/org/apache/fop/apps/BitmapRendererConfBuilder.java
@@ -20,7 +20,6 @@
package org.apache.fop.apps;
import org.apache.fop.apps.FopConfBuilder.RendererConfBuilder;
-
import static org.apache.fop.render.bitmap.BitmapRendererOption.ANTI_ALIASING;
import static org.apache.fop.render.bitmap.BitmapRendererOption.BACKGROUND_COLOR;
import static org.apache.fop.render.bitmap.BitmapRendererOption.COLOR_MODE;
diff --git a/fop-core/src/test/java/org/apache/fop/apps/EnvironmentalProfileFactoryTestCase.java b/fop-core/src/test/java/org/apache/fop/apps/EnvironmentalProfileFactoryTestCase.java
index 83bfd2076..6b4fe3ed3 100644
--- a/fop-core/src/test/java/org/apache/fop/apps/EnvironmentalProfileFactoryTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/apps/EnvironmentalProfileFactoryTestCase.java
@@ -20,7 +20,6 @@ package org.apache.fop.apps;
import java.net.URI;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
diff --git a/fop-core/src/test/java/org/apache/fop/apps/FopConfParserTestCase.java b/fop-core/src/test/java/org/apache/fop/apps/FopConfParserTestCase.java
index 4748cbacc..7d89e636f 100644
--- a/fop-core/src/test/java/org/apache/fop/apps/FopConfParserTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/apps/FopConfParserTestCase.java
@@ -27,7 +27,6 @@ import java.net.URI;
import org.junit.Before;
import org.junit.Test;
import org.xml.sax.SAXException;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/apps/FopFactoryBuilderTestCase.java b/fop-core/src/test/java/org/apache/fop/apps/FopFactoryBuilderTestCase.java
index 470091f6c..49766d555 100644
--- a/fop-core/src/test/java/org/apache/fop/apps/FopFactoryBuilderTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/apps/FopFactoryBuilderTestCase.java
@@ -28,7 +28,6 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
diff --git a/fop-core/src/test/java/org/apache/fop/apps/FopFactoryTestCase.java b/fop-core/src/test/java/org/apache/fop/apps/FopFactoryTestCase.java
index d11a10954..920e72149 100644
--- a/fop-core/src/test/java/org/apache/fop/apps/FopFactoryTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/apps/FopFactoryTestCase.java
@@ -34,7 +34,6 @@ import javax.xml.transform.stream.StreamSource;
import org.junit.Test;
import org.xml.sax.SAXException;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
diff --git a/fop-core/src/test/java/org/apache/fop/apps/Java2DRendererConfBuilder.java b/fop-core/src/test/java/org/apache/fop/apps/Java2DRendererConfBuilder.java
index 00568cfc5..31b990a05 100644
--- a/fop-core/src/test/java/org/apache/fop/apps/Java2DRendererConfBuilder.java
+++ b/fop-core/src/test/java/org/apache/fop/apps/Java2DRendererConfBuilder.java
@@ -20,7 +20,6 @@
package org.apache.fop.apps;
import org.apache.fop.apps.FopConfBuilder.RendererConfBuilder;
-
import static org.apache.fop.render.java2d.Java2DRendererOption.JAVA2D_TRANSPARENT_PAGE_BACKGROUND;
public class Java2DRendererConfBuilder extends RendererConfBuilder {
diff --git a/fop-core/src/test/java/org/apache/fop/apps/PDFRendererConfBuilder.java b/fop-core/src/test/java/org/apache/fop/apps/PDFRendererConfBuilder.java
index 07d30b21a..d51955d23 100644
--- a/fop-core/src/test/java/org/apache/fop/apps/PDFRendererConfBuilder.java
+++ b/fop-core/src/test/java/org/apache/fop/apps/PDFRendererConfBuilder.java
@@ -24,7 +24,6 @@ import org.w3c.dom.Element;
import org.apache.fop.apps.FopConfBuilder.RendererConfBuilder;
import org.apache.fop.render.RendererConfigOption;
import org.apache.fop.render.pdf.PDFEncryptionOption;
-
import static org.apache.fop.render.pdf.PDFEncryptionOption.ENCRYPTION_LENGTH;
import static org.apache.fop.render.pdf.PDFEncryptionOption.ENCRYPTION_PARAMS;
import static org.apache.fop.render.pdf.PDFEncryptionOption.OWNER_PASSWORD;
diff --git a/fop-core/src/test/java/org/apache/fop/apps/PSRendererConfBuilder.java b/fop-core/src/test/java/org/apache/fop/apps/PSRendererConfBuilder.java
index 92d2ce45e..f5fa9d304 100644
--- a/fop-core/src/test/java/org/apache/fop/apps/PSRendererConfBuilder.java
+++ b/fop-core/src/test/java/org/apache/fop/apps/PSRendererConfBuilder.java
@@ -20,7 +20,6 @@
package org.apache.fop.apps;
import org.apache.fop.apps.FopConfBuilder.RendererConfBuilder;
-
import static org.apache.fop.render.ps.PSRendererOption.AUTO_ROTATE_LANDSCAPE;
import static org.apache.fop.render.ps.PSRendererOption.DSC_COMPLIANT;
import static org.apache.fop.render.ps.PSRendererOption.LANGUAGE_LEVEL;
diff --git a/fop-core/src/test/java/org/apache/fop/apps/TxtRendererConfBuilder.java b/fop-core/src/test/java/org/apache/fop/apps/TxtRendererConfBuilder.java
index 816b59b11..763b9a014 100644
--- a/fop-core/src/test/java/org/apache/fop/apps/TxtRendererConfBuilder.java
+++ b/fop-core/src/test/java/org/apache/fop/apps/TxtRendererConfBuilder.java
@@ -20,7 +20,6 @@
package org.apache.fop.apps;
import org.apache.fop.apps.FopConfBuilder.RendererConfBuilder;
-
import static org.apache.fop.render.txt.TxtRendererConfig.TxtRendererOption.ENCODING;
public class TxtRendererConfBuilder extends RendererConfBuilder {
diff --git a/fop-core/src/test/java/org/apache/fop/apps/io/BaseURIResolutionTest.java b/fop-core/src/test/java/org/apache/fop/apps/io/BaseURIResolutionTest.java
index e04283718..27181d376 100644
--- a/fop-core/src/test/java/org/apache/fop/apps/io/BaseURIResolutionTest.java
+++ b/fop-core/src/test/java/org/apache/fop/apps/io/BaseURIResolutionTest.java
@@ -33,7 +33,6 @@ import javax.xml.transform.sax.SAXTransformerFactory;
import javax.xml.transform.stream.StreamSource;
import org.xml.sax.SAXException;
-
import static org.junit.Assert.assertTrue;
import org.apache.commons.io.IOUtils;
@@ -48,7 +47,6 @@ import org.apache.fop.apps.FopConfParser;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.FopFactoryBuilder;
import org.apache.fop.apps.MimeConstants;
-
import static org.apache.fop.FOPTestUtils.getBaseDir;
public abstract class BaseURIResolutionTest {
diff --git a/fop-core/src/test/java/org/apache/fop/apps/io/FontURIResolver.java b/fop-core/src/test/java/org/apache/fop/apps/io/FontURIResolver.java
index 781aca368..aa65be88f 100644
--- a/fop-core/src/test/java/org/apache/fop/apps/io/FontURIResolver.java
+++ b/fop-core/src/test/java/org/apache/fop/apps/io/FontURIResolver.java
@@ -32,7 +32,6 @@ import javax.xml.transform.TransformerException;
import org.junit.Test;
import org.xml.sax.SAXException;
-
import static org.junit.Assert.assertTrue;
import org.apache.xmlgraphics.io.Resource;
diff --git a/fop-core/src/test/java/org/apache/fop/apps/io/ResourceResolverFactoryTestCase.java b/fop-core/src/test/java/org/apache/fop/apps/io/ResourceResolverFactoryTestCase.java
index 6ae34b4f9..6672dbd82 100644
--- a/fop-core/src/test/java/org/apache/fop/apps/io/ResourceResolverFactoryTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/apps/io/ResourceResolverFactoryTestCase.java
@@ -28,7 +28,6 @@ import java.io.OutputStream;
import java.net.URI;
import org.junit.Test;
-
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
diff --git a/fop-core/src/test/java/org/apache/fop/apps/io/URIResolverWrapperTestCase.java b/fop-core/src/test/java/org/apache/fop/apps/io/URIResolverWrapperTestCase.java
index ffb477a73..aecf6b4aa 100644
--- a/fop-core/src/test/java/org/apache/fop/apps/io/URIResolverWrapperTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/apps/io/URIResolverWrapperTestCase.java
@@ -29,7 +29,6 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
diff --git a/fop-core/src/test/java/org/apache/fop/area/TraitTestCase.java b/fop-core/src/test/java/org/apache/fop/area/TraitTestCase.java
index 2c77228c5..4a68e0c50 100644
--- a/fop-core/src/test/java/org/apache/fop/area/TraitTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/area/TraitTestCase.java
@@ -20,7 +20,6 @@
package org.apache.fop.area;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/area/inline/InlineParentTestCase.java b/fop-core/src/test/java/org/apache/fop/area/inline/InlineParentTestCase.java
index f14e05be2..7b42f7549 100644
--- a/fop-core/src/test/java/org/apache/fop/area/inline/InlineParentTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/area/inline/InlineParentTestCase.java
@@ -20,7 +20,6 @@
package org.apache.fop.area.inline;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
public class InlineParentTestCase {
diff --git a/fop-core/src/test/java/org/apache/fop/cli/CommandLineOptions2TestCase.java b/fop-core/src/test/java/org/apache/fop/cli/CommandLineOptions2TestCase.java
index 778544dd0..6e0b8b448 100644
--- a/fop-core/src/test/java/org/apache/fop/cli/CommandLineOptions2TestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/cli/CommandLineOptions2TestCase.java
@@ -22,7 +22,6 @@ import java.io.File;
import org.junit.Assert;
import org.junit.Test;
import org.junit.function.ThrowingRunnable;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
diff --git a/fop-core/src/test/java/org/apache/fop/cli/CommandLineOptionsTestCase.java b/fop-core/src/test/java/org/apache/fop/cli/CommandLineOptionsTestCase.java
index 1be3daa84..976183814 100644
--- a/fop-core/src/test/java/org/apache/fop/cli/CommandLineOptionsTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/cli/CommandLineOptionsTestCase.java
@@ -23,7 +23,6 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/complexscripts/bidi/BidiAlgorithmTestCase.java b/fop-core/src/test/java/org/apache/fop/complexscripts/bidi/BidiAlgorithmTestCase.java
index 8ed1af217..f4c0c5963 100644
--- a/fop-core/src/test/java/org/apache/fop/complexscripts/bidi/BidiAlgorithmTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/complexscripts/bidi/BidiAlgorithmTestCase.java
@@ -20,7 +20,6 @@
package org.apache.fop.complexscripts.bidi;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
diff --git a/fop-core/src/test/java/org/apache/fop/complexscripts/bidi/BidiClassTestCase.java b/fop-core/src/test/java/org/apache/fop/complexscripts/bidi/BidiClassTestCase.java
index f393e5b70..bce792075 100644
--- a/fop-core/src/test/java/org/apache/fop/complexscripts/bidi/BidiClassTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/complexscripts/bidi/BidiClassTestCase.java
@@ -20,7 +20,6 @@
package org.apache.fop.complexscripts.bidi;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
diff --git a/fop-core/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData.java b/fop-core/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData.java
index 4ca3085f6..986778533 100644
--- a/fop-core/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData.java
+++ b/fop-core/src/test/java/org/apache/fop/complexscripts/bidi/BidiTestData.java
@@ -25,6 +25,8 @@ import java.io.ObjectInputStream;
import org.apache.commons.io.IOUtils;
+// CSOFF: InnerAssignment
+
/*
* !!! THIS IS A GENERATED FILE !!!
* If updates to the source are needed, then:
diff --git a/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/GDEFTestCase.java b/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/GDEFTestCase.java
index f1512903c..9b9cf1a9d 100644
--- a/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/GDEFTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/GDEFTestCase.java
@@ -22,7 +22,6 @@ package org.apache.fop.complexscripts.fonts;
import java.io.File;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
diff --git a/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java b/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java
index cf63b4eff..c23fab631 100644
--- a/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java
@@ -22,7 +22,6 @@ package org.apache.fop.complexscripts.fonts;
import java.io.File;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java b/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java
index ad43b920f..4e670b764 100644
--- a/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java
@@ -24,7 +24,6 @@ import java.nio.IntBuffer;
import java.util.Collections;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFile.java b/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFile.java
index 524cc8933..e65eb6125 100644
--- a/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFile.java
+++ b/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFile.java
@@ -69,6 +69,7 @@ import org.apache.fop.util.CharUtilities;
// CSOFF: LineLengthCheck
+// CSOFF: InnerAssignment
/**
* This class supports a subset of the <code>TTX</code> file as produced by the Adobe FLEX
diff --git a/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFileTestCase.java b/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFileTestCase.java
index f4b7d34e8..92234e27f 100644
--- a/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFileTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFileTestCase.java
@@ -22,7 +22,6 @@ package org.apache.fop.complexscripts.fonts.ttx;
import java.io.File;
import org.junit.Test;
-
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
diff --git a/fop-core/src/test/java/org/apache/fop/complexscripts/layout/ComplexScriptsLayoutTestCase.java b/fop-core/src/test/java/org/apache/fop/complexscripts/layout/ComplexScriptsLayoutTestCase.java
index 416cbf8d0..12d64a68a 100644
--- a/fop-core/src/test/java/org/apache/fop/complexscripts/layout/ComplexScriptsLayoutTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/complexscripts/layout/ComplexScriptsLayoutTestCase.java
@@ -51,7 +51,6 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
diff --git a/fop-core/src/test/java/org/apache/fop/complexscripts/scripts/KhmerTestCase.java b/fop-core/src/test/java/org/apache/fop/complexscripts/scripts/KhmerTestCase.java
index 2268fee30..9660831c9 100644
--- a/fop-core/src/test/java/org/apache/fop/complexscripts/scripts/KhmerTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/complexscripts/scripts/KhmerTestCase.java
@@ -26,7 +26,6 @@ import java.util.Map;
import org.junit.Assert;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import org.apache.fop.complexscripts.fonts.GlyphCoverageTable;
diff --git a/fop-core/src/test/java/org/apache/fop/complexscripts/scripts/arabic/ArabicJoinersTestCase.java b/fop-core/src/test/java/org/apache/fop/complexscripts/scripts/arabic/ArabicJoinersTestCase.java
index 6b34379aa..65598213c 100644
--- a/fop-core/src/test/java/org/apache/fop/complexscripts/scripts/arabic/ArabicJoinersTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/complexscripts/scripts/arabic/ArabicJoinersTestCase.java
@@ -24,7 +24,6 @@ import java.util.BitSet;
import java.util.HashMap;
import org.junit.Test;
-
import static org.junit.Assert.assertTrue;
import org.apache.fop.complexscripts.scripts.ScriptProcessor;
diff --git a/fop-core/src/test/java/org/apache/fop/complexscripts/scripts/arabic/ArabicWordFormsTestCase.java b/fop-core/src/test/java/org/apache/fop/complexscripts/scripts/arabic/ArabicWordFormsTestCase.java
index 118961aa4..a920b1f47 100644
--- a/fop-core/src/test/java/org/apache/fop/complexscripts/scripts/arabic/ArabicWordFormsTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/complexscripts/scripts/arabic/ArabicWordFormsTestCase.java
@@ -29,7 +29,6 @@ import java.nio.IntBuffer;
import java.util.List;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
diff --git a/fop-core/src/test/java/org/apache/fop/complexscripts/util/NumberConverterTestCase.java b/fop-core/src/test/java/org/apache/fop/complexscripts/util/NumberConverterTestCase.java
index 4e1db5fb3..b88a29c8b 100644
--- a/fop-core/src/test/java/org/apache/fop/complexscripts/util/NumberConverterTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/complexscripts/util/NumberConverterTestCase.java
@@ -23,7 +23,6 @@ import java.util.ArrayList;
import java.util.List;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
// CSOFF: LineLengthCheck
diff --git a/fop-core/src/test/java/org/apache/fop/config/BaseConstructiveUserConfigTest.java b/fop-core/src/test/java/org/apache/fop/config/BaseConstructiveUserConfigTest.java
index 7a3cab3bb..6e26fc09e 100644
--- a/fop-core/src/test/java/org/apache/fop/config/BaseConstructiveUserConfigTest.java
+++ b/fop-core/src/test/java/org/apache/fop/config/BaseConstructiveUserConfigTest.java
@@ -24,7 +24,6 @@ import java.io.InputStream;
import org.junit.Test;
import org.xml.sax.SAXException;
-
import static org.junit.Assert.fail;
/**
diff --git a/fop-core/src/test/java/org/apache/fop/config/BaseUserConfigTest.java b/fop-core/src/test/java/org/apache/fop/config/BaseUserConfigTest.java
index 90616c526..21ff609f6 100644
--- a/fop-core/src/test/java/org/apache/fop/config/BaseUserConfigTest.java
+++ b/fop-core/src/test/java/org/apache/fop/config/BaseUserConfigTest.java
@@ -31,7 +31,6 @@ import org.apache.commons.logging.LogFactory;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.configuration.DefaultConfigurationBuilder;
import org.apache.fop.render.pdf.BasePDFTest;
-
import static org.apache.fop.FOPTestUtils.getBaseDir;
/**
diff --git a/fop-core/src/test/java/org/apache/fop/configuration/DefaultConfigurationTestCase.java b/fop-core/src/test/java/org/apache/fop/configuration/DefaultConfigurationTestCase.java
index 2500998ea..58371d037 100644
--- a/fop-core/src/test/java/org/apache/fop/configuration/DefaultConfigurationTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/configuration/DefaultConfigurationTestCase.java
@@ -1,47 +1,46 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.fop.configuration;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-public class DefaultConfigurationTestCase {
-
- DefaultConfiguration configuration;
-
- @Before
- public void setup() throws Exception {
- DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder();
- configuration = builder.build(getClass().getResourceAsStream("sample_config.xml"));
- }
-
- @Test
- public void testGetChild() {
- Configuration fontsConfig = configuration.getChild("fonts");
- assertEquals("fonts element should be direct child", "fop/fonts", fontsConfig.getLocation());
- }
-
- @Test
- public void testGetChildren() {
- Configuration[] fontsConfig = configuration.getChildren("fonts");
- assertEquals("only direct children should match", 1, fontsConfig.length);
- assertEquals("fonts element should be direct child", "fop/fonts", fontsConfig[0].getLocation());
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.fop.configuration;
+
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
+public class DefaultConfigurationTestCase {
+
+ DefaultConfiguration configuration;
+
+ @Before
+ public void setup() throws Exception {
+ DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder();
+ configuration = builder.build(getClass().getResourceAsStream("sample_config.xml"));
+ }
+
+ @Test
+ public void testGetChild() {
+ Configuration fontsConfig = configuration.getChild("fonts");
+ assertEquals("fonts element should be direct child", "fop/fonts", fontsConfig.getLocation());
+ }
+
+ @Test
+ public void testGetChildren() {
+ Configuration[] fontsConfig = configuration.getChildren("fonts");
+ assertEquals("only direct children should match", 1, fontsConfig.length);
+ assertEquals("fonts element should be direct child", "fop/fonts", fontsConfig[0].getLocation());
+ }
+}
diff --git a/fop-core/src/test/java/org/apache/fop/datatypes/URISpecificationTestCase.java b/fop-core/src/test/java/org/apache/fop/datatypes/URISpecificationTestCase.java
index 159ad35fd..27752be17 100644
--- a/fop-core/src/test/java/org/apache/fop/datatypes/URISpecificationTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/datatypes/URISpecificationTestCase.java
@@ -20,7 +20,6 @@
package org.apache.fop.datatypes;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
/**
diff --git a/fop-core/src/test/java/org/apache/fop/events/FlowNamedNotMappedTestCase.java b/fop-core/src/test/java/org/apache/fop/events/FlowNamedNotMappedTestCase.java
index 3e6ba3aaf..8c35e5d45 100644
--- a/fop-core/src/test/java/org/apache/fop/events/FlowNamedNotMappedTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/events/FlowNamedNotMappedTestCase.java
@@ -30,7 +30,6 @@ import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.stream.StreamSource;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/fo/DelegatingFOEventHandlerTestCase.java b/fop-core/src/test/java/org/apache/fop/fo/DelegatingFOEventHandlerTestCase.java
index 226c551fb..e81493b00 100644
--- a/fop-core/src/test/java/org/apache/fop/fo/DelegatingFOEventHandlerTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fo/DelegatingFOEventHandlerTestCase.java
@@ -39,7 +39,6 @@ import org.junit.Test;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
-
import static org.junit.Assert.assertArrayEquals;
import org.apache.fop.apps.FOUserAgent;
diff --git a/fop-core/src/test/java/org/apache/fop/fo/flow/MarkersTestCase.java b/fop-core/src/test/java/org/apache/fop/fo/flow/MarkersTestCase.java
index 09a4e129c..c38fe3594 100644
--- a/fop-core/src/test/java/org/apache/fop/fo/flow/MarkersTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fo/flow/MarkersTestCase.java
@@ -23,7 +23,6 @@ import java.util.HashMap;
import java.util.Map;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
diff --git a/fop-core/src/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java b/fop-core/src/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java
index 2a512cf62..8dbdf65b7 100644
--- a/fop-core/src/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java
@@ -24,7 +24,6 @@ import java.util.Iterator;
import java.util.List;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import org.apache.fop.fo.Constants;
diff --git a/fop-core/src/test/java/org/apache/fop/fo/flow/table/HeaderColumnTestCase.java b/fop-core/src/test/java/org/apache/fop/fo/flow/table/HeaderColumnTestCase.java
index 01686745c..7ce9e079a 100644
--- a/fop-core/src/test/java/org/apache/fop/fo/flow/table/HeaderColumnTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fo/flow/table/HeaderColumnTestCase.java
@@ -23,7 +23,6 @@ import org.junit.Test;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.helpers.AttributesImpl;
-
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
diff --git a/fop-core/src/test/java/org/apache/fop/fo/flow/table/PrimaryGridUnitTestCase.java b/fop-core/src/test/java/org/apache/fop/fo/flow/table/PrimaryGridUnitTestCase.java
index 3633a8a4b..5bff9d57e 100644
--- a/fop-core/src/test/java/org/apache/fop/fo/flow/table/PrimaryGridUnitTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fo/flow/table/PrimaryGridUnitTestCase.java
@@ -23,7 +23,6 @@ import java.util.ArrayList;
import java.util.List;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/fop-core/src/test/java/org/apache/fop/fo/flow/table/RowGroupBuilderTestCase.java b/fop-core/src/test/java/org/apache/fop/fo/flow/table/RowGroupBuilderTestCase.java
index b669d9c11..7925ff921 100644
--- a/fop-core/src/test/java/org/apache/fop/fo/flow/table/RowGroupBuilderTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fo/flow/table/RowGroupBuilderTestCase.java
@@ -23,7 +23,6 @@ import java.util.Iterator;
import java.util.List;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
diff --git a/fop-core/src/test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java b/fop-core/src/test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java
index be049eac9..197b996e5 100644
--- a/fop-core/src/test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java
@@ -22,7 +22,6 @@ package org.apache.fop.fo.flow.table;
import java.util.Iterator;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import org.apache.fop.datatypes.PercentBaseContext;
diff --git a/fop-core/src/test/java/org/apache/fop/fo/pagination/LayoutMasterSetTestCase.java b/fop-core/src/test/java/org/apache/fop/fo/pagination/LayoutMasterSetTestCase.java
index cfe71f529..c993e24ce 100644
--- a/fop-core/src/test/java/org/apache/fop/fo/pagination/LayoutMasterSetTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fo/pagination/LayoutMasterSetTestCase.java
@@ -20,7 +20,6 @@
package org.apache.fop.fo.pagination;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import org.apache.fop.apps.FOUserAgent;
diff --git a/fop-core/src/test/java/org/apache/fop/fo/pagination/PageSequenceMasterTestCase.java b/fop-core/src/test/java/org/apache/fop/fo/pagination/PageSequenceMasterTestCase.java
index 584593e22..8f6935910 100644
--- a/fop-core/src/test/java/org/apache/fop/fo/pagination/PageSequenceMasterTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fo/pagination/PageSequenceMasterTestCase.java
@@ -21,7 +21,6 @@ package org.apache.fop.fo.pagination;
import org.junit.Test;
import org.xml.sax.Locator;
-
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
diff --git a/fop-core/src/test/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternativesTestCase.java b/fop-core/src/test/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternativesTestCase.java
index aed714c93..412a10bc1 100644
--- a/fop-core/src/test/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternativesTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternativesTestCase.java
@@ -20,7 +20,6 @@
package org.apache.fop.fo.pagination;
import org.junit.Test;
-
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
diff --git a/fop-core/src/test/java/org/apache/fop/fo/properties/AltTextHolderTestCase.java b/fop-core/src/test/java/org/apache/fop/fo/properties/AltTextHolderTestCase.java
index eae290be3..0abdb0a20 100644
--- a/fop-core/src/test/java/org/apache/fop/fo/properties/AltTextHolderTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fo/properties/AltTextHolderTestCase.java
@@ -20,7 +20,6 @@
package org.apache.fop.fo.properties;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/fop-core/src/test/java/org/apache/fop/fo/properties/CommonAccessibilityHolderTestCase.java b/fop-core/src/test/java/org/apache/fop/fo/properties/CommonAccessibilityHolderTestCase.java
index 008ab0580..c14b9c79f 100644
--- a/fop-core/src/test/java/org/apache/fop/fo/properties/CommonAccessibilityHolderTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fo/properties/CommonAccessibilityHolderTestCase.java
@@ -24,7 +24,6 @@ import java.util.ArrayList;
import java.util.List;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/fop-core/src/test/java/org/apache/fop/fo/properties/CommonHyphenationTestCase.java b/fop-core/src/test/java/org/apache/fop/fo/properties/CommonHyphenationTestCase.java
index 029146413..f91881f19 100644
--- a/fop-core/src/test/java/org/apache/fop/fo/properties/CommonHyphenationTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fo/properties/CommonHyphenationTestCase.java
@@ -22,7 +22,6 @@ package org.apache.fop.fo.properties;
import java.util.Locale;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
diff --git a/fop-core/src/test/java/org/apache/fop/fonts/CIDFullTestCase.java b/fop-core/src/test/java/org/apache/fop/fonts/CIDFullTestCase.java
index ed7a6b294..97eab42b9 100644
--- a/fop-core/src/test/java/org/apache/fop/fonts/CIDFullTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fonts/CIDFullTestCase.java
@@ -25,7 +25,6 @@ import java.util.Map;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/fonts/CIDSubsetTestCase.java b/fop-core/src/test/java/org/apache/fop/fonts/CIDSubsetTestCase.java
index b81964cf8..9addab002 100644
--- a/fop-core/src/test/java/org/apache/fop/fonts/CIDSubsetTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fonts/CIDSubsetTestCase.java
@@ -26,10 +26,8 @@ import java.util.Map;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/fop-core/src/test/java/org/apache/fop/fonts/DejaVuLGCSerifTestCase.java b/fop-core/src/test/java/org/apache/fop/fonts/DejaVuLGCSerifTestCase.java
index bf3da20c1..25a8462bd 100644
--- a/fop-core/src/test/java/org/apache/fop/fonts/DejaVuLGCSerifTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fonts/DejaVuLGCSerifTestCase.java
@@ -23,7 +23,6 @@ import java.io.File;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import org.apache.fop.apps.io.InternalResourceResolver;
diff --git a/fop-core/src/test/java/org/apache/fop/fonts/EmbedFontInfoTestCase.java b/fop-core/src/test/java/org/apache/fop/fonts/EmbedFontInfoTestCase.java
index 61f2bad7b..20a1bccfe 100644
--- a/fop-core/src/test/java/org/apache/fop/fonts/EmbedFontInfoTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fonts/EmbedFontInfoTestCase.java
@@ -25,7 +25,6 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/fonts/EncodingModeTestCase.java b/fop-core/src/test/java/org/apache/fop/fonts/EncodingModeTestCase.java
index 8cab9eb8b..8bc50767a 100644
--- a/fop-core/src/test/java/org/apache/fop/fonts/EncodingModeTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fonts/EncodingModeTestCase.java
@@ -20,7 +20,6 @@
package org.apache.fop.fonts;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
/**
diff --git a/fop-core/src/test/java/org/apache/fop/fonts/FontManagerConfiguratorTestCase.java b/fop-core/src/test/java/org/apache/fop/fonts/FontManagerConfiguratorTestCase.java
index d653171b7..450b8bf20 100644
--- a/fop-core/src/test/java/org/apache/fop/fonts/FontManagerConfiguratorTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fonts/FontManagerConfiguratorTestCase.java
@@ -26,14 +26,12 @@ import java.net.URI;
import org.junit.Before;
import org.junit.Test;
import org.xml.sax.SAXException;
-
import static org.junit.Assert.assertEquals;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FopConfBuilder;
import org.apache.fop.apps.FopConfParser;
import org.apache.fop.apps.FopFactory;
-
import static org.apache.fop.apps.FopConfParserTestCase.getFopFactory;
/**
diff --git a/fop-core/src/test/java/org/apache/fop/fonts/FontManagerTestCase.java b/fop-core/src/test/java/org/apache/fop/fonts/FontManagerTestCase.java
index 49a91aae9..68e23de60 100644
--- a/fop-core/src/test/java/org/apache/fop/fonts/FontManagerTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fonts/FontManagerTestCase.java
@@ -25,7 +25,6 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.InOrder;
-
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
diff --git a/fop-core/src/test/java/org/apache/fop/fonts/FontSelectorTestCase.java b/fop-core/src/test/java/org/apache/fop/fonts/FontSelectorTestCase.java
index 90671d59d..f928dd332 100644
--- a/fop-core/src/test/java/org/apache/fop/fonts/FontSelectorTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fonts/FontSelectorTestCase.java
@@ -28,7 +28,6 @@ import org.junit.Before;
import org.junit.Test;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
diff --git a/fop-core/src/test/java/org/apache/fop/fonts/autodetect/FontFileFinderTestCase.java b/fop-core/src/test/java/org/apache/fop/fonts/autodetect/FontFileFinderTestCase.java
index b4cbba3a6..7600839a7 100644
--- a/fop-core/src/test/java/org/apache/fop/fonts/autodetect/FontFileFinderTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fonts/autodetect/FontFileFinderTestCase.java
@@ -28,7 +28,6 @@ import java.nio.file.attribute.BasicFileAttributes;
import java.nio.file.spi.FileSystemProvider;
import org.junit.Test;
-
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
diff --git a/fop-core/src/test/java/org/apache/fop/fonts/cff/CFFDataReaderTestCase.java b/fop-core/src/test/java/org/apache/fop/fonts/cff/CFFDataReaderTestCase.java
index cb905e9ab..b87589ceb 100644
--- a/fop-core/src/test/java/org/apache/fop/fonts/cff/CFFDataReaderTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fonts/cff/CFFDataReaderTestCase.java
@@ -25,7 +25,6 @@ import java.util.Random;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import org.apache.fop.fonts.cff.CFFDataReader.CFFIndexData;
diff --git a/fop-core/src/test/java/org/apache/fop/fonts/truetype/FontFileReaderTestCase.java b/fop-core/src/test/java/org/apache/fop/fonts/truetype/FontFileReaderTestCase.java
index 5c1fec175..eef00b238 100644
--- a/fop-core/src/test/java/org/apache/fop/fonts/truetype/FontFileReaderTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fonts/truetype/FontFileReaderTestCase.java
@@ -27,7 +27,6 @@ import java.util.Arrays;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
diff --git a/fop-core/src/test/java/org/apache/fop/fonts/truetype/GlyfTableTestCase.java b/fop-core/src/test/java/org/apache/fop/fonts/truetype/GlyfTableTestCase.java
index 952c3ec1f..0ca861ea3 100644
--- a/fop-core/src/test/java/org/apache/fop/fonts/truetype/GlyfTableTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fonts/truetype/GlyfTableTestCase.java
@@ -29,7 +29,6 @@ import java.util.Map;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertTrue;
/**
diff --git a/fop-core/src/test/java/org/apache/fop/fonts/truetype/OTFFileTestCase.java b/fop-core/src/test/java/org/apache/fop/fonts/truetype/OTFFileTestCase.java
index 1f64f1baa..8b2ef6b7a 100644
--- a/fop-core/src/test/java/org/apache/fop/fonts/truetype/OTFFileTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fonts/truetype/OTFFileTestCase.java
@@ -25,7 +25,6 @@ import java.io.InputStream;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/fonts/truetype/OTFSubSetFileTestCase.java b/fop-core/src/test/java/org/apache/fop/fonts/truetype/OTFSubSetFileTestCase.java
index d0fba4cd8..f4555b226 100644
--- a/fop-core/src/test/java/org/apache/fop/fonts/truetype/OTFSubSetFileTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fonts/truetype/OTFSubSetFileTestCase.java
@@ -34,7 +34,6 @@ import java.util.Map;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
diff --git a/fop-core/src/test/java/org/apache/fop/fonts/truetype/TTFFileTestCase.java b/fop-core/src/test/java/org/apache/fop/fonts/truetype/TTFFileTestCase.java
index 089be2372..24b3b396d 100644
--- a/fop-core/src/test/java/org/apache/fop/fonts/truetype/TTFFileTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fonts/truetype/TTFFileTestCase.java
@@ -31,7 +31,6 @@ import java.util.Map;
import org.junit.Assert;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
diff --git a/fop-core/src/test/java/org/apache/fop/fonts/truetype/TTFFontLoaderTestCase.java b/fop-core/src/test/java/org/apache/fop/fonts/truetype/TTFFontLoaderTestCase.java
index e291b8e88..fdc4edd78 100644
--- a/fop-core/src/test/java/org/apache/fop/fonts/truetype/TTFFontLoaderTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fonts/truetype/TTFFontLoaderTestCase.java
@@ -24,7 +24,6 @@ import java.io.IOException;
import java.net.URI;
import org.junit.Test;
-
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/fonts/truetype/TTFSubSetFileTestCase.java b/fop-core/src/test/java/org/apache/fop/fonts/truetype/TTFSubSetFileTestCase.java
index ef0dff5d5..9b3a467b4 100644
--- a/fop-core/src/test/java/org/apache/fop/fonts/truetype/TTFSubSetFileTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fonts/truetype/TTFSubSetFileTestCase.java
@@ -26,7 +26,6 @@ import java.util.Map;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
/**
diff --git a/fop-core/src/test/java/org/apache/fop/fonts/truetype/TTFTableNameTestCase.java b/fop-core/src/test/java/org/apache/fop/fonts/truetype/TTFTableNameTestCase.java
index ac5ab3ddc..f44cf9946 100644
--- a/fop-core/src/test/java/org/apache/fop/fonts/truetype/TTFTableNameTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fonts/truetype/TTFTableNameTestCase.java
@@ -20,7 +20,6 @@
package org.apache.fop.fonts.truetype;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/fonts/type1/AFMParserTestCase.java b/fop-core/src/test/java/org/apache/fop/fonts/type1/AFMParserTestCase.java
index 31a613567..e54594090 100644
--- a/fop-core/src/test/java/org/apache/fop/fonts/type1/AFMParserTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fonts/type1/AFMParserTestCase.java
@@ -25,7 +25,6 @@ import java.io.InputStream;
import java.util.List;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/fonts/type1/AdobeStandardEncodingTestCase.java b/fop-core/src/test/java/org/apache/fop/fonts/type1/AdobeStandardEncodingTestCase.java
index a3a3e1c40..41ebb6753 100644
--- a/fop-core/src/test/java/org/apache/fop/fonts/type1/AdobeStandardEncodingTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fonts/type1/AdobeStandardEncodingTestCase.java
@@ -27,7 +27,6 @@ import java.io.InputStreamReader;
import org.junit.BeforeClass;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
/**
diff --git a/fop-core/src/test/java/org/apache/fop/fonts/type1/CharMetricsHandlerTestCase.java b/fop-core/src/test/java/org/apache/fop/fonts/type1/CharMetricsHandlerTestCase.java
index c3e9334dd..c5c9383a4 100644
--- a/fop-core/src/test/java/org/apache/fop/fonts/type1/CharMetricsHandlerTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fonts/type1/CharMetricsHandlerTestCase.java
@@ -26,7 +26,6 @@ import java.util.Map;
import java.util.Stack;
import org.junit.Test;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
diff --git a/fop-core/src/test/java/org/apache/fop/fonts/type1/PostscriptParserTestCase.java b/fop-core/src/test/java/org/apache/fop/fonts/type1/PostscriptParserTestCase.java
index 8686dc048..51d4b2866 100644
--- a/fop-core/src/test/java/org/apache/fop/fonts/type1/PostscriptParserTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fonts/type1/PostscriptParserTestCase.java
@@ -24,7 +24,6 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/fonts/type1/Type1SubsetFileTestCase.java b/fop-core/src/test/java/org/apache/fop/fonts/type1/Type1SubsetFileTestCase.java
index 3d7093bd3..8006f62c8 100644
--- a/fop-core/src/test/java/org/apache/fop/fonts/type1/Type1SubsetFileTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/fonts/type1/Type1SubsetFileTestCase.java
@@ -31,7 +31,6 @@ import java.util.List;
import java.util.Map;
import org.junit.Test;
-
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
diff --git a/fop-core/src/test/java/org/apache/fop/image/loader/batik/Graphics2DImagePainterImplTestCase.java b/fop-core/src/test/java/org/apache/fop/image/loader/batik/Graphics2DImagePainterImplTestCase.java
index 9a8fa4857..6ab42b8a6 100644
--- a/fop-core/src/test/java/org/apache/fop/image/loader/batik/Graphics2DImagePainterImplTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/image/loader/batik/Graphics2DImagePainterImplTestCase.java
@@ -25,7 +25,6 @@ import java.awt.image.BufferedImage;
import org.junit.Assert;
import org.junit.Test;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/fop-core/src/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java b/fop-core/src/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java
index 7f3036c24..e312dbb08 100644
--- a/fop-core/src/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java
@@ -25,7 +25,6 @@ import java.io.File;
import org.junit.Ignore;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
diff --git a/fop-core/src/test/java/org/apache/fop/image/loader/batik/ImagePreloaderTestCase.java b/fop-core/src/test/java/org/apache/fop/image/loader/batik/ImagePreloaderTestCase.java
index 3d690b67c..f701f58b2 100644
--- a/fop-core/src/test/java/org/apache/fop/image/loader/batik/ImagePreloaderTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/image/loader/batik/ImagePreloaderTestCase.java
@@ -24,7 +24,6 @@ import java.io.IOException;
import org.junit.Ignore;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
diff --git a/fop-core/src/test/java/org/apache/fop/intermediate/IFMimickingTestCase.java b/fop-core/src/test/java/org/apache/fop/intermediate/IFMimickingTestCase.java
index 83dd88661..042a6e4d4 100644
--- a/fop-core/src/test/java/org/apache/fop/intermediate/IFMimickingTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/intermediate/IFMimickingTestCase.java
@@ -31,7 +31,6 @@ import javax.xml.transform.stream.StreamSource;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.fail;
import org.apache.fop.apps.FOPException;
diff --git a/fop-core/src/test/java/org/apache/fop/layoutengine/LayoutEngineTestCase.java b/fop-core/src/test/java/org/apache/fop/layoutengine/LayoutEngineTestCase.java
index 57607e475..e8ee3b8ac 100644
--- a/fop-core/src/test/java/org/apache/fop/layoutengine/LayoutEngineTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/layoutengine/LayoutEngineTestCase.java
@@ -50,7 +50,6 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
diff --git a/fop-core/src/test/java/org/apache/fop/layoutmgr/BreakElementTestCase.java b/fop-core/src/test/java/org/apache/fop/layoutmgr/BreakElementTestCase.java
index c836bce7c..79c0450af 100644
--- a/fop-core/src/test/java/org/apache/fop/layoutmgr/BreakElementTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/layoutmgr/BreakElementTestCase.java
@@ -18,7 +18,6 @@
package org.apache.fop.layoutmgr;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import org.apache.fop.fo.Constants;
diff --git a/fop-core/src/test/java/org/apache/fop/layoutmgr/PageSequenceLayoutManagerTestCase.java b/fop-core/src/test/java/org/apache/fop/layoutmgr/PageSequenceLayoutManagerTestCase.java
index f4ebc010c..06a2b24ba 100644
--- a/fop-core/src/test/java/org/apache/fop/layoutmgr/PageSequenceLayoutManagerTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/layoutmgr/PageSequenceLayoutManagerTestCase.java
@@ -20,7 +20,6 @@
package org.apache.fop.layoutmgr;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock;
diff --git a/fop-core/src/test/java/org/apache/fop/layoutmgr/RetrieveTableMarkerLayoutManagerMakerTestCase.java b/fop-core/src/test/java/org/apache/fop/layoutmgr/RetrieveTableMarkerLayoutManagerMakerTestCase.java
index b0d0181e3..bab737506 100644
--- a/fop-core/src/test/java/org/apache/fop/layoutmgr/RetrieveTableMarkerLayoutManagerMakerTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/layoutmgr/RetrieveTableMarkerLayoutManagerMakerTestCase.java
@@ -23,7 +23,6 @@ import java.util.ArrayList;
import java.util.List;
import org.junit.Test;
-
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/fop-core/src/test/java/org/apache/fop/layoutmgr/RetrieveTableMarkerLayoutManagerTestCase.java b/fop-core/src/test/java/org/apache/fop/layoutmgr/RetrieveTableMarkerLayoutManagerTestCase.java
index fda9cbccb..3637890d7 100644
--- a/fop-core/src/test/java/org/apache/fop/layoutmgr/RetrieveTableMarkerLayoutManagerTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/layoutmgr/RetrieveTableMarkerLayoutManagerTestCase.java
@@ -23,7 +23,6 @@ import java.util.ArrayList;
import java.util.List;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.mockito.Mockito.mock;
diff --git a/fop-core/src/test/java/org/apache/fop/layoutmgr/table/TableCellLayoutManagerTestCase.java b/fop-core/src/test/java/org/apache/fop/layoutmgr/table/TableCellLayoutManagerTestCase.java
index 629e5f1c6..2d5df384f 100644
--- a/fop-core/src/test/java/org/apache/fop/layoutmgr/table/TableCellLayoutManagerTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/layoutmgr/table/TableCellLayoutManagerTestCase.java
@@ -22,7 +22,6 @@ package org.apache.fop.layoutmgr.table;
import java.awt.Color;
import org.junit.Test;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
diff --git a/fop-core/src/test/java/org/apache/fop/layoutmgr/table/TableContentLayoutManagerTestCase.java b/fop-core/src/test/java/org/apache/fop/layoutmgr/table/TableContentLayoutManagerTestCase.java
index 2bc41979c..6a386b398 100644
--- a/fop-core/src/test/java/org/apache/fop/layoutmgr/table/TableContentLayoutManagerTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/layoutmgr/table/TableContentLayoutManagerTestCase.java
@@ -20,7 +20,6 @@
package org.apache.fop.layoutmgr.table;
import org.junit.Test;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
diff --git a/fop-core/src/test/java/org/apache/fop/layoutmgr/table/TableLayoutManagerTestCase.java b/fop-core/src/test/java/org/apache/fop/layoutmgr/table/TableLayoutManagerTestCase.java
index 46a394eb7..34586d16c 100644
--- a/fop-core/src/test/java/org/apache/fop/layoutmgr/table/TableLayoutManagerTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/layoutmgr/table/TableLayoutManagerTestCase.java
@@ -22,7 +22,6 @@ package org.apache.fop.layoutmgr.table;
import java.util.HashMap;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.mockito.Mockito.mock;
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/AbstractPDFStreamTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/AbstractPDFStreamTestCase.java
index ae68cbeb7..1e1015863 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/AbstractPDFStreamTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/AbstractPDFStreamTestCase.java
@@ -25,7 +25,6 @@ import java.io.OutputStream;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
/**
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/FileIDGeneratorTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/FileIDGeneratorTestCase.java
index 3301fff9e..11f87a341 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/FileIDGeneratorTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/FileIDGeneratorTestCase.java
@@ -28,7 +28,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/ObjectStreamManagerTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/ObjectStreamManagerTestCase.java
index fda1a006e..59568d124 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/ObjectStreamManagerTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/ObjectStreamManagerTestCase.java
@@ -24,7 +24,6 @@ import java.io.OutputStream;
import java.util.List;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/ObjectStreamTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/ObjectStreamTestCase.java
index a38df70a0..85d6b4584 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/ObjectStreamTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/ObjectStreamTestCase.java
@@ -26,7 +26,6 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
public class ObjectStreamTestCase {
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFAModeTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFAModeTestCase.java
index 68609575a..cd5f51090 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFAModeTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFAModeTestCase.java
@@ -20,7 +20,6 @@
package org.apache.fop.pdf;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFArrayTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFArrayTestCase.java
index 9d1f17210..75f561f7f 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFArrayTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFArrayTestCase.java
@@ -25,7 +25,6 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java
index b2da349fc..63509c211 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java
@@ -24,7 +24,6 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFDocumentGraphics2DTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFDocumentGraphics2DTestCase.java
index 1678d32d2..0d05f12dd 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFDocumentGraphics2DTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFDocumentGraphics2DTestCase.java
@@ -25,7 +25,6 @@ import java.awt.Font;
import java.awt.Graphics2D;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFDocumentTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFDocumentTestCase.java
index e58201f13..5bfbac704 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFDocumentTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFDocumentTestCase.java
@@ -23,7 +23,6 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
/**
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFEncodingTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFEncodingTestCase.java
index 2f80b077c..f5d68018c 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFEncodingTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFEncodingTestCase.java
@@ -18,7 +18,6 @@
package org.apache.fop.pdf;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFEncryptionJCETestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFEncryptionJCETestCase.java
index d3345a893..6dc466bed 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFEncryptionJCETestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFEncryptionJCETestCase.java
@@ -39,7 +39,6 @@ import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
import org.junit.Test;
-
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFFileSpecTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFFileSpecTestCase.java
index b21b5c0ca..a04c64084 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFFileSpecTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFFileSpecTestCase.java
@@ -1,37 +1,36 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* $Id: PDFFactoryTestCase.java 1823552 2018-02-08 12:26:33Z ssteiner $ */
-
-package org.apache.fop.pdf;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-public class PDFFileSpecTestCase {
-
- @Test
- public void testPDFFileSpec() {
- String germanAe = "\u00E4";
- String filename = "test";
- String unicodeFilename = "t" + germanAe + "st";
- PDFFileSpec fileSpec = new PDFFileSpec(filename, unicodeFilename);
- assertEquals(fileSpec.getUnicodeFilename(), unicodeFilename);
- assertEquals(fileSpec.getFilename(), filename);
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id: PDFFactoryTestCase.java 1823552 2018-02-08 12:26:33Z ssteiner $ */
+
+package org.apache.fop.pdf;
+
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
+public class PDFFileSpecTestCase {
+
+ @Test
+ public void testPDFFileSpec() {
+ String germanAe = "\u00E4";
+ String filename = "test";
+ String unicodeFilename = "t" + germanAe + "st";
+ PDFFileSpec fileSpec = new PDFFileSpec(filename, unicodeFilename);
+ assertEquals(fileSpec.getUnicodeFilename(), unicodeFilename);
+ assertEquals(fileSpec.getFilename(), filename);
+ }
+}
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFFilterListTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFFilterListTestCase.java
index d1cc6273d..3f84e1796 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFFilterListTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFFilterListTestCase.java
@@ -20,7 +20,6 @@
package org.apache.fop.pdf;
import org.junit.Test;
-
import static org.junit.Assert.assertFalse;
public class PDFFilterListTestCase {
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFGoToTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFGoToTestCase.java
index 2da46316e..f5ba09101 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFGoToTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFGoToTestCase.java
@@ -1,34 +1,34 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.fop.pdf;
-
-import org.junit.Test;
-
-import static junit.framework.TestCase.assertEquals;
-
-public class PDFGoToTestCase {
-
- @Test
- public void test() {
- PDFGoTo pdfGoTo = new PDFGoTo("destination", true);
- String expected = "<< /Type /Action\n"
- + "/S /GoTo\n/D (destination)\n"
- + ">>";
- assertEquals(expected, pdfGoTo.toPDFString());
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.fop.pdf;
+
+import org.junit.Test;
+
+import static junit.framework.TestCase.assertEquals;
+
+public class PDFGoToTestCase {
+
+ @Test
+ public void test() {
+ PDFGoTo pdfGoTo = new PDFGoTo("destination", true);
+ String expected = "<< /Type /Action\n"
+ + "/S /GoTo\n/D (destination)\n"
+ + ">>";
+ assertEquals(expected, pdfGoTo.toPDFString());
+ }
+}
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFImageXObjectTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFImageXObjectTestCase.java
index 0f21b0439..5c7ae01e9 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFImageXObjectTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFImageXObjectTestCase.java
@@ -23,7 +23,6 @@ import java.awt.image.IndexColorModel;
import java.awt.image.RenderedImage;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFJavaScriptLaunchActionTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFJavaScriptLaunchActionTestCase.java
index 95f93430d..95a7ef9ea 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFJavaScriptLaunchActionTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFJavaScriptLaunchActionTestCase.java
@@ -18,7 +18,6 @@
package org.apache.fop.pdf;
import org.junit.Test;
-
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFLinkTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFLinkTestCase.java
index 2d2e8110c..ef405b35e 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFLinkTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFLinkTestCase.java
@@ -27,7 +27,6 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-
import static java.util.regex.Pattern.quote;
import javax.xml.transform.stream.StreamResult;
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFNameTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFNameTestCase.java
index 8d7321496..af934b804 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFNameTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFNameTestCase.java
@@ -24,7 +24,6 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFNullTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFNullTestCase.java
index 87dacc7f6..affda4227 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFNullTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFNullTestCase.java
@@ -23,7 +23,6 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
/**
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFNumberTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFNumberTestCase.java
index 65f484dc7..439f9b6ae 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFNumberTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFNumberTestCase.java
@@ -23,7 +23,6 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFObjectTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFObjectTestCase.java
index 544352438..b113e12b4 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFObjectTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFObjectTestCase.java
@@ -24,7 +24,6 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFPageLabelsTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFPageLabelsTestCase.java
index a8be7ee74..429a38a8a 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFPageLabelsTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFPageLabelsTestCase.java
@@ -23,7 +23,6 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFPagePieceTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFPagePieceTestCase.java
index 023463630..158be2c79 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFPagePieceTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFPagePieceTestCase.java
@@ -27,7 +27,6 @@ import javax.xml.transform.stream.StreamResult;
import org.junit.Assert;
import org.junit.Test;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -41,8 +40,6 @@ import org.apache.fop.render.pdf.extensions.PDFDictionaryAttachment;
import org.apache.fop.render.pdf.extensions.PDFDictionaryExtension;
import org.apache.fop.render.pdf.extensions.PDFDictionaryType;
-
-
public class PDFPagePieceTestCase {
@Test
public void testPDF() throws IFException {
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFParentTreeTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFParentTreeTestCase.java
index acb888e4e..fdaa40349 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFParentTreeTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFParentTreeTestCase.java
@@ -21,7 +21,6 @@ package org.apache.fop.pdf;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.spy;
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFRectangleTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFRectangleTestCase.java
index ed87cd23e..ab136a751 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFRectangleTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFRectangleTestCase.java
@@ -24,7 +24,6 @@ import java.io.IOException;
import java.io.OutputStream;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
/**
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFReferenceTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFReferenceTestCase.java
index 4e0e8814d..b958457a8 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFReferenceTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFReferenceTestCase.java
@@ -23,7 +23,6 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
/**
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFResourcesTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFResourcesTestCase.java
index c5fc6593b..2866cb5b6 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFResourcesTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFResourcesTestCase.java
@@ -1,192 +1,191 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* $Id: PDFReferenceTestCase.java 1551536 2013-12-17 13:15:06Z vhennebert $ */
-
-package org.apache.fop.pdf;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertTrue;
-
-/**
- * Test case for {@link PDFResources}.
- */
-public class PDFResourcesTestCase {
-
- private AtomicInteger patternCount = new AtomicInteger(0);
- private AtomicInteger objectNummerCount = new AtomicInteger(0);
-
- /**
- * Test PDF resources output with color space, pattern and shading.
- * @throws IOException
- */
- @Test
- public void testOutput() throws IOException {
- PDFDocument pdfDoc = new PDFDocument(null);
- PDFResources res = new PDFResources(pdfDoc);
- res.addColorSpace(this.createColorSpace());
- PDFResourceContext context = new PDFResourceContext(res);
-
- context.addPattern(this.createPDFPattern(res, pdfDoc));
- context.addShading(this.createPDFShading(res, pdfDoc));
-
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- res.output(baos);
-
- String expectedShading = "/Shading << /Sh2 4 0 R >>";
- String expectedPattern = "/Pattern << /Pa1 2 0 R >>\n";
- String expectedColorspace = "/ColorSpace << /cs1 [/Separation /cs1 /DeviceRGB 1 0 R] >>\n";
-
- String outputString = baos.toString();
-
- assertTrue(outputString.contains(expectedShading));
- assertTrue(outputString.contains(expectedPattern));
- assertTrue(outputString.contains(expectedColorspace));
- }
-
- /**
- * Test PDF resources output with color space, pattern and shading,
- * if the PDF resource object has a parent resource object.
- * @throws IOException
- */
- @Test
- public void testOutputWithParent() throws IOException {
- PDFDocument pdfDoc = new PDFDocument(null);
- PDFResources res = new PDFResources(pdfDoc);
- PDFResources resParent = new PDFResources(pdfDoc);
- res.setParentResources(resParent);
- resParent.addColorSpace(this.createColorSpace());
- PDFResourceContext context = new PDFResourceContext(resParent);
-
- context.addPattern(this.createPDFPattern(resParent, pdfDoc));
- context.addShading(this.createPDFShading(resParent, pdfDoc));
-
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- res.output(baos);
-
- String expectedShading = "/Shading << /Sh2 4 0 R >>";
- String expectedPattern = "/Pattern << /Pa1 2 0 R >>\n";
- String expectedColorspace = "/ColorSpace << /cs1 [/Separation /cs1 /DeviceRGB 1 0 R] >>\n";
-
- String outputString = baos.toString();
-
- assertTrue(outputString.contains(expectedShading));
- assertTrue(outputString.contains(expectedPattern));
- assertTrue(outputString.contains(expectedColorspace));
- }
-
- /**
- * Test PDF resources output with color space, pattern and shading,
- * if the PDF resource object has a parent resource object, that also has
- * color spaces, patterns and shadings.
- * @throws IOException
- */
- @Test
- public void testOutputWithParent2() throws IOException {
- PDFDocument pdfDoc = new PDFDocument(null);
- PDFResources res = new PDFResources(pdfDoc);
- PDFDictionary shadingDict = new PDFDictionary();
- shadingDict.put("Sh1-1718006973", new PDFReference("9 0 R"));
- res.put("Shading", shadingDict);
- PDFDictionary patternDict = new PDFDictionary();
- patternDict.put("Pa1-1718006973", new PDFReference("10 0 R"));
- res.put("Pattern", patternDict);
- PDFDictionary colorSpaceDict = new PDFDictionary();
- colorSpaceDict.put("DefaultRGB", new PDFReference("11 0 R"));
- res.put("ColorSpace", colorSpaceDict);
- PDFResources resParent = new PDFResources(pdfDoc);
- res.setParentResources(resParent);
- resParent.addColorSpace(this.createColorSpace());
- PDFResourceContext context = new PDFResourceContext(resParent);
-
- context.addPattern(this.createPDFPattern(resParent, pdfDoc));
- context.addShading(this.createPDFShading(resParent, pdfDoc));
-
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- res.output(baos);
-
- String outputString = baos.toString();
-
- String expectedShading = "/Shading << /Sh1-1718006973 9 0 R /Sh2 4 0 R >>";
- String expectedPattern = "/Shading << /Sh1-1718006973 9 0 R /Sh2 4 0 R >>";
- String expectedColorspace = "/ColorSpace << /DefaultRGB 11 0 R"
- + " /cs1 [/Separation /cs1 /DeviceRGB 1 0 R] >>";
-
- assertTrue(outputString.contains(expectedShading));
- assertTrue(outputString.contains(expectedPattern));
- assertTrue(outputString.contains(expectedColorspace));
- }
-
- private PDFShading createPDFShading(PDFResources res, PDFDocument pdfDoc) {
- List<Double> coords = new ArrayList<Double>(4);
- coords.add(1d);
- coords.add(1d);
- coords.add(1d);
- coords.add(1d);
- PDFFunction pdfFunction = createPDFFunction();
- PDFDeviceColorSpace deviceColorspace = new PDFDeviceColorSpace(PDFDeviceColorSpace.DEVICE_RGB);
- PDFShading shading = new PDFShading(2, deviceColorspace, coords, pdfFunction);
- shading.setObjectNumber(objectNummerCount.incrementAndGet());
- shading.setDocument(pdfDoc);
- shading.setName("Sh" + patternCount.incrementAndGet());
- return shading;
- }
-
- private PDFColorSpace createColorSpace() {
- PDFFunction tintFunction = createPDFFunction();
- return new PDFSeparationColorSpace("cs1", tintFunction);
- }
-
- private PDFFunction createPDFFunction() {
- final Double zero = 0d;
- final Double one = 1d;
- List<Double> domain = Arrays.asList(new Double[] {zero, one});
- List<Double> range = Arrays.asList(new Double[] {zero, one, zero, one, zero, one});
- float[] cZero = new float[] {1f, 1f, 1f};
- float[] cOne = {0f, 0f, 0f};
- PDFFunction tintFunction = new PDFFunction(domain, range, cZero, cOne, 1.0d);
- tintFunction.setObjectNumber(objectNummerCount.incrementAndGet());
- return tintFunction;
- }
-
- private PDFPattern createPDFPattern(PDFResources res, PDFDocument pdfDoc) {
- List<Double> bbox = new ArrayList<Double>();
- bbox.add(1d);
- bbox.add(1d);
- bbox.add(1d);
- bbox.add(1d);
- List<Double> theMatrix = new ArrayList<Double>();
- for (int i = 0; i < 6; i++) {
- theMatrix.add(1d);
- }
-
- PDFPattern pattern = new PDFPattern(res, 1, 1, 1, bbox, 1, 1, theMatrix, null,
- new StringBuffer());
- pattern.setObjectNumber(objectNummerCount.incrementAndGet());
- pattern.setDocument(pdfDoc);
- pattern.setName("Pa" + patternCount.incrementAndGet());
- return pattern;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id: PDFReferenceTestCase.java 1551536 2013-12-17 13:15:06Z vhennebert $ */
+
+package org.apache.fop.pdf;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Test case for {@link PDFResources}.
+ */
+public class PDFResourcesTestCase {
+
+ private AtomicInteger patternCount = new AtomicInteger(0);
+ private AtomicInteger objectNummerCount = new AtomicInteger(0);
+
+ /**
+ * Test PDF resources output with color space, pattern and shading.
+ * @throws IOException
+ */
+ @Test
+ public void testOutput() throws IOException {
+ PDFDocument pdfDoc = new PDFDocument(null);
+ PDFResources res = new PDFResources(pdfDoc);
+ res.addColorSpace(this.createColorSpace());
+ PDFResourceContext context = new PDFResourceContext(res);
+
+ context.addPattern(this.createPDFPattern(res, pdfDoc));
+ context.addShading(this.createPDFShading(res, pdfDoc));
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ res.output(baos);
+
+ String expectedShading = "/Shading << /Sh2 4 0 R >>";
+ String expectedPattern = "/Pattern << /Pa1 2 0 R >>\n";
+ String expectedColorspace = "/ColorSpace << /cs1 [/Separation /cs1 /DeviceRGB 1 0 R] >>\n";
+
+ String outputString = baos.toString();
+
+ assertTrue(outputString.contains(expectedShading));
+ assertTrue(outputString.contains(expectedPattern));
+ assertTrue(outputString.contains(expectedColorspace));
+ }
+
+ /**
+ * Test PDF resources output with color space, pattern and shading,
+ * if the PDF resource object has a parent resource object.
+ * @throws IOException
+ */
+ @Test
+ public void testOutputWithParent() throws IOException {
+ PDFDocument pdfDoc = new PDFDocument(null);
+ PDFResources res = new PDFResources(pdfDoc);
+ PDFResources resParent = new PDFResources(pdfDoc);
+ res.setParentResources(resParent);
+ resParent.addColorSpace(this.createColorSpace());
+ PDFResourceContext context = new PDFResourceContext(resParent);
+
+ context.addPattern(this.createPDFPattern(resParent, pdfDoc));
+ context.addShading(this.createPDFShading(resParent, pdfDoc));
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ res.output(baos);
+
+ String expectedShading = "/Shading << /Sh2 4 0 R >>";
+ String expectedPattern = "/Pattern << /Pa1 2 0 R >>\n";
+ String expectedColorspace = "/ColorSpace << /cs1 [/Separation /cs1 /DeviceRGB 1 0 R] >>\n";
+
+ String outputString = baos.toString();
+
+ assertTrue(outputString.contains(expectedShading));
+ assertTrue(outputString.contains(expectedPattern));
+ assertTrue(outputString.contains(expectedColorspace));
+ }
+
+ /**
+ * Test PDF resources output with color space, pattern and shading,
+ * if the PDF resource object has a parent resource object, that also has
+ * color spaces, patterns and shadings.
+ * @throws IOException
+ */
+ @Test
+ public void testOutputWithParent2() throws IOException {
+ PDFDocument pdfDoc = new PDFDocument(null);
+ PDFResources res = new PDFResources(pdfDoc);
+ PDFDictionary shadingDict = new PDFDictionary();
+ shadingDict.put("Sh1-1718006973", new PDFReference("9 0 R"));
+ res.put("Shading", shadingDict);
+ PDFDictionary patternDict = new PDFDictionary();
+ patternDict.put("Pa1-1718006973", new PDFReference("10 0 R"));
+ res.put("Pattern", patternDict);
+ PDFDictionary colorSpaceDict = new PDFDictionary();
+ colorSpaceDict.put("DefaultRGB", new PDFReference("11 0 R"));
+ res.put("ColorSpace", colorSpaceDict);
+ PDFResources resParent = new PDFResources(pdfDoc);
+ res.setParentResources(resParent);
+ resParent.addColorSpace(this.createColorSpace());
+ PDFResourceContext context = new PDFResourceContext(resParent);
+
+ context.addPattern(this.createPDFPattern(resParent, pdfDoc));
+ context.addShading(this.createPDFShading(resParent, pdfDoc));
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ res.output(baos);
+
+ String outputString = baos.toString();
+
+ String expectedShading = "/Shading << /Sh1-1718006973 9 0 R /Sh2 4 0 R >>";
+ String expectedPattern = "/Shading << /Sh1-1718006973 9 0 R /Sh2 4 0 R >>";
+ String expectedColorspace = "/ColorSpace << /DefaultRGB 11 0 R"
+ + " /cs1 [/Separation /cs1 /DeviceRGB 1 0 R] >>";
+
+ assertTrue(outputString.contains(expectedShading));
+ assertTrue(outputString.contains(expectedPattern));
+ assertTrue(outputString.contains(expectedColorspace));
+ }
+
+ private PDFShading createPDFShading(PDFResources res, PDFDocument pdfDoc) {
+ List<Double> coords = new ArrayList<Double>(4);
+ coords.add(1d);
+ coords.add(1d);
+ coords.add(1d);
+ coords.add(1d);
+ PDFFunction pdfFunction = createPDFFunction();
+ PDFDeviceColorSpace deviceColorspace = new PDFDeviceColorSpace(PDFDeviceColorSpace.DEVICE_RGB);
+ PDFShading shading = new PDFShading(2, deviceColorspace, coords, pdfFunction);
+ shading.setObjectNumber(objectNummerCount.incrementAndGet());
+ shading.setDocument(pdfDoc);
+ shading.setName("Sh" + patternCount.incrementAndGet());
+ return shading;
+ }
+
+ private PDFColorSpace createColorSpace() {
+ PDFFunction tintFunction = createPDFFunction();
+ return new PDFSeparationColorSpace("cs1", tintFunction);
+ }
+
+ private PDFFunction createPDFFunction() {
+ final Double zero = 0d;
+ final Double one = 1d;
+ List<Double> domain = Arrays.asList(new Double[] {zero, one});
+ List<Double> range = Arrays.asList(new Double[] {zero, one, zero, one, zero, one});
+ float[] cZero = new float[] {1f, 1f, 1f};
+ float[] cOne = {0f, 0f, 0f};
+ PDFFunction tintFunction = new PDFFunction(domain, range, cZero, cOne, 1.0d);
+ tintFunction.setObjectNumber(objectNummerCount.incrementAndGet());
+ return tintFunction;
+ }
+
+ private PDFPattern createPDFPattern(PDFResources res, PDFDocument pdfDoc) {
+ List<Double> bbox = new ArrayList<Double>();
+ bbox.add(1d);
+ bbox.add(1d);
+ bbox.add(1d);
+ bbox.add(1d);
+ List<Double> theMatrix = new ArrayList<Double>();
+ for (int i = 0; i < 6; i++) {
+ theMatrix.add(1d);
+ }
+
+ PDFPattern pattern = new PDFPattern(res, 1, 1, 1, bbox, 1, 1, theMatrix, null,
+ new StringBuffer());
+ pattern.setObjectNumber(objectNummerCount.incrementAndGet());
+ pattern.setDocument(pdfDoc);
+ pattern.setName("Pa" + patternCount.incrementAndGet());
+ return pattern;
+ }
+}
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFStreamTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFStreamTestCase.java
index 5eda9cb7b..577ec7113 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFStreamTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFStreamTestCase.java
@@ -24,7 +24,6 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFToUnicodeCMapTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFToUnicodeCMapTestCase.java
index 67af746db..70545d327 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFToUnicodeCMapTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFToUnicodeCMapTestCase.java
@@ -29,7 +29,6 @@ import java.util.Set;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFVTTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFVTTestCase.java
index 312750f36..df9a6180c 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFVTTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFVTTestCase.java
@@ -39,7 +39,6 @@ import javax.xml.transform.stream.StreamSource;
import org.junit.Assert;
import org.junit.Test;
-
import org.xml.sax.SAXException;
import org.apache.xmlgraphics.util.QName;
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/TableHeaderScopeTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/TableHeaderScopeTestCase.java
index 15537a839..c8f3fdbd6 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/TableHeaderScopeTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/TableHeaderScopeTestCase.java
@@ -22,7 +22,6 @@ package org.apache.fop.pdf;
import org.junit.Test;
import org.mockito.ArgumentMatcher;
import org.mockito.verification.VerificationMode;
-
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.argThat;
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/VersionControllerTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/VersionControllerTestCase.java
index 383208405..3238cda62 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/VersionControllerTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/VersionControllerTestCase.java
@@ -21,7 +21,6 @@ package org.apache.fop.pdf;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/VersionTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/VersionTestCase.java
index ef01b6489..108a288e5 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/VersionTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/VersionTestCase.java
@@ -20,7 +20,6 @@
package org.apache.fop.pdf;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/xref/CompressedObjectReferenceTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/xref/CompressedObjectReferenceTestCase.java
index b58d2f93e..4c9c9bf9b 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/xref/CompressedObjectReferenceTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/xref/CompressedObjectReferenceTestCase.java
@@ -24,7 +24,6 @@ import java.util.Arrays;
import java.util.List;
import org.junit.Test;
-
import static org.junit.Assert.assertArrayEquals;
import org.apache.fop.pdf.PDFObjectNumber;
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/xref/CrossReferenceObjectTest.java b/fop-core/src/test/java/org/apache/fop/pdf/xref/CrossReferenceObjectTest.java
index 513f0d754..96c51e2dc 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/xref/CrossReferenceObjectTest.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/xref/CrossReferenceObjectTest.java
@@ -29,7 +29,6 @@ import java.util.List;
import java.util.Map;
import org.junit.Before;
-
import static org.junit.Assert.assertArrayEquals;
import org.apache.fop.pdf.PDFDocument;
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/xref/UncompressedObjectReferenceTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/xref/UncompressedObjectReferenceTestCase.java
index a9f506aaa..d414d9342 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/xref/UncompressedObjectReferenceTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/xref/UncompressedObjectReferenceTestCase.java
@@ -25,7 +25,6 @@ import java.util.Arrays;
import java.util.List;
import org.junit.Test;
-
import static org.junit.Assert.assertArrayEquals;
public class UncompressedObjectReferenceTestCase extends ObjectReferenceTest {
diff --git a/fop-core/src/test/java/org/apache/fop/render/AbstractPathOrientedRendererTestCase.java b/fop-core/src/test/java/org/apache/fop/render/AbstractPathOrientedRendererTestCase.java
index b7ab64fcf..1df0f662e 100644
--- a/fop-core/src/test/java/org/apache/fop/render/AbstractPathOrientedRendererTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/AbstractPathOrientedRendererTestCase.java
@@ -28,7 +28,6 @@ import java.util.Map;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
diff --git a/fop-core/src/test/java/org/apache/fop/render/ConserveMemoryTestCase.java b/fop-core/src/test/java/org/apache/fop/render/ConserveMemoryTestCase.java
index b8bca13e4..fcf6b946c 100644
--- a/fop-core/src/test/java/org/apache/fop/render/ConserveMemoryTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/ConserveMemoryTestCase.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.fop.render;
import java.io.ByteArrayInputStream;
@@ -32,7 +33,6 @@ import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.stream.StreamSource;
import org.junit.Test;
-
import org.xml.sax.SAXException;
import org.apache.fop.apps.FOUserAgent;
diff --git a/fop-core/src/test/java/org/apache/fop/render/RendererFactoryTestCase.java b/fop-core/src/test/java/org/apache/fop/render/RendererFactoryTestCase.java
index 90afb97cd..47b4fd6aa 100644
--- a/fop-core/src/test/java/org/apache/fop/render/RendererFactoryTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/RendererFactoryTestCase.java
@@ -22,7 +22,6 @@ package org.apache.fop.render;
import java.io.File;
import org.junit.Test;
-
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
diff --git a/fop-core/src/test/java/org/apache/fop/render/afp/AFPBorderPainterTestCase.java b/fop-core/src/test/java/org/apache/fop/render/afp/AFPBorderPainterTestCase.java
index 5354e985d..86db98696 100644
--- a/fop-core/src/test/java/org/apache/fop/render/afp/AFPBorderPainterTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/afp/AFPBorderPainterTestCase.java
@@ -25,7 +25,6 @@ import java.io.OutputStream;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/render/afp/AFPImageHandlerSVGTestCase.java b/fop-core/src/test/java/org/apache/fop/render/afp/AFPImageHandlerSVGTestCase.java
index 61fb20730..8cc422cb8 100644
--- a/fop-core/src/test/java/org/apache/fop/render/afp/AFPImageHandlerSVGTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/afp/AFPImageHandlerSVGTestCase.java
@@ -31,7 +31,6 @@ import java.util.HashMap;
import org.junit.Assert;
import org.junit.Test;
-
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
diff --git a/fop-core/src/test/java/org/apache/fop/render/afp/AFPPainterTestCase.java b/fop-core/src/test/java/org/apache/fop/render/afp/AFPPainterTestCase.java
index 29c478cc2..d729b7eee 100644
--- a/fop-core/src/test/java/org/apache/fop/render/afp/AFPPainterTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/afp/AFPPainterTestCase.java
@@ -38,7 +38,6 @@ import javax.xml.transform.stream.StreamResult;
import org.junit.Assert;
import org.junit.Test;
-
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.mock;
diff --git a/fop-core/src/test/java/org/apache/fop/render/afp/AFPRendererConfigParserTestCase.java b/fop-core/src/test/java/org/apache/fop/render/afp/AFPRendererConfigParserTestCase.java
index 5ea2d49e5..de4b5ac74 100644
--- a/fop-core/src/test/java/org/apache/fop/render/afp/AFPRendererConfigParserTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/afp/AFPRendererConfigParserTestCase.java
@@ -24,7 +24,6 @@ import java.util.HashMap;
import java.util.Map;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -36,7 +35,6 @@ import org.apache.fop.apps.AFPRendererConfBuilder;
import org.apache.fop.apps.AbstractRendererConfigParserTester;
import org.apache.fop.render.afp.AFPRendererConfig.AFPRendererConfigParser;
import org.apache.fop.render.afp.AFPRendererConfig.ImagesModeOptions;
-
import static org.apache.fop.render.afp.AFPRendererConfig.ImagesModeOptions.MODE_COLOR;
import static org.apache.fop.render.afp.AFPRendererConfig.ImagesModeOptions.MODE_GRAYSCALE;
diff --git a/fop-core/src/test/java/org/apache/fop/render/afp/AFPRendererConfiguratorTestCase.java b/fop-core/src/test/java/org/apache/fop/render/afp/AFPRendererConfiguratorTestCase.java
index e02e746d5..ff85a14e2 100644
--- a/fop-core/src/test/java/org/apache/fop/render/afp/AFPRendererConfiguratorTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/afp/AFPRendererConfiguratorTestCase.java
@@ -24,7 +24,6 @@ import java.util.Map;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
-
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.verify;
diff --git a/fop-core/src/test/java/org/apache/fop/render/afp/AFPTrueTypeTestCase.java b/fop-core/src/test/java/org/apache/fop/render/afp/AFPTrueTypeTestCase.java
index 4407c2af2..1575f03b3 100644
--- a/fop-core/src/test/java/org/apache/fop/render/afp/AFPTrueTypeTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/afp/AFPTrueTypeTestCase.java
@@ -37,7 +37,6 @@ import javax.xml.transform.stream.StreamSource;
import org.junit.Assert;
import org.junit.Test;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/fop-core/src/test/java/org/apache/fop/render/afp/AddToPreviousPageGroupTestCase.java b/fop-core/src/test/java/org/apache/fop/render/afp/AddToPreviousPageGroupTestCase.java
index 8383efa16..345638c40 100644
--- a/fop-core/src/test/java/org/apache/fop/render/afp/AddToPreviousPageGroupTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/afp/AddToPreviousPageGroupTestCase.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.fop.render.afp;
import java.awt.Dimension;
diff --git a/fop-core/src/test/java/org/apache/fop/render/afp/NoOperationTestCase.java b/fop-core/src/test/java/org/apache/fop/render/afp/NoOperationTestCase.java
index 9e83829f8..97f029ea0 100644
--- a/fop-core/src/test/java/org/apache/fop/render/afp/NoOperationTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/afp/NoOperationTestCase.java
@@ -25,7 +25,6 @@ import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
diff --git a/fop-core/src/test/java/org/apache/fop/render/bitmap/AbstractBitmapRendererConfigParserTester.java b/fop-core/src/test/java/org/apache/fop/render/bitmap/AbstractBitmapRendererConfigParserTester.java
index cae184d51..c5a7198e7 100644
--- a/fop-core/src/test/java/org/apache/fop/render/bitmap/AbstractBitmapRendererConfigParserTester.java
+++ b/fop-core/src/test/java/org/apache/fop/render/bitmap/AbstractBitmapRendererConfigParserTester.java
@@ -23,7 +23,6 @@ import java.awt.Color;
import java.awt.image.BufferedImage;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
@@ -32,7 +31,6 @@ import static org.junit.Assert.assertTrue;
import org.apache.fop.apps.AbstractRendererConfigParserTester;
import org.apache.fop.apps.BitmapRendererConfBuilder;
import org.apache.fop.render.bitmap.BitmapRendererConfig.BitmapRendererConfigParser;
-
import static org.apache.fop.render.bitmap.BitmapRendererOption.COLOR_MODE_BILEVEL;
import static org.apache.fop.render.bitmap.BitmapRendererOption.COLOR_MODE_BINARY;
import static org.apache.fop.render.bitmap.BitmapRendererOption.COLOR_MODE_GRAY;
diff --git a/fop-core/src/test/java/org/apache/fop/render/bitmap/AbstractBitmapRendererConfiguratorTest.java b/fop-core/src/test/java/org/apache/fop/render/bitmap/AbstractBitmapRendererConfiguratorTest.java
index dcbb27754..ff86884c8 100644
--- a/fop-core/src/test/java/org/apache/fop/render/bitmap/AbstractBitmapRendererConfiguratorTest.java
+++ b/fop-core/src/test/java/org/apache/fop/render/bitmap/AbstractBitmapRendererConfiguratorTest.java
@@ -22,7 +22,6 @@ package org.apache.fop.render.bitmap;
import java.awt.image.BufferedImage;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -32,7 +31,6 @@ import org.apache.fop.apps.AbstractRendererConfiguratorTest;
import org.apache.fop.apps.BitmapRendererConfBuilder;
import org.apache.fop.render.intermediate.IFDocumentHandler;
import org.apache.fop.util.ColorUtil;
-
import static org.apache.fop.render.bitmap.BitmapRendererOption.COLOR_MODE_BILEVEL;
import static org.apache.fop.render.bitmap.BitmapRendererOption.COLOR_MODE_BINARY;
import static org.apache.fop.render.bitmap.BitmapRendererOption.COLOR_MODE_GRAY;
diff --git a/fop-core/src/test/java/org/apache/fop/render/bitmap/TIFFCompressionValueTestCase.java b/fop-core/src/test/java/org/apache/fop/render/bitmap/TIFFCompressionValueTestCase.java
index c4285f034..ff201baaa 100644
--- a/fop-core/src/test/java/org/apache/fop/render/bitmap/TIFFCompressionValueTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/bitmap/TIFFCompressionValueTestCase.java
@@ -20,7 +20,6 @@ package org.apache.fop.render.bitmap;
import java.awt.image.BufferedImage;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/render/bitmap/TIFFRendererConfigParserTestCase.java b/fop-core/src/test/java/org/apache/fop/render/bitmap/TIFFRendererConfigParserTestCase.java
index 8a5c2a72d..b3c549e01 100644
--- a/fop-core/src/test/java/org/apache/fop/render/bitmap/TIFFRendererConfigParserTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/bitmap/TIFFRendererConfigParserTestCase.java
@@ -20,7 +20,6 @@
package org.apache.fop.render.bitmap;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/render/bitmap/TIFFRendererConfiguratorTestCase.java b/fop-core/src/test/java/org/apache/fop/render/bitmap/TIFFRendererConfiguratorTestCase.java
index e340830f4..f76fb734d 100644
--- a/fop-core/src/test/java/org/apache/fop/render/bitmap/TIFFRendererConfiguratorTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/bitmap/TIFFRendererConfiguratorTestCase.java
@@ -22,7 +22,6 @@ package org.apache.fop.render.bitmap;
import java.awt.image.BufferedImage;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -33,7 +32,6 @@ import org.apache.fop.apps.FopConfBuilder;
import org.apache.fop.apps.MimeConstants;
import org.apache.fop.apps.TIFFRendererConfBuilder;
import org.apache.fop.render.bitmap.TIFFRendererConfig.TIFFRendererConfigParser;
-
import static org.apache.fop.render.bitmap.TIFFCompressionValue.CCITT_T4;
import static org.apache.fop.render.bitmap.TIFFCompressionValue.CCITT_T6;
diff --git a/fop-core/src/test/java/org/apache/fop/render/extensions/DocumentNavigationHandlerTestCase.java b/fop-core/src/test/java/org/apache/fop/render/extensions/DocumentNavigationHandlerTestCase.java
index 0578d27e7..02b94661f 100644
--- a/fop-core/src/test/java/org/apache/fop/render/extensions/DocumentNavigationHandlerTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/extensions/DocumentNavigationHandlerTestCase.java
@@ -43,7 +43,6 @@ import org.junit.Assert;
import org.junit.Test;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/fop-core/src/test/java/org/apache/fop/render/extensions/prepress/PageBoundariesTestCase.java b/fop-core/src/test/java/org/apache/fop/render/extensions/prepress/PageBoundariesTestCase.java
index e3f892e7c..7e19de872 100644
--- a/fop-core/src/test/java/org/apache/fop/render/extensions/prepress/PageBoundariesTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/extensions/prepress/PageBoundariesTestCase.java
@@ -23,7 +23,6 @@ import java.awt.Dimension;
import java.awt.Rectangle;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
diff --git a/fop-core/src/test/java/org/apache/fop/render/extensions/prepress/PageScaleTestCase.java b/fop-core/src/test/java/org/apache/fop/render/extensions/prepress/PageScaleTestCase.java
index 9de045cf7..109b9d8cc 100644
--- a/fop-core/src/test/java/org/apache/fop/render/extensions/prepress/PageScaleTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/extensions/prepress/PageScaleTestCase.java
@@ -22,7 +22,6 @@ package org.apache.fop.render.extensions.prepress;
import java.awt.geom.Point2D;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
diff --git a/fop-core/src/test/java/org/apache/fop/render/gradient/GradientTestCase.java b/fop-core/src/test/java/org/apache/fop/render/gradient/GradientTestCase.java
index 165f1cc9d..32a15ffbe 100644
--- a/fop-core/src/test/java/org/apache/fop/render/gradient/GradientTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/gradient/GradientTestCase.java
@@ -23,7 +23,6 @@ import java.awt.Color;
import java.awt.geom.AffineTransform;
import org.junit.Test;
-
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
diff --git a/fop-core/src/test/java/org/apache/fop/render/intermediate/AbstractIFPainterTestCase.java b/fop-core/src/test/java/org/apache/fop/render/intermediate/AbstractIFPainterTestCase.java
index ec0f35737..c55ddfa10 100644
--- a/fop-core/src/test/java/org/apache/fop/render/intermediate/AbstractIFPainterTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/intermediate/AbstractIFPainterTestCase.java
@@ -25,7 +25,6 @@ import java.awt.geom.AffineTransform;
import org.junit.Before;
import org.junit.Test;
import org.w3c.dom.Document;
-
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/fop-core/src/test/java/org/apache/fop/render/intermediate/ArcToBezierCurveTransformerTestCase.java b/fop-core/src/test/java/org/apache/fop/render/intermediate/ArcToBezierCurveTransformerTestCase.java
index 039ddcf90..57ce2dfbf 100644
--- a/fop-core/src/test/java/org/apache/fop/render/intermediate/ArcToBezierCurveTransformerTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/intermediate/ArcToBezierCurveTransformerTestCase.java
@@ -21,7 +21,6 @@ import java.io.IOException;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
diff --git a/fop-core/src/test/java/org/apache/fop/render/intermediate/BorderPainterTestCase.java b/fop-core/src/test/java/org/apache/fop/render/intermediate/BorderPainterTestCase.java
index 4a89b3ac6..509a6c09d 100644
--- a/fop-core/src/test/java/org/apache/fop/render/intermediate/BorderPainterTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/intermediate/BorderPainterTestCase.java
@@ -22,7 +22,6 @@ import java.awt.Rectangle;
import java.io.IOException;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doThrow;
diff --git a/fop-core/src/test/java/org/apache/fop/render/intermediate/IFRendererTestCase.java b/fop-core/src/test/java/org/apache/fop/render/intermediate/IFRendererTestCase.java
index 17da6c7ac..04f03ca42 100644
--- a/fop-core/src/test/java/org/apache/fop/render/intermediate/IFRendererTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/intermediate/IFRendererTestCase.java
@@ -34,7 +34,6 @@ import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.stream.StreamSource;
import org.junit.Test;
-
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/render/intermediate/IFSerializerTestCase.java b/fop-core/src/test/java/org/apache/fop/render/intermediate/IFSerializerTestCase.java
index 075bfa417..2e09f67a7 100644
--- a/fop-core/src/test/java/org/apache/fop/render/intermediate/IFSerializerTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/intermediate/IFSerializerTestCase.java
@@ -29,7 +29,6 @@ import javax.xml.transform.sax.SAXResult;
import org.junit.Before;
import org.junit.Test;
import org.xml.sax.helpers.DefaultHandler;
-
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.nullable;
diff --git a/fop-core/src/test/java/org/apache/fop/render/intermediate/IFStructureTreeBuilderTestCase.java b/fop-core/src/test/java/org/apache/fop/render/intermediate/IFStructureTreeBuilderTestCase.java
index 93a6480c1..9e3b585c6 100644
--- a/fop-core/src/test/java/org/apache/fop/render/intermediate/IFStructureTreeBuilderTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/intermediate/IFStructureTreeBuilderTestCase.java
@@ -40,7 +40,6 @@ import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.argThat;
diff --git a/fop-core/src/test/java/org/apache/fop/render/intermediate/SAXEventRecorderTestCase.java b/fop-core/src/test/java/org/apache/fop/render/intermediate/SAXEventRecorderTestCase.java
index 66f251038..5bcec3cc7 100644
--- a/fop-core/src/test/java/org/apache/fop/render/intermediate/SAXEventRecorderTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/intermediate/SAXEventRecorderTestCase.java
@@ -26,7 +26,6 @@ import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.inOrder;
diff --git a/fop-core/src/test/java/org/apache/fop/render/java2d/Java2DRendererConfigParserTestcase.java b/fop-core/src/test/java/org/apache/fop/render/java2d/Java2DRendererConfigParserTestcase.java
index e87c8713d..9e0adceba 100644
--- a/fop-core/src/test/java/org/apache/fop/render/java2d/Java2DRendererConfigParserTestcase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/java2d/Java2DRendererConfigParserTestcase.java
@@ -20,7 +20,6 @@
package org.apache.fop.render.java2d;
import org.junit.Test;
-
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/render/java2d/Java2DUtilTestCase.java b/fop-core/src/test/java/org/apache/fop/render/java2d/Java2DUtilTestCase.java
index 76c743487..fcfde6fb0 100644
--- a/fop-core/src/test/java/org/apache/fop/render/java2d/Java2DUtilTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/java2d/Java2DUtilTestCase.java
@@ -27,7 +27,6 @@ import java.util.Map;
import org.junit.Test;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.nullable;
@@ -42,7 +41,6 @@ import org.apache.fop.fonts.SingleByteFont;
import org.apache.fop.fonts.Typeface;
import org.apache.fop.util.CharUtilities;
-
public class Java2DUtilTestCase {
private static final String MULTI_BYTE_FONT_NAME = "multi";
diff --git a/fop-core/src/test/java/org/apache/fop/render/pcl/PCLRendererConfBuilder.java b/fop-core/src/test/java/org/apache/fop/render/pcl/PCLRendererConfBuilder.java
index 1265526a4..5c19be993 100644
--- a/fop-core/src/test/java/org/apache/fop/render/pcl/PCLRendererConfBuilder.java
+++ b/fop-core/src/test/java/org/apache/fop/render/pcl/PCLRendererConfBuilder.java
@@ -22,7 +22,6 @@ package org.apache.fop.render.pcl;
import org.apache.fop.apps.FopConfBuilder.RendererConfBuilder;
import org.apache.fop.apps.MimeConstants;
-
import static org.apache.fop.render.pcl.Java2DRendererOption.DISABLE_PJL;
import static org.apache.fop.render.pcl.Java2DRendererOption.RENDERING_MODE;
import static org.apache.fop.render.pcl.Java2DRendererOption.TEXT_RENDERING;
diff --git a/fop-core/src/test/java/org/apache/fop/render/pcl/PCLRendererConfigParserTestCase.java b/fop-core/src/test/java/org/apache/fop/render/pcl/PCLRendererConfigParserTestCase.java
index caf534854..3a4e0f7b7 100644
--- a/fop-core/src/test/java/org/apache/fop/render/pcl/PCLRendererConfigParserTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/pcl/PCLRendererConfigParserTestCase.java
@@ -20,7 +20,6 @@
package org.apache.fop.render.pcl;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import org.apache.fop.apps.AbstractRendererConfigParserTester;
diff --git a/fop-core/src/test/java/org/apache/fop/render/pcl/PCLRendererConfiguratorTestCase.java b/fop-core/src/test/java/org/apache/fop/render/pcl/PCLRendererConfiguratorTestCase.java
index fc7175ad6..87297899d 100644
--- a/fop-core/src/test/java/org/apache/fop/render/pcl/PCLRendererConfiguratorTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/pcl/PCLRendererConfiguratorTestCase.java
@@ -18,7 +18,6 @@
package org.apache.fop.render.pcl;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/render/pcl/fonts/PCLByteWriterUtilTestCase.java b/fop-core/src/test/java/org/apache/fop/render/pcl/fonts/PCLByteWriterUtilTestCase.java
index a558a23d9..6c3de301a 100644
--- a/fop-core/src/test/java/org/apache/fop/render/pcl/fonts/PCLByteWriterUtilTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/pcl/fonts/PCLByteWriterUtilTestCase.java
@@ -21,7 +21,6 @@ package org.apache.fop.render.pcl.fonts;
import java.io.IOException;
import org.junit.Test;
-
import static org.junit.Assert.assertArrayEquals;
public class PCLByteWriterUtilTestCase {
diff --git a/fop-core/src/test/java/org/apache/fop/render/pcl/fonts/PCLFontReaderFactoryTestCase.java b/fop-core/src/test/java/org/apache/fop/render/pcl/fonts/PCLFontReaderFactoryTestCase.java
index cf05a0ca5..408e3ea44 100644
--- a/fop-core/src/test/java/org/apache/fop/render/pcl/fonts/PCLFontReaderFactoryTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/pcl/fonts/PCLFontReaderFactoryTestCase.java
@@ -23,7 +23,6 @@ import java.io.FileInputStream;
import java.net.URI;
import org.junit.Test;
-
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/fop-core/src/test/java/org/apache/fop/render/pcl/fonts/PCLTTFFontReaderTestCase.java b/fop-core/src/test/java/org/apache/fop/render/pcl/fonts/PCLTTFFontReaderTestCase.java
index 08323e0cf..50992df55 100644
--- a/fop-core/src/test/java/org/apache/fop/render/pcl/fonts/PCLTTFFontReaderTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/pcl/fonts/PCLTTFFontReaderTestCase.java
@@ -28,7 +28,6 @@ import java.util.List;
import java.util.Map;
import org.junit.Test;
-
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
diff --git a/fop-core/src/test/java/org/apache/fop/render/pcl/fonts/truetype/PCLTTFCharacterWriterTestCase.java b/fop-core/src/test/java/org/apache/fop/render/pcl/fonts/truetype/PCLTTFCharacterWriterTestCase.java
index 4a8edb401..63755fae2 100644
--- a/fop-core/src/test/java/org/apache/fop/render/pcl/fonts/truetype/PCLTTFCharacterWriterTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/pcl/fonts/truetype/PCLTTFCharacterWriterTestCase.java
@@ -22,7 +22,6 @@ import java.io.File;
import java.io.FileInputStream;
import org.junit.Test;
-
import static org.junit.Assert.assertArrayEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/fop-core/src/test/java/org/apache/fop/render/pdf/ImageRawPNGAdapterTestCase.java b/fop-core/src/test/java/org/apache/fop/render/pdf/ImageRawPNGAdapterTestCase.java
index c3b262477..f48ffa59f 100644
--- a/fop-core/src/test/java/org/apache/fop/render/pdf/ImageRawPNGAdapterTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/pdf/ImageRawPNGAdapterTestCase.java
@@ -28,7 +28,6 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import org.junit.Test;
-
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/render/pdf/ImageRenderedAdapterTestCase.java b/fop-core/src/test/java/org/apache/fop/render/pdf/ImageRenderedAdapterTestCase.java
index e80a37725..02766839f 100644
--- a/fop-core/src/test/java/org/apache/fop/render/pdf/ImageRenderedAdapterTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/pdf/ImageRenderedAdapterTestCase.java
@@ -27,7 +27,6 @@ import java.awt.image.IndexColorModel;
import java.awt.image.RenderedImage;
import org.junit.Test;
-
import static org.junit.Assert.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.nullable;
diff --git a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java
index acd480615..e96fad2a3 100644
--- a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java
@@ -26,7 +26,6 @@ import java.util.Map;
import org.junit.Test;
import org.xml.sax.SAXException;
-
import static org.junit.Assert.fail;
import org.apache.fop.apps.FOUserAgent;
diff --git a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFAMetadataTestCase.java b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFAMetadataTestCase.java
index 806fb5403..798c51049 100644
--- a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFAMetadataTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFAMetadataTestCase.java
@@ -26,7 +26,6 @@ import java.util.Locale;
import java.util.TimeZone;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
diff --git a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFBorderPainterTestCase.java b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFBorderPainterTestCase.java
index ed8156001..5a7a52e3f 100644
--- a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFBorderPainterTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFBorderPainterTestCase.java
@@ -25,7 +25,6 @@ import java.io.OutputStream;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertTrue;
import org.apache.fop.fo.Constants;
diff --git a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFCMapTestCase.java b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFCMapTestCase.java
index bb0f2f92e..a82084296 100644
--- a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFCMapTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFCMapTestCase.java
@@ -22,7 +22,6 @@ package org.apache.fop.render.pdf;
import java.io.StringWriter;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import org.apache.fop.pdf.CMapBuilder;
diff --git a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java
index 9659157e8..eb2024c27 100644
--- a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java
@@ -24,7 +24,6 @@ import java.io.IOException;
import org.junit.Test;
import org.xml.sax.SAXException;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -34,7 +33,6 @@ import org.apache.pdfbox.text.PDFTextStripper;
import org.apache.fop.apps.FOUserAgent;
-
/** Test that characters are correctly encoded in a generated PDF file */
public class PDFEncodingTestCase extends BasePDFTest {
private File foBaseDir = new File("test/xml/pdf-encoding");
diff --git a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFGraphicsPainterTestCase.java b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFGraphicsPainterTestCase.java
index 5ba5811aa..9587baefe 100644
--- a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFGraphicsPainterTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFGraphicsPainterTestCase.java
@@ -23,7 +23,6 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
-
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.endsWith;
import static org.mockito.Mockito.mock;
diff --git a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFPainterTestCase.java b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFPainterTestCase.java
index bc91b4bda..cabf36f7c 100644
--- a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFPainterTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFPainterTestCase.java
@@ -40,7 +40,6 @@ import org.junit.Assert;
import org.junit.Test;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.endsWith;
diff --git a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFRendererConfigParserTestCase.java b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFRendererConfigParserTestCase.java
index 210d10909..9eb6bd578 100644
--- a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFRendererConfigParserTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFRendererConfigParserTestCase.java
@@ -22,7 +22,6 @@ package org.apache.fop.render.pdf;
import java.io.File;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
diff --git a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFRendererOptionsConfigTestCase.java b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFRendererOptionsConfigTestCase.java
index 699a8a186..593a0eefa 100644
--- a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFRendererOptionsConfigTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFRendererOptionsConfigTestCase.java
@@ -28,14 +28,12 @@ import java.util.List;
import java.util.Map;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import org.apache.fop.pdf.PDFAMode;
import org.apache.fop.pdf.PDFEncryptionParams;
import org.apache.fop.pdf.PDFXMode;
import org.apache.fop.pdf.Version;
-
import static org.apache.fop.render.pdf.PDFRendererOption.DISABLE_SRGB_COLORSPACE;
import static org.apache.fop.render.pdf.PDFRendererOption.FILTER_LIST;
import static org.apache.fop.render.pdf.PDFRendererOption.OUTPUT_PROFILE;
diff --git a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFStructureTreeBuilderTestCase.java b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFStructureTreeBuilderTestCase.java
index 5fb2f1e51..8048633c5 100644
--- a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFStructureTreeBuilderTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFStructureTreeBuilderTestCase.java
@@ -31,9 +31,7 @@ import javax.xml.transform.stream.StreamResult;
import org.junit.Before;
import org.junit.Test;
-
import org.xml.sax.helpers.AttributesImpl;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
diff --git a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFsRGBSettingsTestCase.java b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFsRGBSettingsTestCase.java
index 965a8e30e..dd9a3e714 100644
--- a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFsRGBSettingsTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFsRGBSettingsTestCase.java
@@ -24,7 +24,6 @@ import java.io.IOException;
import org.junit.Test;
import org.xml.sax.SAXException;
-
import static org.junit.Assert.fail;
import org.apache.fop.apps.FOUserAgent;
diff --git a/fop-core/src/test/java/org/apache/fop/render/pdf/extensions/PDFEmbeddedFileAttachmentTestCase.java b/fop-core/src/test/java/org/apache/fop/render/pdf/extensions/PDFEmbeddedFileAttachmentTestCase.java
index d73160d6f..15faa8255 100644
--- a/fop-core/src/test/java/org/apache/fop/render/pdf/extensions/PDFEmbeddedFileAttachmentTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/pdf/extensions/PDFEmbeddedFileAttachmentTestCase.java
@@ -1,42 +1,41 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* $Id: PDFRenderingUtil.java 1761019 2016-09-16 10:43:45Z ssteiner $ */
-
-package org.apache.fop.render.pdf.extensions;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
-public class PDFEmbeddedFileAttachmentTestCase {
-
- @Test
- public void testGetFilename() {
- String germanAe = "\u00E4";
- String unicodeFilename = "t" + germanAe + "st";
- String src = "src";
- String desc = "desc";
- PDFEmbeddedFileAttachment fileAtt = new PDFEmbeddedFileAttachment(unicodeFilename, src, desc);
- assertEquals(fileAtt.getUnicodeFilename(), unicodeFilename);
- assertFalse(fileAtt.getFilename().contains(germanAe));
- assertEquals(fileAtt.getSrc(), src);
- assertEquals(fileAtt.getDesc(), desc);
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id: PDFRenderingUtil.java 1761019 2016-09-16 10:43:45Z ssteiner $ */
+
+package org.apache.fop.render.pdf.extensions;
+
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+public class PDFEmbeddedFileAttachmentTestCase {
+
+ @Test
+ public void testGetFilename() {
+ String germanAe = "\u00E4";
+ String unicodeFilename = "t" + germanAe + "st";
+ String src = "src";
+ String desc = "desc";
+ PDFEmbeddedFileAttachment fileAtt = new PDFEmbeddedFileAttachment(unicodeFilename, src, desc);
+ assertEquals(fileAtt.getUnicodeFilename(), unicodeFilename);
+ assertFalse(fileAtt.getFilename().contains(germanAe));
+ assertEquals(fileAtt.getSrc(), src);
+ assertEquals(fileAtt.getDesc(), desc);
+ }
+
+}
diff --git a/fop-core/src/test/java/org/apache/fop/render/ps/ImageEncoderPNGTestCase.java b/fop-core/src/test/java/org/apache/fop/render/ps/ImageEncoderPNGTestCase.java
index 53654d76a..82bd90650 100644
--- a/fop-core/src/test/java/org/apache/fop/render/ps/ImageEncoderPNGTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/ps/ImageEncoderPNGTestCase.java
@@ -26,7 +26,6 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import org.junit.Test;
-
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
diff --git a/fop-core/src/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java b/fop-core/src/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java
index b702e1264..b723279c2 100644
--- a/fop-core/src/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java
@@ -27,9 +27,7 @@ import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import org.junit.Test;
-
import org.w3c.dom.Document;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/render/ps/PSBorderPainterTestCase.java b/fop-core/src/test/java/org/apache/fop/render/ps/PSBorderPainterTestCase.java
index 602431231..efa1a2faf 100644
--- a/fop-core/src/test/java/org/apache/fop/render/ps/PSBorderPainterTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/ps/PSBorderPainterTestCase.java
@@ -24,7 +24,6 @@ import java.io.ByteArrayOutputStream;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertTrue;
import org.apache.xmlgraphics.ps.PSGenerator;
diff --git a/fop-core/src/test/java/org/apache/fop/render/ps/PSGraphics2DAdapterTestCase.java b/fop-core/src/test/java/org/apache/fop/render/ps/PSGraphics2DAdapterTestCase.java
index b3ca7205b..3637612cf 100644
--- a/fop-core/src/test/java/org/apache/fop/render/ps/PSGraphics2DAdapterTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/ps/PSGraphics2DAdapterTestCase.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.fop.render.ps;
import java.awt.Dimension;
diff --git a/fop-core/src/test/java/org/apache/fop/render/ps/PSPainterTestCase.java b/fop-core/src/test/java/org/apache/fop/render/ps/PSPainterTestCase.java
index 421f2ea87..0274fc3e3 100644
--- a/fop-core/src/test/java/org/apache/fop/render/ps/PSPainterTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/ps/PSPainterTestCase.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.fop.render.ps;
import java.awt.Color;
@@ -32,7 +33,6 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.verification.VerificationMode;
-
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyDouble;
diff --git a/fop-core/src/test/java/org/apache/fop/render/ps/PSPainterUtilTestCase.java b/fop-core/src/test/java/org/apache/fop/render/ps/PSPainterUtilTestCase.java
index d34b5693f..99c615358 100644
--- a/fop-core/src/test/java/org/apache/fop/render/ps/PSPainterUtilTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/ps/PSPainterUtilTestCase.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.fop.render.ps;
import java.awt.Color;
diff --git a/fop-core/src/test/java/org/apache/fop/render/ps/PSRendererConfigParserTestCase.java b/fop-core/src/test/java/org/apache/fop/render/ps/PSRendererConfigParserTestCase.java
index 45642764c..7f02c165c 100644
--- a/fop-core/src/test/java/org/apache/fop/render/ps/PSRendererConfigParserTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/ps/PSRendererConfigParserTestCase.java
@@ -20,7 +20,6 @@
package org.apache.fop.render.ps;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import org.apache.xmlgraphics.ps.PSGenerator;
diff --git a/fop-core/src/test/java/org/apache/fop/render/ps/PSRendererConfiguratorTestCase.java b/fop-core/src/test/java/org/apache/fop/render/ps/PSRendererConfiguratorTestCase.java
index 67ba24763..3f0d41aa1 100644
--- a/fop-core/src/test/java/org/apache/fop/render/ps/PSRendererConfiguratorTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/ps/PSRendererConfiguratorTestCase.java
@@ -18,7 +18,6 @@
package org.apache.fop.render.ps;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/render/ps/PSRenderingUtilTestCase.java b/fop-core/src/test/java/org/apache/fop/render/ps/PSRenderingUtilTestCase.java
index 0a2c895be..67571a944 100644
--- a/fop-core/src/test/java/org/apache/fop/render/ps/PSRenderingUtilTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/ps/PSRenderingUtilTestCase.java
@@ -22,7 +22,6 @@ package org.apache.fop.render.ps;
import java.io.IOException;
import org.junit.Test;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
diff --git a/fop-core/src/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java b/fop-core/src/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java
index 8a548b1b5..e7831a566 100644
--- a/fop-core/src/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java
@@ -27,7 +27,6 @@ import java.util.Collection;
import java.util.Set;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
diff --git a/fop-core/src/test/java/org/apache/fop/render/ps/fonts/PSTTFGeneratorTestCase.java b/fop-core/src/test/java/org/apache/fop/render/ps/fonts/PSTTFGeneratorTestCase.java
index f7f311ff8..3b33f090d 100644
--- a/fop-core/src/test/java/org/apache/fop/render/ps/fonts/PSTTFGeneratorTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/ps/fonts/PSTTFGeneratorTestCase.java
@@ -24,7 +24,6 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
diff --git a/fop-core/src/test/java/org/apache/fop/render/ps/fonts/PSTTFGlyphOutputStreamTestCase.java b/fop-core/src/test/java/org/apache/fop/render/ps/fonts/PSTTFGlyphOutputStreamTestCase.java
index 82b4364c3..9314b4a03 100644
--- a/fop-core/src/test/java/org/apache/fop/render/ps/fonts/PSTTFGlyphOutputStreamTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/ps/fonts/PSTTFGlyphOutputStreamTestCase.java
@@ -24,7 +24,6 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
import org.mockito.InOrder;
-
import static org.junit.Assert.fail;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
diff --git a/fop-core/src/test/java/org/apache/fop/render/ps/fonts/PSTTFOutputStreamTestCase.java b/fop-core/src/test/java/org/apache/fop/render/ps/fonts/PSTTFOutputStreamTestCase.java
index 744f17f64..0e2369db8 100644
--- a/fop-core/src/test/java/org/apache/fop/render/ps/fonts/PSTTFOutputStreamTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/ps/fonts/PSTTFOutputStreamTestCase.java
@@ -23,7 +23,6 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
diff --git a/fop-core/src/test/java/org/apache/fop/render/ps/fonts/PSTTFTableOutputStreamTestCase.java b/fop-core/src/test/java/org/apache/fop/render/ps/fonts/PSTTFTableOutputStreamTestCase.java
index c20c3d8b1..c8dfa9611 100644
--- a/fop-core/src/test/java/org/apache/fop/render/ps/fonts/PSTTFTableOutputStreamTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/ps/fonts/PSTTFTableOutputStreamTestCase.java
@@ -24,7 +24,6 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
import org.mockito.InOrder;
-
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
diff --git a/fop-core/src/test/java/org/apache/fop/render/ps/svg/GradientTestCase.java b/fop-core/src/test/java/org/apache/fop/render/ps/svg/GradientTestCase.java
index 1b7ad1962..49b8abbef 100644
--- a/fop-core/src/test/java/org/apache/fop/render/ps/svg/GradientTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/ps/svg/GradientTestCase.java
@@ -25,7 +25,6 @@ import java.io.IOException;
import java.nio.charset.StandardCharsets;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import org.apache.commons.io.IOUtils;
diff --git a/fop-core/src/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ParagraphAlignment.java b/fop-core/src/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ParagraphAlignment.java
index 2de087d91..464d2c612 100644
--- a/fop-core/src/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ParagraphAlignment.java
+++ b/fop-core/src/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ParagraphAlignment.java
@@ -49,8 +49,7 @@ public class ParagraphAlignment extends TestDocument {
* @param sect RtfSection
* @throws java.io.IOException for I/O errors
*/
- protected void generateDocument(RtfDocumentArea rda, RtfSection sect) throws java.io.IOException
- {
+ protected void generateDocument(RtfDocumentArea rda, RtfSection sect) throws java.io.IOException {
RtfAttributes attr = new RtfAttributes();
attr.set(RtfText.ALIGN_CENTER);
RtfParagraph p = sect.newParagraph(attr);
diff --git a/fop-core/src/test/java/org/apache/fop/render/txt/TxtRendererConfigParserTestCase.java b/fop-core/src/test/java/org/apache/fop/render/txt/TxtRendererConfigParserTestCase.java
index 30fed05ea..384a2415e 100644
--- a/fop-core/src/test/java/org/apache/fop/render/txt/TxtRendererConfigParserTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/txt/TxtRendererConfigParserTestCase.java
@@ -20,7 +20,6 @@
package org.apache.fop.render.txt;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import org.apache.fop.apps.AbstractRendererConfigParserTester;
diff --git a/fop-core/src/test/java/org/apache/fop/svg/AbstractBasicTranscoderTest.java b/fop-core/src/test/java/org/apache/fop/svg/AbstractBasicTranscoderTest.java
index f7abc1d5f..e7b06145e 100644
--- a/fop-core/src/test/java/org/apache/fop/svg/AbstractBasicTranscoderTest.java
+++ b/fop-core/src/test/java/org/apache/fop/svg/AbstractBasicTranscoderTest.java
@@ -23,7 +23,6 @@ import java.io.File;
import java.io.InputStream;
import org.junit.Test;
-
import static org.junit.Assert.assertTrue;
import org.apache.commons.io.output.ByteArrayOutputStream;
diff --git a/fop-core/src/test/java/org/apache/fop/svg/PDFGraphics2DTestCase.java b/fop-core/src/test/java/org/apache/fop/svg/PDFGraphics2DTestCase.java
index 3f610c56f..3d9cf01dd 100644
--- a/fop-core/src/test/java/org/apache/fop/svg/PDFGraphics2DTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/svg/PDFGraphics2DTestCase.java
@@ -22,7 +22,6 @@ package org.apache.fop.svg;
import java.awt.BasicStroke;
import org.junit.Test;
-
import static org.junit.Assert.assertTrue;
public class PDFGraphics2DTestCase {
diff --git a/fop-core/src/test/java/org/apache/fop/svg/PDFTextPainterTestCase.java b/fop-core/src/test/java/org/apache/fop/svg/PDFTextPainterTestCase.java
index 941cdb754..25cd0d6e5 100644
--- a/fop-core/src/test/java/org/apache/fop/svg/PDFTextPainterTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/svg/PDFTextPainterTestCase.java
@@ -26,7 +26,6 @@ import java.awt.geom.GeneralPath;
import java.io.StringWriter;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/fop-core/src/test/java/org/apache/fop/svg/SimpleSVGUserAgentTestCase.java b/fop-core/src/test/java/org/apache/fop/svg/SimpleSVGUserAgentTestCase.java
index 2d9ae9285..782ad1e68 100644
--- a/fop-core/src/test/java/org/apache/fop/svg/SimpleSVGUserAgentTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/svg/SimpleSVGUserAgentTestCase.java
@@ -18,7 +18,6 @@
package org.apache.fop.svg;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
public class SimpleSVGUserAgentTestCase {
diff --git a/fop-core/src/test/java/org/apache/fop/svg/font/BasicGlyphVectorTestCase.java b/fop-core/src/test/java/org/apache/fop/svg/font/BasicGlyphVectorTestCase.java
index e98e3066d..16181b708 100644
--- a/fop-core/src/test/java/org/apache/fop/svg/font/BasicGlyphVectorTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/svg/font/BasicGlyphVectorTestCase.java
@@ -29,7 +29,6 @@ import java.text.StringCharacterIterator;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.anyInt;
diff --git a/fop-core/src/test/java/org/apache/fop/svg/font/FOPFontFamilyResolverTestCase.java b/fop-core/src/test/java/org/apache/fop/svg/font/FOPFontFamilyResolverTestCase.java
index 4376779f9..7b6dddc64 100644
--- a/fop-core/src/test/java/org/apache/fop/svg/font/FOPFontFamilyResolverTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/svg/font/FOPFontFamilyResolverTestCase.java
@@ -32,7 +32,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
diff --git a/fop-core/src/test/java/org/apache/fop/svg/font/FOPGVTFontTestCase.java b/fop-core/src/test/java/org/apache/fop/svg/font/FOPGVTFontTestCase.java
index 75c669b40..0a7ca5c9a 100644
--- a/fop-core/src/test/java/org/apache/fop/svg/font/FOPGVTFontTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/svg/font/FOPGVTFontTestCase.java
@@ -23,7 +23,6 @@ import java.text.StringCharacterIterator;
import org.junit.Before;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
diff --git a/fop-core/src/test/java/org/apache/fop/svg/font/GlyphLayoutTestCase.java b/fop-core/src/test/java/org/apache/fop/svg/font/GlyphLayoutTestCase.java
index 04af70544..801404038 100644
--- a/fop-core/src/test/java/org/apache/fop/svg/font/GlyphLayoutTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/svg/font/GlyphLayoutTestCase.java
@@ -22,7 +22,6 @@ package org.apache.fop.svg.font;
import java.util.Collections;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import org.apache.fop.fonts.FontInfo;
diff --git a/fop-core/src/test/java/org/apache/fop/svg/font/KerningGlyphLayoutTestCase.java b/fop-core/src/test/java/org/apache/fop/svg/font/KerningGlyphLayoutTestCase.java
index ff3b84cb9..83f95b632 100644
--- a/fop-core/src/test/java/org/apache/fop/svg/font/KerningGlyphLayoutTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/svg/font/KerningGlyphLayoutTestCase.java
@@ -1,91 +1,90 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* $Id$ */
-package org.apache.fop.svg.font;
-
-import java.awt.geom.Point2D;
-import java.text.CharacterIterator;
-import java.text.StringCharacterIterator;
-
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.apache.batik.gvt.font.GVTLineMetrics;
-
-import org.apache.fop.fonts.Font;
-import org.apache.fop.fonts.FontMetrics;
-
-
-public class KerningGlyphLayoutTestCase extends FOPGVTGlyphVectorTest {
- private final int fontSize = 37500;
-
- @Before
- public void createGlyphVector() {
- FontMetrics metrics = mockFontMetrics();
- Font font = mockFont(metrics);
- FOPGVTFont gvtFont = mockGVTFont(font);
- CharacterIterator it = new StringCharacterIterator("AVo", 1, 3, 1);
- glyphVector = new FOPGVTGlyphVector(gvtFont, it, null);
- glyphVector.performDefaultLayout();
- }
-
- private FontMetrics mockFontMetrics() {
- FontMetrics metrics = mock(FontMetrics.class);
- when(metrics.getWidth(eq(1), eq(fontSize))).thenReturn(25012000);
- when(metrics.getWidth(eq(2), eq(fontSize))).thenReturn(22912000);
- when(metrics.getWidth(eq(3), eq(fontSize))).thenReturn(20850000);
- return metrics;
- }
-
- private Font mockFont(FontMetrics metrics) {
- Font font = mock(Font.class);
- when(font.getFontMetrics()).thenReturn(metrics);
- when(font.getFontSize()).thenReturn(fontSize);
- when(font.mapChar(eq('A'))).thenReturn((char) 1);
- when(font.mapChar(eq('V'))).thenReturn((char) 2);
- when(font.mapChar(eq('o'))).thenReturn((char) 3);
- when(font.hasKerning()).thenReturn(true);
- when(font.getCharWidth('A')).thenReturn(25012);
- when(font.getCharWidth('V')).thenReturn(22912);
- when(font.getCharWidth('o')).thenReturn(20850);
- when(font.getCharWidth(65)).thenReturn(25012);
- when(font.getCharWidth(86)).thenReturn(22912);
- when(font.getCharWidth(111)).thenReturn(20850);
- when(font.getKernValue('V', 'o')).thenReturn(-2812);
- return font;
- }
-
- private FOPGVTFont mockGVTFont(Font font) {
- FOPGVTFont gvtFont = mock(FOPGVTFont.class);
- when(gvtFont.getFont()).thenReturn(font);
- when(gvtFont.getLineMetrics(anyInt())).thenReturn(
- new GVTLineMetrics(8, 0, null, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0));
- return gvtFont;
- }
-
- @Test
- public void testGlyphPositions() {
- assertEquals(new Point2D.Float(20.1f, 0), glyphVector.getGlyphPosition(1));
- assertEquals(new Point2D.Float(40.95f, 0), glyphVector.getGlyphPosition(2));
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+package org.apache.fop.svg.font;
+
+import java.awt.geom.Point2D;
+import java.text.CharacterIterator;
+import java.text.StringCharacterIterator;
+
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.batik.gvt.font.GVTLineMetrics;
+
+import org.apache.fop.fonts.Font;
+import org.apache.fop.fonts.FontMetrics;
+
+public class KerningGlyphLayoutTestCase extends FOPGVTGlyphVectorTest {
+ private final int fontSize = 37500;
+
+ @Before
+ public void createGlyphVector() {
+ FontMetrics metrics = mockFontMetrics();
+ Font font = mockFont(metrics);
+ FOPGVTFont gvtFont = mockGVTFont(font);
+ CharacterIterator it = new StringCharacterIterator("AVo", 1, 3, 1);
+ glyphVector = new FOPGVTGlyphVector(gvtFont, it, null);
+ glyphVector.performDefaultLayout();
+ }
+
+ private FontMetrics mockFontMetrics() {
+ FontMetrics metrics = mock(FontMetrics.class);
+ when(metrics.getWidth(eq(1), eq(fontSize))).thenReturn(25012000);
+ when(metrics.getWidth(eq(2), eq(fontSize))).thenReturn(22912000);
+ when(metrics.getWidth(eq(3), eq(fontSize))).thenReturn(20850000);
+ return metrics;
+ }
+
+ private Font mockFont(FontMetrics metrics) {
+ Font font = mock(Font.class);
+ when(font.getFontMetrics()).thenReturn(metrics);
+ when(font.getFontSize()).thenReturn(fontSize);
+ when(font.mapChar(eq('A'))).thenReturn((char) 1);
+ when(font.mapChar(eq('V'))).thenReturn((char) 2);
+ when(font.mapChar(eq('o'))).thenReturn((char) 3);
+ when(font.hasKerning()).thenReturn(true);
+ when(font.getCharWidth('A')).thenReturn(25012);
+ when(font.getCharWidth('V')).thenReturn(22912);
+ when(font.getCharWidth('o')).thenReturn(20850);
+ when(font.getCharWidth(65)).thenReturn(25012);
+ when(font.getCharWidth(86)).thenReturn(22912);
+ when(font.getCharWidth(111)).thenReturn(20850);
+ when(font.getKernValue('V', 'o')).thenReturn(-2812);
+ return font;
+ }
+
+ private FOPGVTFont mockGVTFont(Font font) {
+ FOPGVTFont gvtFont = mock(FOPGVTFont.class);
+ when(gvtFont.getFont()).thenReturn(font);
+ when(gvtFont.getLineMetrics(anyInt())).thenReturn(
+ new GVTLineMetrics(8, 0, null, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0));
+ return gvtFont;
+ }
+
+ @Test
+ public void testGlyphPositions() {
+ assertEquals(new Point2D.Float(20.1f, 0), glyphVector.getGlyphPosition(1));
+ assertEquals(new Point2D.Float(40.95f, 0), glyphVector.getGlyphPosition(2));
+ }
+}
diff --git a/fop-core/src/test/java/org/apache/fop/text/linebreak/LineBreakStatusTestCase.java b/fop-core/src/test/java/org/apache/fop/text/linebreak/LineBreakStatusTestCase.java
index 279c2f7fc..1cfa24f87 100644
--- a/fop-core/src/test/java/org/apache/fop/text/linebreak/LineBreakStatusTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/text/linebreak/LineBreakStatusTestCase.java
@@ -20,7 +20,6 @@
package org.apache.fop.text.linebreak;
import org.junit.Test;
-
import static org.junit.Assert.assertTrue;
/**
diff --git a/fop-core/src/test/java/org/apache/fop/text/linebreak/LineBreakUtilsTestCase.java b/fop-core/src/test/java/org/apache/fop/text/linebreak/LineBreakUtilsTestCase.java
index 5fc5c7d50..b8820fd49 100644
--- a/fop-core/src/test/java/org/apache/fop/text/linebreak/LineBreakUtilsTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/text/linebreak/LineBreakUtilsTestCase.java
@@ -20,7 +20,6 @@
package org.apache.fop.text.linebreak;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
/**
diff --git a/fop-core/src/test/java/org/apache/fop/threading/FOProcessorImpl.java b/fop-core/src/test/java/org/apache/fop/threading/FOProcessorImpl.java
index b784b5c03..75bee64a8 100644
--- a/fop-core/src/test/java/org/apache/fop/threading/FOProcessorImpl.java
+++ b/fop-core/src/test/java/org/apache/fop/threading/FOProcessorImpl.java
@@ -37,7 +37,6 @@ import javax.xml.transform.sax.SAXResult;
import org.xml.sax.SAXException;
import org.apache.commons.io.FilenameUtils;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/fop-core/src/test/java/org/apache/fop/threading/IFProcessorImpl.java b/fop-core/src/test/java/org/apache/fop/threading/IFProcessorImpl.java
index ed50e0521..c36c624fe 100644
--- a/fop-core/src/test/java/org/apache/fop/threading/IFProcessorImpl.java
+++ b/fop-core/src/test/java/org/apache/fop/threading/IFProcessorImpl.java
@@ -36,7 +36,6 @@ import javax.xml.transform.stream.StreamResult;
import org.xml.sax.ContentHandler;
import org.apache.commons.io.FilenameUtils;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/fop-core/src/test/java/org/apache/fop/traits/BorderPropsTestCase.java b/fop-core/src/test/java/org/apache/fop/traits/BorderPropsTestCase.java
index 692e3059f..2737b1258 100644
--- a/fop-core/src/test/java/org/apache/fop/traits/BorderPropsTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/traits/BorderPropsTestCase.java
@@ -22,7 +22,6 @@ package org.apache.fop.traits;
import java.awt.Color;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import org.apache.xmlgraphics.java2d.color.ColorWithAlternatives;
diff --git a/fop-core/src/test/java/org/apache/fop/traits/MinOptMaxTestCase.java b/fop-core/src/test/java/org/apache/fop/traits/MinOptMaxTestCase.java
index abe0c2c45..124436aec 100644
--- a/fop-core/src/test/java/org/apache/fop/traits/MinOptMaxTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/traits/MinOptMaxTestCase.java
@@ -20,7 +20,6 @@
package org.apache.fop.traits;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/util/AdvancedMessageFormatTestCase.java b/fop-core/src/test/java/org/apache/fop/util/AdvancedMessageFormatTestCase.java
index 3a8712cee..f19ad4bfb 100644
--- a/fop-core/src/test/java/org/apache/fop/util/AdvancedMessageFormatTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/util/AdvancedMessageFormatTestCase.java
@@ -23,7 +23,6 @@ import java.util.Map;
import org.junit.Test;
import org.xml.sax.helpers.LocatorImpl;
-
import static org.junit.Assert.assertEquals;
import org.apache.fop.events.model.EventSeverity;
diff --git a/fop-core/src/test/java/org/apache/fop/util/BitmapImageUtilTestCase.java b/fop-core/src/test/java/org/apache/fop/util/BitmapImageUtilTestCase.java
index 8bda99785..3691a7157 100644
--- a/fop-core/src/test/java/org/apache/fop/util/BitmapImageUtilTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/util/BitmapImageUtilTestCase.java
@@ -30,7 +30,6 @@ import java.io.InputStream;
import java.io.StringWriter;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import org.apache.commons.io.IOUtils;
diff --git a/fop-core/src/test/java/org/apache/fop/util/CharUtilitiesTestCase.java b/fop-core/src/test/java/org/apache/fop/util/CharUtilitiesTestCase.java
index 6a97c4442..b10ae8aea 100644
--- a/fop-core/src/test/java/org/apache/fop/util/CharUtilitiesTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/util/CharUtilitiesTestCase.java
@@ -20,7 +20,6 @@
package org.apache.fop.util;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/util/ColorUtilTestCase.java b/fop-core/src/test/java/org/apache/fop/util/ColorUtilTestCase.java
index 4a530257e..a05951a62 100644
--- a/fop-core/src/test/java/org/apache/fop/util/ColorUtilTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/util/ColorUtilTestCase.java
@@ -25,7 +25,6 @@ import java.io.File;
import java.net.URI;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
diff --git a/fop-core/src/test/java/org/apache/fop/util/CompareUtilTestCase.java b/fop-core/src/test/java/org/apache/fop/util/CompareUtilTestCase.java
index e0f769afc..cb84f3905 100644
--- a/fop-core/src/test/java/org/apache/fop/util/CompareUtilTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/util/CompareUtilTestCase.java
@@ -28,7 +28,6 @@ import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicBoolean;
import org.junit.Test;
-
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
diff --git a/fop-core/src/test/java/org/apache/fop/util/ElementListUtilsTestCase.java b/fop-core/src/test/java/org/apache/fop/util/ElementListUtilsTestCase.java
index 843bc232d..a40eff63d 100644
--- a/fop-core/src/test/java/org/apache/fop/util/ElementListUtilsTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/util/ElementListUtilsTestCase.java
@@ -23,7 +23,6 @@ import java.util.ArrayList;
import java.util.LinkedList;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/fop-core/src/test/java/org/apache/fop/util/HexEncoderTestCase.java b/fop-core/src/test/java/org/apache/fop/util/HexEncoderTestCase.java
index b989ebea5..7c18f3e94 100644
--- a/fop-core/src/test/java/org/apache/fop/util/HexEncoderTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/util/HexEncoderTestCase.java
@@ -20,7 +20,6 @@
package org.apache.fop.util;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
/**
diff --git a/fop-core/src/test/java/org/apache/fop/util/LanguageTagsTestCase.java b/fop-core/src/test/java/org/apache/fop/util/LanguageTagsTestCase.java
index 91861dcc6..78401005b 100644
--- a/fop-core/src/test/java/org/apache/fop/util/LanguageTagsTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/util/LanguageTagsTestCase.java
@@ -22,7 +22,6 @@ package org.apache.fop.util;
import java.util.Locale;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
/**
diff --git a/fop-core/src/test/java/org/apache/fop/util/XMLResourceBundleTestCase.java b/fop-core/src/test/java/org/apache/fop/util/XMLResourceBundleTestCase.java
index d67c8da56..66110aad7 100644
--- a/fop-core/src/test/java/org/apache/fop/util/XMLResourceBundleTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/util/XMLResourceBundleTestCase.java
@@ -24,7 +24,6 @@ import java.util.MissingResourceException;
import java.util.ResourceBundle;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
diff --git a/fop-core/src/tools/resources/checkstyle/checkstyle.xml b/fop-core/src/tools/resources/checkstyle/checkstyle.xml
index 7cd53c359..e4a3894dc 100644
--- a/fop-core/src/tools/resources/checkstyle/checkstyle.xml
+++ b/fop-core/src/tools/resources/checkstyle/checkstyle.xml
@@ -12,7 +12,7 @@
<!-- ===================================================================================================== -->
<module name="NewlineAtEndOfFile">
- <property name="lineSeparator" value="lf" />
+ <property name="lineSeparator" value="lf_cr_crlf" />
</module>
<!-- ===================================================================================================== -->
@@ -38,25 +38,27 @@
<!-- ===================================================================================================== -->
<!-- ===================================================================================================== -->
- <module name="SuppressionCommentFilter">
+ <module name="SuppressWithPlainTextCommentFilter">
<property name="offCommentFormat" value="CSOFF\: ([\w\|]+)"/>
<property name="onCommentFormat" value="CSON\: ([\w\|]+)"/>
<property name="checkFormat" value="$1"/>
</module>
<!-- ===================================================================================================== -->
+ <!-- ===================================================================================================== -->
<module name="SuppressionFilter">
<property name="file" value="${checkstyle.suppressions.file}" default="suppressions.xml"/>
</module>
+ <!-- ===================================================================================================== -->
<!-- ===================================================================================================== -->
- <module name="TreeWalker">
+ <module name="LineLength">
+ <property name="max" value="120"/>
+ </module>
+ <!-- ===================================================================================================== -->
- <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
- <module name="LineLength">
- <property name="max" value="120"/>
- </module>
- <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
+ <!-- ===================================================================================================== -->
+ <module name="TreeWalker">
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
<module name="AnnotationUseStyle"/>
@@ -105,10 +107,6 @@
<module name="ExplicitInitialization"/>
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
- <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
- <module name="FileContentsHolder"/>
- <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
-
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
<module name="FinalClass"/>
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
@@ -187,7 +185,10 @@
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
- <module name="NoWhitespaceBefore"/>
+ <module name="NoWhitespaceBefore">
+ <!-- excluded COMMA -->
+ <property name="tokens" value="SEMI,POST_INC,POST_DEC,ELLIPSIS,LABELED_STAT"/>
+ </module>
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
@@ -215,7 +216,9 @@
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
- <module name="RedundantModifier"/>
+ <module name="RedundantModifier">
+ <property name="tokens" value="METHOD_DEF,VARIABLE_DEF,ANNOTATION_FIELD_DEF,INTERFACE_DEF,RESOURCE"/>
+ </module>
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
@@ -260,7 +263,7 @@
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
<module name="WhitespaceAround">
- <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,TYPE_EXTENSION_AND,WILDCARD_TYPE"/>
+ <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,TYPE_EXTENSION_AND"/>
<property name="ignoreEnhancedForColon" value="false"/>
</module>
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
diff --git a/fop-events/src/main/java/org/apache/fop/events/Event.java b/fop-events/src/main/java/org/apache/fop/events/Event.java
index 7c5759e6b..70e3b225f 100644
--- a/fop-events/src/main/java/org/apache/fop/events/Event.java
+++ b/fop-events/src/main/java/org/apache/fop/events/Event.java
@@ -48,8 +48,7 @@ public class Event extends EventObject {
* @param severity the severity level
* @param params the event parameters (a map of name/value pairs)
*/
- public Event(Object source, String eventID, EventSeverity severity, Map<String, Object> params)
- {
+ public Event(Object source, String eventID, EventSeverity severity, Map<String, Object> params) {
this (source, eventID, severity, Locale.getDefault(), params);
}
@@ -61,8 +60,7 @@ public class Event extends EventObject {
* @param locale to use when formatting event (or null, which means use default locale)
* @param params the event parameters (a map of name/value pairs)
*/
- public Event(Object source, String eventID, EventSeverity severity, Locale locale, Map<String, Object> params)
- {
+ public Event(Object source, String eventID, EventSeverity severity, Locale locale, Map<String, Object> params) {
super(source);
int pos = eventID.lastIndexOf('.');
if (pos < 0 || pos == eventID.length() - 1) {
diff --git a/fop-events/src/test/java/org/apache/fop/events/BasicEventTestCase.java b/fop-events/src/test/java/org/apache/fop/events/BasicEventTestCase.java
index e8c559728..f8d16ef0f 100644
--- a/fop-events/src/test/java/org/apache/fop/events/BasicEventTestCase.java
+++ b/fop-events/src/test/java/org/apache/fop/events/BasicEventTestCase.java
@@ -20,7 +20,6 @@
package org.apache.fop.events;
import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
diff --git a/pom.xml b/pom.xml
index 725b69494..fe795279d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
<antrun.plugin.version>1.8</antrun.plugin.version>
<batik.version>1.18.0-SNAPSHOT</batik.version>
<build.helper.plugin.version>1.9.1</build.helper.plugin.version>
- <checkstyle.plugin.version>2.14</checkstyle.plugin.version>
+ <checkstyle.plugin.version>3.6.0</checkstyle.plugin.version>
<commons.io.version>2.17.0</commons.io.version>
<commons.logging.version>1.3.0</commons.logging.version>
<compiler.plugin.version>3.11.0</compiler.plugin.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org