Enabled LineLength check and fixed corresponding issues

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1547372 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/checkstyle-5.5.xml b/checkstyle-5.5.xml
index 30a39612e85a5033fab19333603c38fe40dc3116..4d499f645ba0b282ab70ecc900071bf69f9487de 100644 (file)
--- a/checkstyle-5.5.xml
+++ b/checkstyle-5.5.xml
@@ -50,6 +50,12 @@
   <!-- ===================================================================================================== -->
   <module name="TreeWalker">
 
+    <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
+    <module name="LineLength">
+      <property name="max" value="120"/>
+    </module>
+    <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
+
     <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
     <module name="AnnotationUseStyle"/>
     <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->

diff --git a/src/java/org/apache/fop/complexscripts/util/CharScript.java b/src/java/org/apache/fop/complexscripts/util/CharScript.java
index 420964393ec5889305297908b5acfd571e39446c..6809be609b2fdb3ede56e834464042c91e0cf458 100644 (file)
--- a/src/java/org/apache/fop/complexscripts/util/CharScript.java
+++ b/src/java/org/apache/fop/complexscripts/util/CharScript.java
@@ -35,6 +35,8 @@ import org.apache.fop.util.CharUtilities;
  */
 public final class CharScript {
 
+    // CSOFF: LineLength
+
     //
     // The following script codes are based on ISO 15924. Codes less than 1000 are
     // official assignments from 15924; those equal to or greater than 1000 are FOP

diff --git a/src/java/org/apache/fop/fo/expr/FunctionBase.java b/src/java/org/apache/fop/fo/expr/FunctionBase.java
index 707424b86cf5eea9419f2793de22569b2a41357d..e5e3460605398dda6e6de61c8ed85e1925fcb271 100644 (file)
--- a/src/java/org/apache/fop/fo/expr/FunctionBase.java
+++ b/src/java/org/apache/fop/fo/expr/FunctionBase.java
@@ -36,7 +36,8 @@ public abstract class FunctionBase implements Function {
     /** {@inheritDoc} */
     public Property getOptionalArgDefault(int index, PropertyInfo pi) throws PropertyException {
         if (index >= getOptionalArgsCount()) {
-            PropertyException e = new PropertyException(new IndexOutOfBoundsException("illegal optional argument index"));
+            PropertyException e = new PropertyException(
+                    new IndexOutOfBoundsException("illegal optional argument index"));
             e.setPropertyInfo(pi);
             throw e;
         } else {

diff --git a/src/java/org/apache/fop/fo/expr/PropertyParser.java b/src/java/org/apache/fop/fo/expr/PropertyParser.java
index cac115d6edcff05ca2317b54ed914e0afdf5c6a8..26c8f6c1bfb940e15e6d316234d44f285d58a83f 100644 (file)
--- a/src/java/org/apache/fop/fo/expr/PropertyParser.java
+++ b/src/java/org/apache/fop/fo/expr/PropertyParser.java
@@ -385,7 +385,8 @@ public final class PropertyParser extends PropertyTokenizer {
         }
         int numArgs = args.size();
         if (numArgs < numReq) {
-            throw new PropertyException("Expected " + numReq + " required arguments, but only " + numArgs + " specified");
+            throw new PropertyException("Expected " + numReq + " required arguments, but only "
+                    + numArgs + " specified");
         } else {
             for (int i = 0; i < numOpt; i++) {
                 if (args.size() < (numReq + i + 1)) {

diff --git a/src/java/org/apache/fop/fonts/FontTriplet.java b/src/java/org/apache/fop/fonts/FontTriplet.java
index 2c1d89088bf758c381b7f2e2d840a9cb81d881ea..9392cc8b96958d3aee31d7d3bcaa3279b9ff4cec 100644 (file)
--- a/src/java/org/apache/fop/fonts/FontTriplet.java
+++ b/src/java/org/apache/fop/fonts/FontTriplet.java
@@ -27,7 +27,8 @@ import java.io.Serializable;
  */
 public class FontTriplet implements Comparable<FontTriplet>, Serializable {
 
-    public static final FontTriplet DEFAULT_FONT_TRIPLET = new FontTriplet("any", Font.STYLE_NORMAL, Font.WEIGHT_NORMAL);
+    public static final FontTriplet DEFAULT_FONT_TRIPLET
+            = new FontTriplet("any", Font.STYLE_NORMAL, Font.WEIGHT_NORMAL);
 
     /** serial version UID */
     private static final long serialVersionUID = 1168991106658033508L;

diff --git a/src/java/org/apache/fop/fonts/truetype/OTFSubSetFile.java b/src/java/org/apache/fop/fonts/truetype/OTFSubSetFile.java
index 906fbd5e0e13718859262cb348a58e10728d3b8e..4d0cce67abc0330dccec14a1756974712448efbd 100644 (file)
--- a/src/java/org/apache/fop/fonts/truetype/OTFSubSetFile.java
+++ b/src/java/org/apache/fop/fonts/truetype/OTFSubSetFile.java
@@ -451,7 +451,8 @@ public class OTFSubSetFile extends OTFFile {
                 localUniques = foundLocalUniquesB.get(subsetFDSelect.get(subsetGlyphs.get(gid)).getNewFDIndex());
                 byte[] data = charStringsIndex.getValue(gid);
                 subsetLocalIndexSubr = fdSubrs.get(subsetFDSelect.get(subsetGlyphs.get(gid)).getNewFDIndex());
-                subsetLocalSubrCount = foundLocalUniques.get(subsetFDSelect.get(subsetGlyphs.get(gid)).getNewFDIndex()).size();
+                subsetLocalSubrCount = foundLocalUniques.get(
+                        subsetFDSelect.get(subsetGlyphs.get(gid)).getNewFDIndex()).size();
                 data = readCharStringData(data, subsetLocalSubrCount);
                 subsetCharStringsIndex.add(data);
             }

diff --git a/src/java/org/apache/fop/render/afp/AFPFontConfig.java b/src/java/org/apache/fop/render/afp/AFPFontConfig.java
index aef0b666cb905eda50414525c4ada9406832464a..149973eddfd3674b0b298f7f94809d8d6a50f7a0 100644 (file)
--- a/src/java/org/apache/fop/render/afp/AFPFontConfig.java
+++ b/src/java/org/apache/fop/render/afp/AFPFontConfig.java
@@ -316,8 +316,8 @@ public final class AFPFontConfig implements FontConfig {
 
         private final String characterset;
 
-        private CIDKeyedFontConfig(List<FontTriplet> triplets, String type, String codePage,
-                String encoding, String characterset, String name, CharacterSetType charsetType, boolean embeddable, String uri) {
+        private CIDKeyedFontConfig(List<FontTriplet> triplets, String type, String codePage, String encoding,
+                String characterset, String name, CharacterSetType charsetType, boolean embeddable, String uri) {
             super(triplets, type, codePage, encoding, name, embeddable, uri);
             this.characterset = characterset;
             this.charsetType = charsetType;

diff --git a/src/java/org/apache/fop/render/afp/AFPRendererConfig.java b/src/java/org/apache/fop/render/afp/AFPRendererConfig.java
index 90cc6e767a34c0a7719e62bfddb54d1dc59b90b1..a943f5aad40acf44a0add746c6cf8c698f503d45 100644 (file)
--- a/src/java/org/apache/fop/render/afp/AFPRendererConfig.java
+++ b/src/java/org/apache/fop/render/afp/AFPRendererConfig.java
@@ -103,7 +103,8 @@ public final class AFPRendererConfig implements RendererConfig {
         }
     }
 
-    private final EnumMap<AFPRendererOption, Object> params = new EnumMap<AFPRendererOption, Object>(AFPRendererOption.class);
+    private final EnumMap<AFPRendererOption, Object> params
+            = new EnumMap<AFPRendererOption, Object>(AFPRendererOption.class);
 
     private final EnumMap<ImagesModeOptions, Object> imageModeParams
     = new EnumMap<ImagesModeOptions, Object>(ImagesModeOptions.class);

diff --git a/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java b/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java
index d27fead120c0f2a8a46d51dc914a156b25f4e5f9..4352dae6c831e1c14e8e4b7b0a1878b99f795fda 100644 (file)
--- a/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java
+++ b/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java
@@ -463,7 +463,8 @@ class PDFRenderingUtil {
     private PDFDictionary augmentDictionary(PDFDictionary dictionary, PDFDictionaryExtension extension) {
         for (PDFCollectionEntryExtension entry : extension.getEntries()) {
             if (entry instanceof PDFDictionaryExtension) {
-                dictionary.put(entry.getKey(), augmentDictionary(new PDFDictionary(dictionary), (PDFDictionaryExtension) entry));
+                dictionary.put(entry.getKey(),
+                        augmentDictionary(new PDFDictionary(dictionary), (PDFDictionaryExtension) entry));
             } else if (entry instanceof PDFArrayExtension) {
                 dictionary.put(entry.getKey(), augmentArray(new PDFArray(dictionary), (PDFArrayExtension) entry));
             } else {

diff --git a/src/java/org/apache/fop/render/ps/svg/PSSVGGraphics2D.java b/src/java/org/apache/fop/render/ps/svg/PSSVGGraphics2D.java
index 3b6b5490c35f140a90fecb9c4936b8088b272520..1c15e569b1eac2b3374d79009fee4ae3efd77c01 100644 (file)
--- a/src/java/org/apache/fop/render/ps/svg/PSSVGGraphics2D.java
+++ b/src/java/org/apache/fop/render/ps/svg/PSSVGGraphics2D.java
@@ -119,7 +119,8 @@ public class PSSVGGraphics2D extends PSGraphics2D implements GradientRegistrar {
         List<Double> theCoords = new java.util.ArrayList<Double>();
 
 
-        AffineTransform start = applyTransform(lgp.getTransform(), lgp.getStartPoint().getX(), lgp.getStartPoint().getY());
+        AffineTransform start = applyTransform(lgp.getTransform(),
+                lgp.getStartPoint().getX(), lgp.getStartPoint().getY());
         AffineTransform end = applyTransform(lgp.getTransform(), lgp.getEndPoint().getX(), lgp.getEndPoint().getY());
         double startX = start.getTranslateX();
         double startY = start.getTranslateY();
@@ -177,8 +178,10 @@ public class PSSVGGraphics2D extends PSGraphics2D implements GradientRegistrar {
         transform.concatenate(getTransform());
         transform.concatenate(rgp.getTransform());
 
-        AffineTransform resultCentre = applyTransform(rgp.getTransform(), rgp.getCenterPoint().getX(), rgp.getCenterPoint().getY());
-        AffineTransform resultFocus = applyTransform(rgp.getTransform(), rgp.getFocusPoint().getX(), rgp.getFocusPoint().getY());
+        AffineTransform resultCentre = applyTransform(rgp.getTransform(),
+                rgp.getCenterPoint().getX(), rgp.getCenterPoint().getY());
+        AffineTransform resultFocus = applyTransform(rgp.getTransform(),
+                rgp.getFocusPoint().getX(), rgp.getFocusPoint().getY());
         double scale = Math.sqrt(rgp.getTransform().getDeterminant());
         double radius = rgp.getRadius() * scale;
         double centreX = resultCentre.getTranslateX();

diff --git a/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java b/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java
index 0c0335a8b7bf541b6cdf673bce378098d02112d2..6f2d4429da26fdd1287b51fe413bf1a1b5a2dcfe 100644 (file)
--- a/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java
+++ b/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java
@@ -88,7 +88,8 @@ public class PDFDocumentGraphics2DConfigurator {
         final boolean strict = false;
         if (cfg != null) {
             URI thisUri = new File(".").getAbsoluteFile().toURI();
-            InternalResourceResolver resourceResolver = ResourceResolverFactory.createDefaultInternalResourceResolver(thisUri);
+            InternalResourceResolver resourceResolver
+                    = ResourceResolverFactory.createDefaultInternalResourceResolver(thisUri);
             //TODO The following could be optimized by retaining the FontManager somewhere
             FontManager fontManager = new FontManager(resourceResolver, FontDetectorFactory.createDefault(),
                     FontCacheManagerFactory.createDefault());