disable line breaks after DOT with NoWhiteSpaceAfter; fix violations

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

diff --git a/checkstyle-5.5.xml b/checkstyle-5.5.xml
index 7d59fea00e801888460a58021e2532988ae8de37..a4722c626243dfd7f2412bb7c626ad551ed2fd4c 100644 (file)
--- a/checkstyle-5.5.xml
+++ b/checkstyle-5.5.xml
@@ -175,11 +175,11 @@
     <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
     <module name="NoWhitespaceAfter">
       <property name="allowLineBreaks" value="false"/>
-      <property name="tokens" value="BNOT,DEC,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
+      <property name="tokens" value="BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
     </module>
     <module name="NoWhitespaceAfter">
       <property name="allowLineBreaks" value="true"/>
-      <property name="tokens" value="ARRAY_INIT,DOT"/>
+      <property name="tokens" value="ARRAY_INIT"/>
     </module>
     <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
 

diff --git a/src/java/org/apache/fop/cli/InputHandler.java b/src/java/org/apache/fop/cli/InputHandler.java
index f6389a25f437bdea92e5c520cd02dfc3867821e8..5054f12e1eab76c57a36af63702d4f75cfd6b40e 100644 (file)
--- a/src/java/org/apache/fop/cli/InputHandler.java
+++ b/src/java/org/apache/fop/cli/InputHandler.java
@@ -116,8 +116,8 @@ public class InputHandler implements ErrorListener, Renderable {
             String baseURL = null;
 
             try {
-                baseURL = new File(sourcefile.getAbsolutePath()).
-                        getParentFile().toURI().toURL().toExternalForm();
+                baseURL = new File(sourcefile.getAbsolutePath())
+                        .getParentFile().toURI().toURL().toExternalForm();
             } catch (Exception e) {
                 baseURL = "";
             }

diff --git a/src/java/org/apache/fop/fonts/LazyFont.java b/src/java/org/apache/fop/fonts/LazyFont.java
index ab4b71739a7f3bfe14d205da6c7e6856b7fc1e8c..7077c53b9d987134ac1bd94cc033e7f13c0591a5 100644 (file)
--- a/src/java/org/apache/fop/fonts/LazyFont.java
+++ b/src/java/org/apache/fop/fonts/LazyFont.java
@@ -422,8 +422,8 @@ public class LazyFont extends Typeface implements FontDescriptor, Substitutable,
         ( CharSequence cs, int[][] gpa, String script, String language ) {
         load(true);
         if ( realFontDescriptor instanceof Substitutable ) {
-            return ((Substitutable)realFontDescriptor).
-                reorderCombiningMarks(cs, gpa, script, language);
+            return ((Substitutable)realFontDescriptor)
+                .reorderCombiningMarks(cs, gpa, script, language);
         } else {
             return cs;
         }

diff --git a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
index 05f3b1eff38419dc45126f4375390922dbade9a9..d227b706000dfaad717fb90cfbfb9f8d129b0038 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
@@ -222,8 +222,8 @@ public abstract class AbstractLayoutManager extends AbstractBaseLayoutManager
                         (RetrieveMarker) foNode);
                 }
                 if (foNode != null) {
-                    getPSLM().getLayoutManagerMaker().
-                        makeLayoutManagers(foNode, newLMs);
+                    getPSLM().getLayoutManagerMaker()
+                        .makeLayoutManagers(foNode, newLMs);
                 }
             }
         }

