You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by vh...@apache.org on 2013/12/17 14:15:10 UTC

svn commit: r1551536 [1/4] - in /xmlgraphics/fop/trunk: ./ test/java/org/apache/fop/ test/java/org/apache/fop/afp/ test/java/org/apache/fop/afp/goca/ test/java/org/apache/fop/afp/modca/ test/java/org/apache/fop/afp/parser/ test/java/org/apache/fop/afp/...

Author: vhennebert
Date: Tue Dec 17 13:15:06 2013
New Revision: 1551536

URL: http://svn.apache.org/r1551536
Log:
Cosmetics only: enabled Checkstyle for test files and fixed resulting errors

Modified:
    xmlgraphics/fop/trunk/build.xml
    xmlgraphics/fop/trunk/checkstyle-suppressions.xml
    xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractBasicTranscoderTest.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicDriverTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicDriverTestSuite.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicPSTranscoderTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/DebugHelper.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/DigestFilterTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/KnuthAlgorithmTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPObjectAreaInfoTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPPaintingStateTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPResourceManagerTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPResourceUtilTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/goca/GraphicsCharacterStringTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractAFPObjectTest.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractNamedAFPObjectTest.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractStructuredObjectTest.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractTripletStructuredObjectTest.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/IncludeObjectTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/parser/MODCAParserTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/ptoca/TransparentDataControlSequenceTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/AbstractRendererConfigParserTester.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/AbstractRendererConfiguratorTest.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/EnvironmentalProfileFactoryTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/FopFactoryBuilderTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/FopFactoryTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/PDFRendererConfBuilder.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/BaseURIResolutionTest.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/FontURIResolver.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/area/ViewportTest.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/area/ViewportTestSuite.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/area/inline/InlineViewportTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/check/ChecksFactory.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/cli/CommandLineOptionsTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/bidi/BidiAlgorithmTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/bidi/BidiClassTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/bidi/BidiTestData.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GDEFTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFile.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/scripts/ScriptsTestSuite.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/scripts/arabic/ArabicTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/scripts/arabic/ArabicTestConstants.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/scripts/arabic/GenerateArabicTestData.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/util/NumberConverterTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/util/UtilTestSuite.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontAttributesMissingTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontMetricsUrlBadTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontMetricsUrlMalformedTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontTripletAttributeMissingTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontsAutoDetectTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontsDirectoryRecursiveTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/datatypes/URISpecificationTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/events/BasicEventTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/events/TestEventProducer.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/DelegatingFOEventHandlerTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/FODocumentParser.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/FONodeMocks.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/MarkersTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/AbstractTableTest.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/RowGroupBuilderTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/TableHandler.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/pagination/AllTests.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/pagination/PageSequenceMasterTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternativesTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/properties/AltTextHolderTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/properties/CommonAccessibilityHolderTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/DejaVuLGCSerifTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/EmbedFontInfoTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/FontManagerConfiguratorTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/cff/CFFDataReaderTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/truetype/GlyfTableTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/truetype/OTFFileTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/truetype/OTFSubSetFileTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/truetype/TTFFileTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/truetype/TTFFontLoaderTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/type1/AFMParserTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/type1/AdobeStandardEncodingTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/type1/CharMetricsHandlerTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/AssertElement.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/image/loader/batik/ImagePreloaderTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIFTest.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AreaTreeXMLFormatTestSuite.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/IFMimickingTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/IntermediateFormatTestSuite.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/LayoutIFTestSuite.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/ElementListCheck.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineTestSuite.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutResult.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutmgr/table/TableCellLayoutManagerTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/logging/LoggingElementListObserver.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/memory/MemoryEater.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/AbstractPDFStreamTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/FileIDGeneratorTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/ObjectStreamManagerTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/ObjectStreamTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFAModeTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFArrayTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFDestsTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFDocumentGraphics2DTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFDocumentTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFEncodingTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFEncryptionJCETestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFFilterListTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFNameTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFNullTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFNumberTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFNumsArrayTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFObjectTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFRectangleTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFReferenceTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFStreamTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/TableHeaderScopeTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/VersionControllerTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/VersionTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/xref/CompressedObjectReferenceTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/xref/CrossReferenceObjectTest.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/xref/UncompressedObjectReferenceTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/AbstractRenderingTest.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/RawPNGTestUtil.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/RendererFactoryTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/afp/AFPBorderPainterTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/afp/AFPRendererConfigParserTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/afp/AFPRendererConfiguratorTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/afp/NoOperationTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/bitmap/AbstractBitmapRendererConfigParserTester.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/bitmap/AbstractBitmapRendererConfiguratorTest.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/bitmap/TIFFRendererConfigParserTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/bitmap/TIFFRendererConfiguratorTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/extensions/prepress/PageBoundariesTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/extensions/prepress/PageScaleTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/intermediate/AbstractIFPainterTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/intermediate/ArcToBezierCurveTransformerTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/intermediate/BorderPainterTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/intermediate/IFStructureTreeBuilderTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/intermediate/SAXEventRecorderTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/java2d/Java2DRendererConfigParserTestcase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pcl/PCLRendererConfigParserTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pcl/PCLRendererConfiguratorTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFAMetadataTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFCMapTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFGraphicsPainterTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFPainterTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFRendererConfigParserTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFRendererOptionsConfigTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFsRGBSettingsTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/RenderPDFTestSuite.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/AbstractPostScriptTest.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ImageEncoderPNGTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/PSPainterTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/PSRendererConfigParserTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/PSRendererConfiguratorTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/PSRenderingUtilTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/svg/PSSVGGraphics2DTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/svg/PSSVGLinearGraphics2DTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/rtf/Bug39607TestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/rtf/RichTextFormatTestSuite.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/rtf/rtflib/testdocs/BasicLink.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/rtf/rtflib/testdocs/CreateTestDocuments.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/rtf/rtflib/testdocs/DummyTableColumnsInfo.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ExternalGraphic.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ListInTable.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/rtf/rtflib/testdocs/MergedTableCells.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/rtf/rtflib/testdocs/NestedTable.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ParagraphAlignment.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleDocument.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleLists.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleTable.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/rtf/rtflib/testdocs/TestDocument.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/rtf/rtflib/testdocs/TextAttributes.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/rtf/rtflib/testdocs/Whitespace.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/render/txt/TxtRendererConfigParserTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakStatusTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakUtilsTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/threading/FOProcessorImpl.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/threading/Main.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/traits/BorderPropsTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/traits/MinOptMaxTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/util/AdvancedMessageFormatTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/util/BitmapImageUtilTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/util/ColorUtilTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/util/DigestFilter.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/util/ElementListUtilsTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/util/LanguageTagsTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/util/XMLResourceBundleTestCase.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/visual/BitmapComparator.java
    xmlgraphics/fop/trunk/test/java/org/apache/fop/visual/ConvertUtils.java

