From: Glenn Adams Date: Mon, 5 Mar 2012 21:13:28 +0000 (+0000) Subject: disable line breaks after DOT with NoWhiteSpaceAfter; fix violations X-Git-Tag: fop-1_1rc1old~103 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=64cbcc37824ec37cf6bbfa9336fad2b41cda5ccd;p=xmlgraphics-fop.git 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 7d59fea00..a4722c626 100644 --- a/checkstyle-5.5.xml +++ b/checkstyle-5.5.xml @@ -175,11 +175,11 @@ - + - + diff --git a/src/java/org/apache/fop/cli/InputHandler.java b/src/java/org/apache/fop/cli/InputHandler.java index f6389a25f..5054f12e1 100644 --- 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 ab4b71739..7077c53b9 100644 --- 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 05f3b1eff..d227b7060 100644 --- 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 47051152b..43f231cf3 100644 --- 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 52262252f..1b25c113f 100644 --- 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 1f09fbca6..61d860eaa 100644 --- 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 ded87a057..3fc988110 100644 --- 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 58dd1fb5b..3cc93bafa 100644 --- 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) {