Author: gadams
Date: Mon Mar 5 21:13:28 2012
New Revision: 1297232
URL: http://svn.apache.org/viewvc?rev=1297232&view=rev
Log:
disable line breaks after DOT with NoWhiteSpaceAfter; fix violations
Modified:
xmlgraphics/fop/trunk/checkstyle-5.5.xml
xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/LazyFont.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AbstractPDFStream.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPages.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLGraphics2D.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/Fop.java
Modified: xmlgraphics/fop/trunk/checkstyle-5.5.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/checkstyle-5.5.xml?rev=1297232&r1=1297231&r2=1297232&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/checkstyle-5.5.xml (original)
+++ xmlgraphics/fop/trunk/checkstyle-5.5.xml Mon Mar 5 21:13:28 2012
@@ -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>
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ...
... ... ... ... ... ... ... ... -->
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java?rev=1297232&r1=1297231&r2=1297232&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/InputHandler.java Mon Mar
5 21:13:28 2012
@@ -116,8 +116,8 @@ public class InputHandler implements Err
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 = "";
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/LazyFont.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/LazyFont.java?rev=1297232&r1=1297231&r2=1297232&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/LazyFont.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/LazyFont.java Mon Mar
5 21:13:28 2012
@@ -422,8 +422,8 @@ public class LazyFont extends Typeface i
( 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;
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java?rev=1297232&r1=1297231&r2=1297232&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
Mon Mar 5 21:13:28 2012
@@ -222,8 +222,8 @@ public abstract class AbstractLayoutMana
(RetrieveMarker) foNode);
}
if (foNode != null) {
- getPSLM().getLayoutManagerMaker().
- makeLayoutManagers(foNode, newLMs);
+ getPSLM().getLayoutManagerMaker()
+ .makeLayoutManagers(foNode, newLMs);
}
}
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java?rev=1297232&r1=1297231&r2=1297232&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
Mon Mar 5 21:13:28 2012
@@ -87,8 +87,8 @@ public class PageSequenceLayoutManager e
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
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AbstractPDFStream.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AbstractPDFStream.java?rev=1297232&r1=1297231&r2=1297232&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AbstractPDFStream.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AbstractPDFStream.java
Mon Mar 5 21:13:28 2012
@@ -130,8 +130,8 @@ public abstract class AbstractPDFStream
*/
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);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPages.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPages.java?rev=1297232&r1=1297231&r2=1297232&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPages.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPages.java Mon Mar 5
21:13:28 2012
@@ -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) {
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLGraphics2D.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLGraphics2D.java?rev=1297232&r1=1297231&r2=1297232&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLGraphics2D.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLGraphics2D.java
Mon Mar 5 21:13:28 2012
@@ -127,8 +127,8 @@ public class PCLGraphics2D extends Abstr
/** {@inheritDoc} */
public GraphicsConfiguration getDeviceConfiguration() {
- return GraphicsEnvironment.getLocalGraphicsEnvironment().
- getDefaultScreenDevice().getDefaultConfiguration();
+ return GraphicsEnvironment.getLocalGraphicsEnvironment()
+ .getDefaultScreenDevice().getDefaultConfiguration();
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/Fop.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/Fop.java?rev=1297232&r1=1297231&r2=1297232&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/Fop.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/Fop.java Mon
Mar 5 21:13:28 2012
@@ -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) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