Modified: xmlgraphics/fop/trunk/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/build.xml?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/build.xml (original)
+++ xmlgraphics/fop/trunk/build.xml Tue Dec 17 13:15:06 2013
@@ -1074,6 +1074,7 @@ NOTE:
         <pathelement location="${build.codegen-classes.dir}"/>
       </classpath>
       <fileset dir="${src.dir}" includes="**/*.java"/>
+      <fileset dir="${test.dir}" includes="**/*.java"/>
       <formatter type="xml" toFile="${build.dir}/report_checkstyle.xml"/>
     </checkstyle>
     <xslt in="${build.dir}/report_checkstyle.xml" out="${build.dir}/report_checkstyle.html" style="${checkstyle.noframes.xslt}"/>

Modified: xmlgraphics/fop/trunk/checkstyle-suppressions.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/checkstyle-suppressions.xml?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/checkstyle-suppressions.xml (original)
+++ xmlgraphics/fop/trunk/checkstyle-suppressions.xml Tue Dec 17 13:15:06 2013
@@ -6,4 +6,7 @@
   <suppress files="org/apache/fop/complexscripts/bidi/GenerateBidiTestData.java" checks="SimplifyBooleanReturn"/>
   <suppress files="org/apache/fop/complexscripts/scripts/ArabicScriptProcessor.java" checks="SimplifyBooleanReturn"/>
   <suppress files="org/apache/fop/complexscripts/util/CharScript.java" checks="SimplifyBooleanReturn"/>
