From 56a5fe00c829a616178a2b95f371577fa4ff6db1 Mon Sep 17 00:00:00 2001 From: Glenn Adams Date: Sun, 13 Mar 2016 01:32:45 +0000 Subject: [PATCH] Fixups for ant targets, checkstyle, findbugs. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/maven@1734752 13f79535-47bb-0310-9956-ffa450edef68 --- fop-core/pom.xml | 13 - fop-core/src/main/codegen/fonts/Courier.xml | 494 +++---- .../src/main/codegen/fonts/CourierBold.xml | 494 +++---- .../main/codegen/fonts/CourierBoldOblique.xml | 494 +++---- .../src/main/codegen/fonts/CourierOblique.xml | 494 +++---- fop-core/src/main/codegen/fonts/Helvetica.xml | 1172 ++++++++-------- .../src/main/codegen/fonts/HelveticaBold.xml | 1088 +++++++------- .../codegen/fonts/HelveticaBoldOblique.xml | 1088 +++++++------- .../main/codegen/fonts/HelveticaOblique.xml | 1172 ++++++++-------- fop-core/src/main/codegen/fonts/Symbol.xml | 410 +++--- fop-core/src/main/codegen/fonts/TimesBold.xml | 1250 ++++++++--------- .../main/codegen/fonts/TimesBoldItalic.xml | 1250 ++++++++--------- .../src/main/codegen/fonts/TimesItalic.xml | 1250 ++++++++--------- .../src/main/codegen/fonts/TimesRoman.xml | 1250 ++++++++--------- .../src/main/codegen/fonts/ZapfDingbats.xml | 434 +++--- .../main/codegen/fonts/code-point-mapping.xsl | 41 +- fop-core/src/main/codegen/fonts/font-file.xsl | 98 +- .../tools/resources/checkstyle/checkstyle.xml | 2 +- fop-events/pom.xml | 2 - fop-sandbox/pom.xml | 4 +- .../org/apache/fop/render/mif/MIFElement.java | 5 +- .../org/apache/fop/render/mif/MIFFile.java | 22 +- .../org/apache/fop/render/mif/MIFHandler.java | 6 +- .../render/svg/EmbeddedSVGImageHandler.java | 8 +- .../render/svg/SVGDataUrlImageHandler.java | 3 + .../fop/render/svg/SVGDocumentHandler.java | 11 +- .../org/apache/fop/render/svg/SVGPainter.java | 4 +- .../tools/resources/findbugs/exclusions.xml | 126 ++ fop-util/pom.xml | 2 - fop/build.xml | 16 +- pom.xml | 24 +- 31 files changed, 6441 insertions(+), 6286 deletions(-) create mode 100644 fop-sandbox/src/tools/resources/findbugs/exclusions.xml diff --git a/fop-core/pom.xml b/fop-core/pom.xml index 4ba2c6d3b..37b489240 100644 --- a/fop-core/pom.xml +++ b/fop-core/pom.xml @@ -218,17 +218,6 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - - - - org/apache/fop/util/bitmap/JAIMonochromeBitmapConverter.java - - - org.apache.maven.plugins @@ -284,9 +273,7 @@ - org.apache.maven.plugins maven-checkstyle-plugin - ${checkstyle.plugin.version} ${project.baseUri}src/tools/resources/checkstyle/checkstyle.xml ${project.baseUri}src/tools/resources/checkstyle/LICENSE.txt diff --git a/fop-core/src/main/codegen/fonts/Courier.xml b/fop-core/src/main/codegen/fonts/Courier.xml index 075699427..68405b1dc 100644 --- a/fop-core/src/main/codegen/fonts/Courier.xml +++ b/fop-core/src/main/codegen/fonts/Courier.xml @@ -17,251 +17,251 @@ - Courier - Courier - Courier - Courier - StandardEncoding - -100 - 50 - 562 - 426 - 629 - -157 - 32 - 255 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Courier +Courier +Courier +Courier +StandardEncoding +-100 +50 +562 +426 +629 +-157 +32 +255 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fop-core/src/main/codegen/fonts/CourierBold.xml b/fop-core/src/main/codegen/fonts/CourierBold.xml index c06ef5f23..430314ff0 100644 --- a/fop-core/src/main/codegen/fonts/CourierBold.xml +++ b/fop-core/src/main/codegen/fonts/CourierBold.xml @@ -17,251 +17,251 @@ - Courier-Bold - Courier Bold - Courier - CourierBold - StandardEncoding - -100 - 50 - 562 - 439 - 626 - -142 - 32 - 255 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Courier-Bold +Courier Bold +Courier +CourierBold +StandardEncoding +-100 +50 +562 +439 +626 +-142 +32 +255 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fop-core/src/main/codegen/fonts/CourierBoldOblique.xml b/fop-core/src/main/codegen/fonts/CourierBoldOblique.xml index a82a75ad2..ac5a30eaa 100644 --- a/fop-core/src/main/codegen/fonts/CourierBoldOblique.xml +++ b/fop-core/src/main/codegen/fonts/CourierBoldOblique.xml @@ -17,251 +17,251 @@ - Courier-BoldOblique - Courier Bold Oblique - Courier - CourierBoldOblique - StandardEncoding - -100 - 50 - 562 - 439 - 626 - -142 - 32 - 255 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Courier-BoldOblique +Courier Bold Oblique +Courier +CourierBoldOblique +StandardEncoding +-100 +50 +562 +439 +626 +-142 +32 +255 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fop-core/src/main/codegen/fonts/CourierOblique.xml b/fop-core/src/main/codegen/fonts/CourierOblique.xml index e08fa9b9b..366db5685 100644 --- a/fop-core/src/main/codegen/fonts/CourierOblique.xml +++ b/fop-core/src/main/codegen/fonts/CourierOblique.xml @@ -17,251 +17,251 @@ - Courier-Oblique - Courier Oblique - Courier - CourierOblique - StandardEncoding - -100 - 50 - 562 - 426 - 629 - -157 - 32 - 255 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Courier-Oblique +Courier Oblique +Courier +CourierOblique +StandardEncoding +-100 +50 +562 +426 +629 +-157 +32 +255 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fop-core/src/main/codegen/fonts/Helvetica.xml b/fop-core/src/main/codegen/fonts/Helvetica.xml index b6e11a72b..aa79b0ac7 100644 --- a/fop-core/src/main/codegen/fonts/Helvetica.xml +++ b/fop-core/src/main/codegen/fonts/Helvetica.xml @@ -17,590 +17,590 @@ - Helvetica - Helvetica - Helvetica - Helvetica - StandardEncoding - -100 - 50 - 718 - 523 - 718 - -207 - 32 - 255 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Helvetica +Helvetica +Helvetica +Helvetica +StandardEncoding +-100 +50 +718 +523 +718 +-207 +32 +255 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fop-core/src/main/codegen/fonts/HelveticaBold.xml b/fop-core/src/main/codegen/fonts/HelveticaBold.xml index 4efd01f22..533764881 100644 --- a/fop-core/src/main/codegen/fonts/HelveticaBold.xml +++ b/fop-core/src/main/codegen/fonts/HelveticaBold.xml @@ -17,548 +17,548 @@ - Helvetica-Bold - Helvetica Bold - Helvetica - HelveticaBold - StandardEncoding - -100 - 50 - 718 - 532 - 718 - -207 - 32 - 255 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Helvetica-Bold +Helvetica Bold +Helvetica +HelveticaBold +StandardEncoding +-100 +50 +718 +532 +718 +-207 +32 +255 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fop-core/src/main/codegen/fonts/HelveticaBoldOblique.xml b/fop-core/src/main/codegen/fonts/HelveticaBoldOblique.xml index e1d0fd294..f3ed4f862 100644 --- a/fop-core/src/main/codegen/fonts/HelveticaBoldOblique.xml +++ b/fop-core/src/main/codegen/fonts/HelveticaBoldOblique.xml @@ -17,548 +17,548 @@ - Helvetica-BoldOblique - Helvetica Bold Oblique - Helvetica - HelveticaBoldOblique - StandardEncoding - -100 - 50 - 718 - 532 - 718 - -207 - 32 - 255 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Helvetica-BoldOblique +Helvetica Bold Oblique +Helvetica +HelveticaBoldOblique +StandardEncoding +-100 +50 +718 +532 +718 +-207 +32 +255 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fop-core/src/main/codegen/fonts/HelveticaOblique.xml b/fop-core/src/main/codegen/fonts/HelveticaOblique.xml index efa1165f2..4590f7c2c 100644 --- a/fop-core/src/main/codegen/fonts/HelveticaOblique.xml +++ b/fop-core/src/main/codegen/fonts/HelveticaOblique.xml @@ -17,590 +17,590 @@ - Helvetica-Oblique - Helvetica Oblique - Helvetica - HelveticaOblique - StandardEncoding - -100 - 50 - 718 - 523 - 718 - -207 - 32 - 255 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Helvetica-Oblique +Helvetica Oblique +Helvetica +HelveticaOblique +StandardEncoding +-100 +50 +718 +523 +718 +-207 +32 +255 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fop-core/src/main/codegen/fonts/Symbol.xml b/fop-core/src/main/codegen/fonts/Symbol.xml index 7493b7e7f..e2a7871f6 100644 --- a/fop-core/src/main/codegen/fonts/Symbol.xml +++ b/fop-core/src/main/codegen/fonts/Symbol.xml @@ -16,209 +16,209 @@ --> - Symbol - Symbol - Symbol - Symbol - SymbolEncoding - -100 - 50 - 1010 - 520 - 1010 - -293 - 32 - 255 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Symbol +Symbol +Symbol +Symbol +SymbolEncoding +-100 +50 +1010 +520 +1010 +-293 +32 +255 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fop-core/src/main/codegen/fonts/TimesBold.xml b/fop-core/src/main/codegen/fonts/TimesBold.xml index ef5d6bcc0..d229e5bc8 100644 --- a/fop-core/src/main/codegen/fonts/TimesBold.xml +++ b/fop-core/src/main/codegen/fonts/TimesBold.xml @@ -17,629 +17,629 @@ - Times-Bold - Times Bold - Times - TimesBold - StandardEncoding - -100 - 50 - 676 - 461 - 676 - -205 - 32 - 255 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Times-Bold +Times Bold +Times +TimesBold +StandardEncoding +-100 +50 +676 +461 +676 +-205 +32 +255 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fop-core/src/main/codegen/fonts/TimesBoldItalic.xml b/fop-core/src/main/codegen/fonts/TimesBoldItalic.xml index ec67369f2..568cddc1a 100644 --- a/fop-core/src/main/codegen/fonts/TimesBoldItalic.xml +++ b/fop-core/src/main/codegen/fonts/TimesBoldItalic.xml @@ -17,629 +17,629 @@ - Times-BoldItalic - Times Bold Italic - Times - TimesBoldItalic - StandardEncoding - -100 - 50 - 669 - 462 - 699 - -205 - 32 - 255 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Times-BoldItalic +Times Bold Italic +Times +TimesBoldItalic +StandardEncoding +-100 +50 +669 +462 +699 +-205 +32 +255 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fop-core/src/main/codegen/fonts/TimesItalic.xml b/fop-core/src/main/codegen/fonts/TimesItalic.xml index 607f4d701..8f59abe05 100644 --- a/fop-core/src/main/codegen/fonts/TimesItalic.xml +++ b/fop-core/src/main/codegen/fonts/TimesItalic.xml @@ -17,629 +17,629 @@ - Times-Italic - Times Italic - Times - TimesItalic - StandardEncoding - -100 - 50 - 653 - 441 - 683 - -205 - 32 - 255 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Times-Italic +Times Italic +Times +TimesItalic +StandardEncoding +-100 +50 +653 +441 +683 +-205 +32 +255 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fop-core/src/main/codegen/fonts/TimesRoman.xml b/fop-core/src/main/codegen/fonts/TimesRoman.xml index 9e16b6a3b..119d1c19a 100644 --- a/fop-core/src/main/codegen/fonts/TimesRoman.xml +++ b/fop-core/src/main/codegen/fonts/TimesRoman.xml @@ -17,629 +17,629 @@ - Times-Roman - Times Roman - Times - TimesRoman - StandardEncoding - -100 - 50 - 662 - 450 - 683 - -217 - 32 - 255 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Times-Roman +Times Roman +Times +TimesRoman +StandardEncoding +-100 +50 +662 +450 +683 +-217 +32 +255 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fop-core/src/main/codegen/fonts/ZapfDingbats.xml b/fop-core/src/main/codegen/fonts/ZapfDingbats.xml index bd72901dc..05a573bb7 100644 --- a/fop-core/src/main/codegen/fonts/ZapfDingbats.xml +++ b/fop-core/src/main/codegen/fonts/ZapfDingbats.xml @@ -16,221 +16,221 @@ --> - ZapfDingbats - ITC Zapf Dingbats - ZapfDingbats - ZapfDingbats - ZapfDingbatsEncoding - -100 - 50 - 820 - 426 - 820 - -143 - 32 - 255 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +ZapfDingbats +ITC Zapf Dingbats +ZapfDingbats +ZapfDingbats +ZapfDingbatsEncoding +-100 +50 +820 +426 +820 +-143 +32 +255 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fop-core/src/main/codegen/fonts/code-point-mapping.xsl b/fop-core/src/main/codegen/fonts/code-point-mapping.xsl index 7c49034c5..6433d68e5 100644 --- a/fop-core/src/main/codegen/fonts/code-point-mapping.xsl +++ b/fop-core/src/main/codegen/fonts/code-point-mapping.xsl @@ -28,9 +28,9 @@ * 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. @@ -40,8 +40,10 @@ package org.apache.fop.fonts; -import java.util.Map; import java.util.Collections; +import java.util.Map; + +// CSOFF: ConstantNameCheck public class CodePointMapping extends AbstractCodePointMapping { @@ -64,23 +66,26 @@ public class CodePointMapping extends AbstractCodePointMapping { CodePointMapping mapping = (CodePointMapping) mappings.get(encoding); if (mapping != null) { return mapping; - } - throw new UnsupportedOperationException("Unknown encoding: " + encoding); + + } else { + throw new UnsupportedOperationException("Unknown encoding: " + encoding); + } } } - + - public static final String = ""; + + public static final String = ""; + - - else if (encoding.equals()) { - mapping = new CodePointMapping(, enc, names); + + } else if (encoding.equals()) { + mapping = new CodePointMapping(, enc, names); mappings.put(, mapping); return mapping; - } - + @@ -93,7 +98,7 @@ public class CodePointMapping extends AbstractCodePointMapping { 0x, 0x, // }; - + private static final String[] names @@ -102,7 +107,7 @@ public class CodePointMapping extends AbstractCodePointMapping { }; - + @@ -121,20 +126,20 @@ public class CodePointMapping extends AbstractCodePointMapping { --- --> - /**/ + /**/ - "" + "" - null + null - , + , diff --git a/fop-core/src/main/codegen/fonts/font-file.xsl b/fop-core/src/main/codegen/fonts/font-file.xsl index 082160606..37010a826 100644 --- a/fop-core/src/main/codegen/fonts/font-file.xsl +++ b/fop-core/src/main/codegen/fonts/font-file.xsl @@ -32,7 +32,23 @@ - + /* + * 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.fonts.base14; import java.awt.Rectangle; @@ -41,53 +57,58 @@ import java.net.URI; import java.util.Map; import java.util.Set; -import org.apache.fop.fonts.FontType; + import org.apache.fop.fonts.Base14Font; import org.apache.fop.fonts.CodePointMapping; +import org.apache.fop.fonts.FontType; import org.apache.fop.fonts.Typeface; +// CSOFF: ConstantNameCheck + public class extends Base14Font { - private final static URI fontFileURI; - private final static String fontName = ""; - private final static String fullName = ""; - private final static Set familyNames; - private final static int underlinePosition = ; - private final static int underlineThickness = ; - private final static String encoding = ""; - private final static int capHeight = ; - private final static int xHeight = ; - private final static int ascender = ; - private final static int descender = ; - private final static int firstChar = ; - private final static int lastChar = ; - private final static int[] width; - private final static Rectangle[] boundingBoxes; + private static final URI fontFileURI; + private static final String fontName = ""; + private static final String fullName = ""; + private static final Set familyNames; + private static final int underlinePosition = ; + private static final int underlineThickness = ; + private static final String encoding = ""; + private static final int capHeight = ; + private static final int xHeight = ; + private static final int ascender = ; + private static final int descender = ; + private static final int firstChar = ; + private static final int lastChar = ; + private static final int[] width; + private static final Rectangle[] boundingBoxes; private final CodePointMapping mapping = CodePointMapping.getMapping(""); - private final static Map kerning; + private static final Map kerning; - private boolean enableKerning = false; + private boolean enableKerning; static { URI uri = null; try { uri = new URI("base14:" + fontName.toLowerCase()); } catch (java.net.URISyntaxException e) { + throw new RuntimeException(e); } fontFileURI = uri; width = new int[256]; boundingBoxes = new Rectangle[256]; - + + familyNames = new java.util.HashSet(); + familyNames.add(""); kerning = new java.util.HashMap(); - Integer first, second; + Integer first; + Integer second; Map pairs; - + - familyNames = new java.util.HashSet(); - familyNames.add(""); } public () { @@ -158,7 +179,7 @@ public class extends Base14Font { return lastChar; } - public int getWidth(int i,int size) { + public int getWidth(int i, int size) { return size * width[i]; } @@ -172,9 +193,8 @@ public class extends Base14Font { System.arraycopy(width, getFirstChar(), arr, 0, getLastChar() - getFirstChar() + 1); return arr; } - - + public boolean hasKerningInfo() { return enableKerning; } @@ -182,8 +202,8 @@ public class extends Base14Font { public java.util.Map getKerningInfo() { return kerning; } - - + + public boolean hasKerningInfo() { return false; } @@ -191,9 +211,8 @@ public class extends Base14Font { public java.util.Map getKerningInfo() { return java.util.Collections.EMPTY_MAP; } - + - public char mapChar(char c) { notifyMapOperation(); char d = mapping.mapChar(c); @@ -210,25 +229,24 @@ public class extends Base14Font { } } - + - - width[0x] = ; - boundingBoxes[0x] = new Rectangle(,,,); + width[0x] = ; + boundingBoxes[0x] = new Rectangle(, , , ); - + first = new Integer(); pairs = (Map)kerning.get(first); if (pairs == null) { pairs = new java.util.HashMap(); kerning.put(first, pairs); } - - + - + second = new Integer(); pairs.put(second, new Integer()); - + + diff --git a/fop-core/src/tools/resources/checkstyle/checkstyle.xml b/fop-core/src/tools/resources/checkstyle/checkstyle.xml index bff3fd8c3..8e72bf48c 100644 --- a/fop-core/src/tools/resources/checkstyle/checkstyle.xml +++ b/fop-core/src/tools/resources/checkstyle/checkstyle.xml @@ -37,7 +37,7 @@ - + diff --git a/fop-events/pom.xml b/fop-events/pom.xml index 548d0adf5..0303deba5 100644 --- a/fop-events/pom.xml +++ b/fop-events/pom.xml @@ -95,9 +95,7 @@ - org.apache.maven.plugins maven-checkstyle-plugin - ${checkstyle.plugin.version} ${project.baseUri}../fop-core/src/tools/resources/checkstyle/checkstyle.xml ${project.baseUri}../fop-core/src/tools/resources/checkstyle/LICENSE.txt diff --git a/fop-sandbox/pom.xml b/fop-sandbox/pom.xml index 8d44f1443..d0eb9847a 100644 --- a/fop-sandbox/pom.xml +++ b/fop-sandbox/pom.xml @@ -90,9 +90,7 @@ - org.apache.maven.plugins maven-checkstyle-plugin - ${checkstyle.plugin.version} ${project.baseUri}../fop-core/src/tools/resources/checkstyle/checkstyle.xml ${project.baseUri}../fop-core/src/tools/resources/checkstyle/LICENSE.txt @@ -110,7 +108,7 @@ findbugs-maven-plugin ${findbugs.plugin.version} - ../fop-core/src/tools/resources/findbugs/exclusions.xml + src/tools/resources/findbugs/exclusions.xml Max Low diff --git a/fop-sandbox/src/main/java/org/apache/fop/render/mif/MIFElement.java b/fop-sandbox/src/main/java/org/apache/fop/render/mif/MIFElement.java index 098eab470..93f7c1d8d 100644 --- a/fop-sandbox/src/main/java/org/apache/fop/render/mif/MIFElement.java +++ b/fop-sandbox/src/main/java/org/apache/fop/render/mif/MIFElement.java @@ -83,10 +83,11 @@ public class MIFElement { return false; } - String indentStr = ""; + StringBuffer sb = new StringBuffer(); for (int c = 0; c < indent; c++) { - indentStr += " "; + sb.append(' '); } + String indentStr = sb.toString(); if (!started) { os.write((indentStr + "<" + name).getBytes()); if (valueElements != null) { diff --git a/fop-sandbox/src/main/java/org/apache/fop/render/mif/MIFFile.java b/fop-sandbox/src/main/java/org/apache/fop/render/mif/MIFFile.java index 9ee8a8a5f..c727b2998 100644 --- a/fop-sandbox/src/main/java/org/apache/fop/render/mif/MIFFile.java +++ b/fop-sandbox/src/main/java/org/apache/fop/render/mif/MIFFile.java @@ -38,31 +38,31 @@ public class MIFFile extends MIFElement { /** pgfCatalog */ protected PGFElement pgfCatalog; /** fontCatalog */ - protected MIFElement fontCatalog; + // protected MIFElement fontCatalog; /** rulingCatalog */ protected RulingElement rulingCatalog; /** tblCatalog */ - protected MIFElement tblCatalog; + // protected MIFElement tblCatalog; /** views */ - protected MIFElement views; + // protected MIFElement views; /** variableFormats */ - protected MIFElement variableFormats; + // protected MIFElement variableFormats; /** xRefFormats */ - protected MIFElement xRefFormats; + // protected MIFElement xRefFormats; /** document */ - protected MIFElement document; + // protected MIFElement document; /** bookComponent */ - protected MIFElement bookComponent; + // protected MIFElement bookComponent; /** initialAutoNums */ - protected MIFElement initialAutoNums; + // protected MIFElement initialAutoNums; /** aFrames */ - protected MIFElement aFrames; + // protected MIFElement aFrames; /** tbls */ - protected MIFElement tbls; + // protected MIFElement tbls; /** pages */ protected List pages = new java.util.ArrayList(); /** textFlows */ - protected List textFlows; + // protected List textFlows; /** default constructor */ diff --git a/fop-sandbox/src/main/java/org/apache/fop/render/mif/MIFHandler.java b/fop-sandbox/src/main/java/org/apache/fop/render/mif/MIFHandler.java index 00b9dfbfe..32f6a5f49 100644 --- a/fop-sandbox/src/main/java/org/apache/fop/render/mif/MIFHandler.java +++ b/fop-sandbox/src/main/java/org/apache/fop/render/mif/MIFHandler.java @@ -53,7 +53,6 @@ import org.apache.fop.fo.flow.table.TableHeader; import org.apache.fop.fo.flow.table.TableRow; import org.apache.fop.fo.pagination.Flow; import org.apache.fop.fo.pagination.PageSequence; -import org.apache.fop.fo.pagination.PageSequenceMaster; import org.apache.fop.fo.pagination.SimplePageMaster; import org.apache.fop.fo.pagination.StaticContent; import org.apache.fop.fonts.FontSetup; @@ -122,10 +121,7 @@ public class MIFHandler extends FOEventHandler { // setup the pages for this sequence String name = pageSeq.getMasterReference(); SimplePageMaster spm = pageSeq.getRoot().getLayoutMasterSet().getSimplePageMaster(name); - if (spm == null) { - PageSequenceMaster psm - = pageSeq.getRoot().getLayoutMasterSet().getPageSequenceMaster(name); - } else { + if (spm != null) { // create simple master with regions MIFElement prop = new MIFElement("PageType"); prop.setValue("BodyPage"); diff --git a/fop-sandbox/src/main/java/org/apache/fop/render/svg/EmbeddedSVGImageHandler.java b/fop-sandbox/src/main/java/org/apache/fop/render/svg/EmbeddedSVGImageHandler.java index 371f5a768..856ee370c 100644 --- a/fop-sandbox/src/main/java/org/apache/fop/render/svg/EmbeddedSVGImageHandler.java +++ b/fop-sandbox/src/main/java/org/apache/fop/render/svg/EmbeddedSVGImageHandler.java @@ -42,7 +42,6 @@ import org.apache.xmlgraphics.image.loader.Image; import org.apache.xmlgraphics.image.loader.ImageFlavor; import org.apache.xmlgraphics.image.loader.impl.ImageRawStream; import org.apache.xmlgraphics.image.loader.impl.ImageXMLDOM; -import org.apache.xmlgraphics.util.QName; import org.apache.fop.image.loader.batik.BatikImageFlavors; import org.apache.fop.render.ImageHandler; @@ -77,16 +76,21 @@ public class EmbeddedSVGImageHandler implements ImageHandler, SVGConstants { }; } + /* private void addAttribute(AttributesImpl atts, QName attribute, String value) { atts.addAttribute(attribute.getNamespaceURI(), attribute.getLocalName(), attribute.getQName(), CDATA, value); } + */ /** {@inheritDoc} */ public void handleImage(RenderingContext context, Image image, final Rectangle pos) throws IOException { SVGRenderingContext svgContext = (SVGRenderingContext)context; - ImageXMLDOM svg = (ImageXMLDOM)image; + if (!(image instanceof ImageXMLDOM)) { + throw new IllegalStateException(); + } + ImageXMLDOM svg = (ImageXMLDOM) image; ContentHandler handler = svgContext.getContentHandler(); AttributesImpl atts = new AttributesImpl(); atts.addAttribute("", "x", "x", CDATA, SVGUtil.formatMptToPt(pos.x)); diff --git a/fop-sandbox/src/main/java/org/apache/fop/render/svg/SVGDataUrlImageHandler.java b/fop-sandbox/src/main/java/org/apache/fop/render/svg/SVGDataUrlImageHandler.java index fbe29e8d5..7363a7c72 100644 --- a/fop-sandbox/src/main/java/org/apache/fop/render/svg/SVGDataUrlImageHandler.java +++ b/fop-sandbox/src/main/java/org/apache/fop/render/svg/SVGDataUrlImageHandler.java @@ -75,6 +75,9 @@ public class SVGDataUrlImageHandler implements ImageHandler, SVGConstants { public void handleImage(RenderingContext context, Image image, Rectangle pos) throws IOException { SVGRenderingContext svgContext = (SVGRenderingContext)context; + if (!(image instanceof ImageRawStream)) { + throw new IllegalStateException(); + } ImageRawStream raw = (ImageRawStream)image; InputStream in = raw.createInputStream(); try { diff --git a/fop-sandbox/src/main/java/org/apache/fop/render/svg/SVGDocumentHandler.java b/fop-sandbox/src/main/java/org/apache/fop/render/svg/SVGDocumentHandler.java index f7bfbb38e..e5aa2af07 100644 --- a/fop-sandbox/src/main/java/org/apache/fop/render/svg/SVGDocumentHandler.java +++ b/fop-sandbox/src/main/java/org/apache/fop/render/svg/SVGDocumentHandler.java @@ -75,6 +75,8 @@ public class SVGDocumentHandler extends AbstractSVGDocumentHandler { */ public SVGDocumentHandler(IFContext context) { super(context); + this.multiFileUtil = null; + this.reusedParts = null; } /** {@inheritDoc} */ @@ -192,10 +194,13 @@ public class SVGDocumentHandler extends AbstractSVGDocumentHandler { } catch (TransformerConfigurationException tce) { throw new IFException("Error setting up a Transformer", tce); } catch (TransformerException te) { - if (te.getCause() instanceof SAXException) { - throw (SAXException)te.getCause(); + Throwable t = te.getCause(); + if (t instanceof SAXException) { + throw (SAXException) t; + } else if (t instanceof Exception) { + throw new IFException("Error while serializing reused parts", (Exception) t); } else { - throw new IFException("Error while serializing reused parts", te); + throw new RuntimeException(t); } } } catch (SAXException e) { diff --git a/fop-sandbox/src/main/java/org/apache/fop/render/svg/SVGPainter.java b/fop-sandbox/src/main/java/org/apache/fop/render/svg/SVGPainter.java index fb7ce2677..8c85353d5 100644 --- a/fop-sandbox/src/main/java/org/apache/fop/render/svg/SVGPainter.java +++ b/fop-sandbox/src/main/java/org/apache/fop/render/svg/SVGPainter.java @@ -278,9 +278,7 @@ public class SVGPainter extends AbstractIFPainter XMLUtil.addAttribute(atts, "y", SVGUtil.formatMptToPt(rect.y)); XMLUtil.addAttribute(atts, "width", SVGUtil.formatMptToPt(rect.width)); XMLUtil.addAttribute(atts, "height", SVGUtil.formatMptToPt(rect.height)); - if (fill != null) { - XMLUtil.addAttribute(atts, "fill", toString(fill)); - } + XMLUtil.addAttribute(atts, "fill", toString(fill)); /* disabled if (stroke != null) { XMLUtil.addAttribute(atts, "stroke", toString(stroke)); diff --git a/fop-sandbox/src/tools/resources/findbugs/exclusions.xml b/fop-sandbox/src/tools/resources/findbugs/exclusions.xml new file mode 100644 index 000000000..9be08f1a7 --- /dev/null +++ b/fop-sandbox/src/tools/resources/findbugs/exclusions.xml @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/fop-util/pom.xml b/fop-util/pom.xml index 831c645ab..72fb37b08 100644 --- a/fop-util/pom.xml +++ b/fop-util/pom.xml @@ -44,9 +44,7 @@ - org.apache.maven.plugins maven-checkstyle-plugin - ${checkstyle.plugin.version} ${project.baseUri}../fop-core/src/tools/resources/checkstyle/checkstyle.xml ${project.baseUri}../fop-core/src/tools/resources/checkstyle/LICENSE.txt diff --git a/fop/build.xml b/fop/build.xml index e26d22f75..3f9398c2b 100644 --- a/fop/build.xml +++ b/fop/build.xml @@ -153,7 +153,7 @@ list of possible build targets. - + @@ -194,8 +194,8 @@ list of possible build targets. - - + + @@ -523,7 +523,7 @@ list of possible build targets. - + @@ -543,7 +543,7 @@ list of possible build targets. - + @@ -673,7 +673,7 @@ list of possible build targets. - + @@ -708,7 +708,7 @@ list of possible build targets. - + @@ -1074,7 +1074,7 @@ NOTE: - + diff --git a/pom.xml b/pom.xml index d95d0e7ad..96d14f482 100644 --- a/pom.xml +++ b/pom.xml @@ -13,13 +13,13 @@ 1.8 4.3.1 1.9.0-SNAPSHOT - 1.10 - 2.15 + 1.9.1 + 2.14 1.3.1 1.0.4 3.1 1.4.0 - 3.0.1 + 2.5.5 2.6 1.6 4.11 @@ -60,6 +60,11 @@ + + org.apache.maven.plugins + maven-checkstyle-plugin + ${checkstyle.plugin.version} + org.apache.maven.plugins maven-compiler-plugin @@ -98,10 +103,23 @@ apache.snapshots.https https://repository.apache.org/content/repositories/snapshots + + false + true + + apache.releases.https + https://repository.apache.org/content/repositories/releases + + true + + + false + + -- 2.39.5