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

diff --git a/src/java/org/apache/fop/fo/expr/NumericOp.java b/src/java/org/apache/fop/fo/expr/NumericOp.java
index af77bb44c..9fe35d96d 100755
--- a/src/java/org/apache/fop/fo/expr/NumericOp.java
+++ b/src/java/org/apache/fop/fo/expr/NumericOp.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.
@@ -23,12 +23,12 @@ import org.apache.fop.datatypes.PercentBaseContext;
 import org.apache.fop.datatypes.Numeric;
 
 /**
- * This class contains static methods to evaluate operations on Numeric 
+ * This class contains static methods to evaluate operations on Numeric
  * operands. If the operands are absolute numerics the result is computed
  * rigth away and a new absolute numeric is return. If one of the operands are
  * relative a n operation node is created with the operation and the operands.
  * The evaluation of the operation can then occur when getNumericValue() is
- * called.     
+ * called.
  */
 public class NumericOp {
     /**
@@ -46,16 +46,16 @@ public class NumericOp {
             return new RelativeNumericProperty(RelativeNumericProperty.ADDITION, op1, op2);
         }
     }
-    
+
     public static Numeric addition2(Numeric op1, Numeric op2, PercentBaseContext context) throws PropertyException {
         if (op1.getDimension() != op2.getDimension()) {
             throw new PropertyException("Can't subtract Numerics of different dimensions");
         }
         return numeric(op1.getNumericValue(context) + op2.getNumericValue(context), op1.getDimension());
     }
-    
+
     /**
-     * Add the second operand from the first and return a new Numeric 
+     * Add the second operand from the first and return a new Numeric
      * representing the result.
      * @param op1 The first operand.
      * @param op2 The second operand.
@@ -77,9 +77,9 @@ public class NumericOp {
         }
         return numeric(op1.getNumericValue(context) - op2.getNumericValue(context), op1.getDimension());
     }
-    
+
     /**
-     * Multiply the two operands and return a new Numeric representing the 
+     * Multiply the two operands and return a new Numeric representing the
      * result.
      * @param op1 The first operand.
      * @param op2 The second operand.
@@ -93,16 +93,16 @@ public class NumericOp {
         } else {
             return new RelativeNumericProperty(RelativeNumericProperty.MULTIPLY, op1, op2);
         }
-    }    
+    }
 
     public static Numeric multiply2(Numeric op1, Numeric op2, PercentBaseContext context) throws PropertyException {
-        return numeric(op1.getNumericValue(context) * op2.getNumericValue(context), 
+        return numeric(op1.getNumericValue(context) * op2.getNumericValue(context),
                        op1.getDimension() + op2.getDimension());
     }
-    
+
     /**
-     * Divide the second operand into the first and return a new 
-     * Numeric representing the 
+     * Divide the second operand into the first and return a new
+     * Numeric representing the
      * result.
      * @param op1 The first operand.
      * @param op2 The second operand.
@@ -117,12 +117,12 @@ public class NumericOp {
             return new RelativeNumericProperty(RelativeNumericProperty.DIVIDE, op1, op2);
         }
     }
-    
+
     public static Numeric divide2(Numeric op1, Numeric op2, PercentBaseContext context) throws PropertyException {
-        return numeric(op1.getNumericValue(context) / op2.getNumericValue(context), 
+        return numeric(op1.getNumericValue(context) / op2.getNumericValue(context),
                        op1.getDimension() - op2.getDimension());
     }
-    
+
     /**
      * Return the remainder of a division of the two operand Numeric.
      * @param op1 The first operand.
@@ -136,7 +136,7 @@ public class NumericOp {
             return new RelativeNumericProperty(RelativeNumericProperty.MODULO, op1, op2);
         }
     }
-    
+
     public static Numeric modulo2(Numeric op1, Numeric op2, PercentBaseContext context) throws PropertyException {
         return numeric(op1.getNumericValue(context) % op2.getNumericValue(context), op1.getDimension());
     }
@@ -157,7 +157,7 @@ public class NumericOp {
     public static Numeric abs2(Numeric op, PercentBaseContext context) throws PropertyException {
         return numeric(Math.abs(op.getNumericValue(context)), op.getDimension());
     }
-    
+
     /**
      * Return the negation of a Numeric.
      * @param op the  operand.
@@ -174,7 +174,7 @@ public class NumericOp {
     public static Numeric negate2(Numeric op, PercentBaseContext context) throws PropertyException {
         return numeric(- op.getNumericValue(context), op.getDimension());
     }
-    
+
     /**
      * Return the larger of the two Numerics.
      * @param op1 The first operand.
@@ -196,7 +196,7 @@ public class NumericOp {
         }
         return op1.getNumericValue(context) > op2.getNumericValue(context) ? op1 : op2;
     }
-    
+
     /**
      * Return the smaller of two Numerics.
      * @param op1 The first operand.
@@ -218,9 +218,9 @@ public class NumericOp {
         }
         return op1.getNumericValue(context) <= op2.getNumericValue(context) ? op1 : op2;
     }
-    
+
     /**
-     * Create a new absolute numeric with the specified value and dimension. 
+     * Create a new absolute numeric with the specified value and dimension.
      * @param value
      * @param dimension
      * @return a new absolute numeric.