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, 4 insertions, 4 deletions

diff --git a/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java b/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java
index c3df74800..ede6210ca 100644
--- a/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java
+++ b/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java
@@ -131,7 +131,7 @@ public abstract class CollapsingBorderModel {
 
     /**
      * Compares the two given styles (see {@link Constants}).
-     * 
+     *
      * @param style1 a style constant
      * @param style2 another style constant
      * @return a value < 0 if style1 has less priority than style2, 0 if both are
@@ -161,7 +161,7 @@ public abstract class CollapsingBorderModel {
     /**
      * Compares the two given FO ids ({@link Constants}.FO*) in terms of border
      * declaration.
-     * 
+     *
      * @param id1 a FO id ({@link Constants#FO_TABLE}, {@link Constants#FO_TABLE_BODY},
      * etc.)
      * @param id2 another FO id
@@ -178,7 +178,7 @@ public abstract class CollapsingBorderModel {
      * Returns the border which wins the border conflict resolution. In case the two
      * borders are equivalent (identical, or only the color is different), null is
      * returned.
-     * 
+     *
      * @param border1 a border specification
      * @param border2 another border specification
      * @param discard true if the .conditionality component of the border width must be
@@ -192,7 +192,7 @@ public abstract class CollapsingBorderModel {
      * Returns the border which wins the border conflict resolution. Same as
      * {@link #determineWinner(BorderSpecification, BorderSpecification, boolean)
      * determineWinner(border1, border2, false)}.
-     * 
+     *
      * @param border1 a border specification
      * @param border2 another border specification
      * @return the winning border, null if the two borders are equivalent