diff options
| author | Glenn Adams <gadams@apache.org> | 2012-03-02 19:25:52 +0000 |
|---|---|---|
| committer | Glenn Adams <gadams@apache.org> | 2012-03-02 19:25:52 +0000 |
| commit | 78df57bd74bff5f53d126ff4c6f86f3e5e174855 (patch) | |
| tree | 29b903f2fc184470fb5c5dfb4e3f943ea18db9f3 | |
| parent | ef3c0ef8b860cccb6965873b9dcd98454a7cd46e (diff) | |
| download | xmlgraphics-fop-78df57bd74bff5f53d126ff4c6f86f3e5e174855.tar.gz xmlgraphics-fop-78df57bd74bff5f53d126ff4c6f86f3e5e174855.zip | |
change allowLineBreaks to false (default value) on NoWhitespaceBefore; fix violations
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1296399 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | checkstyle-5.5.xml | 4 | ||||
| -rw-r--r-- | src/java/org/apache/fop/fonts/apps/TTFReader.java | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/checkstyle-5.5.xml b/checkstyle-5.5.xml index 018eb4911..e20161435 100644 --- a/checkstyle-5.5.xml +++ b/checkstyle-5.5.xml @@ -184,9 +184,7 @@ <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... --> <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... --> - <module name="NoWhitespaceBefore"> - <property name="allowLineBreaks" value="true"/> <!-- changing to false produces 1 new error --> - </module> + <module name="NoWhitespaceBefore"/> <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... --> <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... --> diff --git a/src/java/org/apache/fop/fonts/apps/TTFReader.java b/src/java/org/apache/fop/fonts/apps/TTFReader.java index 1804a8dd9..9a12e888c 100644 --- a/src/java/org/apache/fop/fonts/apps/TTFReader.java +++ b/src/java/org/apache/fop/fonts/apps/TTFReader.java @@ -496,8 +496,7 @@ public class TTFReader extends AbstractFontReader { if (version < METRICS_VERSION) { err = "Incompatible " + METRICS_VERSION_ATTR + " value (" + version + ", should be " + METRICS_VERSION - + ")" - ; + + ")"; } } catch (NumberFormatException e) { err = "Invalid " + METRICS_VERSION_ATTR |