+  <suppress files="org/apache/fop/render/rtf/rtflib/testdocs/MergedTableCells.java" checks="AvoidNestedBlocks"/>
+  <suppress files="org/apache/fop/render/rtf/rtflib/testdocs/NestedTable.java" checks="AvoidNestedBlocks"/>
+  <suppress files="org/apache/fop/fo/flow/MarkersTestCase.java" checks="LocalVariableName"/>
 </suppressions>

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractBasicTranscoderTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractBasicTranscoderTest.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractBasicTranscoderTest.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractBasicTranscoderTest.java Tue Dec 17 13:15:06 2013
@@ -24,13 +24,15 @@ 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 org.apache.commons.io.output.ByteArrayOutputStream;
 
 import static org.apache.fop.FOPTestUtils.getBaseDir;
-import static org.junit.Assert.assertTrue;
 
 /**
  * Basic runtime test for FOP's transcoders. It is used to verify that

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicDriverTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicDriverTestCase.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicDriverTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicDriverTestCase.java Tue Dec 17 13:15:06 2013
@@ -28,11 +28,13 @@ import javax.xml.transform.TransformerFa
 import javax.xml.transform.sax.SAXResult;
 import javax.xml.transform.stream.StreamSource;
 
-import org.apache.fop.apps.FOPException;
 import org.junit.Test;
 
+import static org.junit.Assert.assertTrue;
+
 import org.apache.commons.io.output.ByteArrayOutputStream;
 
+import org.apache.fop.apps.FOPException;
 import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.apps.Fop;
 import org.apache.fop.apps.FopFactory;
@@ -40,7 +42,6 @@ import org.apache.fop.apps.MimeConstants
 import org.apache.fop.cli.InputHandler;
 
 import static org.apache.fop.FOPTestUtils.getBaseDir;
-import static org.junit.Assert.assertTrue;
 
 /**
  * Basic runtime test for the old Fop class. It is used to verify that
@@ -136,7 +137,7 @@ public class BasicDriverTestCase {
         InputHandler handler = new InputHandler(xmlFile, xsltFile, null);
         try {
             handler.renderTo(foUserAgent, MimeConstants.MIME_PDF, baout);
-        } catch (FOPException e) {}
+        } catch (FOPException e) { /* NOP */ }
     }
 
 }

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicDriverTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicDriverTestSuite.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicDriverTestSuite.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicDriverTestSuite.java Tue Dec 17 13:15:06 2013
@@ -27,6 +27,6 @@ import org.junit.runners.Suite.SuiteClas
  * Test suite for basic functionality of FOP's Driver API.
  */
 @RunWith(Suite.class)
-@SuiteClasses({ BasicDriverTestCase.class })
+@SuiteClasses(BasicDriverTestCase.class)
 public class BasicDriverTestSuite {
 }

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicPSTranscoderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicPSTranscoderTestCase.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicPSTranscoderTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicPSTranscoderTestCase.java Tue Dec 17 13:15:06 2013
@@ -20,6 +20,7 @@
 package org.apache.fop;
 
 import org.apache.batik.transcoder.Transcoder;
+
 import org.apache.fop.render.ps.PSTranscoder;
 
 /**

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/DebugHelper.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/DebugHelper.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/DebugHelper.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/DebugHelper.java Tue Dec 17 13:15:06 2013
@@ -25,7 +25,10 @@ import org.apache.fop.logging.LoggingEle
 /**
  * Handles some standard tasks for debugging.
  */
