[FOray-commit] SF.net SVN: foray: [8014] trunk/foray

[<vic...@us...>]

Revision: 8014
          http://svn.sourceforge.net/foray/?rev=8014&view=rev
Author:   victormote
Date:     2006-09-09 12:22:54 -0700 (Sat, 09 Sep 2006)

Log Message:
-----------
Remove magic numbers.

Modified Paths:
--------------
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java
    trunk/foray/scripts/checkstyle-suppressions.xml

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java	2006-09-09 19:16:04 UTC (rev 8013)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java	2006-09-09 19:22:54 UTC (rev 8014)
@@ -43,12 +43,13 @@
  */
 public class BlockPL extends FObjMixedPL {
 
+    private static final int DEFAULT_LOOPS_ALLOWED = 50;
     // this may be helpful on other FOs too
     private boolean anythingLaidOut = false;
     //Added to see how long it's been since nothing was laid out.
     private int noLayoutCount = 0;
 
-    private int infLoopThreshhold = 50;
+    private int infLoopThreshhold = DEFAULT_LOOPS_ALLOWED;
     private boolean breakStatusBeforeChecked = false;
 
     private LineArea currentLineArea;

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java	2006-09-09 19:16:04 UTC (rev 8013)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java	2006-09-09 19:22:54 UTC (rev 8014)
@@ -215,7 +215,7 @@
     protected int layoutInlineContent(final FObj node, LineArea lineArea,
             final FOContext foContext) throws AreaWException {
         if (! (node instanceof FOLineNonText)) {
-            return -1000;
+            return Integer.MIN_VALUE;
         }
         final FOLineNonText nonText = (FOLineNonText) node;
         // this should start a new page

Modified: trunk/foray/scripts/checkstyle-suppressions.xml
===================================================================
--- trunk/foray/scripts/checkstyle-suppressions.xml	2006-09-09 19:16:04 UTC (rev 8013)
+++ trunk/foray/scripts/checkstyle-suppressions.xml	2006-09-09 19:22:54 UTC (rev 8014)
@@ -24,8 +24,6 @@
   <suppress checks="MagicNumber"
       files="org.foray.pdf.*"/>
   <suppress checks="MagicNumber"
-      files="org.foray.pioneer.*"/>
-  <suppress checks="MagicNumber"
       files="org.foray.ps.*"/>
   <suppress checks="MagicNumber"
       files="org.foray.render.*"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.