Merged revisions 679052-679352 via svnmerge from

https://svn.eu.apache.org/repos/asf/xmlgraphics/fop/trunk

........
  r679060 | acumiskey | 2008-07-23 11:39:11 +0100 (Wed, 23 Jul 2008) | 2 lines
  
  My bad..  copy paste error I introduced which broke forrest.
........
  r679164 | jeremias | 2008-07-23 20:33:24 +0100 (Wed, 23 Jul 2008) | 1 line
  
  Only update the generated files if any source file is newer than the generated ones.
........
  r679326 | vhennebert | 2008-07-24 10:35:34 +0100 (Thu, 24 Jul 2008) | 2 lines
  
  Fed up with all those trailing whitespaces. Let's remove them all (once... and for all?)
........


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

1 files changed, 7 insertions, 7 deletions

diff --git a/src/java/org/apache/fop/layoutmgr/KeepUtil.java b/src/java/org/apache/fop/layoutmgr/KeepUtil.java
index 8c80a1b10..5cc33533f 100644
--- a/src/java/org/apache/fop/layoutmgr/KeepUtil.java
+++ b/src/java/org/apache/fop/layoutmgr/KeepUtil.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -46,7 +46,7 @@ public class KeepUtil {
             return keep.getNumber().intValue();
         }
     }
-    
+
     /**
      * Returns the combined block-level keep strength from a keep property.
      * <p>
@@ -60,7 +60,7 @@ public class KeepUtil {
                 getKeepStrength(keep.getWithinPage()),
                 getKeepStrength(keep.getWithinColumn()));
     }
-    
+
     /**
      * Indicates whether a keep strength indicates a keep constraint.
      * @param strength the keep strength
@@ -69,7 +69,7 @@ public class KeepUtil {
     public static boolean hasKeep(int strength) {
         return strength > BlockLevelLayoutManager.KEEP_AUTO;
     }
-    
+
     /**
      * Returns the penalty value to be used for a certain keep strength.
      * <ul>
@@ -90,7 +90,7 @@ public class KeepUtil {
         }
         return penalty;
     }
-    
+
     /**
      * Returns a string representation of a keep strength value.
      * @param keepStrength the keep strength
@@ -105,5 +105,5 @@ public class KeepUtil {
             return Integer.toString(keepStrength);
         }
     }
-    
+
 }