-public class DebugHelper {
+public final class DebugHelper {
+
+    private DebugHelper() {
+    }
 
     private static boolean elObserversRegistered = false;
 

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/DigestFilterTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/DigestFilterTestCase.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/DigestFilterTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/DigestFilterTestCase.java Tue Dec 17 13:15:06 2013
@@ -19,8 +19,6 @@
 
 package org.apache.fop;
 
-import static org.junit.Assert.assertTrue;
-
 import java.io.IOException;
 import java.io.StringReader;
 import java.security.NoSuchAlgorithmException;
@@ -28,13 +26,16 @@ import java.security.NoSuchAlgorithmExce
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.apache.fop.util.DigestFilter;
 import org.junit.Before;
 import org.junit.Test;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 
+import static org.junit.Assert.assertTrue;
+
+import org.apache.fop.util.DigestFilter;
+
 /**
  * Test case for digesting SAX filter.
  *

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/KnuthAlgorithmTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/KnuthAlgorithmTestCase.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/KnuthAlgorithmTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/KnuthAlgorithmTestCase.java Tue Dec 17 13:15:06 2013
@@ -19,10 +19,13 @@
 
 package org.apache.fop;
 
-import static org.junit.Assert.assertEquals;
-
 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;
@@ -30,8 +33,6 @@ import org.apache.fop.layoutmgr.KnuthBox
 import org.apache.fop.layoutmgr.KnuthGlue;
 import org.apache.fop.layoutmgr.KnuthPenalty;
 import org.apache.fop.layoutmgr.KnuthSequence;
-import org.junit.Before;
-import org.junit.Test;
 
 /**
  * Tests the Knuth algorithm implementation.

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java Tue Dec 17 13:15:06 2013
@@ -41,6 +41,9 @@ 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;
 import org.apache.xpath.XPathAPI;
@@ -59,8 +62,6 @@ import org.apache.fop.apps.io.ResourceRe
 import org.apache.fop.render.xml.XMLRenderer;
 
 import static org.apache.fop.FOPTestUtils.getBaseDir;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 /**
  * Tests URI resolution facilities.

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPObjectAreaInfoTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPObjectAreaInfoTestCase.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPObjectAreaInfoTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPObjectAreaInfoTestCase.java Tue Dec 17 13:15:06 2013
@@ -19,11 +19,11 @@
 
 package org.apache.fop.afp;
 
-import static org.junit.Assert.assertEquals;
-
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 /**
  * Test case for {@link AFPObjectAreaInfo}.
  */

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPPaintingStateTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPPaintingStateTestCase.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPPaintingStateTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPPaintingStateTestCase.java Tue Dec 17 13:15:06 2013
@@ -19,11 +19,11 @@
 
 package org.apache.fop.afp;
 
-import static org.junit.Assert.assertEquals;
-
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 /**
  * Test case for {@link AFPPaintingState}.
  */

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPResourceManagerTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPResourceManagerTestCase.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPResourceManagerTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPResourceManagerTestCase.java Tue Dec 17 13:15:06 2013
@@ -26,13 +26,13 @@ import java.io.IOException;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import org.apache.xmlgraphics.util.MimeConstants;
 
 import org.apache.fop.apps.io.ResourceResolverFactory;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 /**
  * Test case for {@link AFPResourceManager}.
  */

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPResourceUtilTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPResourceUtilTestCase.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPResourceUtilTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPResourceUtilTestCase.java Tue Dec 17 13:15:06 2013
@@ -19,8 +19,6 @@
 
 package org.apache.fop.afp;
 
-import static org.junit.Assert.assertTrue;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,11 +27,11 @@ 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 org.junit.Test;
 
-import static org.junit.Assert.assertTrue;
+import org.apache.fop.afp.util.AFPResourceUtil;
 
 /**
  * Tests the {@link AFPResourceUtil} class.
@@ -133,7 +131,7 @@ public class AFPResourceUtilTestCase {
      * names fails.
      * @throws Exception -
      */
-    @Test(expected=Exception.class)
+    @Test(expected = Exception.class)
     public void testResourceNameMismatch() throws Exception {
         testResource(RESOURCE_NAME_MISMATCH, PSEG_B);
     }
@@ -156,6 +154,6 @@ public class AFPResourceUtilTestCase {
     }
 
     private interface ResourceCopier {
-        public void copy(InputStream in, OutputStream out) throws IOException;
+        void copy(InputStream in, OutputStream out) throws IOException;
     }
 }

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/goca/GraphicsCharacterStringTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/goca/GraphicsCharacterStringTestCase.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/goca/GraphicsCharacterStringTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/goca/GraphicsCharacterStringTestCase.java Tue Dec 17 13:15:06 2013
@@ -16,16 +16,17 @@
  */
 package org.apache.fop.afp.goca;
 
-import static org.junit.Assert.assertEquals;
-
 import java.io.ByteArrayOutputStream;
 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 org.junit.Before;
-import org.junit.Test;
 
 public class GraphicsCharacterStringTestCase {
     private GraphicsCharacterString gcsCp500;

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractAFPObjectTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractAFPObjectTest.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractAFPObjectTest.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractAFPObjectTest.java Tue Dec 17 13:15:06 2013
@@ -19,10 +19,6 @@
 
 package org.apache.fop.afp.modca;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -30,9 +26,14 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.fop.afp.Streamable;
 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.fop.afp.Streamable;
+
 /**
  * Tests the {@link AbstractAFPObject} class.
  */

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractNamedAFPObjectTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractNamedAFPObjectTest.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractNamedAFPObjectTest.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractNamedAFPObjectTest.java Tue Dec 17 13:15:06 2013
@@ -19,12 +19,12 @@
 
 package org.apache.fop.afp.modca;
 
-import static org.junit.Assert.assertTrue;
-
 import java.util.Arrays;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertTrue;
+
 /**
  * Tests the {@linkplain AbstractAFPObject} class.
  */

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractStructuredObjectTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractStructuredObjectTest.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractStructuredObjectTest.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractStructuredObjectTest.java Tue Dec 17 13:15:06 2013
@@ -21,7 +21,8 @@ package org.apache.fop.afp.modca;
 
 import java.io.IOException;
 
-public abstract class AbstractStructuredObjectTest<S extends  AbstractStructuredObject> extends AbstractAFPObjectTest<S> {
+public abstract class AbstractStructuredObjectTest<S extends  AbstractStructuredObject>
+        extends AbstractAFPObjectTest<S> {
 
     /**
      * Test writeStart() - test that the contract is maintained with

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractTripletStructuredObjectTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractTripletStructuredObjectTest.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractTripletStructuredObjectTest.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractTripletStructuredObjectTest.java Tue Dec 17 13:15:06 2013
@@ -19,10 +19,6 @@
 
 package org.apache.fop.afp.modca;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -33,6 +29,10 @@ 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;

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/IncludeObjectTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/IncludeObjectTestCase.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/IncludeObjectTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/IncludeObjectTestCase.java Tue Dec 17 13:15:06 2013
@@ -19,16 +19,17 @@
 
 package org.apache.fop.afp.modca;
 
-import static org.junit.Assert.assertTrue;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Arrays;
 
-import org.apache.fop.afp.util.BinaryUtils;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.assertTrue;
+
+import org.apache.fop.afp.util.BinaryUtils;
+
 /**
  * Test {@link IncludeObject}
  */

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/parser/MODCAParserTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/parser/MODCAParserTestCase.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/parser/MODCAParserTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/parser/MODCAParserTestCase.java Tue Dec 17 13:15:06 2013
@@ -19,11 +19,6 @@
 
 package org.apache.fop.afp.parser;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.EOFException;
@@ -32,6 +27,11 @@ import java.util.Arrays;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 /**
  * MODCAParser and MODCAParser.UnparsedStructuredField Unit tests
  */

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/ptoca/TransparentDataControlSequenceTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/ptoca/TransparentDataControlSequenceTestCase.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/ptoca/TransparentDataControlSequenceTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/ptoca/TransparentDataControlSequenceTestCase.java Tue Dec 17 13:15:06 2013
@@ -24,15 +24,16 @@ 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.apache.fop.afp.ptoca.PtocaConstants.TRANSPARENT_DATA_MAX_SIZE;
 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 {
 
     private EncodedChars encodedChars;

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/AbstractRendererConfigParserTester.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/AbstractRendererConfigParserTester.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/AbstractRendererConfigParserTester.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/AbstractRendererConfigParserTester.java Tue Dec 17 13:15:06 2013
@@ -19,6 +19,9 @@
 
 package org.apache.fop.apps;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
 
@@ -28,9 +31,6 @@ 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> {
 

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/AbstractRendererConfiguratorTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/AbstractRendererConfiguratorTest.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/AbstractRendererConfiguratorTest.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/AbstractRendererConfiguratorTest.java Tue Dec 17 13:15:06 2013
@@ -24,16 +24,17 @@ import java.io.IOException;
 
 import org.xml.sax.SAXException;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import org.apache.avalon.framework.configuration.ConfigurationException;
 
 import org.apache.fop.apps.FopConfBuilder.RendererConfBuilder;
 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> {
+public abstract class AbstractRendererConfiguratorTest<T extends PrintRendererConfigurator,
+        B extends RendererConfBuilder> {
 
     protected final String mimeType;
     protected FOUserAgent userAgent;

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/EnvironmentalProfileFactoryTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/EnvironmentalProfileFactoryTestCase.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/EnvironmentalProfileFactoryTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/EnvironmentalProfileFactoryTestCase.java Tue Dec 17 13:15:06 2013
@@ -21,7 +21,6 @@ import java.net.URI;
 
 import org.junit.Test;
 
-
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/FopFactoryBuilderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/FopFactoryBuilderTestCase.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/FopFactoryBuilderTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/FopFactoryBuilderTestCase.java Tue Dec 17 13:15:06 2013
@@ -27,6 +27,12 @@ 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;
@@ -45,12 +51,6 @@ import org.apache.fop.layoutmgr.PageSequ
 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}.
  */

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/FopFactoryTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/FopFactoryTestCase.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/FopFactoryTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/FopFactoryTestCase.java Tue Dec 17 13:15:06 2013
@@ -24,16 +24,15 @@ import java.io.IOException;
 import org.junit.Test;
 import org.xml.sax.SAXException;
 
-import org.apache.fop.apps.MimeConstants;
-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 {

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/PDFRendererConfBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/PDFRendererConfBuilder.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/PDFRendererConfBuilder.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/PDFRendererConfBuilder.java Tue Dec 17 13:15:06 2013
@@ -22,10 +22,8 @@ package org.apache.fop.apps;
 import org.w3c.dom.Element;
 
 import org.apache.fop.apps.FopConfBuilder.RendererConfBuilder;
-import org.apache.fop.pdf.PDFEncryptionParams;
 import org.apache.fop.render.RendererConfigOption;
 import org.apache.fop.render.pdf.PDFEncryptionOption;
-import org.apache.fop.render.pdf.PDFRendererOption;
 
 import static org.apache.fop.render.pdf.PDFEncryptionOption.ENCRYPTION_LENGTH;
 import static org.apache.fop.render.pdf.PDFEncryptionOption.ENCRYPTION_PARAMS;

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/BaseURIResolutionTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/BaseURIResolutionTest.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/BaseURIResolutionTest.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/BaseURIResolutionTest.java Tue Dec 17 13:15:06 2013
@@ -34,6 +34,8 @@ import javax.xml.transform.stream.Stream
 
 import org.xml.sax.SAXException;
 
+import static org.junit.Assert.assertTrue;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.output.ByteArrayOutputStream;
 
@@ -48,7 +50,6 @@ import org.apache.fop.apps.FopFactoryBui
 import org.apache.fop.apps.MimeConstants;
 
 import static org.apache.fop.FOPTestUtils.getBaseDir;
-import static org.junit.Assert.assertTrue;
 
 public abstract class BaseURIResolutionTest {
 

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/FontURIResolver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/FontURIResolver.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/FontURIResolver.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/io/FontURIResolver.java Tue Dec 17 13:15:06 2013
@@ -33,14 +33,13 @@ import javax.xml.transform.TransformerEx
 import org.junit.Test;
 import org.xml.sax.SAXException;
 
-import org.apache.fop.apps.FopConfBuilder;
-import org.apache.fop.apps.MimeConstants;
-import org.apache.fop.apps.PDFRendererConfBuilder;
-
 import static org.junit.Assert.assertTrue;
 
 import org.apache.xmlgraphics.io.Resource;
 
+import org.apache.fop.apps.FopConfBuilder;
+import org.apache.fop.apps.PDFRendererConfBuilder;
+
 public class FontURIResolver extends BaseURIResolutionTest {
 
     public enum Event {

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/area/ViewportTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/area/ViewportTest.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/area/ViewportTest.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/area/ViewportTest.java Tue Dec 17 13:15:06 2013
@@ -19,13 +19,13 @@
 
 package org.apache.fop.area;
 
+import java.awt.Rectangle;
+
 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 java.awt.Rectangle;
-
 /**
  * Tests implementations of the {@linkplain Viewport} interface.
  */

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/area/ViewportTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/area/ViewportTestSuite.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/area/ViewportTestSuite.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/area/ViewportTestSuite.java Tue Dec 17 13:15:06 2013
@@ -19,11 +19,12 @@
 
 package org.apache.fop.area;
 
-import org.apache.fop.area.inline.InlineViewportTestCase;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
+import org.apache.fop.area.inline.InlineViewportTestCase;
+
 /**
  * A suite of all the tests relating to the {@linkplain Viewport} interface.
  */

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/area/inline/InlineViewportTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/area/inline/InlineViewportTestCase.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/area/inline/InlineViewportTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/area/inline/InlineViewportTestCase.java Tue Dec 17 13:15:06 2013
@@ -19,9 +19,10 @@
 
 package org.apache.fop.area.inline;
 
-import org.apache.fop.area.ViewportTest;
 import org.junit.Test;
 
+import org.apache.fop.area.ViewportTest;
+
 /**
  * Tests the {@linkplain InlineViewport} class.
  */

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/check/ChecksFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/check/ChecksFactory.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/check/ChecksFactory.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/check/ChecksFactory.java Tue Dec 17 13:15:06 2013
@@ -37,7 +37,7 @@ public abstract class ChecksFactory<C ex
     /**
      * A factory to create a particular kind of check.
      */
-    protected static interface CheckFactory<C> {
+    protected interface CheckFactory<C> {
 
         /**
          * Creates a {@link Check} instance from the given XML element.

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/cli/CommandLineOptionsTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/cli/CommandLineOptionsTestCase.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/cli/CommandLineOptionsTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/cli/CommandLineOptionsTestCase.java Tue Dec 17 13:15:06 2013
@@ -19,15 +19,16 @@
 
 package org.apache.fop.cli;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 import java.io.IOException;
 
-import org.apache.fop.apps.FOPException;
 import org.junit.Before;
 import org.junit.Test;
 
+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();

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/bidi/BidiAlgorithmTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/bidi/BidiAlgorithmTestCase.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/bidi/BidiAlgorithmTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/bidi/BidiAlgorithmTestCase.java Tue Dec 17 13:15:06 2013
@@ -19,26 +19,23 @@
 
 package org.apache.fop.complexscripts.bidi;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.apache.fop.complexscripts.bidi.UnicodeBidiAlgorithm;
-
 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;
+
 /**
  * <p>Test case for Unicode Bidi Algorithm.</p>
- * @author Glenn Adams
  */
 public class BidiAlgorithmTestCase {
 
     /**
      * logging instance
      */
-    private static final Log log = LogFactory.getLog(BidiAlgorithmTestCase.class);                                      // CSOK: ConstantNameCheck
+    private static final Log log = LogFactory.getLog(BidiAlgorithmTestCase.class);
 
     /**
      * Concatenated array of <test-set,test-sequence> tuples
@@ -122,7 +119,7 @@ public class BidiAlgorithmTestCase {
                 }
                 if (includeSequence(testSet, testSequence)) {
                     includedSequences++;
-                    if (! excludeSequence(testSet, testSequence)) {
+                    if (!excludeSequence(testSet, testSequence)) {
                         if (testBidiAlgorithm(testSet, testSequence, la, ra, ta, bs)) {
                             passedSequences++;
                         }
@@ -151,7 +148,7 @@ public class BidiAlgorithmTestCase {
     }
 
     private boolean includeSequence(int testSet, int testSequence) {
-        if (! includeTestSet(testSet)) {
+        if (!includeTestSet(testSet)) {
             return false;
         } else {
             for (int i = 0, n = INCLUSIONS.length / 2; i < n; i++) {
@@ -196,7 +193,8 @@ public class BidiAlgorithmTestCase {
         return false;
     }
 
-    private boolean testBidiAlgorithm(int testSet, int testSequence, int[] la, int[] ra, int[] ta, int bs) throws Exception {
+    private boolean testBidiAlgorithm(int testSet, int testSequence, int[] la, int[] ra, int[] ta, int bs)
+            throws Exception {
         boolean passed = true;
         int n = la.length;
         if (ra.length != n) {
@@ -211,14 +209,14 @@ public class BidiAlgorithmTestCase {
             // LTR
             if ((bs & 2) != 0) {
                 int[] levels = UnicodeBidiAlgorithm.resolveLevels(null, ta, 0, new int [ n ], true);
-                if (! verifyResults(la, levels, ta, 0, testSet, testSequence)) {
+                if (!verifyResults(la, levels, ta, 0, testSet, testSequence)) {
                     passed = false;
                 }
             }
             // RTL
             if ((bs & 4) != 0) {
                 int[] levels = UnicodeBidiAlgorithm.resolveLevels(null, ta, 1, new int [ n ], true);
-                if (! verifyResults(la, levels, ta, 1, testSet, testSequence)) {
+                if (!verifyResults(la, levels, ta, 1, testSet, testSequence)) {
                     passed = false;
                 }
             }

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/bidi/BidiClassTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/bidi/BidiClassTestCase.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/bidi/BidiClassTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/bidi/BidiClassTestCase.java Tue Dec 17 13:15:06 2013
@@ -19,14 +19,13 @@
 
 package org.apache.fop.complexscripts.bidi;
 
-import org.apache.fop.complexscripts.bidi.BidiClass;
-import org.apache.fop.util.CharUtilities;
-
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
+import org.apache.fop.util.CharUtilities;
+
 public class BidiClassTestCase {
 
     @Test
@@ -46,8 +45,8 @@ public class BidiClassTestCase {
     private void testBidiClass(int[] da) throws Exception {
         int bc = da[0];
         for (int i = 1, n = da.length; i < n; i += 2) {
-            int s = da[i+0];
-            int e = da[i+1];
+            int s = da[i + 0];
+            int e = da[i + 1];
             for (int c = s; c < e; c++) {
                 int cbc = BidiClass.getBidiClass(c);
                 assertEquals("bad bidi class for CH(" + CharUtilities.format(c) + ")", bc, cbc);

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/bidi/BidiTestData.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/bidi/BidiTestData.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/bidi/BidiTestData.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/bidi/BidiTestData.java Tue Dec 17 13:15:06 2013
@@ -65,7 +65,7 @@ public final class BidiTestData {
             data = null;
         } finally {
             if (is != null) {
-                try { is.close(); } catch (Exception e) {}
+                try { is.close(); } catch (Exception e) { /* NOP */ }
             }
         }
         return data;

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GDEFTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GDEFTestCase.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GDEFTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GDEFTestCase.java Tue Dec 17 13:15:06 2013
@@ -21,21 +21,14 @@ package org.apache.fop.complexscripts.fo
 
 import java.io.File;
 
-import org.apache.fop.complexscripts.fonts.GlyphSubtable;
-import org.apache.fop.complexscripts.fonts.GlyphDefinitionSubtable;
-import org.apache.fop.complexscripts.fonts.GlyphDefinitionTable;
-import org.apache.fop.complexscripts.fonts.GlyphTable.LookupSpec;
-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.junit.Test;
 
 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";

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java Tue Dec 17 13:15:06 2013
@@ -20,18 +20,6 @@
 package org.apache.fop.complexscripts.fonts;
 
 import java.io.File;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.fop.complexscripts.fonts.GlyphSubtable;
-import org.apache.fop.complexscripts.fonts.GlyphPositioningSubtable;
-import org.apache.fop.complexscripts.fonts.GlyphPositioningTable;
-import org.apache.fop.complexscripts.fonts.GlyphTable.LookupSpec;
-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 org.junit.Test;
 
@@ -40,6 +28,14 @@ import static org.junit.Assert.assertNot
 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;
+
+// CSOFF: LineLength
+
 public class GPOSTestCase implements ScriptContextTester, GlyphContextTester {
 
     private static String ttxFilesRoot = "test/resources/complexscripts";

Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java?rev=1551536&r1=1551535&r2=1551536&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java Tue Dec 17 13:15:06 2013
@@ -21,18 +21,6 @@ package org.apache.fop.complexscripts.fo
 
 import java.io.File;
 import java.nio.IntBuffer;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.fop.complexscripts.fonts.GlyphSubtable;
-import org.apache.fop.complexscripts.fonts.GlyphSubstitutionSubtable;
-import org.apache.fop.complexscripts.fonts.GlyphSubstitutionTable;
-import org.apache.fop.complexscripts.fonts.GlyphTable.LookupSpec;
-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 org.junit.Test;
 
@@ -41,6 +29,14 @@ import static org.junit.Assert.assertNot
 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;
+
+// CSOFF: LineLength
+
 public class GSUBTestCase implements ScriptContextTester, GlyphContextTester {
 
     private static String ttxFilesRoot = "test/resources/complexscripts";



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org