You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by cb...@apache.org on 2012/01/18 15:32:43 UTC

svn commit: r1232905 - in /xmlgraphics/fop/trunk: findbugs-exclude.xml src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java

Author: cbowditch
Date: Wed Jan 18 14:32:43 2012
New Revision: 1232905

URL: http://svn.apache.org/viewvc?rev=1232905&view=rev
Log:
resolve findbug warnings

Modified:
    xmlgraphics/fop/trunk/findbugs-exclude.xml
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java

Modified: xmlgraphics/fop/trunk/findbugs-exclude.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/findbugs-exclude.xml?rev=1232905&r1=1232904&r2=1232905&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/findbugs-exclude.xml (original)
+++ xmlgraphics/fop/trunk/findbugs-exclude.xml Wed Jan 18 14:32:43 2012
@@ -2507,6 +2507,16 @@
       <Bug pattern="DM_NUMBER_CTOR"/>
    </Match>
    <Match>
+      <Class name="org.apache.fop.render.rtf.RTFHandler"/>
+      <Method name="startPageSequence"/>
+      <Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"/>
+   </Match>
+   <Match>
+      <Class name="org.apache.fop.render.afp.AFPImageHandlerRawCCITTFax"/>
+      <Method name="setAdditionalParameters"/>
+      <Bug pattern="BC_UNCONFIRMED_CAST"/>
+   </Match>   
+   <Match>
       <Class name="org.apache.fop.render.rtf.rtflib.rtfdoc.RtfAttributes"/>
       <Method name="set"/>
       <Bug pattern="DM_NUMBER_CTOR"/>
@@ -3546,6 +3556,11 @@
       <Method name="handleImage"/>
       <Bug pattern="BC_UNCONFIRMED_CAST"/>
    </Match>
+    <Match>
+      <Class name="org.apache.fop.render.afp.AFPImageHandlerRawJPEG"/>
+      <Method name="handleImage"/>
+      <Bug pattern="BC_UNCONFIRMED_CAST"/>
+   </Match>
    <Match>
       <Class name="org.apache.fop.render.afp.AFPImageHandlerSVG"/>
       <Method name="handleImage"/>

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java?rev=1232905&r1=1232904&r2=1232905&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java Wed Jan 18 14:32:43 2012
@@ -172,7 +172,12 @@ public class RepeatablePageMasterReferen
 
     /** {@inheritDoc} */
     public boolean canProcess(String flowName) {
-        return master.getRegion(FO_REGION_BODY).getRegionName().equals(flowName);
+        if (master != null) {
+            return master.getRegion(FO_REGION_BODY).getRegionName().equals(flowName);
+        }
+        else {
+            return false;
+        }
     }
 
     /** {@inheritDoc} */

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java?rev=1232905&r1=1232904&r2=1232905&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java Wed Jan 18 14:32:43 2012
@@ -150,7 +150,12 @@ public class SinglePageMasterReference e
 
     /** {@inheritDoc} */
     public boolean canProcess(String flowName) {
-        return master.getRegion(FO_REGION_BODY).getRegionName().equals(flowName);
+        if (master != null) {
+            return master.getRegion(FO_REGION_BODY).getRegionName().equals(flowName);
+        }
+        else {
+            return false;
+        }
     }
 
     /** {@inheritDoc} */



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org