Fixed checkstyle missing EOL. Resolved ignored findbugs warning

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

diff --git a/findbugs-exclude.xml b/findbugs-exclude.xml
index 13f811251028b4ff8c86cad6e93b3d538b0f2f07..2eaa8580b370e1bd67c4562c92880bb79eb2f153 100644 (file)
--- a/findbugs-exclude.xml
+++ b/findbugs-exclude.xml
@@ -238,10 +238,6 @@
        <Bug pattern="OS_OPEN_STREAM_EXCEPTION_PATH"/>
      </Or>
    </Match> 
-  <Match>
-    <Class name="org.apache.fop.render.pcl.fonts.truetype.PCLTTFTable"/>
-    <Bug pattern="ICAST_INTEGER_MULTIPLY_CAST_TO_LONG"/>
-  </Match>
   <!-- END - APPROVED EXCLUSIONS -->
 
   <!-- START - TEMPORARY (UNAPPROVED) EXCLUSIONS -->

diff --git a/src/java/org/apache/fop/render/pcl/fonts/truetype/PCLTTFFontReader.java b/src/java/org/apache/fop/render/pcl/fonts/truetype/PCLTTFFontReader.java
index 1a054953ca4728556a210b3df6009c9734832df3..35e37f23f9726518aaf18a66ad76201529fc1bbf 100644 (file)
--- a/src/java/org/apache/fop/render/pcl/fonts/truetype/PCLTTFFontReader.java
+++ b/src/java/org/apache/fop/render/pcl/fonts/truetype/PCLTTFFontReader.java
@@ -728,4 +728,5 @@ public class PCLTTFFontReader extends PCLFontReader {
         out[offset] = b1;
         out[offset + 1] = b2;
     }
-}
\ No newline at end of file
+}
+

diff --git a/src/java/org/apache/fop/render/pcl/fonts/truetype/PCLTTFTable.java b/src/java/org/apache/fop/render/pcl/fonts/truetype/PCLTTFTable.java
index cfe8664742ed211e7544095efaafb4f41f4bce37..ea0f5cafb6ebbe88f5f05def5dec22f2bcdc6a18 100644 (file)
--- a/src/java/org/apache/fop/render/pcl/fonts/truetype/PCLTTFTable.java
+++ b/src/java/org/apache/fop/render/pcl/fonts/truetype/PCLTTFTable.java
@@ -32,12 +32,12 @@ public class PCLTTFTable {
 
     protected void skipShort(FontFileReader reader, int skips)
             throws IOException {
-        reader.skip(skips * 2);
+        reader.skip(skips * 2L);
     }
 
     protected void skipLong(FontFileReader reader, int skips)
             throws IOException {
-        reader.skip(skips * 4);
+        reader.skip(skips * 4L);
     }
 
     protected void skipByte(FontFileReader reader, int skips)