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/10/29 01:17:06 UTC
(xmlgraphics-fop) branch temp/matthias-FOP-3281 updated: FOP-3281: update checkstyle.xml and fix some new checkstyle issues in several Java files
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
The following commit(s) were added to refs/heads/temp/matthias-FOP-3281 by this push:
new 7c58c6a01 FOP-3281: update checkstyle.xml and fix some new checkstyle issues in several Java files
7c58c6a01 is described below
commit 7c58c6a01cca62bec6c0265d89648f2c4dbe642a
Author: Matthias Reischenbacher <ma...@apache.org>
AuthorDate: Tue Oct 28 22:16:23 2025 -0300
FOP-3281: update checkstyle.xml and fix some new checkstyle issues in several Java files
---
.../fop/afp/goca/GraphicsSetPatternSymbol.java | 2 +-
.../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/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 | 4 +-
.../main/java/org/apache/fop/pdf/RefPDFFont.java | 1 +
.../org/apache/fop/render/AbstractRenderer.java | 3 +-
.../org/apache/fop/render/gradient/Shading.java | 19 +-
.../fop/render/intermediate/GraphicsPainter.java | 4 +-
.../apache/fop/render/pdf/ImageRawPNGAdapter.java | 578 ++++++++++-----------
.../java/org/apache/fop/render/ps/DataOutput.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 | 4 +-
.../java/org/apache/fop/DigestFilterTestCase.java | 4 +-
.../java/org/apache/fop/HyphenationTestCase.java | 6 +-
.../org/apache/fop/KnuthAlgorithmTestCase.java | 4 +-
.../java/org/apache/fop/URIResolutionTestCase.java | 6 +-
.../accessibility/fo/ArtifactImageBugTestCase.java | 1 -
.../fo/FO2StructureTreeConverterTestCase.java | 5 +-
.../fop/accessibility/fo/PDFUAWarningTestCase.java | 1 -
.../fo/StructureTreeEventTriggerTestCase.java | 12 +-
.../pdf/FootnoteSeparatorTestCase.java | 4 +-
.../pdf/MissingLanguageWarningTestCase.java | 8 +-
.../org/apache/fop/afp/AFPGraphics2DTestCase.java | 8 +-
.../afp/AFPImageHandlerRenderedImageTestCase.java | 8 +-
.../apache/fop/afp/AFPResourceManagerTestCase.java | 8 +-
.../apache/fop/afp/AFPResourceUtilTestCase.java | 4 +-
.../org/apache/fop/afp/DataStreamTestCase.java | 7 +-
.../afp/goca/GraphicsCharacterStringTestCase.java | 5 +-
.../fop/afp/modca/AbstractAFPObjectTest.java | 4 +-
.../modca/AbstractTripletStructuredObjectTest.java | 8 +-
.../fop/afp/modca/IncludeObjectTestCase.java | 4 +-
.../TransparentDataControlSequenceTestCase.java | 6 +-
.../fop/afp/util/AFPResourceAccessorTestCase.java | 4 +-
.../apps/AbstractRendererConfigParserTester.java | 6 +-
.../fop/apps/AbstractRendererConfiguratorTest.java | 6 +-
.../apps/EnvironmentalProfileFactoryTestCase.java | 4 +-
.../apache/fop/apps/FopFactoryBuilderTestCase.java | 12 +-
.../org/apache/fop/apps/FopFactoryTestCase.java | 8 +-
.../apache/fop/apps/io/BaseURIResolutionTest.java | 4 +-
.../org/apache/fop/apps/io/FontURIResolver.java | 4 +-
.../apps/io/ResourceResolverFactoryTestCase.java | 8 +-
.../fop/apps/io/URIResolverWrapperTestCase.java | 12 +-
.../fop/cli/CommandLineOptions2TestCase.java | 4 +-
.../apache/fop/cli/CommandLineOptionsTestCase.java | 4 +-
.../complexscripts/bidi/BidiAlgorithmTestCase.java | 6 +-
.../fop/complexscripts/bidi/BidiClassTestCase.java | 4 +-
.../fop/complexscripts/bidi/BidiTestData.java | 2 +
.../fop/complexscripts/fonts/GDEFTestCase.java | 4 +-
.../fop/complexscripts/fonts/GPOSTestCase.java | 10 +-
.../fop/complexscripts/fonts/GSUBTestCase.java | 10 +-
.../fop/complexscripts/fonts/ttx/TTXFile.java | 1 +
.../layout/ComplexScriptsLayoutTestCase.java | 8 +-
.../fop/complexscripts/scripts/KhmerTestCase.java | 4 +-
.../scripts/arabic/ArabicJoinersTestCase.java | 4 +-
.../scripts/arabic/ArabicWordFormsTestCase.java | 8 +-
.../DefaultConfigurationTestCase.java | 94 ++--
.../fop/events/FlowNamedNotMappedTestCase.java | 6 +-
.../fop/fo/DelegatingFOEventHandlerTestCase.java | 4 +-
.../test/java/org/apache/fop/fo/FONodeMocks.java | 10 +-
.../org/apache/fop/fo/flow/MarkersTestCase.java | 4 +-
.../table/CollapsedConditionalBorderTestCase.java | 4 +-
.../apache/fop/fo/flow/table/ErrorCheckTest.java | 6 +-
.../fop/fo/flow/table/HeaderColumnTestCase.java | 18 +-
.../fop/fo/flow/table/PrimaryGridUnitTestCase.java | 8 +-
.../table/TableColumnColumnNumberTestCase.java | 4 +-
.../fop/fo/pagination/LayoutMasterSetTestCase.java | 4 +-
.../fo/pagination/PageSequenceMasterTestCase.java | 8 +-
.../RepeatablePageMasterAlternativesTestCase.java | 10 +-
.../fop/fo/properties/AltTextHolderTestCase.java | 8 +-
.../CommonAccessibilityHolderTestCase.java | 8 +-
.../fop/fo/properties/PropertyListMocks.java | 8 +-
.../apache/fop/fo/properties/PropertyMocks.java | 8 +-
.../java/org/apache/fop/fonts/CIDFullTestCase.java | 4 +-
.../org/apache/fop/fonts/CIDSubsetTestCase.java | 5 +-
.../apache/fop/fonts/DejaVuLGCSerifTestCase.java | 4 +-
.../fop/fonts/FontManagerConfiguratorTestCase.java | 4 +-
.../org/apache/fop/fonts/FontManagerTestCase.java | 8 +-
.../org/apache/fop/fonts/FontSelectorTestCase.java | 12 +-
.../fonts/autodetect/FontFileFinderTestCase.java | 4 +-
.../fop/fonts/cff/CFFDataReaderTestCase.java | 4 +-
.../fop/fonts/truetype/OTFSubSetFileTestCase.java | 12 +-
.../apache/fop/fonts/truetype/TTFFileTestCase.java | 6 +-
.../fop/fonts/truetype/TTFFontLoaderTestCase.java | 6 +-
.../fonts/type1/CharMetricsHandlerTestCase.java | 6 +-
.../fop/fonts/type1/PostscriptParserTestCase.java | 6 +-
.../fop/fonts/type1/Type1SubsetFileTestCase.java | 10 +-
.../batik/Graphics2DImagePainterImplTestCase.java | 6 +-
.../image/loader/batik/ImageLoaderTestCase.java | 8 +-
.../image/loader/batik/ImagePreloaderTestCase.java | 6 +-
.../fop/intermediate/IFMimickingTestCase.java | 4 +-
.../fop/layoutengine/LayoutEngineTestCase.java | 8 +-
.../apache/fop/layoutmgr/BreakElementTestCase.java | 4 +-
.../PageSequenceLayoutManagerTestCase.java | 10 +-
...rieveTableMarkerLayoutManagerMakerTestCase.java | 8 +-
.../RetrieveTableMarkerLayoutManagerTestCase.java | 12 +-
.../table/TableCellLayoutManagerTestCase.java | 8 +-
.../table/TableContentLayoutManagerTestCase.java | 8 +-
.../table/TableLayoutManagerTestCase.java | 16 +-
.../fop/pdf/ObjectStreamManagerTestCase.java | 4 +-
.../org/apache/fop/pdf/PDFDictionaryTestCase.java | 4 +-
.../fop/pdf/PDFDocumentGraphics2DTestCase.java | 8 +-
.../org/apache/fop/pdf/PDFEncodingTestCase.java | 4 +-
.../org/apache/fop/pdf/PDFFactoryTestCase.java | 9 +-
.../org/apache/fop/pdf/PDFFileSpecTestCase.java | 74 +--
.../java/org/apache/fop/pdf/PDFGoToTestCase.java | 68 +--
.../apache/fop/pdf/PDFImageXObjectTestCase.java | 10 +-
.../java/org/apache/fop/pdf/PDFLinkTestCase.java | 4 +-
.../java/org/apache/fop/pdf/PDFNameTestCase.java | 4 +-
.../org/apache/fop/pdf/PDFPagePieceTestCase.java | 6 +-
.../org/apache/fop/pdf/PDFResourcesTestCase.java | 384 +++++++-------
.../java/org/apache/fop/pdf/PDFRootTestCase.java | 3 +-
.../apache/fop/pdf/PDFToUnicodeCMapTestCase.java | 8 +-
.../java/org/apache/fop/pdf/PDFVTTestCase.java | 1 -
.../apache/fop/pdf/TableHeaderScopeTestCase.java | 6 +-
.../xref/CompressedObjectReferenceTestCase.java | 4 +-
.../fop/pdf/xref/CrossReferenceObjectTest.java | 4 +-
.../AbstractPathOrientedRendererTestCase.java | 6 +-
.../apache/fop/render/ConserveMemoryTestCase.java | 2 +-
.../apache/fop/render/RendererFactoryTestCase.java | 6 +-
.../fop/render/afp/AFPBorderPainterTestCase.java | 6 +-
.../fop/render/afp/AFPImageHandlerSVGTestCase.java | 1 -
.../apache/fop/render/afp/AFPPainterTestCase.java | 12 +-
.../afp/AFPRendererConfigParserTestCase.java | 12 +-
.../afp/AFPRendererConfiguratorTestCase.java | 6 +-
.../apache/fop/render/afp/AFPTrueTypeTestCase.java | 6 +-
.../render/afp/AddToPreviousPageGroupTestCase.java | 1 +
.../apache/fop/render/afp/NoOperationTestCase.java | 6 +-
.../AbstractBitmapRendererConfigParserTester.java | 8 +-
.../AbstractBitmapRendererConfiguratorTest.java | 10 +-
.../bitmap/TIFFRendererConfigParserTestCase.java | 8 +-
.../bitmap/TIFFRendererConfiguratorTestCase.java | 8 +-
.../DocumentNavigationHandlerTestCase.java | 6 +-
.../fop/render/gradient/GradientTestCase.java | 6 +-
.../intermediate/AbstractIFPainterTestCase.java | 8 +-
.../render/intermediate/BorderPainterTestCase.java | 8 +-
.../render/intermediate/IFRendererTestCase.java | 6 +-
.../render/intermediate/IFSerializerTestCase.java | 14 +-
.../IFStructureTreeBuilderTestCase.java | 16 +-
.../intermediate/SAXEventRecorderTestCase.java | 8 +-
.../java2d/Java2DRendererConfigParserTestcase.java | 8 +-
.../fop/render/java2d/Java2DUtilTestCase.java | 14 +-
.../pcl/PCLRendererConfigParserTestCase.java | 4 +-
.../pcl/PCLRendererConfiguratorTestCase.java | 10 +-
.../pcl/fonts/PCLFontReaderFactoryTestCase.java | 8 +-
.../render/pcl/fonts/PCLTTFFontReaderTestCase.java | 10 +-
.../truetype/PCLTTFCharacterWriterTestCase.java | 8 +-
.../fop/render/pdf/ImageRawPNGAdapterTestCase.java | 14 +-
.../render/pdf/ImageRenderedAdapterTestCase.java | 12 +-
.../fop/render/pdf/PDFAConformanceTestCase.java | 4 +-
.../fop/render/pdf/PDFAMetadataTestCase.java | 12 +-
.../fop/render/pdf/PDFBorderPainterTestCase.java | 4 +-
.../org/apache/fop/render/pdf/PDFCMapTestCase.java | 4 +-
.../apache/fop/render/pdf/PDFEncodingTestCase.java | 6 +-
.../fop/render/pdf/PDFGraphicsPainterTestCase.java | 6 +-
.../apache/fop/render/pdf/PDFPainterTestCase.java | 20 +-
.../pdf/PDFRendererConfigParserTestCase.java | 10 +-
.../pdf/PDFRendererOptionsConfigTestCase.java | 4 +-
.../pdf/PDFStructureTreeBuilderTestCase.java | 11 +-
.../fop/render/pdf/PDFsRGBSettingsTestCase.java | 4 +-
.../PDFEmbeddedFileAttachmentTestCase.java | 84 +--
.../fop/render/ps/AbstractPostScriptTest.java | 4 +-
.../fop/render/ps/ImageEncoderPNGTestCase.java | 10 +-
.../fop/render/ps/ImageHandlingTestCase.java | 7 +-
.../fop/render/ps/PSBorderPainterTestCase.java | 4 +-
.../fop/render/ps/PSGraphics2DAdapterTestCase.java | 1 +
.../apache/fop/render/ps/PSPainterTestCase.java | 25 +-
.../fop/render/ps/PSPainterUtilTestCase.java | 1 +
.../render/ps/PSRendererConfigParserTestCase.java | 4 +-
.../render/ps/PSRendererConfiguratorTestCase.java | 10 +-
.../fop/render/ps/PSRenderingUtilTestCase.java | 6 +-
.../render/ps/ResourceOptimizationTestCase.java | 10 +-
.../render/ps/fonts/PSTTFGeneratorTestCase.java | 4 +-
.../render/ps/fonts/PSTTFOutputStreamTestCase.java | 8 +-
.../apache/fop/render/ps/svg/GradientTestCase.java | 4 +-
.../rtf/rtflib/testdocs/ParagraphAlignment.java | 3 +-
.../txt/TxtRendererConfigParserTestCase.java | 4 +-
.../fop/svg/AbstractBasicTranscoderTest.java | 4 +-
.../apache/fop/svg/BasicPDFTranscoderTestCase.java | 3 +-
.../org/apache/fop/svg/PDFTextPainterTestCase.java | 8 +-
.../fop/svg/font/BasicGlyphVectorTestCase.java | 12 +-
.../svg/font/FOPFontFamilyResolverTestCase.java | 12 +-
.../apache/fop/svg/font/FOPGVTFontTestCase.java | 4 +-
.../apache/fop/svg/font/GlyphLayoutTestCase.java | 4 +-
.../fop/svg/font/KerningGlyphLayoutTestCase.java | 182 +++----
.../org/apache/fop/threading/FOProcessorImpl.java | 1 -
.../org/apache/fop/threading/IFProcessorImpl.java | 1 -
.../org/apache/fop/traits/BorderPropsTestCase.java | 4 +-
.../fop/util/AdvancedMessageFormatTestCase.java | 4 +-
.../apache/fop/util/BitmapImageUtilTestCase.java | 4 +-
.../org/apache/fop/util/ColorUtilTestCase.java | 10 +-
.../apache/fop/util/ElementListUtilsTestCase.java | 8 +-
.../apache/fop/util/XMLResourceBundleTestCase.java | 4 +-
.../src/tools/resources/checkstyle/checkstyle.xml | 30 +-
.../src/main/java/org/apache/fop/events/Event.java | 6 +-
.../org/apache/fop/events/BasicEventTestCase.java | 4 +-
228 files changed, 1488 insertions(+), 1390 deletions(-)
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/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/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..f8a55112f 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
@@ -22,11 +22,11 @@ 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;
import org.apache.fop.render.pdf.PDFEventProducer;
+import static java.lang.Character.isHighSurrogate;
+
/**
* Class representing ToUnicode CMaps.
* Here are some documentation resources:
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/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/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/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/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..cae3e9200 100644
--- a/fop-core/src/test/java/org/apache/fop/BasicDriverTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/BasicDriverTestCase.java
@@ -30,8 +30,6 @@ import javax.xml.transform.stream.StreamSource;
import org.junit.Test;
-import static org.junit.Assert.assertTrue;
-
import org.apache.commons.io.output.ByteArrayOutputStream;
import org.apache.fop.apps.FOPException;
@@ -41,6 +39,8 @@ import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.MimeConstants;
import org.apache.fop.cli.InputHandler;
+import static org.junit.Assert.assertTrue;
+
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..9e4b763cb 100644
--- a/fop-core/src/test/java/org/apache/fop/DigestFilterTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/DigestFilterTestCase.java
@@ -32,10 +32,10 @@ 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;
+import static org.junit.Assert.assertTrue;
+
/**
* Test case for digesting SAX filter.
*
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..759c2bee3 100644
--- a/fop-core/src/test/java/org/apache/fop/HyphenationTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/HyphenationTestCase.java
@@ -28,9 +28,6 @@ import java.util.Map;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
import org.apache.commons.io.IOUtils;
import org.apache.fop.apps.FopFactory;
@@ -41,6 +38,9 @@ import org.apache.fop.hyphenation.HyphenationException;
import org.apache.fop.hyphenation.HyphenationTree;
import org.apache.fop.hyphenation.Hyphenator;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
public class HyphenationTestCase {
private FopFactory fopFactory = FopFactory.newInstance(new File(".").toURI());
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..9b2c5556f 100644
--- a/fop-core/src/test/java/org/apache/fop/KnuthAlgorithmTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/KnuthAlgorithmTestCase.java
@@ -24,8 +24,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;
import org.apache.fop.layoutmgr.BreakingAlgorithm;
import org.apache.fop.layoutmgr.ElementListObserver;
@@ -34,6 +32,8 @@ import org.apache.fop.layoutmgr.KnuthGlue;
import org.apache.fop.layoutmgr.KnuthPenalty;
import org.apache.fop.layoutmgr.KnuthSequence;
+import static org.junit.Assert.assertEquals;
+
/**
* Tests the Knuth algorithm implementation.
*/
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..a8826eee8 100644
--- a/fop-core/src/test/java/org/apache/fop/URIResolutionTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/URIResolutionTestCase.java
@@ -45,9 +45,6 @@ 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;
-
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.output.ByteArrayOutputStream;
@@ -63,6 +60,9 @@ import org.apache.fop.apps.MimeConstants;
import org.apache.fop.apps.io.ResourceResolverFactory;
import org.apache.fop.render.xml.XMLRenderer;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
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/FO2StructureTreeConverterTestCase.java b/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java
index 5350fb560..943247c2c 100644
--- a/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java
@@ -50,8 +50,6 @@ import org.junit.Test;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import org.apache.commons.io.IOUtils;
import org.apache.pdfbox.Loader;
@@ -72,6 +70,9 @@ import org.apache.fop.fo.FOEventHandler;
import org.apache.fop.fo.LoadingException;
import org.apache.fop.fotreetest.DummyFOEventHandler;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class FO2StructureTreeConverterTestCase {
private static class FOLoader {
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..2b1a833b6 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
@@ -21,12 +21,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;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
import org.apache.fop.accessibility.StructureTreeEventHandler;
import org.apache.fop.fo.Constants;
import org.apache.fop.fo.FONode;
@@ -36,6 +30,12 @@ import org.apache.fop.fo.extensions.ExternalDocument;
import org.apache.fop.fo.properties.CommonAccessibility;
import org.apache.fop.fo.properties.StringProperty;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
public class StructureTreeEventTriggerTestCase {
@Test
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..e023352ef 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,9 +23,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import org.junit.Test;
-
import org.xml.sax.helpers.AttributesImpl;
-import static org.junit.Assert.assertEquals;
import org.apache.fop.pdf.PDFDocument;
import org.apache.fop.pdf.PDFFactory;
@@ -34,6 +32,8 @@ import org.apache.fop.pdf.PDFStructElem;
import org.apache.fop.pdf.PDFStructTreeRoot;
import org.apache.fop.render.pdf.PDFStructureTreeBuilder;
+import static org.junit.Assert.assertEquals;
+
public class FootnoteSeparatorTestCase {
@Test
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..ff63ceb58 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
@@ -32,10 +32,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;
-
import org.apache.commons.io.output.NullOutputStream;
import org.apache.fop.apps.FOUserAgent;
@@ -46,6 +42,10 @@ import org.apache.fop.events.Event;
import org.apache.fop.events.EventListener;
import org.apache.fop.render.pdf.PDFEventProducer;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
public class MissingLanguageWarningTestCase {
private Fop fop;
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..27d226510 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
@@ -35,10 +35,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;
-
import org.apache.xmlgraphics.java2d.GraphicContext;
import org.apache.fop.afp.modca.GraphicsObject;
@@ -49,6 +45,10 @@ import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.fonts.FontInfo;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
public class AFPGraphics2DTestCase {
private final float lineWidth = 1.0f;
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..3ec05edfb 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,7 +21,6 @@ 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;
@@ -29,20 +28,19 @@ import java.io.IOException;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
import org.apache.xmlgraphics.image.loader.ImageInfo;
import org.apache.xmlgraphics.image.loader.ImageSize;
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;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
/**
* A test class for testing AFP events.
*/
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..cf6659382 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
@@ -30,10 +30,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;
-
import org.apache.xmlgraphics.java2d.GraphicContext;
import org.apache.xmlgraphics.java2d.Graphics2DImagePainter;
import org.apache.xmlgraphics.util.MimeConstants;
@@ -41,6 +37,10 @@ import org.apache.xmlgraphics.util.MimeConstants;
import org.apache.fop.apps.io.ResourceResolverFactory;
import org.apache.fop.render.afp.AFPParser;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
/**
* Test case for {@link AFPResourceManager}.
*/
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..d2e5b9f3c 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
@@ -27,12 +27,12 @@ import java.util.Arrays;
import org.junit.Test;
-import static org.junit.Assert.assertTrue;
-
import org.apache.commons.io.IOUtils;
import org.apache.fop.afp.util.AFPResourceUtil;
+import static org.junit.Assert.assertTrue;
+
/**
* Tests the {@link AFPResourceUtil} class.
*/
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..00fd4e222 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
@@ -28,10 +28,6 @@ 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;
@@ -43,6 +39,9 @@ import org.apache.fop.fonts.Font;
import org.apache.fop.fonts.Typeface;
import org.apache.fop.util.CharUtilities;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
public class DataStreamTestCase {
private DataStream ds;
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..f01e831fe 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;
@@ -22,12 +23,12 @@ 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;
import org.apache.fop.afp.fonts.CharacterSetBuilder;
import org.apache.fop.fonts.Typeface;
+import static org.junit.Assert.assertEquals;
+
public class GraphicsCharacterStringTestCase {
private GraphicsCharacterString gcsCp500;
private GraphicsCharacterString gcsCp1146;
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..6689c4824 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
@@ -28,12 +28,12 @@ import java.util.List;
import org.junit.Test;
+import org.apache.fop.afp.Streamable;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import org.apache.fop.afp.Streamable;
-
/**
* Tests the {@link AbstractAFPObject} class.
*/
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..70d0515f0 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
@@ -29,16 +29,16 @@ 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;
-
import org.apache.fop.afp.modca.triplets.AbstractTriplet;
import org.apache.fop.afp.modca.triplets.AttributeQualifierTriplet;
import org.apache.fop.afp.modca.triplets.CommentTriplet;
import org.apache.fop.afp.modca.triplets.ObjectAreaSizeTriplet;
import org.apache.fop.afp.modca.triplets.Triplet;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
/**
* Test {@link AbstractTripletStructuredObject}
*/
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..813529ee4 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
@@ -26,10 +26,10 @@ 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;
+import static org.junit.Assert.assertTrue;
+
/**
* Test {@link IncludeObject}
*/
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..5d9168455 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
@@ -24,14 +24,14 @@ import java.io.OutputStream;
import org.junit.Test;
+import org.apache.fop.afp.fonts.CharactersetEncoder.EncodedChars;
+import org.apache.fop.afp.ptoca.TransparentDataControlSequence.TransparentData;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
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..f7dae4e5a 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
@@ -24,12 +24,12 @@ import java.net.URISyntaxException;
import org.junit.Before;
import org.junit.Test;
+import org.apache.fop.apps.io.InternalResourceResolver;
+
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import org.apache.fop.apps.io.InternalResourceResolver;
-
public class AFPResourceAccessorTestCase {
private InternalResourceResolver nullBaseResourceResolver;
diff --git a/fop-core/src/test/java/org/apache/fop/apps/AbstractRendererConfigParserTester.java b/fop-core/src/test/java/org/apache/fop/apps/AbstractRendererConfigParserTester.java
index 6b1846efc..93b6af2cc 100644
--- a/fop-core/src/test/java/org/apache/fop/apps/AbstractRendererConfigParserTester.java
+++ b/fop-core/src/test/java/org/apache/fop/apps/AbstractRendererConfigParserTester.java
@@ -19,9 +19,6 @@
package org.apache.fop.apps;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
import org.apache.fop.apps.FopConfBuilder.RendererConfBuilder;
import org.apache.fop.configuration.Configuration;
import org.apache.fop.configuration.DefaultConfigurationBuilder;
@@ -30,6 +27,9 @@ import org.apache.fop.fonts.FontManager;
import org.apache.fop.render.RendererConfig;
import org.apache.fop.render.RendererConfig.RendererConfigParser;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
public abstract class AbstractRendererConfigParserTester<B extends RendererConfBuilder,
C extends RendererConfig> {
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..86e31f169 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
@@ -24,14 +24,14 @@ import java.io.IOException;
import org.xml.sax.SAXException;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
import org.apache.fop.apps.FopConfBuilder.RendererConfBuilder;
import org.apache.fop.configuration.ConfigurationException;
import org.apache.fop.render.PrintRendererConfigurator;
import org.apache.fop.render.intermediate.IFDocumentHandler;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
public abstract class AbstractRendererConfiguratorTest<T extends PrintRendererConfigurator,
B extends RendererConfBuilder> {
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..1693cd520 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
@@ -21,11 +21,11 @@ import java.net.URI;
import org.junit.Test;
+import org.apache.xmlgraphics.io.ResourceResolver;
+
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
-import org.apache.xmlgraphics.io.ResourceResolver;
-
public class EnvironmentalProfileFactoryTestCase {
private final URI testURI = URI.create("this.is.purely.for.test.purposes");
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..9ae78fe4e 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
@@ -29,12 +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.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
import org.apache.fop.apps.io.ResourceResolverFactory;
import org.apache.fop.area.AreaTreeHandler;
import org.apache.fop.area.Block;
@@ -55,6 +49,12 @@ import org.apache.fop.layoutmgr.PageSequenceLayoutManager;
import org.apache.fop.layoutmgr.StaticContentLayoutManager;
import org.apache.fop.layoutmgr.inline.ContentLayoutManager;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Test case for {@link FopFactoryBuilder}.
*/
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..6e1fb4864 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
@@ -35,15 +35,15 @@ import javax.xml.transform.stream.StreamSource;
import org.junit.Test;
import org.xml.sax.SAXException;
+import org.apache.fop.config.BaseConstructiveUserConfigTest;
+import org.apache.fop.render.RendererConfig.RendererConfigParser;
+import org.apache.fop.render.pdf.PDFRendererConfig;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.fop.config.BaseConstructiveUserConfigTest;
-import org.apache.fop.render.RendererConfig.RendererConfigParser;
-import org.apache.fop.render.pdf.PDFRendererConfig;
-
public class FopFactoryTestCase extends BaseConstructiveUserConfigTest {
public FopFactoryTestCase() throws SAXException, IOException {
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..d8e177fe9 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
@@ -34,8 +34,6 @@ import javax.xml.transform.stream.StreamSource;
import org.xml.sax.SAXException;
-import static org.junit.Assert.assertTrue;
-
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.output.ByteArrayOutputStream;
@@ -49,6 +47,8 @@ import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.FopFactoryBuilder;
import org.apache.fop.apps.MimeConstants;
+import static org.junit.Assert.assertTrue;
+
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..ae5cb8f01 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
@@ -33,13 +33,13 @@ 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;
import org.apache.fop.apps.FopConfBuilder;
import org.apache.fop.apps.PDFRendererConfBuilder;
+import static org.junit.Assert.assertTrue;
+
public class FontURIResolver extends BaseURIResolutionTest {
public enum Event {
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..c722a694f 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
@@ -29,6 +29,10 @@ import java.net.URI;
import org.junit.Test;
+import org.apache.xmlgraphics.io.Resource;
+import org.apache.xmlgraphics.io.ResourceResolver;
+import org.apache.xmlgraphics.io.TempResourceResolver;
+
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
@@ -36,10 +40,6 @@ import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import org.apache.xmlgraphics.io.Resource;
-import org.apache.xmlgraphics.io.ResourceResolver;
-import org.apache.xmlgraphics.io.TempResourceResolver;
-
public class ResourceResolverFactoryTestCase {
private static final byte[] DATA = new byte[]{(byte) 0, (byte) 1, (byte) 2};
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..eb1dfb909 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
@@ -30,6 +30,12 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
+import org.apache.commons.io.IOUtils;
+
+import org.apache.xmlgraphics.io.ResourceResolver;
+import org.apache.xmlgraphics.util.WriterOutputStream;
+import org.apache.xmlgraphics.util.io.Base64EncodeStream;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
@@ -37,12 +43,6 @@ import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import org.apache.commons.io.IOUtils;
-
-import org.apache.xmlgraphics.io.ResourceResolver;
-import org.apache.xmlgraphics.util.WriterOutputStream;
-import org.apache.xmlgraphics.util.io.Base64EncodeStream;
-
public class URIResolverWrapperTestCase {
private static final List<String> BASE_URIS = Collections.unmodifiableList(Arrays.asList(
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..6060fad8c 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
@@ -23,13 +23,13 @@ import org.junit.Assert;
import org.junit.Test;
import org.junit.function.ThrowingRunnable;
+import org.apache.fop.apps.FOPException;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import org.apache.fop.apps.FOPException;
-
public class CommandLineOptions2TestCase {
/**
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..a57a765f3 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
@@ -24,11 +24,11 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
+import org.apache.fop.apps.FOPException;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import org.apache.fop.apps.FOPException;
-
public class CommandLineOptionsTestCase {
private final CommandLineOptions clo = new CommandLineOptions();
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..f14814a6e 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
@@ -21,12 +21,12 @@ package org.apache.fop.complexscripts.bidi;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
/**
* <p>Test case for Unicode Bidi Algorithm.</p>
*/
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..01e3eb8c0 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
@@ -21,11 +21,11 @@ package org.apache.fop.complexscripts.bidi;
import org.junit.Test;
+import org.apache.fop.util.CharUtilities;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-import org.apache.fop.util.CharUtilities;
-
public class BidiClassTestCase {
@Test
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..cd6a8453a 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
@@ -23,12 +23,12 @@ import java.io.File;
import org.junit.Test;
+import org.apache.fop.complexscripts.fonts.ttx.TTXFile;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import org.apache.fop.complexscripts.fonts.ttx.TTXFile;
-
public class GDEFTestCase {
private static String ttxFilesRoot = "test/resources/complexscripts";
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..b761de87b 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
@@ -23,17 +23,17 @@ 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;
-import static org.junit.Assert.fail;
-
import org.apache.fop.complexscripts.fonts.GlyphTable.LookupTable;
import org.apache.fop.complexscripts.fonts.ttx.TTXFile;
import org.apache.fop.complexscripts.util.GlyphContextTester;
import org.apache.fop.complexscripts.util.GlyphSequence;
import org.apache.fop.complexscripts.util.ScriptContextTester;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
// CSOFF: LineLength
public class GPOSTestCase implements ScriptContextTester, GlyphContextTester {
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..de3ed9d6d 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
@@ -25,11 +25,6 @@ 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;
-import static org.junit.Assert.fail;
-
import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.apps.io.ResourceResolverFactory;
import org.apache.fop.complexscripts.fonts.GlyphTable.LookupTable;
@@ -40,6 +35,11 @@ import org.apache.fop.complexscripts.util.ScriptContextTester;
import org.apache.fop.fonts.MultiByteFont;
import org.apache.fop.fonts.truetype.OFFontLoader;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class GSUBTestCase implements ScriptContextTester, GlyphContextTester {
private static String ttxFilesRoot = "test/resources/complexscripts";
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/layout/ComplexScriptsLayoutTestCase.java b/fop-core/src/test/java/org/apache/fop/complexscripts/layout/ComplexScriptsLayoutTestCase.java
index 416cbf8d0..aa74e3f58 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
@@ -52,10 +52,6 @@ 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;
-
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.filefilter.AndFileFilter;
import org.apache.commons.io.filefilter.IOFileFilter;
@@ -100,6 +96,10 @@ import org.apache.fop.render.xml.XMLRenderer;
import org.apache.fop.util.ConsoleEventListenerForTests;
import org.apache.fop.util.DelegatingContentHandler;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
// CSOFF: LineLengthCheck
/**
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..76eb38abf 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
@@ -27,8 +27,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;
import org.apache.fop.complexscripts.fonts.GlyphPositioningTable;
import org.apache.fop.complexscripts.fonts.GlyphSubtable;
@@ -39,6 +37,8 @@ import org.apache.fop.complexscripts.util.CharScript;
import org.apache.fop.complexscripts.util.GlyphSequence;
import org.apache.fop.fonts.MultiByteFont;
+import static org.junit.Assert.assertEquals;
+
public class KhmerTestCase {
@Test
public void testProcessor() {
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..ab9fb9fe4 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
@@ -25,8 +25,6 @@ import java.util.HashMap;
import org.junit.Test;
-import static org.junit.Assert.assertTrue;
-
import org.apache.fop.complexscripts.scripts.ScriptProcessor;
import org.apache.fop.complexscripts.util.CharScript;
import org.apache.fop.complexscripts.util.GlyphContextTester;
@@ -34,6 +32,8 @@ import org.apache.fop.complexscripts.util.GlyphSequence;
import org.apache.fop.complexscripts.util.ScriptContextTester;
import org.apache.fop.complexscripts.util.UTF32;
+import static org.junit.Assert.assertTrue;
+
// CSOFF: LineLength
/**
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..4a8346b47 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
@@ -30,10 +30,6 @@ 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;
-
import org.apache.commons.io.IOUtils;
import org.apache.fop.complexscripts.fonts.GlyphPositioningTable;
@@ -41,6 +37,10 @@ import org.apache.fop.complexscripts.fonts.GlyphSubstitutionTable;
import org.apache.fop.complexscripts.fonts.ttx.TTXFile;
import org.apache.fop.complexscripts.util.GlyphSequence;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
// CSOFF: LineLength
/**
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..b5b19116d 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,47 @@
-/*
- * 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/events/FlowNamedNotMappedTestCase.java b/fop-core/src/test/java/org/apache/fop/events/FlowNamedNotMappedTestCase.java
index 3e6ba3aaf..e9e7326f5 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
@@ -31,9 +31,6 @@ import javax.xml.transform.stream.StreamSource;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
import org.apache.commons.io.output.NullOutputStream;
import org.apache.fop.apps.FOUserAgent;
@@ -42,6 +39,9 @@ import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.MimeConstants;
import org.apache.fop.fo.FOValidationEventProducer;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class FlowNamedNotMappedTestCase {
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..54908fe21 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
@@ -40,8 +40,6 @@ 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;
import org.apache.fop.fo.FODocumentParser.FOEventHandlerFactory;
import org.apache.fop.fo.flow.BasicLink;
@@ -74,6 +72,8 @@ import org.apache.fop.fo.pagination.PageSequence;
import org.apache.fop.fo.pagination.Root;
import org.apache.fop.fo.pagination.StaticContent;
+import static org.junit.Assert.assertArrayEquals;
+
/**
* Tests that {@link DelegatingFOEventHandler} does forward every event to its delegate
* event handler.
diff --git a/fop-core/src/test/java/org/apache/fop/fo/FONodeMocks.java b/fop-core/src/test/java/org/apache/fop/fo/FONodeMocks.java
index d729157f2..c7b28fcf6 100644
--- a/fop-core/src/test/java/org/apache/fop/fo/FONodeMocks.java
+++ b/fop-core/src/test/java/org/apache/fop/fo/FONodeMocks.java
@@ -21,11 +21,6 @@ package org.apache.fop.fo;
import java.io.IOException;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
import org.apache.xmlgraphics.image.loader.ImageException;
import org.apache.xmlgraphics.image.loader.ImageManager;
import org.apache.xmlgraphics.image.loader.ImageSessionContext;
@@ -35,6 +30,11 @@ import org.apache.fop.events.EventBroadcaster;
import org.apache.fop.fo.flow.table.ColumnNumberManager;
import org.apache.fop.fo.flow.table.ColumnNumberManagerHolder;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
/**
* A helper class for creating mocks of {@link FONode} and its descendants.
*/
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..770debc04 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
@@ -24,13 +24,13 @@ import java.util.Map;
import org.junit.Test;
+import org.apache.fop.fo.Constants;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.fop.fo.Constants;
-
public class MarkersTestCase {
@Test
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..79131ecc8 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
@@ -25,12 +25,12 @@ import java.util.List;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
import org.apache.fop.fo.Constants;
import org.apache.fop.fo.FONode.FONodeIterator;
import org.apache.fop.fo.properties.CommonBorderPaddingBackground.BorderInfo;
+import static org.junit.Assert.assertEquals;
+
// CSOFF: LineLength
/**
diff --git a/fop-core/src/test/java/org/apache/fop/fo/flow/table/ErrorCheckTest.java b/fop-core/src/test/java/org/apache/fop/fo/flow/table/ErrorCheckTest.java
index b30c64c07..5b8165f0d 100644
--- a/fop-core/src/test/java/org/apache/fop/fo/flow/table/ErrorCheckTest.java
+++ b/fop-core/src/test/java/org/apache/fop/fo/flow/table/ErrorCheckTest.java
@@ -19,12 +19,12 @@
package org.apache.fop.fo.flow.table;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
import org.apache.fop.fo.LoadingException;
import org.apache.fop.fo.ValidationException;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Abstract class for testing erroneous files, checking that a ValidationException is thrown.
*/
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..2f1ac7c94 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
@@ -24,15 +24,6 @@ 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;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.events.EventBroadcaster;
import org.apache.fop.fo.ElementMappingRegistry;
@@ -46,6 +37,15 @@ import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.extensions.ExtensionElementMapping;
import org.apache.fop.util.XMLUtil;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
/**
* Tests that the fox:header property is correctly parsed and set up at the FO tree level.
*/
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..a0e08108c 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
@@ -24,16 +24,16 @@ 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;
-
import org.apache.fop.datatypes.Length;
import org.apache.fop.fo.properties.LengthPairProperty;
import org.apache.fop.fo.properties.Property;
import org.apache.fop.layoutmgr.KnuthBox;
import org.apache.fop.layoutmgr.KnuthElement;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
/**
* Tests that the fox:header property is correctly parsed and set up at the FO tree level.
*/
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..458e3a4e0 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
@@ -23,11 +23,11 @@ import java.util.Iterator;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
import org.apache.fop.datatypes.PercentBaseContext;
import org.apache.fop.fo.FObj;
+import static org.junit.Assert.assertEquals;
+
public class TableColumnColumnNumberTestCase extends AbstractTableTest {
/**
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..cfed05bf5 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
@@ -21,13 +21,13 @@ package org.apache.fop.fo.pagination;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.fo.FODocumentParser;
import org.apache.fop.fo.FODocumentParser.FOEventHandlerFactory;
import org.apache.fop.fo.FOEventHandler;
+import static org.junit.Assert.assertEquals;
+
public class LayoutMasterSetTestCase {
private static class FlowMappingTester extends FOEventHandler {
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..577606265 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
@@ -22,6 +22,10 @@ package org.apache.fop.fo.pagination;
import org.junit.Test;
import org.xml.sax.Locator;
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.fo.FONode;
+import org.apache.fop.layoutmgr.BlockLevelEventProducer;
+
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
@@ -32,10 +36,6 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.fo.FONode;
-import org.apache.fop.layoutmgr.BlockLevelEventProducer;
-
/**
* Unit Test for PageSequenceMaster
*
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..172d8b940 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
@@ -21,17 +21,17 @@ package org.apache.fop.fo.pagination;
import org.junit.Test;
+import org.apache.fop.fo.Constants;
+import org.apache.fop.fo.PropertyList;
+import org.apache.fop.fo.expr.NumericProperty;
+import org.apache.fop.fo.properties.Property;
+
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.fop.fo.Constants;
-import org.apache.fop.fo.PropertyList;
-import org.apache.fop.fo.expr.NumericProperty;
-import org.apache.fop.fo.properties.Property;
-
/**
* Unit Test for RepeatablePageMasterAlternatives
*
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..6dc703ea9 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
@@ -21,10 +21,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;
-
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.fo.Constants;
@@ -36,6 +32,10 @@ import org.apache.fop.fo.flow.AbstractGraphics;
import org.apache.fop.fo.flow.ExternalGraphic;
import org.apache.fop.fo.flow.InstreamForeignObject;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
/**
* Tests that the fox:alt-text property is correctly set on objects that support it.
*/
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..e62a23f6b 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
@@ -25,16 +25,16 @@ 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;
-
import org.apache.fop.fo.Constants;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FONodeMocks;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.expr.PropertyException;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
/**
* This tests that all the FONodes that implement CommonAccessibilityHolder correctly configure
* the CommonAccessibility property.
diff --git a/fop-core/src/test/java/org/apache/fop/fo/properties/PropertyListMocks.java b/fop-core/src/test/java/org/apache/fop/fo/properties/PropertyListMocks.java
index 871b0648b..3d532ad1b 100644
--- a/fop-core/src/test/java/org/apache/fop/fo/properties/PropertyListMocks.java
+++ b/fop-core/src/test/java/org/apache/fop/fo/properties/PropertyListMocks.java
@@ -19,14 +19,14 @@
package org.apache.fop.fo.properties;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
import org.apache.fop.fo.Constants;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.expr.PropertyException;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
/**
* A helper class for mocking a property list.
*/
diff --git a/fop-core/src/test/java/org/apache/fop/fo/properties/PropertyMocks.java b/fop-core/src/test/java/org/apache/fop/fo/properties/PropertyMocks.java
index bdd1875a5..d23848a63 100644
--- a/fop-core/src/test/java/org/apache/fop/fo/properties/PropertyMocks.java
+++ b/fop-core/src/test/java/org/apache/fop/fo/properties/PropertyMocks.java
@@ -19,14 +19,14 @@
package org.apache.fop.fo.properties;
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
import org.apache.fop.datatypes.Numeric;
import org.apache.fop.datatypes.PercentBaseContext;
import org.apache.fop.fo.Constants;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
/**
* Helper class to create mocks of various kinds of properties.
*/
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..0e76f21f7 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
@@ -26,14 +26,14 @@ import java.util.Map;
import org.junit.Before;
import org.junit.Test;
+import org.apache.fop.util.CharUtilities;
+
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.fop.util.CharUtilities;
-
public class CIDFullTestCase {
private CIDFull cidFull;
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..15e29f97f 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
@@ -27,14 +27,13 @@ import java.util.Map;
import org.junit.Before;
import org.junit.Test;
+import org.apache.fop.util.CharUtilities;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.fop.util.CharUtilities;
-
public class CIDSubsetTestCase {
/** The surrogate pair is expected to be in the end of the string. Change it carefully. */
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..e38fa9b21 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
@@ -24,11 +24,11 @@ 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;
import org.apache.fop.apps.io.ResourceResolverFactory;
+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..48a6907c7 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
@@ -27,13 +27,13 @@ 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.junit.Assert.assertEquals;
+
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..b73cb6a47 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
@@ -26,15 +26,15 @@ import org.junit.Before;
import org.junit.Test;
import org.mockito.InOrder;
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.apps.io.InternalResourceResolver;
+import org.apache.fop.apps.io.ResourceResolverFactory;
+
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.apps.io.InternalResourceResolver;
-import org.apache.fop.apps.io.ResourceResolverFactory;
-
public class FontManagerTestCase {
private FontManager sut;
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..45e9d2e42 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
@@ -29,12 +29,6 @@ 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;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
import org.apache.commons.io.output.NullPrintStream;
import org.apache.fop.datatypes.PercentBaseContext;
@@ -52,6 +46,12 @@ import org.apache.fop.fo.properties.FontFamilyProperty;
import org.apache.fop.fo.properties.NumberProperty;
import org.apache.fop.fo.properties.Property;
+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;
+
public class FontSelectorTestCase {
private static final FontTriplet LATIN_FONT_TRIPLET = new FontTriplet("Verdana", "normal", 400);
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..3a7c10366 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
@@ -29,6 +29,8 @@ import java.nio.file.spi.FileSystemProvider;
import org.junit.Test;
+import org.apache.fop.fonts.FontEventListener;
+
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
@@ -36,8 +38,6 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import org.apache.fop.fonts.FontEventListener;
-
public class FontFileFinderTestCase {
@Test
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..a17167324 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
@@ -26,12 +26,12 @@ 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;
import org.apache.fop.fonts.cff.CFFDataReader.DICTEntry;
import org.apache.fop.fonts.truetype.OTFSubSetFile;
+import static org.junit.Assert.assertEquals;
+
public class CFFDataReaderTestCase {
private CFFDataReader cffReader;
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..40b048255 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
@@ -35,12 +35,6 @@ 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;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
import org.apache.fontbox.cff.CFFFont;
import org.apache.fontbox.cff.CFFParser;
import org.apache.fontbox.cff.CFFType1Font;
@@ -54,6 +48,12 @@ import org.apache.fop.fonts.cff.CFFDataReader.CFFIndexData;
import org.apache.fop.fonts.cff.CFFDataReader.DICTEntry;
import org.apache.fop.fonts.truetype.OTFSubSetFile.BytesNumber;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
public class OTFSubSetFileTestCase extends OTFFileTestCase {
private Map<Integer, Integer> glyphs = new HashMap<Integer, Integer>();
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..1373b54f7 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
@@ -32,13 +32,13 @@ import java.util.Map;
import org.junit.Assert;
import org.junit.Test;
+import org.apache.fop.fonts.CMapSegment;
+import org.apache.fop.fonts.truetype.OpenFont.PostScriptVersion;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import org.apache.fop.fonts.CMapSegment;
-import org.apache.fop.fonts.truetype.OpenFont.PostScriptVersion;
-
/**
* Class for testing org.apache.fop.fonts.truetype.TTFFile
*/
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..95eaa0925 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
@@ -25,14 +25,14 @@ import java.net.URI;
import org.junit.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
import org.apache.fop.apps.io.InternalResourceResolver;
import org.apache.fop.apps.io.ResourceResolverFactory;
import org.apache.fop.fonts.EmbeddingMode;
import org.apache.fop.fonts.EncodingMode;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
/**
* Test case for {@link OFFontLoader}.
*/
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..54806a94e 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
@@ -27,13 +27,13 @@ import java.util.Stack;
import org.junit.Test;
+import org.apache.fop.fonts.NamedCharacter;
+import org.apache.fop.fonts.type1.AFMParser.ValueHandler;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import org.apache.fop.fonts.NamedCharacter;
-import org.apache.fop.fonts.type1.AFMParser.ValueHandler;
-
/**
* Test case for {@link CharMetricsHandler}.
*/
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..76ea7a044 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
@@ -25,9 +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.assertTrue;
-
import org.apache.fop.fonts.type1.PostscriptParser.PSDictionary;
import org.apache.fop.fonts.type1.PostscriptParser.PSElement;
import org.apache.fop.fonts.type1.PostscriptParser.PSFixedArray;
@@ -35,6 +32,9 @@ import org.apache.fop.fonts.type1.PostscriptParser.PSSubroutine;
import org.apache.fop.fonts.type1.PostscriptParser.PSVariable;
import org.apache.fop.fonts.type1.PostscriptParser.PSVariableArray;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
public class PostscriptParserTestCase {
private PostscriptParser parser;
private String eol = new String(new byte[] {13});
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..668820e3a 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
@@ -32,11 +32,6 @@ 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;
-import static org.mockito.Mockito.when;
-
import org.apache.xmlgraphics.fonts.Glyphs;
import org.apache.fop.fonts.SingleByteFont;
@@ -46,6 +41,11 @@ import org.apache.fop.fonts.type1.PostscriptParser.PSFixedArray;
import org.apache.fop.fonts.type1.Type1SubsetFile.BinaryCoder;
import org.apache.fop.fonts.type1.Type1SubsetFile.BytesNumber;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
public class Type1SubsetFileTestCase {
private List<byte[]> decodedSections;
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..c40fae095 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
@@ -26,12 +26,12 @@ 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;
-
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.gvt.GraphicsNode;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
public class Graphics2DImagePainterImplTestCase {
@Test
public void testScale() {
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..708b57047 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
@@ -26,10 +26,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;
-
import org.apache.xmlgraphics.image.loader.Image;
import org.apache.xmlgraphics.image.loader.ImageFlavor;
import org.apache.xmlgraphics.image.loader.ImageInfo;
@@ -43,6 +39,10 @@ import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.FopFactoryBuilder;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+
/**
* Tests for bundled ImageLoader implementations.
*/
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..949183379 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
@@ -25,9 +25,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;
-
import org.apache.xmlgraphics.image.loader.ImageException;
import org.apache.xmlgraphics.image.loader.ImageInfo;
import org.apache.xmlgraphics.image.loader.ImageManager;
@@ -37,6 +34,9 @@ import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.FopFactoryBuilder;
import org.apache.fop.apps.MimeConstants;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
/**
* Tests for bundled image preloader implementations.
*/
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..c21967a51 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
@@ -32,8 +32,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;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
@@ -48,6 +46,8 @@ import org.apache.fop.render.intermediate.IFDocumentHandler;
import org.apache.fop.render.intermediate.IFException;
import org.apache.fop.render.intermediate.IFSerializer;
+import static org.junit.Assert.fail;
+
/**
* This test checks the correct mimicking of a different output format.
*/
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..9fc997203 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
@@ -51,10 +51,6 @@ 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;
-
import org.apache.fop.DebugHelper;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
@@ -77,6 +73,10 @@ import org.apache.fop.render.xml.XMLRenderer;
import org.apache.fop.util.ConsoleEventListenerForTests;
import org.apache.fop.util.DelegatingContentHandler;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Class for testing the FOP's layout engine using testcases specified in XML
* files.
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..8563614bb 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
@@ -19,10 +19,10 @@ package org.apache.fop.layoutmgr;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
import org.apache.fop.fo.Constants;
+import static org.junit.Assert.assertEquals;
+
public class BreakElementTestCase {
/**
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..29ed27b59 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
@@ -21,11 +21,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;
-import static org.mockito.Mockito.when;
-
import org.apache.fop.area.AreaTreeHandler;
import org.apache.fop.area.PageViewport;
import org.apache.fop.fo.pagination.Flow;
@@ -35,6 +30,11 @@ import org.apache.fop.fo.pagination.RegionBody;
import org.apache.fop.fo.pagination.Root;
import org.apache.fop.fo.pagination.SimplePageMaster;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
public class PageSequenceLayoutManagerTestCase {
private static final String MAIN_FLOW_NAME = "main";
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..daa924d96 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
@@ -24,15 +24,15 @@ 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;
-
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.FObj.FObjIterator;
import org.apache.fop.fo.flow.RetrieveTableMarker;
import org.apache.fop.layoutmgr.LayoutManagerMapping.RetrieveTableMarkerLayoutManagerMaker;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
public class RetrieveTableMarkerLayoutManagerMakerTestCase {
@Test
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..8a810ecb1 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
@@ -24,18 +24,18 @@ 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;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
import org.apache.fop.fo.Constants;
import org.apache.fop.fo.flow.RetrieveTableMarker;
import org.apache.fop.fo.flow.table.Table;
import org.apache.fop.layoutmgr.inline.TextLayoutManager;
import org.apache.fop.layoutmgr.table.TableLayoutManager;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
public class RetrieveTableMarkerLayoutManagerTestCase {
@Test
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..c2fc84551 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
@@ -23,10 +23,6 @@ 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;
-
import org.apache.fop.fo.flow.table.PrimaryGridUnit;
import org.apache.fop.fo.flow.table.Table;
import org.apache.fop.fo.flow.table.TableCell;
@@ -41,6 +37,10 @@ import org.apache.fop.layoutmgr.PageSequenceLayoutManager;
import org.apache.fop.layoutmgr.PositionIterator;
import org.apache.fop.layoutmgr.RetrieveTableMarkerLayoutManager;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
public class TableCellLayoutManagerTestCase {
// this test aims to check that the first call to addAreas() calls
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..e6850a6a5 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
@@ -21,15 +21,15 @@ 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;
-
import org.apache.fop.fo.FONode.FONodeIterator;
import org.apache.fop.fo.flow.table.Table;
import org.apache.fop.layoutmgr.LayoutContext;
import org.apache.fop.layoutmgr.PositionIterator;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
public class TableContentLayoutManagerTestCase {
@Test
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..764617ba1 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
@@ -23,14 +23,6 @@ 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;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
import org.apache.fop.area.PageViewport;
import org.apache.fop.fo.Constants;
import org.apache.fop.fo.flow.Marker;
@@ -40,6 +32,14 @@ import org.apache.fop.layoutmgr.BlockLayoutManager;
import org.apache.fop.layoutmgr.Page;
import org.apache.fop.layoutmgr.PageSequenceLayoutManager;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
public class TableLayoutManagerTestCase {
@Test
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..6553e1d67 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
@@ -25,11 +25,11 @@ import java.util.List;
import org.junit.Test;
+import org.apache.fop.pdf.xref.CompressedObjectReference;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import org.apache.fop.pdf.xref.CompressedObjectReference;
-
public class ObjectStreamManagerTestCase {
private List<CompressedObjectReference> compressedObjectReferences;
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..2a2776b32 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
@@ -25,12 +25,12 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
+import org.apache.commons.io.output.CountingOutputStream;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
-import org.apache.commons.io.output.CountingOutputStream;
-
/**
* Test case for {@link PDFDictionary}.
*/
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..db6a000b2 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
@@ -26,10 +26,6 @@ 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;
-
import org.apache.commons.io.output.ByteArrayOutputStream;
import org.apache.xmlgraphics.java2d.GraphicContext;
@@ -37,6 +33,10 @@ import org.apache.xmlgraphics.util.UnitConv;
import org.apache.fop.svg.PDFDocumentGraphics2D;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
/**
* Tests for {@link PDFDocumentGraphics2D}.
*/
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..34e48f1a6 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
@@ -19,11 +19,11 @@ package org.apache.fop.pdf;
import org.junit.Test;
+import org.apache.fop.fonts.CodePointMapping;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import org.apache.fop.fonts.CodePointMapping;
-
public class PDFEncodingTestCase {
/**
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFFactoryTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFFactoryTestCase.java
index baa39d830..923de99db 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFFactoryTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFFactoryTestCase.java
@@ -30,10 +30,6 @@ import java.net.URI;
import java.nio.charset.StandardCharsets;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
import org.apache.xmlgraphics.io.ResourceResolver;
@@ -52,6 +48,11 @@ import org.apache.fop.fonts.SingleByteEncoding;
import org.apache.fop.fonts.SingleByteFont;
import org.apache.fop.fonts.truetype.OFFontLoader;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Test case for {@link PDFFactory}.
*/
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..da7d072fc 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,37 @@
-/*
- * 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/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..0d62e432e 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
@@ -24,17 +24,17 @@ 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;
-import static org.mockito.Mockito.when;
-
import org.apache.xmlgraphics.image.loader.ImageInfo;
import org.apache.xmlgraphics.image.loader.impl.ImageRendered;
import org.apache.fop.render.pdf.ImageRenderedAdapter;
import org.apache.fop.render.pdf.ImageRenderedAdapterTestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
public class PDFImageXObjectTestCase {
/**
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..fd709547f 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
@@ -28,8 +28,6 @@ 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;
import org.junit.Assert;
@@ -47,6 +45,8 @@ import org.apache.fop.render.intermediate.extensions.Link;
import org.apache.fop.render.intermediate.extensions.URIAction;
import org.apache.fop.render.pdf.PDFDocumentHandler;
+import static java.util.regex.Pattern.quote;
+
@RunWith(Parameterized.class)
public class PDFLinkTestCase {
private String target;
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..10c6d1099 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
@@ -25,11 +25,11 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
+import org.apache.commons.io.output.CountingOutputStream;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-import org.apache.commons.io.output.CountingOutputStream;
-
/**
* Test class for {@link PDFName}.
*/
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..5d1abf930 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
@@ -28,9 +28,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;
-
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.render.intermediate.IFContext;
@@ -41,6 +38,9 @@ import org.apache.fop.render.pdf.extensions.PDFDictionaryAttachment;
import org.apache.fop.render.pdf.extensions.PDFDictionaryExtension;
import org.apache.fop.render.pdf.extensions.PDFDictionaryType;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
public class PDFPagePieceTestCase {
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..2e9cd7707 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,192 @@
-/*
- * 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/PDFRootTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFRootTestCase.java
index 11470abd3..858d126cf 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFRootTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFRootTestCase.java
@@ -25,13 +25,14 @@ import java.util.Locale;
import org.junit.Assert;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.events.Event;
import org.apache.fop.events.EventListener;
+import static org.junit.Assert.assertEquals;
+
public class PDFRootTestCase {
@Test
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..c47f94c8b 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
@@ -30,10 +30,6 @@ 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;
-
import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.FopFactoryBuilder;
import org.apache.fop.events.Event;
@@ -41,6 +37,10 @@ import org.apache.fop.events.EventBroadcaster;
import org.apache.fop.events.EventListener;
import org.apache.fop.events.model.EventSeverity;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
public class PDFToUnicodeCMapTestCase {
private static final int UNICODE_CHAR_MAP_SIZE = 200;
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..3442184df 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
@@ -23,6 +23,9 @@ import org.junit.Test;
import org.mockito.ArgumentMatcher;
import org.mockito.verification.VerificationMode;
+import org.apache.fop.pdf.StandardStructureAttributes.Table.Scope;
+import org.apache.fop.pdf.StandardStructureTypes.Table;
+
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.argThat;
@@ -32,9 +35,6 @@ import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import org.apache.fop.pdf.StandardStructureAttributes.Table.Scope;
-import org.apache.fop.pdf.StandardStructureTypes.Table;
-
public class TableHeaderScopeTestCase {
private static final String ATTRIBUTE_ENTRY = "A";
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..54c091b47 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
@@ -25,10 +25,10 @@ import java.util.List;
import org.junit.Test;
-import static org.junit.Assert.assertArrayEquals;
-
import org.apache.fop.pdf.PDFObjectNumber;
+import static org.junit.Assert.assertArrayEquals;
+
public class CompressedObjectReferenceTestCase extends ObjectReferenceTest {
@Test
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..ae9bde2f9 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
@@ -30,13 +30,13 @@ import java.util.Map;
import org.junit.Before;
-import static org.junit.Assert.assertArrayEquals;
-
import org.apache.fop.pdf.PDFDocument;
import org.apache.fop.pdf.PDFInfo;
import org.apache.fop.pdf.PDFPages;
import org.apache.fop.pdf.PDFRoot;
+import static org.junit.Assert.assertArrayEquals;
+
public abstract class CrossReferenceObjectTest {
protected static final int STARTXREF = 12345;
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..6ddc29c81 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
@@ -29,9 +29,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;
-
import org.apache.xmlgraphics.image.loader.ImageInfo;
import org.apache.xmlgraphics.image.loader.ImageSize;
@@ -39,6 +36,9 @@ import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.area.CTM;
import org.apache.fop.area.Trait;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+
public class AbstractPathOrientedRendererTestCase {
@Before
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..6d16a4477 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
@@ -23,9 +23,6 @@ import java.io.File;
import org.junit.Test;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
import org.apache.commons.io.output.NullOutputStream;
import org.apache.fop.apps.FOPException;
@@ -40,6 +37,9 @@ import org.apache.fop.render.intermediate.IFRenderer;
import org.apache.fop.render.pdf.PDFDocumentHandler;
import org.apache.fop.render.rtf.RTFHandler;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
/**
* Tests for {@link RendererFactory}.
*/
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..3bfaa4377 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
@@ -26,9 +26,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;
-
import org.apache.fop.afp.AFPBorderPainter;
import org.apache.fop.afp.AFPLineDataInfo;
import org.apache.fop.afp.AFPPaintingState;
@@ -37,6 +34,9 @@ import org.apache.fop.afp.DataStream;
import org.apache.fop.afp.Factory;
import org.apache.fop.fo.Constants;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
public class AFPBorderPainterTestCase {
private ByteArrayOutputStream outStream;
private AFPBorderPainter borderPainter;
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..bc2e68cb9 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
@@ -39,12 +39,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;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
import org.apache.xmlgraphics.image.loader.Image;
import org.apache.xmlgraphics.image.loader.ImageException;
import org.apache.xmlgraphics.image.loader.ImageFlavor;
@@ -81,6 +75,12 @@ import org.apache.fop.render.intermediate.IFException;
import org.apache.fop.traits.BorderProps;
import org.apache.fop.util.ColorUtil;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
public class AFPPainterTestCase {
@Test
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..7ad6f9d79 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
@@ -25,18 +25,18 @@ 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;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
import org.apache.fop.afp.AFPConstants;
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.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
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..195055d2e 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
@@ -25,9 +25,6 @@ import org.junit.Assert;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.verify;
-
import org.apache.fop.afp.AFPResourceLevel;
import org.apache.fop.afp.AFPResourceLevel.ResourceType;
import org.apache.fop.afp.AFPResourceLevelDefaults;
@@ -37,6 +34,9 @@ import org.apache.fop.apps.MimeConstants;
import org.apache.fop.render.afp.AFPRendererConfig.AFPRendererConfigParser;
import org.apache.fop.render.afp.AFPRendererConfig.ImagesModeOptions;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.verify;
+
public class AFPRendererConfiguratorTestCase extends
AbstractRendererConfiguratorTest<AFPRendererConfigurator, AFPRendererConfBuilder> {
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..6d9ca5693 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
@@ -38,9 +38,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;
-
import org.apache.xmlgraphics.io.Resource;
import org.apache.xmlgraphics.io.ResourceResolver;
@@ -65,6 +62,9 @@ import org.apache.fop.fonts.FontTriplet;
import org.apache.fop.fonts.MultiByteFont;
import org.apache.fop.render.intermediate.IFException;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
public class AFPTrueTypeTestCase {
private String font;
private String fopxconf = "<fop version=\"1.0\">\n"
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..f28bbf5ea 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
@@ -26,9 +26,6 @@ import java.io.UnsupportedEncodingException;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
import org.apache.commons.io.IOUtils;
import org.apache.fop.afp.AFPConstants;
@@ -36,6 +33,9 @@ import org.apache.fop.afp.parser.MODCAParser;
import org.apache.fop.afp.parser.UnparsedStructuredField;
import org.apache.fop.apps.FOUserAgent;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
/**
* Tests generation of afp:no-operation (NOPs).
*/
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..8e325903c 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
@@ -24,15 +24,15 @@ import java.awt.image.BufferedImage;
import org.junit.Test;
+import org.apache.fop.apps.AbstractRendererConfigParserTester;
+import org.apache.fop.apps.BitmapRendererConfBuilder;
+import org.apache.fop.render.bitmap.BitmapRendererConfig.BitmapRendererConfigParser;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
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..e44cc7906 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
@@ -23,16 +23,16 @@ 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;
-import static org.mockito.Mockito.when;
-
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.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.when;
+
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/TIFFRendererConfigParserTestCase.java b/fop-core/src/test/java/org/apache/fop/render/bitmap/TIFFRendererConfigParserTestCase.java
index 8a5c2a72d..d33076983 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
@@ -21,16 +21,16 @@ 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;
-
import org.apache.xmlgraphics.image.writer.Endianness;
import org.apache.fop.apps.FopConfBuilder;
import org.apache.fop.apps.TIFFRendererConfBuilder;
import org.apache.fop.render.bitmap.TIFFRendererConfig.TIFFRendererConfigParser;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
public class TIFFRendererConfigParserTestCase
extends AbstractBitmapRendererConfigParserTester {
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..30e6b0f10 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
@@ -23,10 +23,6 @@ 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;
-
import org.apache.xmlgraphics.image.writer.Endianness;
import org.apache.fop.apps.FopConfBuilder;
@@ -34,6 +30,10 @@ import org.apache.fop.apps.MimeConstants;
import org.apache.fop.apps.TIFFRendererConfBuilder;
import org.apache.fop.render.bitmap.TIFFRendererConfig.TIFFRendererConfigParser;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
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..a952778f8 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
@@ -44,9 +44,6 @@ 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;
-
import org.apache.xmlgraphics.util.QName;
import org.apache.fop.accessibility.StructureTreeElement;
@@ -70,6 +67,9 @@ import org.apache.fop.render.intermediate.extensions.GoToXYAction;
import org.apache.fop.render.pdf.PDFDocumentHandler;
import org.apache.fop.render.pdf.PDFDocumentNavigationHandler;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
public class DocumentNavigationHandlerTestCase {
@Test
public void testGotoXY() throws SAXException, IFException {
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..26565f61c 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
@@ -24,12 +24,12 @@ import java.awt.geom.AffineTransform;
import org.junit.Test;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-
import org.apache.batik.ext.awt.LinearGradientPaint;
import org.apache.batik.ext.awt.RadialGradientPaint;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
public class GradientTestCase {
private static class PatternChecker {
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..be8b5d718 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
@@ -26,15 +26,15 @@ 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;
-
import org.apache.fop.fonts.FontInfo;
import org.apache.fop.fonts.FontTriplet;
import org.apache.fop.render.RenderingContext;
import org.apache.fop.traits.BorderProps;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
public class AbstractIFPainterTestCase {
private AbstractIFPainter<?> sut;
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..977e8675a 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
@@ -23,6 +23,10 @@ import java.io.IOException;
import org.junit.Test;
+import org.apache.fop.fo.Constants;
+import org.apache.fop.traits.BorderProps;
+import org.apache.fop.traits.BorderProps.Mode;
+
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doThrow;
@@ -32,10 +36,6 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
-import org.apache.fop.fo.Constants;
-import org.apache.fop.traits.BorderProps;
-import org.apache.fop.traits.BorderProps.Mode;
-
public class BorderPainterTestCase {
private static final BorderProps BORDER_PROPS = new BorderProps(Constants.EN_SOLID, 10, 50, 50,
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..143508433 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
@@ -35,9 +35,6 @@ import javax.xml.transform.stream.StreamSource;
import org.junit.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
@@ -46,6 +43,9 @@ import org.apache.fop.apps.FopFactoryBuilder;
import org.apache.fop.area.inline.WordArea;
import org.apache.fop.util.CharUtilities;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
public class IFRendererTestCase {
private List<WordArea> wordAreas = new ArrayList<WordArea>();
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..31c0a1d87 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
@@ -30,13 +30,6 @@ 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;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
import org.apache.xmlgraphics.image.loader.ImageManager;
import org.apache.xmlgraphics.image.loader.ImageSessionContext;
@@ -45,6 +38,13 @@ import org.apache.fop.apps.FopFactory;
import org.apache.fop.events.EventChecker;
import org.apache.fop.render.afp.AFPDocumentHandler;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
public class IFSerializerTestCase {
private static final String IMAGE = "image.png";
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..95ee530fc 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
@@ -41,14 +41,6 @@ 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;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
@@ -58,6 +50,14 @@ import org.apache.fop.fo.extensions.ExtensionElementMapping;
import org.apache.fop.fo.extensions.InternalElementMapping;
import org.apache.fop.util.XMLUtil;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
public class IFStructureTreeBuilderTestCase {
private IFStructureTreeBuilder sut;
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..66b13308b 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
@@ -27,16 +27,16 @@ import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
+import org.apache.fop.fo.FOElementMapping;
+import org.apache.fop.render.intermediate.IFStructureTreeBuilder.SAXEventRecorder;
+import org.apache.fop.util.XMLUtil;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import org.apache.fop.fo.FOElementMapping;
-import org.apache.fop.render.intermediate.IFStructureTreeBuilder.SAXEventRecorder;
-import org.apache.fop.util.XMLUtil;
-
/**
* Tests {@link SAXEventRecorder}.
*/
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..08a2f490e 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
@@ -21,14 +21,14 @@ 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;
-
import org.apache.fop.apps.AbstractRendererConfigParserTester;
import org.apache.fop.apps.Java2DRendererConfBuilder;
import org.apache.fop.render.java2d.Java2DRendererConfig.Java2DRendererConfigParser;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
public class Java2DRendererConfigParserTestcase
extends AbstractRendererConfigParserTester<Java2DRendererConfBuilder, Java2DRendererConfig> {
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..d09200781 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
@@ -28,13 +28,6 @@ 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;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
import org.apache.fop.fonts.Font;
import org.apache.fop.fonts.FontInfo;
import org.apache.fop.fonts.MultiByteFont;
@@ -42,6 +35,13 @@ import org.apache.fop.fonts.SingleByteFont;
import org.apache.fop.fonts.Typeface;
import org.apache.fop.util.CharUtilities;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
public class Java2DUtilTestCase {
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..113c3e2bd 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
@@ -21,13 +21,13 @@ package org.apache.fop.render.pcl;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
import org.apache.fop.apps.AbstractRendererConfigParserTester;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.MimeConstants;
import org.apache.fop.render.pcl.PCLRendererConfig.PCLRendererConfigParser;
+import static org.junit.Assert.assertEquals;
+
public class PCLRendererConfigParserTestCase
extends AbstractRendererConfigParserTester<PCLRendererConfBuilder, PCLRendererConfig> {
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..024104179 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
@@ -19,16 +19,16 @@ 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;
-import static org.mockito.Mockito.when;
-
import org.apache.fop.apps.AbstractRendererConfiguratorTest;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.MimeConstants;
import org.apache.fop.render.pcl.PCLRendererConfig.PCLRendererConfigParser;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.when;
+
public class PCLRendererConfiguratorTestCase extends
AbstractRendererConfiguratorTest<PCLRendererConfigurator, PCLRendererConfBuilder> {
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..5e7a2c3cc 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
@@ -24,15 +24,15 @@ 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;
-
import org.apache.fop.fonts.CustomFont;
import org.apache.fop.fonts.FontType;
import org.apache.fop.render.java2d.CustomFontMetricsMapper;
import org.apache.fop.render.pcl.fonts.truetype.PCLTTFFontReader;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
public class PCLFontReaderFactoryTestCase {
private static final String TEST_FONT_TTF = "./test/resources/fonts/ttf/DejaVuLGCSerif.ttf";
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..5f6529997 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
@@ -29,17 +29,17 @@ 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;
-import static org.mockito.Mockito.when;
-
import org.apache.fop.fonts.CustomFont;
import org.apache.fop.fonts.SingleByteFont;
import org.apache.fop.render.java2d.CustomFontMetricsMapper;
import org.apache.fop.render.pcl.fonts.PCLFontSegment.SegmentID;
import org.apache.fop.render.pcl.fonts.truetype.PCLTTFFontReader;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
public class PCLTTFFontReaderTestCase {
private CustomFontMetricsMapper customFont = mock(CustomFontMetricsMapper.class);
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..88ba41e90 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
@@ -23,10 +23,6 @@ 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;
-
import org.apache.fop.fonts.CustomFont;
import org.apache.fop.fonts.truetype.FontFileReader;
import org.apache.fop.fonts.truetype.OFFontLoader;
@@ -35,6 +31,10 @@ import org.apache.fop.render.java2d.CustomFontMetricsMapper;
import org.apache.fop.render.pcl.fonts.PCLByteWriterUtil;
import org.apache.fop.render.pcl.fonts.PCLSoftFont;
+import static org.junit.Assert.assertArrayEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
public class PCLTTFCharacterWriterTestCase {
private PCLTTFCharacterWriter characterWriter;
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..1224fd19b 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
@@ -29,13 +29,6 @@ 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;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
import org.apache.xmlgraphics.image.loader.ImageSize;
import org.apache.xmlgraphics.image.loader.impl.ImageRawPNG;
import org.apache.xmlgraphics.java2d.color.profile.ColorProfileUtil;
@@ -51,6 +44,13 @@ import org.apache.fop.pdf.PDFProfile;
import org.apache.fop.pdf.PDFResources;
import org.apache.fop.render.RawPNGTestUtil;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
public class ImageRawPNGAdapterTestCase {
@Test
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..583ee094b 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
@@ -28,12 +28,6 @@ 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;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
import org.apache.xmlgraphics.image.loader.ImageInfo;
import org.apache.xmlgraphics.image.loader.impl.ImageRendered;
@@ -49,6 +43,12 @@ import org.apache.fop.pdf.PDFProfile;
import org.apache.fop.pdf.PDFResourceContext;
import org.apache.fop.pdf.PDFResources;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
public class ImageRenderedAdapterTestCase {
/**
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..f7cce7a47 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
@@ -27,14 +27,14 @@ 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;
import org.apache.fop.events.EventChecker;
import org.apache.fop.pdf.PDFAMode;
import org.apache.fop.pdf.PDFConformanceException;
import org.apache.fop.svg.SVGEventProducer;
+import static org.junit.Assert.fail;
+
/**
* Tests PDF/A-1 functionality.
*/
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..9baf71e9f 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
@@ -27,12 +27,6 @@ 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;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
import org.apache.xmlgraphics.util.QName;
import org.apache.xmlgraphics.xmp.Metadata;
import org.apache.xmlgraphics.xmp.XMPArray;
@@ -52,6 +46,12 @@ import org.apache.fop.pdf.PDFInfo;
import org.apache.fop.pdf.PDFMetadata;
import org.apache.fop.pdf.PDFUAMode;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Test case for PDF/A metadata handling.
*/
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..cf109dc08 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
@@ -26,11 +26,11 @@ import java.io.OutputStream;
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.assertTrue;
-
import org.apache.fop.fo.Constants;
import org.apache.fop.pdf.PDFDocument;
+import static org.junit.Assert.assertTrue;
+
public class PDFBorderPainterTestCase {
private PDFContentGenerator generator;
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..133a32ea4 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
@@ -23,10 +23,10 @@ import java.io.StringWriter;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
import org.apache.fop.pdf.CMapBuilder;
+import static org.junit.Assert.assertEquals;
+
/** Simple sanity test of the PDFCmap class */
public class PDFCMapTestCase {
private static final String EOL = "\n";
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..3be46789e 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
@@ -25,15 +25,15 @@ 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;
-
import org.apache.pdfbox.Loader;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.text.PDFTextStripper;
import org.apache.fop.apps.FOUserAgent;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
/** Test that characters are correctly encoded in a generated PDF file */
public class PDFEncodingTestCase extends BasePDFTest {
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..db2d32171 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
@@ -24,15 +24,15 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
+import org.apache.fop.fo.Constants;
+import org.apache.fop.pdf.PDFNumber;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.endsWith;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
-import org.apache.fop.fo.Constants;
-import org.apache.fop.pdf.PDFNumber;
-
public class PDFGraphicsPainterTestCase {
private PDFGraphicsPainter sut;
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..11b37f2d0 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
@@ -41,16 +41,6 @@ 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;
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
import org.apache.xmlgraphics.image.loader.Image;
import org.apache.xmlgraphics.image.loader.ImageException;
import org.apache.xmlgraphics.image.loader.ImageInfo;
@@ -83,6 +73,16 @@ import org.apache.fop.render.intermediate.IFException;
import org.apache.fop.traits.BorderProps;
import org.apache.fop.util.CharUtilities;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.endsWith;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
public class PDFPainterTestCase {
private static final int PAGE_WIDTH = 100000;
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..485ad1aea 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
@@ -23,11 +23,6 @@ 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;
-import static org.junit.Assert.assertTrue;
-
import org.apache.fop.apps.AbstractRendererConfigParserTester;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.FopFactory;
@@ -38,6 +33,11 @@ import org.apache.fop.pdf.PDFXMode;
import org.apache.fop.pdf.Version;
import org.apache.fop.render.pdf.PDFRendererConfig.PDFRendererConfigParser;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
public class PDFRendererConfigParserTestCase
extends AbstractRendererConfigParserTester<PDFRendererConfBuilder, PDFRendererConfig> {
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..784761798 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
@@ -29,13 +29,13 @@ 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.junit.Assert.assertEquals;
+
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..9d990d76c 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,14 +31,8 @@ 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;
-import static org.mockito.Mockito.mock;
-
import org.apache.fop.accessibility.StructureTreeElement;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.FopFactory;
@@ -49,6 +43,11 @@ import org.apache.fop.pdf.PDFStructElem;
import org.apache.fop.pdf.StandardStructureTypes;
import org.apache.fop.render.intermediate.IFContext;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.mockito.Mockito.mock;
+
public class PDFStructureTreeBuilderTestCase {
private PDFFactory pdfFactory;
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..c8602110b 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
@@ -25,10 +25,10 @@ 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;
+import static org.junit.Assert.fail;
+
/**
* Tests the disables-srgb-colorspace setting.
*/
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..658cc0ca2 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,42 @@
-/*
- * 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/AbstractPostScriptTest.java b/fop-core/src/test/java/org/apache/fop/render/ps/AbstractPostScriptTest.java
index eb25c3f94..ca0513927 100644
--- a/fop-core/src/test/java/org/apache/fop/render/ps/AbstractPostScriptTest.java
+++ b/fop-core/src/test/java/org/apache/fop/render/ps/AbstractPostScriptTest.java
@@ -22,8 +22,6 @@ package org.apache.fop.render.ps;
import java.io.File;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
-
import org.apache.xmlgraphics.ps.PSResource;
import org.apache.xmlgraphics.ps.dsc.DSCException;
import org.apache.xmlgraphics.ps.dsc.DSCParser;
@@ -35,6 +33,8 @@ import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.MimeConstants;
import org.apache.fop.render.AbstractRenderingTest;
+import static org.junit.Assert.assertEquals;
+
/**
* Abstract base class for PostScript verification tests.
*/
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..23db63f2a 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
@@ -27,16 +27,16 @@ 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;
-import static org.mockito.Mockito.when;
-
import org.apache.xmlgraphics.image.loader.ImageSize;
import org.apache.xmlgraphics.image.loader.impl.ImageRawPNG;
import org.apache.fop.render.RawPNGTestUtil;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
public class ImageEncoderPNGTestCase {
@Test
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..488b40cdf 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,12 +27,8 @@ 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;
-
import org.apache.commons.io.IOUtils;
import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
@@ -53,6 +49,9 @@ import org.apache.fop.apps.FopFactory;
import org.apache.fop.fonts.FontInfo;
import org.apache.fop.render.intermediate.IFContext;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
/**
* Tests the image handling in PostScript output.
*/
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..2da998a5a 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
@@ -25,12 +25,12 @@ import java.io.ByteArrayOutputStream;
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.assertTrue;
-
import org.apache.xmlgraphics.ps.PSGenerator;
import org.apache.fop.fo.Constants;
+import static org.junit.Assert.assertTrue;
+
public class PSBorderPainterTestCase {
private PSGenerator generator;
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..a36b10f34 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;
@@ -33,18 +34,6 @@ 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;
-import static org.mockito.ArgumentMatchers.anyFloat;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
import org.apache.xmlgraphics.image.loader.ImageInfo;
import org.apache.xmlgraphics.image.loader.ImageSize;
import org.apache.xmlgraphics.ps.PSGenerator;
@@ -68,6 +57,18 @@ import org.apache.fop.render.intermediate.IFState;
import org.apache.fop.traits.BorderProps;
import org.apache.fop.util.CharUtilities;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyDouble;
+import static org.mockito.ArgumentMatchers.anyFloat;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
public class PSPainterTestCase {
private PSDocumentHandler docHandler;
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..fe59143b4 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
@@ -21,14 +21,14 @@ package org.apache.fop.render.ps;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
import org.apache.xmlgraphics.ps.PSGenerator;
import org.apache.fop.apps.AbstractRendererConfigParserTester;
import org.apache.fop.apps.PSRendererConfBuilder;
import org.apache.fop.render.ps.PSRendererConfig.PSRendererConfigParser;
+import static org.junit.Assert.assertEquals;
+
public class PSRendererConfigParserTestCase
extends AbstractRendererConfigParserTester<PSRendererConfBuilder, PSRendererConfig> {
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..4d42a0aab 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
@@ -19,16 +19,16 @@ 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;
-import static org.mockito.Mockito.when;
-
import org.apache.fop.apps.AbstractRendererConfiguratorTest;
import org.apache.fop.apps.MimeConstants;
import org.apache.fop.apps.PSRendererConfBuilder;
import org.apache.fop.render.ps.PSRendererConfig.PSRendererConfigParser;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.when;
+
public class PSRendererConfiguratorTestCase extends
AbstractRendererConfiguratorTest<PSRendererConfigurator, PSRendererConfBuilder> {
private PSRenderingUtil psUtil;
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..3f1088fe1 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
@@ -23,13 +23,13 @@ import java.io.IOException;
import org.junit.Test;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
import org.apache.xmlgraphics.ps.PSGenerator;
import org.apache.fop.render.ps.extensions.PSPageTrailerCodeBefore;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
public class PSRenderingUtilTestCase {
private final String content = "<< /MyEntry 0 >> command";
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..f73a6e03c 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
@@ -28,11 +28,6 @@ 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;
-import static org.junit.Assert.assertTrue;
-
import org.apache.commons.io.IOUtils;
import org.apache.xmlgraphics.ps.DSCConstants;
@@ -54,6 +49,11 @@ import org.apache.xmlgraphics.ps.dsc.events.DSCCommentPages;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.render.intermediate.IFContext;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Tests the PostScript resource optimization (selective de-duplication of
* images that are used multiple times).
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..3eda45caf 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
@@ -25,12 +25,12 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Test;
+import org.apache.xmlgraphics.ps.PSGenerator;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import org.apache.xmlgraphics.ps.PSGenerator;
-
/**
* The test class for org.apache.fop.render.ps.fonts.PSGenerator
*/
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..06b1612cd 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
@@ -24,15 +24,15 @@ 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;
-
import org.apache.xmlgraphics.ps.PSGenerator;
import org.apache.fop.fonts.truetype.TTFGlyphOutputStream;
import org.apache.fop.fonts.truetype.TTFTableOutputStream;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
/**
* Tests PSTTFOuputStream
*/
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..1377da46c 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
@@ -26,8 +26,6 @@ import java.nio.charset.StandardCharsets;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
import org.apache.commons.io.IOUtils;
import org.apache.batik.ext.awt.LinearGradientPaint;
@@ -37,6 +35,8 @@ import org.apache.batik.ext.awt.RadialGradientPaint;
import org.apache.xmlgraphics.java2d.GraphicContext;
import org.apache.xmlgraphics.ps.PSGenerator;
+import static org.junit.Assert.assertEquals;
+
public class GradientTestCase {
@Test
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..90e0c2f5c 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
@@ -21,13 +21,13 @@ package org.apache.fop.render.txt;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
import org.apache.fop.apps.AbstractRendererConfigParserTester;
import org.apache.fop.apps.TxtRendererConfBuilder;
import org.apache.fop.render.txt.TxtRendererConfig.TxtRendererConfigParser;
import org.apache.fop.render.txt.TxtRendererConfig.TxtRendererOption;
+import static org.junit.Assert.assertEquals;
+
public class TxtRendererConfigParserTestCase
extends AbstractRendererConfigParserTester<TxtRendererConfBuilder, TxtRendererConfig> {
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..8ca266e8d 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
@@ -24,14 +24,14 @@ import java.io.InputStream;
import org.junit.Test;
-import static org.junit.Assert.assertTrue;
-
import org.apache.commons.io.output.ByteArrayOutputStream;
import org.apache.batik.transcoder.Transcoder;
import org.apache.batik.transcoder.TranscoderInput;
import org.apache.batik.transcoder.TranscoderOutput;
+import static org.junit.Assert.assertTrue;
+
import static org.apache.fop.FOPTestUtils.getBaseDir;
/**
diff --git a/fop-core/src/test/java/org/apache/fop/svg/BasicPDFTranscoderTestCase.java b/fop-core/src/test/java/org/apache/fop/svg/BasicPDFTranscoderTestCase.java
index fd97ee30e..7e084507f 100644
--- a/fop-core/src/test/java/org/apache/fop/svg/BasicPDFTranscoderTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/svg/BasicPDFTranscoderTestCase.java
@@ -26,7 +26,6 @@ import java.util.HashMap;
import java.util.Map;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
import org.apache.pdfbox.Loader;
import org.apache.pdfbox.pdmodel.PDDocument;
@@ -42,6 +41,8 @@ import org.apache.fop.configuration.Configuration;
import org.apache.fop.configuration.ConfigurationException;
import org.apache.fop.configuration.DefaultConfigurationBuilder;
+import static org.junit.Assert.assertEquals;
+
/**
* Basic runtime test for the PDF transcoder. It is used to verify that
* nothing obvious is broken after compiling.
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..45a3c7ff1 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
@@ -27,10 +27,6 @@ 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;
-
import org.apache.batik.bridge.TextPainter;
import org.apache.batik.gvt.text.TextPaintInfo;
@@ -45,6 +41,10 @@ import org.apache.fop.pdf.PDFDocument;
import org.apache.fop.svg.font.FOPGVTFont;
import org.apache.fop.svg.font.FOPGVTGlyphVector;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
public class PDFTextPainterTestCase extends NativeTextPainterTest {
private static class OperatorCheckingPDFGraphics2D extends PDFGraphics2D {
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..125c2ee87 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
@@ -30,6 +30,12 @@ import java.text.StringCharacterIterator;
import org.junit.Before;
import org.junit.Test;
+import org.apache.batik.gvt.font.GVTGlyphMetrics;
+import org.apache.batik.gvt.font.GVTLineMetrics;
+
+import org.apache.fop.fonts.Font;
+import org.apache.fop.fonts.FontMetrics;
+
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.anyInt;
@@ -37,12 +43,6 @@ import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.batik.gvt.font.GVTGlyphMetrics;
-import org.apache.batik.gvt.font.GVTLineMetrics;
-
-import org.apache.fop.fonts.Font;
-import org.apache.fop.fonts.FontMetrics;
-
/**
* Tests all the methods of {@link FOPGVTGlyphVector} with a mocked font.
*/
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..2b12a2622 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
@@ -33,18 +33,18 @@ 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;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
import org.apache.batik.gvt.font.GVTFontFamily;
import org.apache.batik.gvt.font.GVTLineMetrics;
import org.apache.fop.fonts.CustomFont;
import org.apache.fop.fonts.FontInfo;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
public class FOPFontFamilyResolverTestCase {
private static FontInfo fontInfo;
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..85451ef82 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
@@ -24,13 +24,13 @@ import java.text.StringCharacterIterator;
import org.junit.Before;
import org.junit.Test;
+import org.apache.fop.fonts.Font;
+
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.fop.fonts.Font;
-
public class FOPGVTFontTestCase {
private FOPGVTFont font;
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..871b2a99e 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
@@ -23,10 +23,10 @@ import java.util.Collections;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
import org.apache.fop.fonts.FontInfo;
+import static org.junit.Assert.assertEquals;
+
/**
* Specifically tests glyph positioning from a real font.
*/
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..7b29a639d 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,91 @@
-/*
- * 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 org.apache.batik.gvt.font.GVTLineMetrics;
+
+import org.apache.fop.fonts.Font;
+import org.apache.fop.fonts.FontMetrics;
+
+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;
+
+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/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..c73a1bcb8 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
@@ -23,14 +23,14 @@ import java.awt.Color;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
import org.apache.xmlgraphics.java2d.color.ColorWithAlternatives;
import org.apache.xmlgraphics.java2d.color.DeviceCMYKColorSpace;
import org.apache.fop.fo.Constants;
import org.apache.fop.util.ColorUtil;
+import static org.junit.Assert.assertEquals;
+
/**
* Tests the BorderProps class.
*/
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..38f514a82 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
@@ -24,11 +24,11 @@ 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;
import org.apache.fop.utils.text.AdvancedMessageFormat;
+import static org.junit.Assert.assertEquals;
+
/**
* Tests for EventFormatter.
*/
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..4655cf618 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
@@ -31,8 +31,6 @@ import java.io.StringWriter;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
import org.apache.commons.io.IOUtils;
import org.apache.xmlgraphics.image.writer.ImageWriterUtil;
@@ -42,6 +40,8 @@ import org.apache.xmlgraphics.util.io.ASCIIHexOutputStream;
import org.apache.fop.util.bitmap.BitmapImageUtil;
import org.apache.fop.util.bitmap.MonochromeBitmapConverter;
+import static org.junit.Assert.assertEquals;
+
/**
* Tests {@link BitmapImageUtil}.
*/
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..9dd0f5eae 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
@@ -26,11 +26,6 @@ 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;
-import static org.junit.Assert.assertTrue;
-
import org.apache.xmlgraphics.java2d.color.ColorSpaces;
import org.apache.xmlgraphics.java2d.color.ColorWithAlternatives;
import org.apache.xmlgraphics.java2d.color.NamedColorSpace;
@@ -39,6 +34,11 @@ import org.apache.xmlgraphics.java2d.color.RenderingIntent;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.FopFactory;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Tests the ColorUtil class.
*/
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..b007f5e61 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
@@ -24,16 +24,16 @@ 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;
-
import org.apache.fop.layoutmgr.ElementListUtils;
import org.apache.fop.layoutmgr.KnuthBox;
import org.apache.fop.layoutmgr.KnuthElement;
import org.apache.fop.layoutmgr.KnuthGlue;
import org.apache.fop.layoutmgr.KnuthPenalty;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
/**
* Test class for ElementListUtils.
*/
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..1fa543744 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
@@ -25,11 +25,11 @@ import java.util.ResourceBundle;
import org.junit.Test;
+import org.apache.fop.utils.XMLResourceBundle;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-import org.apache.fop.utils.XMLResourceBundle;
-
/**
* Tests for XMLResourceBundle.
*/
diff --git a/fop-core/src/tools/resources/checkstyle/checkstyle.xml b/fop-core/src/tools/resources/checkstyle/checkstyle.xml
index e4b14ebf3..eb0cc5c61 100644
--- a/fop-core/src/tools/resources/checkstyle/checkstyle.xml
+++ b/fop-core/src/tools/resources/checkstyle/checkstyle.xml
@@ -37,6 +37,14 @@
</module>
<!-- ===================================================================================================== -->
+ <!-- ===================================================================================================== -->
+ <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"/>
@@ -52,14 +60,6 @@
<!-- ===================================================================================================== -->
<module name="TreeWalker">
- <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
- <module name="SuppressionCommentFilter">
- <property name="offCommentFormat" value="CSOFF\: ([\w\|]+)"/>
- <property name="onCommentFormat" value="CSON\: ([\w\|]+)"/>
- <property name="checkFormat" value="$1"/>
- </module>
- <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
-
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
<module name="AnnotationUseStyle"/>
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
@@ -126,7 +126,10 @@
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
<module name="ImportOrder">
<property name="groups" value="java,javax,org,org.apache,org.apache.batik,org.apache.xmlgraphics,org.apache.fop,com"/>
+ <property name="staticGroups" value="java,javax,org,org.apache,org.apache.batik,org.apache.xmlgraphics,org.apache.fop,com"/>
<property name="separated" value="true"/>
+ <property name="separatedStaticGroups" value="true"/>
+ <property name="option" value="bottom"/>
</module>
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
@@ -185,7 +188,10 @@
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
- <module name="NoWhitespaceBefore"/>
+ <module name="NoWhitespaceBefore">
+ <!-- excluded COMMA -->
+ <property name="tokens" value="SEMI,POST_INC,POST_DEC,ELLIPSIS,LABELED_STAT"/>
+ </module>
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
@@ -213,7 +219,9 @@
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
- <module name="RedundantModifier"/>
+ <module name="RedundantModifier">
+ <property name="tokens" value="METHOD_DEF,VARIABLE_DEF,ANNOTATION_FIELD_DEF,INTERFACE_DEF,RESOURCE"/>
+ </module>
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
@@ -258,7 +266,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..3c283da2f 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
@@ -21,14 +21,14 @@ package org.apache.fop.events;
import org.junit.Test;
+import org.apache.fop.events.model.EventSeverity;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import org.apache.fop.events.model.EventSeverity;
-
public class BasicEventTestCase {
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org