diff --git a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
index 47051152baa4922cdc8552c01d500b89669765f2..43f231cf3efddb6aeec30b00447c37a2241798a5 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
@@ -87,8 +87,8 @@ public class PageSequenceLayoutManager extends AbstractPageSequenceLayoutManager
         LineArea title = null;
         if (getPageSequence().getTitleFO() != null) {
             try {
-                ContentLayoutManager clm = getLayoutManagerMaker().
-                    makeContentLayoutManager(this, getPageSequence().getTitleFO());
+                ContentLayoutManager clm = getLayoutManagerMaker()
+                    .makeContentLayoutManager(this, getPageSequence().getTitleFO());
                 title = (LineArea) clm.getParentArea(null);
             } catch (IllegalStateException e) {
                 // empty title; do nothing

diff --git a/src/java/org/apache/fop/pdf/AbstractPDFStream.java b/src/java/org/apache/fop/pdf/AbstractPDFStream.java
index 52262252f4ed20149ddb5ac8bbb6ade1ce3ce9d5..1b25c113fb5190c13f2c92b052caaf8aa8492962 100644 (file)
--- a/src/java/org/apache/fop/pdf/AbstractPDFStream.java
+++ b/src/java/org/apache/fop/pdf/AbstractPDFStream.java
@@ -130,8 +130,8 @@ public abstract class AbstractPDFStream extends PDFDictionary {
      */
     protected StreamCache encodeStream() throws IOException {
         //Allocate a temporary buffer to find out the size of the encoded stream
-        final StreamCache encodedStream = StreamCacheFactory.getInstance().
-                createStreamCache(getSizeHint());
+        final StreamCache encodedStream = StreamCacheFactory.getInstance()
+                .createStreamCache(getSizeHint());
         OutputStream filteredOutput
                 = getFilterList().applyFilters(encodedStream.getOutputStream());
         outputRawStreamData(filteredOutput);

diff --git a/src/java/org/apache/fop/pdf/PDFPages.java b/src/java/org/apache/fop/pdf/PDFPages.java
index 1f09fbca6d13c1d5aa5328c94fd7ea6f6be89bc0..61d860eaa0e97a58d92c02c42a9a4ca18aed54f2 100644 (file)
--- a/src/java/org/apache/fop/pdf/PDFPages.java
+++ b/src/java/org/apache/fop/pdf/PDFPages.java
@@ -109,10 +109,10 @@ public class PDFPages extends PDFObject {
      */
     public String toPDFString() {
         StringBuffer sb = new StringBuffer(64);
-        sb.append(getObjectID()).
-            append("<< /Type /Pages\n/Count ").
-            append(this.getCount()).
-            append("\n/Kids [");
+        sb.append(getObjectID())
+            .append("<< /Type /Pages\n/Count ")
+            .append(this.getCount())
+            .append("\n/Kids [");
         for (int i = 0; i < kids.size(); i++) {
             Object kid = kids.get(i);
             if (kid == null) {

diff --git a/src/java/org/apache/fop/render/pcl/PCLGraphics2D.java b/src/java/org/apache/fop/render/pcl/PCLGraphics2D.java
index ded87a05743f3159c785f5e12d97a93f81813316..3fc9881100771c14c839aa01e83baaf1b1546707 100644 (file)
--- a/src/java/org/apache/fop/render/pcl/PCLGraphics2D.java
+++ b/src/java/org/apache/fop/render/pcl/PCLGraphics2D.java
@@ -127,8 +127,8 @@ public class PCLGraphics2D extends AbstractGraphics2D {
 
     /** {@inheritDoc} */
     public GraphicsConfiguration getDeviceConfiguration() {
-        return GraphicsEnvironment.getLocalGraphicsEnvironment().
-                getDefaultScreenDevice().getDefaultConfiguration();
+        return GraphicsEnvironment.getLocalGraphicsEnvironment()
+                .getDefaultScreenDevice().getDefaultConfiguration();
     }
 
     /**

diff --git a/src/java/org/apache/fop/tools/anttasks/Fop.java b/src/java/org/apache/fop/tools/anttasks/Fop.java
index 58dd1fb5b20eaa9794307703e58ffc740e0e9a0d..3cc93bafa1a068efc0bb4ee984a5f48d22cca23f 100644 (file)
--- a/src/java/org/apache/fop/tools/anttasks/Fop.java
+++ b/src/java/org/apache/fop/tools/anttasks/Fop.java
@@ -498,8 +498,8 @@ class FOPTaskStarter {
         } else {
             try {
                 if (task.getFofile() != null) {
-                    this.baseURL =  task.getFofile().getParentFile().toURI().toURL().
-                                      toExternalForm();
+                    this.baseURL =  task.getFofile().getParentFile().toURI().toURL()
+                                      .toExternalForm();
                 }
             } catch (MalformedURLException mfue) {
                 logger.error("Error creating base URL from XSL-FO input file", mfue);
@@ -598,12 +598,12 @@ class FOPTaskStarter {
                 }
                 try {
                     if (task.getRelativebase()) {
-                        this.baseURL = f.getParentFile().toURI().toURL().
-                                         toExternalForm();
+                        this.baseURL = f.getParentFile().toURI().toURL()
+                                         .toExternalForm();
                     }
                     if (this.baseURL == null) {
-                        this.baseURL = fs.getDir(task.getProject()).toURI().toURL().
-                                          toExternalForm();
+                        this.baseURL = fs.getDir(task.getProject()).toURI().toURL()
+                                          .toExternalForm();
                     }
 
                 } catch (Exception e) {