xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vhenneb...@apache.org
Subject svn commit: r679758 [7/34] - in /xmlgraphics/fop/branches/Temp_AFPGOCAResources: ./ examples/embedding/java/embedding/ examples/embedding/java/embedding/events/ examples/embedding/java/embedding/intermediate/ examples/embedding/java/embedding/model/ ex...
Date Fri, 25 Jul 2008 10:56:32 GMT
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/MaxFunction.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/MaxFunction.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/MaxFunction.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/MaxFunction.java Fri Jul 25 03:55:49 2008
@@ -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.

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/MinFunction.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/MinFunction.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/MinFunction.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/MinFunction.java Fri Jul 25 03:55:49 2008
@@ -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.

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/NCnameProperty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/NCnameProperty.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/NCnameProperty.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/NCnameProperty.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -42,13 +42,13 @@
 
     /**
      * If a system color, return the corresponding value.
-     * 
-     * @param foUserAgent 
+     *
+     * @param foUserAgent
      *     Reference to FOP user agent - keeps track of cached ColorMaps for ICC colors
      * @return Color object corresponding to the NCName
      */
     public Color getColor(FOUserAgent foUserAgent)  {
-        try { 
+        try {
             return ColorUtil.parseColorString(foUserAgent, ncName);
         } catch (PropertyException e) {
             //Not logging this error since for properties like "border" you would get an awful
@@ -71,7 +71,7 @@
     public Object getObject() {
         return this.ncName;
     }
-    
+
     /**
      * @return ncName for this
      */

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/NearestSpecPropFunction.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/NearestSpecPropFunction.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/NearestSpecPropFunction.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/NearestSpecPropFunction.java Fri Jul 25 03:55:49 2008
@@ -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.

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/NumericOp.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/NumericOp.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/NumericOp.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/NumericOp.java Fri Jul 25 03:55:49 2008
@@ -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.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 @@
             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 @@
         }
         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 @@
         } 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 @@
             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 @@
             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 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 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 @@
         }
         return op1.getNumericValue(context) > op2.getNumericValue(context) ? op1 : op2;
     }
-    
+
     /**
      * Return the smaller of two Numerics.
      * @param op1 The first operand.
@@ -218,9 +218,9 @@
         }
         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.

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/NumericProperty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/NumericProperty.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/NumericProperty.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/NumericProperty.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.fo.expr;
 
 import java.awt.Color;
@@ -30,7 +30,7 @@
 
 /**
  * A numeric property which hold the final absolute result of an expression
- * calculations.  
+ * calculations.
  */
 public class NumericProperty extends Property implements Numeric, Length {
     private double value;

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/PPColWidthFunction.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/PPColWidthFunction.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/PPColWidthFunction.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/PPColWidthFunction.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -40,8 +40,8 @@
         return 1;
     }
 
-    /** 
-     * @return the {@link PercentBase} for the proportional-column-width() 
+    /**
+     * @return the {@link PercentBase} for the proportional-column-width()
      *         function
      */
     public PercentBase getPercentBase() {
@@ -68,7 +68,7 @@
             throw new PropertyException("proportional-column-width() function "
                     + "may only be used on fo:table-column.");
         }
-        
+
         Table t = (Table) pList.getParentFObj();
         if (t.isAutoLayout()) {
             throw new PropertyException("proportional-column-width() function "
@@ -96,6 +96,6 @@
         public int getDimension() {
             return 0;
         }
-        
+
     }
 }

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/PropertyException.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/PropertyException.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/PropertyException.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/PropertyException.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -45,7 +45,7 @@
             this.propertyName = ((PropertyException)cause).propertyName;
         }
     }
-    
+
     /**
      * Sets the property context information.
      * @param propInfo the property info instance

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/PropertyInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/PropertyInfo.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/PropertyInfo.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/PropertyInfo.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -94,7 +94,7 @@
     public PropertyMaker getPropertyMaker() {
         return maker;
     }
-    
+
     /**
      * push a function onto the function stack
      * @param func function to push onto stack
@@ -117,15 +117,15 @@
 
     /**
      * Convenience shortcut to get a reference to the FOUserAgent
-     * 
+     *
      * @return  the FOUserAgent
      */
     protected FOUserAgent getUserAgent() {
-        return (plist.getFObj() != null) 
-            ? plist.getFObj().getUserAgent() 
+        return (plist.getFObj() != null)
+            ? plist.getFObj().getUserAgent()
                     : null;
     }
-    
+
     private PercentBase getFunctionPercentBase() {
         if (stkFunction != null) {
             Function f = (Function)stkFunction.peek();

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/PropertyParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/PropertyParser.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/PropertyParser.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/PropertyParser.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -45,7 +45,7 @@
 
     private static final String RELUNIT = "em";
     private static final HashMap FUNCTION_TABLE = new HashMap();
-    
+
     static {
         // Initialize the HashMap of XSL-defined functions
         FUNCTION_TABLE.put("ceiling", new CeilingFunction());
@@ -310,10 +310,10 @@
                                     propInfo.currentFontSize());
             } else {
                 if ("px".equals(unitPart)) {
-                    //pass the ratio between source-resolution and 
+                    //pass the ratio between source-resolution and
                     //the default resolution of 72dpi
                     prop = FixedLength.getInstance(
-                            numPart, unitPart, 
+                            numPart, unitPart,
                             propInfo.getPropertyList().getFObj()
                                     .getUserAgent().getSourceResolution() / 72.0f);
                 } else {
@@ -344,7 +344,7 @@
             }
             propInfo.popFunction();
             return prop;
-        
+
         default:
             // TODO: add the token or the expr to the error message.
             throw new PropertyException("syntax error");
@@ -357,7 +357,7 @@
      * Parse a comma separated list of function arguments. Each argument
      * may itself be an expression. This method consumes the closing right
      * parenthesis of the argument list.
-     * @param function The function object for which the arguments are 
+     * @param function The function object for which the arguments are
      * collected.
      * @return An array of Property objects representing the arguments
      * found.
@@ -397,27 +397,27 @@
         }
         return args;
     }
-    
+
     /**
-     * 
+     *
      * Parse a comma separated list of function arguments. Each argument
      * may itself be an expression. This method consumes the closing right
      * parenthesis of the argument list.
-     * 
-     * The method differs from parseArgs in that it accepts a variable 
+     *
+     * The method differs from parseArgs in that it accepts a variable
      * number of arguments.
-     * 
-     * @param function The function object for which the arguments are 
+     *
+     * @param function The function object for which the arguments are
      * collected.
      * @return An array of Property objects representing the arguments
      * found.
      * @throws PropertyException If the number of arguments found isn't equal
      * to the number expected.
-     * 
-     * TODO Merge this with parseArgs? 
+     *
+     * TODO Merge this with parseArgs?
      */
     Property[] parseVarArgs(Function function) throws PropertyException {
-        // For variable argument functions the minimum number of arguments is returned as a 
+        // For variable argument functions the minimum number of arguments is returned as a
         // negative integer from the nbArgs method
         int nbArgs = -function.nbArgs();
         List args = new LinkedList();

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java Fri Jul 25 03:55:49 2008
@@ -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.

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/RGBColorFunction.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/RGBColorFunction.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/RGBColorFunction.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/RGBColorFunction.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.fo.expr;
 
 import org.apache.fop.datatypes.PercentBaseContext;
@@ -28,7 +28,7 @@
  * Implements the rgb() function.
  */
 class RGBColorFunction extends FunctionBase {
-    
+
     /** {@inheritDoc} */
     public int nbArgs() {
         return 3;
@@ -46,8 +46,8 @@
     /** {@inheritDoc} */
     public Property eval(Property[] args,
                          PropertyInfo pInfo) throws PropertyException {
-      return ColorProperty.getInstance(pInfo.getUserAgent(), 
-                                       "rgb(" + args[0] + "," 
+      return ColorProperty.getInstance(pInfo.getUserAgent(),
+                                       "rgb(" + args[0] + ","
                                        + args[1] + "," + args[2] + ")");
 
     }

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -27,10 +27,10 @@
 
 
 /**
- * This class represent a node in a property expression tree. 
+ * This class represent a node in a property expression tree.
  * It is created when an operation involve relative expression and is used
  * to delay evaluation of the operation until the time where getNumericValue()
- * or getValue() is called. 
+ * or getValue() is called.
  */
 public class RelativeNumericProperty extends Property implements Length {
     public static final int ADDITION = 1;
@@ -42,10 +42,10 @@
     public static final int ABS = 7;
     public static final int MAX = 8;
     public static final int MIN = 9;
-    
+
     // Used in the toString() method, indexed by operation id.
     private static String operations = " +-*/%";
-    
+
     /**
      * The operation identifier.
      */
@@ -62,7 +62,7 @@
      * The dimension of the result.
      */
     private int dimension;
-    
+
     /**
      * Constructor for a two argument operation.
      * @param operation the operation opcode: ADDITION, SUBTRACTION, ...
@@ -124,12 +124,12 @@
         case MIN:
             return NumericOp.min2(op1, op2, context);
         default:
-            throw new PropertyException("Unknown expr operation " + operation);  
+            throw new PropertyException("Unknown expr operation " + operation);
         }
     }
 
     /**
-     * Return the resolved (calculated) value of the expression. 
+     * Return the resolved (calculated) value of the expression.
      * {@inheritDoc}
      */
     public double getNumericValue() throws PropertyException {
@@ -152,14 +152,14 @@
 
     /**
      * Return false since an expression is only created when there is relative
-     * numerics involved. 
+     * numerics involved.
      */
     public boolean isAbsolute() {
         return false;
     }
 
     /**
-     * Cast this numeric as a Length. 
+     * Cast this numeric as a Length.
      */
     public Length getLength() {
         if (dimension == 1) {
@@ -205,7 +205,7 @@
      * If this value is not 0, the actual value of the Length cannot be known
      * without looking at all of the columns in the table to determine the value
      * of a "table-unit".
-     * 
+     *
      * @return The number of table units which are included in this length
      *         specification.
      */
@@ -261,7 +261,7 @@
      */
     public String toString() {
         switch (operation) {
-        case ADDITION: case SUBTRACTION: 
+        case ADDITION: case SUBTRACTION:
         case DIVIDE: case MULTIPLY: case MODULO:
             return "(" + op1 + " " + operations.charAt(operation) + op2 + ")";
         case NEGATE:

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/RoundFunction.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/RoundFunction.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/RoundFunction.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/RoundFunction.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.fo.expr;
 
 

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/SystemColorFunction.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/SystemColorFunction.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/SystemColorFunction.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/expr/SystemColorFunction.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.fo.expr;
 
 import org.apache.fop.apps.FOUserAgent;
@@ -27,7 +27,7 @@
  * Implements the system-color() function.
  */
 class SystemColorFunction extends FunctionBase {
-    
+
     /** {@inheritDoc} */
     public int nbArgs() {
         return 1;
@@ -36,8 +36,8 @@
     /** {@inheritDoc} */
     public Property eval(Property[] args,
                          PropertyInfo pInfo) throws PropertyException {
-        FOUserAgent ua = (pInfo == null) 
-                ? null 
+        FOUserAgent ua = (pInfo == null)
+                ? null
                 : (pInfo.getFO() == null ? null : pInfo.getFO().getUserAgent());
         return ColorProperty.getInstance(ua, "system-color(" + args[0] + ")");
 

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/ExtensionAttachment.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/ExtensionAttachment.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/ExtensionAttachment.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/ExtensionAttachment.java Fri Jul 25 03:55:49 2008
@@ -35,5 +35,5 @@
      * @return the category URI
      */
     String getCategory();
-    
+
 }

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -33,12 +33,12 @@
  * Element mapping for FOP's proprietary extension to XSL-FO.
  */
 public class ExtensionElementMapping extends ElementMapping {
-    
+
     /** The FOP extension namespace URI */
     public static final String URI = "http://xmlgraphics.apache.org/fop/extensions";
 
     private static final Set propertyAttributes = new java.util.HashSet();
-    
+
     static {
         //These are FOP's standard extension properties (fox:*)
         propertyAttributes.add("block-progression-unit");
@@ -46,7 +46,7 @@
         propertyAttributes.add("orphan-content-limit");
         propertyAttributes.add("internal-destination");
     }
-    
+
     /**
      * Constructor.
      */
@@ -66,7 +66,7 @@
             foObjs.put("external-document", new ExternalDocumentMaker());
         }
     }
-    
+
     static class DestinationMaker extends ElementMapping.Maker {
         public FONode make(FONode parent) {
             return new Destination(parent);
@@ -83,7 +83,7 @@
     public String getStandardPrefix() {
         return "fox";
     }
-    
+
     /** {@inheritDoc} */
     public boolean isAttributeProperty(QName attributeName) {
         if (!URI.equals(attributeName.getNamespaceURI())) {
@@ -91,5 +91,5 @@
         }
         return propertyAttributes.contains(attributeName.getLocalName());
     }
-    
+
 }

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/ExtensionObj.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/ExtensionObj.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/ExtensionObj.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/ExtensionObj.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -45,7 +45,7 @@
     /**
      * {@inheritDoc}
      */
-    public void processNode(String elementName, Locator locator, 
+    public void processNode(String elementName, Locator locator,
                             Attributes attlist, PropertyList pList)
         throws FOPException
     {
@@ -53,9 +53,9 @@
     }
 
     /**
-     * Create a default property list for this element. 
+     * Create a default property list for this element.
      */
-    protected PropertyList createPropertyList(PropertyList parent, 
+    protected PropertyList createPropertyList(PropertyList parent,
                 FOEventHandler foEventHandler) throws FOPException {
         return null;
     }

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/ExternalDocument.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/ExternalDocument.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/ExternalDocument.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/ExternalDocument.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -76,7 +76,7 @@
         textAlign = pList.get(PR_TEXT_ALIGN).getEnum();
         width = pList.get(PR_WIDTH).getLength();
         src = pList.get(PR_SRC).getString();
-        
+
         if (this.src == null || this.src.length() == 0) {
             missingPropertyError("src");
         }

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/OldExtensionElementMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/OldExtensionElementMapping.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/OldExtensionElementMapping.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/OldExtensionElementMapping.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -28,7 +28,7 @@
  * Element mapping for the old FOP extension namespace.
  */
 public class OldExtensionElementMapping extends ElementMapping {
-    
+
     /** The old FOP extension namespace URI (FOP 0.20.5 and earlier) */
     public static final String URI = "http://xml.apache.org/fop/extensions";
 

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/destination/Destination.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/destination/Destination.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/destination/Destination.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/destination/Destination.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -50,14 +50,14 @@
     /**
      * {@inheritDoc}
      */
-    public void processNode(String elementName, Locator locator, 
+    public void processNode(String elementName, Locator locator,
             Attributes attlist, PropertyList pList) throws FOPException {
         internalDestination = attlist.getValue("internal-destination");
         if (internalDestination == null || internalDestination.length() == 0) {
             missingPropertyError("internal-destination");
         }
     }
-    
+
     /**
      * {@inheritDoc}
      */

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/svg/BatikExtensionElementMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/svg/BatikExtensionElementMapping.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/svg/BatikExtensionElementMapping.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/svg/BatikExtensionElementMapping.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -32,10 +32,10 @@
  * of the http://xml.apache.org/batik/ext namespace.
  */
 public class BatikExtensionElementMapping extends ElementMapping {
-    
+
     /** Namespace URI for Batik extension elements */
     public static final String URI = "http://xml.apache.org/batik/ext";
-    
+
     private boolean batikAvail = true;
 
     /** Main constructor. */

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -65,14 +65,14 @@
      * {@inheritDoc}
      */
     public ContentHandlerFactory getContentHandlerFactory() {
-        return new DOMBuilderContentHandlerFactory(getNamespaceURI(), 
+        return new DOMBuilderContentHandlerFactory(getNamespaceURI(),
                 SVGDOMImplementation.getDOMImplementation());
     }
-    
+
     /**
      * {@inheritDoc}
      */
-    public void processNode(String elementName, Locator locator, 
+    public void processNode(String elementName, Locator locator,
                             Attributes attlist, PropertyList propertyList) throws FOPException {
         super.processNode(elementName, locator, attlist, propertyList);
         init();
@@ -91,11 +91,11 @@
         /* if width and height are zero, get the bounds of the content. */
 
         try {
-            URL baseURL = new URL(getUserAgent().getBaseURL() == null 
-                            ? new java.io.File("").toURI().toURL().toExternalForm() 
+            URL baseURL = new URL(getUserAgent().getBaseURL() == null
+                            ? new java.io.File("").toURI().toURL().toExternalForm()
                             : getUserAgent().getBaseURL());
             if (baseURL != null) {
-                SVGOMDocument svgdoc = (SVGOMDocument)doc; 
+                SVGOMDocument svgdoc = (SVGOMDocument)doc;
                 svgdoc.setURLObject(baseURL);
                 //The following line should not be called to leave FOP compatible to Batik 1.6.
                 //svgdoc.setDocumentURI(baseURL.toString());

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -37,13 +37,13 @@
  * that create the SVG Document.
  */
 public class SVGElementMapping extends ElementMapping {
-    
+
     /** the SVG namespace */
     public static final String URI = SVGDOMImplementation.SVG_NAMESPACE_URI;
-    
+
     /** logging instance */
     protected Log log = LogFactory.getLog(SVGElementMapping.class);
-    
+
     private boolean batikAvailable = true;
 
     /** Main constructor. */

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/svg/SVGObj.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/svg/SVGObj.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/svg/SVGObj.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/svg/SVGObj.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -27,7 +27,7 @@
  * This aids in the construction of the SVG Document.
  */
 public class SVGObj extends XMLObj {
-    
+
     /**
      * Constructs an SVG object (called by Maker).
      *
@@ -46,6 +46,6 @@
     public String getNormalNamespacePrefix() {
         return "svg";
     }
-    
+
 }
 

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/xmp/AbstractMetadataElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/xmp/AbstractMetadataElement.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/xmp/AbstractMetadataElement.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/xmp/AbstractMetadataElement.java Fri Jul 25 03:55:49 2008
@@ -32,7 +32,7 @@
 public abstract class AbstractMetadataElement extends FONode implements ObjectBuiltListener {
 
     private XMPMetadata attachment;
-    
+
     /**
      * Main constructor.
      * @param parent the parent formatting object
@@ -40,14 +40,14 @@
     public AbstractMetadataElement(FONode parent) {
         super(parent);
     }
-    
+
     /**
      * {@inheritDoc}
      */
     public ContentHandlerFactory getContentHandlerFactory() {
         return new XMPContentHandlerFactory();
     }
-    
+
     /** {@inheritDoc} */
     public ExtensionAttachment getExtensionAttachment() {
         if (parent instanceof FObj) {
@@ -65,5 +65,5 @@
         attachment.setMetadata((Metadata)obj);
     }
 
-    
+
 }

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/xmp/RDFElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/xmp/RDFElement.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/xmp/RDFElement.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/xmp/RDFElement.java Fri Jul 25 03:55:49 2008
@@ -34,7 +34,7 @@
     public RDFElement(FONode parent) {
         super(parent);
     }
-    
+
     /** {@inheritDoc} */
     public String getLocalName() {
         return "RDF";

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/xmp/RDFElementMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/xmp/RDFElementMapping.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/xmp/RDFElementMapping.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/xmp/RDFElementMapping.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -31,7 +31,7 @@
  * Setup the element mapping for XMP metadata.
  */
 public class RDFElementMapping extends ElementMapping {
-    
+
     /** Main constructor. */
     public RDFElementMapping() {
         namespaceURI = XMPConstants.RDF_NAMESPACE;

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/xmp/XMPContentHandlerFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/xmp/XMPContentHandlerFactory.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/xmp/XMPContentHandlerFactory.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/xmp/XMPContentHandlerFactory.java Fri Jul 25 03:55:49 2008
@@ -30,7 +30,7 @@
  */
 public class XMPContentHandlerFactory implements ContentHandlerFactory {
 
-    private static final String[] NAMESPACES = new String[] 
+    private static final String[] NAMESPACES = new String[]
                                          {XMPConstants.XMP_NAMESPACE, XMPConstants.RDF_NAMESPACE};
 
     /** {@inheritDoc} */
@@ -49,7 +49,7 @@
     private class FOPXMPHandler extends XMPHandler implements ObjectSource {
 
         private ObjectBuiltListener obListener;
-        
+
         public Object getObject() {
             return getMetadata();
         }
@@ -58,14 +58,14 @@
         public void setObjectBuiltListener(ObjectBuiltListener listener) {
             this.obListener = listener;
         }
-        
+
         /** {@inheritDoc} */
         public void endDocument() throws SAXException {
             if (obListener != null) {
                 obListener.notifyObjectBuilt(getObject());
             }
         }
-        
+
     }
-    
+
 }

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/xmp/XMPElementMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/xmp/XMPElementMapping.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/xmp/XMPElementMapping.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/xmp/XMPElementMapping.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -31,7 +31,7 @@
  * Setup the element mapping for XMP metadata.
  */
 public class XMPElementMapping extends ElementMapping {
-    
+
     /** Main constructor. */
     public XMPElementMapping() {
         namespaceURI = XMPConstants.XMP_NAMESPACE;

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/xmp/XMPMetaElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/xmp/XMPMetaElement.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/xmp/XMPMetaElement.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/xmp/XMPMetaElement.java Fri Jul 25 03:55:49 2008
@@ -34,7 +34,7 @@
     public XMPMetaElement(FONode parent) {
         super(parent);
     }
-    
+
     /** {@inheritDoc} */
     public String getLocalName() {
         return "xmpmeta";

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/xmp/XMPMetadata.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/xmp/XMPMetadata.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/xmp/XMPMetadata.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/extensions/xmp/XMPMetadata.java Fri Jul 25 03:55:49 2008
@@ -35,7 +35,7 @@
 
     /** The category URI for this extension attachment. */
     public static final String CATEGORY = XMPConstants.XMP_NAMESPACE;
-    
+
     private Metadata meta;
     private boolean readOnly = true;
 
@@ -45,7 +45,7 @@
     public XMPMetadata() {
         //nop
     }
-    
+
     /**
      * Default constructor.
      * @param metadata the XMP metadata
@@ -53,12 +53,12 @@
     public XMPMetadata(Metadata metadata) {
         this.meta = metadata;
     }
-    
+
     /** @return the XMP metadata */
     public Metadata getMetadata() {
         return this.meta;
     }
-    
+
     /**
      * Sets the XMP metadata.
      * @param metadata the XMP metadata
@@ -66,7 +66,7 @@
     public void setMetadata(Metadata metadata) {
         this.meta = metadata;
     }
-    
+
     /** @return true if the XMP metadata is marked read-only. */
     public boolean isReadOnly() {
         return readOnly;
@@ -84,10 +84,10 @@
     public String getCategory() {
         return CATEGORY;
     }
-    
+
     /** {@inheritDoc} */
     public void toSAX(ContentHandler handler) throws SAXException {
         getMetadata().toSAX(handler);
     }
-    
+
 }

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/AbstractGraphics.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/AbstractGraphics.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/AbstractGraphics.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/AbstractGraphics.java Fri Jul 25 03:55:49 2008
@@ -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.

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -45,7 +45,7 @@
 
     /**
      * Base constructor
-     * 
+     *
      * @param parent {@link FONode} that is the parent of this object
      */
     public AbstractListItemPart(FONode parent) {
@@ -62,7 +62,7 @@
      * {@inheritDoc}
      * <br>XSL Content Model: marker* (%block;)+
      */
-    protected void validateChildNode(Locator loc, String nsURI, String localName) 
+    protected void validateChildNode(Locator loc, String nsURI, String localName)
         throws ValidationException {
         if (FO_URI.equals(nsURI)) {
             if (localName.equals("marker")) {

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -38,12 +38,12 @@
 
 /**
  * Common base class for the <a href="http://www.w3.org/TR/xsl/#fo_page-number-citation">
- * <code>fo:page-number-citation</code></a> and 
+ * <code>fo:page-number-citation</code></a> and
  * <a href="http://www.w3.org/TR/xsl/#fo_page-number-citation-last">
  * <code>fo:page-number-citation-last</code></a> objects.
  */
 public abstract class AbstractPageNumberCitation extends FObj {
-    
+
     // The value of properties relevant for fo:page-number-citation(-last).
     private CommonBorderPaddingBackground commonBorderPaddingBackground;
     private CommonFont commonFont;
@@ -73,12 +73,12 @@
     //     private int wrapOption;
     // End of property values
 
-    // Properties which are not explicitely listed but are still applicable 
+    // Properties which are not explicitely listed but are still applicable
     private Color color;
 
     /**
      * Base constructor
-     * 
+     *
      * @param parent {@link FONode} that is the parent of this object
      */
     public AbstractPageNumberCitation(FONode parent) {
@@ -99,7 +99,7 @@
         refId = pList.get(PR_REF_ID).getString();
         textDecoration = pList.getTextDecorationProps();
         // textShadow = pList.get(PR_TEXT_SHADOW);
-        
+
         // implicit properties
         color = pList.get(Constants.PR_COLOR).getColor(getUserAgent());
     }
@@ -116,7 +116,7 @@
      * {@inheritDoc}
      * <br>XSL Content Model: empty
      */
-    protected void validateChildNode(Locator loc, String nsURI, String localName) 
+    protected void validateChildNode(Locator loc, String nsURI, String localName)
                 throws ValidationException {
         if (FO_URI.equals(nsURI)) {
             invalidChildError(loc, nsURI, localName);
@@ -135,29 +135,29 @@
 
     /** @return the "text-decoration" property. */
     public CommonTextDecoration getTextDecoration() {
-        return textDecoration; 
+        return textDecoration;
     }
-    
+
     /** @return the "alignment-adjust" property */
     public Length getAlignmentAdjust() {
         return alignmentAdjust;
     }
-    
+
     /** @return the "alignment-baseline" property */
     public int getAlignmentBaseline() {
         return alignmentBaseline;
     }
-    
+
     /** @return the "baseline-shift" property */
     public Length getBaselineShift() {
         return baselineShift;
     }
-    
+
     /** @return the "dominant-baseline" property */
     public int getDominantBaseline() {
         return dominantBaseline;
     }
-    
+
     /** @return the {@link CommonBorderPaddingBackground} */
     public CommonBorderPaddingBackground getCommonBorderPaddingBackground() {
         return commonBorderPaddingBackground;
@@ -167,10 +167,10 @@
     public SpaceProperty getLineHeight() {
         return lineHeight;
     }
-    
+
     /** @return the "ref-id" property. */
     public String getRefId() {
         return refId;
     }
-     
+
 }

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java Fri Jul 25 03:55:49 2008
@@ -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.

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/BasicLink.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/BasicLink.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/BasicLink.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/BasicLink.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -31,7 +31,7 @@
  * <code>fo:basic-link</code></a> object.
  *
  * This class contains the logic to determine the link represented by this FO,
- * and whether that link is external (uses a URI) or internal (an id 
+ * and whether that link is external (uses a URI) or internal (an id
  * reference).
  */
 public class BasicLink extends Inline {
@@ -55,7 +55,7 @@
     /**
      * Construct a BasicLink instance with the given {@link FONode}
      * as its parent.
-     * 
+     *
      * @param parent {@link FONode} that is the parent of this object
      */
     public BasicLink(FONode parent) {
@@ -74,8 +74,8 @@
         // targetPresentationContext = pList.get(PR_TARGET_PRESENTATION_CONTEXT);
         // targetStylesheet = pList.get(PR_TARGET_STYLESHEET);
 
-        // per spec, internal takes precedence if both specified        
-        if (internalDestination.length() > 0) { 
+        // per spec, internal takes precedence if both specified
+        if (internalDestination.length() > 0) {
             externalDestination = null;
         } else if (externalDestination.length() == 0) {
             // slightly stronger than spec "should be specified"
@@ -96,7 +96,7 @@
     }
 
     /** {@inheritDoc} */
-    protected void validateChildNode(Locator loc, String nsURI, String localName) 
+    protected void validateChildNode(Locator loc, String nsURI, String localName)
                 throws ValidationException {
         if (FO_URI.equals(nsURI)) {
             if (localName.equals("marker")) {
@@ -162,7 +162,7 @@
     public String getLocalName() {
         return "basic-link";
     }
-    
+
     /**
      * {@inheritDoc}
      * @return {@link org.apache.fop.fo.Constants#FO_BASIC_LINK}

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/BidiOverride.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/BidiOverride.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/BidiOverride.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/BidiOverride.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -54,12 +54,12 @@
 
     /**
      * Base constructor
-     * 
+     *
      * @param parent FONode that is the parent of this object
      */
     public BidiOverride(FONode parent) {
         super(parent);
-        
+
        /* Check to see if this node can have block-level children.
         * See validateChildNode() below.
         */
@@ -94,15 +94,15 @@
      * <br>XSL Content Model: marker* (#PCDATA|%inline;|%block;)*
      * <br><i>Additionally: "An fo:bidi-override that is a descendant of an fo:leader
      *  or of the fo:inline child of an fo:footnote may not have block-level
-     *  children, unless it has a nearer ancestor that is an 
+     *  children, unless it has a nearer ancestor that is an
      *  fo:inline-container."</i>
      */
-    protected void validateChildNode(Locator loc, String nsURI, String localName) 
+    protected void validateChildNode(Locator loc, String nsURI, String localName)
                 throws ValidationException {
         if (FO_URI.equals(nsURI)) {
             if (localName.equals("marker")) {
                 if (blockOrInlineItemFound) {
-                   nodesOutOfOrderError(loc, "fo:marker", 
+                   nodesOutOfOrderError(loc, "fo:marker",
                         "(#PCDATA|%inline;|%block;)");
                 }
             } else if (!isBlockOrInlineItem(nsURI, localName)) {

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Block.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Block.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Block.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Block.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -86,10 +86,10 @@
     //     private Length textAltitude;
     //     private int visibility;
     // End of property values
-    
+
     /**
      * Base constructor
-     * 
+     *
      * @param parent FONode that is the parent of this object
      *
      */
@@ -254,22 +254,22 @@
      * <br>XSL Content Model: marker* initial-property-set? (#PCDATA|%inline;|%block;)*
      * <br><i>Additionally: "An fo:bidi-override that is a descendant of an fo:leader
      *  or of the fo:inline child of an fo:footnote may not have block-level
-     *  children, unless it has a nearer ancestor that is an 
+     *  children, unless it has a nearer ancestor that is an
      *  fo:inline-container."</i>
      */
-    protected void validateChildNode(Locator loc, String nsURI, String localName) 
+    protected void validateChildNode(Locator loc, String nsURI, String localName)
             throws ValidationException {
         if (FO_URI.equals(nsURI)) {
             if ("marker".equals(localName)) {
                 if (blockOrInlineItemFound || initialPropertySetFound) {
-                   nodesOutOfOrderError(loc, "fo:marker", 
+                   nodesOutOfOrderError(loc, "fo:marker",
                         "initial-property-set? (#PCDATA|%inline;|%block;)");
                 }
             } else if ("initial-property-set".equals(localName)) {
                 if (initialPropertySetFound) {
                     tooManyNodesError(loc, "fo:initial-property-set");
                 } else if (blockOrInlineItemFound) {
-                    nodesOutOfOrderError(loc, "fo:initial-property-set", 
+                    nodesOutOfOrderError(loc, "fo:initial-property-set",
                         "(#PCDATA|%inline;|%block;)");
                 } else {
                     initialPropertySetFound = true;
@@ -286,17 +286,17 @@
     public int getLinefeedTreatment() {
         return linefeedTreatment;
     }
-    
+
     /** @return the "white-space-treatment" property */
     public int getWhitespaceTreatment() {
         return whiteSpaceTreatment;
     }
-    
+
     /** @return the "white-space-collapse" property */
     public int getWhitespaceCollapse() {
         return whiteSpaceCollapse;
     }
-    
+
     /** @return the {@link CommonRelativePosition} */
     public CommonRelativePosition getCommonRelativePosition() {
         return this.commonRelativePosition;
@@ -334,5 +334,5 @@
     public int getNameId() {
         return FO_BLOCK;
     }
-    
+
 }

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/BlockContainer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/BlockContainer.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/BlockContainer.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/BlockContainer.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -67,7 +67,7 @@
     /**
      * Creates a new BlockContainer instance as a child of
      * the given {@link FONode}.
-     * 
+     *
      * @param parent {@link FONode} that is the parent of this object
      */
     public BlockContainer(FONode parent) {
@@ -104,13 +104,13 @@
     /**
      * {@inheritDoc}
      * <br>XSL Content Model: marker* (%block;)+
-     * <br><i><b>BUT</b>: "In addition an fo:block-container that does not generate an 
-     * absolutely positioned area may have a sequence of zero or more 
+     * <br><i><b>BUT</b>: "In addition an fo:block-container that does not generate an
+     * absolutely positioned area may have a sequence of zero or more
      * fo:markers as its initial children."
      * The latter refers to block-containers with absolute-position="absolute"
      * or absolute-position="fixed".
      */
-    protected void validateChildNode(Locator loc, String nsURI, String localName) 
+    protected void validateChildNode(Locator loc, String nsURI, String localName)
         throws ValidationException {
         if (FO_URI.equals(nsURI)) {
             if ("marker".equals(localName)) {
@@ -148,7 +148,7 @@
     public CommonAbsolutePosition getCommonAbsolutePosition() {
         return commonAbsolutePosition;
     }
-    
+
     /** @return the {@link CommonMarginBlock} */
     public CommonMarginBlock getCommonMarginBlock() {
         return commonMarginBlock;
@@ -170,7 +170,7 @@
     public int getDisplayAlign() {
         return displayAlign;
     }
-    
+
     /** @return the "break-after" property. */
     public int getBreakAfter() {
         return breakAfter;
@@ -220,12 +220,12 @@
     public int getWritingMode() {
         return writingMode;
     }
-    
+
     /** {@inheritDoc} */
     public String getLocalName() {
         return "block-container";
     }
-    
+
     /**
      * {@inheritDoc}
      * @return {@link org.apache.fop.fo.Constants#FO_BLOCK_CONTAINER}

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Character.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Character.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Character.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Character.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -120,7 +120,7 @@
      * {@inheritDoc}
      * <br>XSL Content Model: empty
      */
-    protected void validateChildNode(Locator loc, String nsURI, String localName) 
+    protected void validateChildNode(Locator loc, String nsURI, String localName)
                 throws ValidationException {
         if (FO_URI.equals(nsURI)) {
             invalidChildError(loc, nsURI, localName);
@@ -161,25 +161,25 @@
     public Length getAlignmentAdjust() {
         return alignmentAdjust;
     }
-    
+
     /** @return the "alignment-baseline" property */
     public int getAlignmentBaseline() {
         return alignmentBaseline;
     }
-    
+
     /** @return the "baseline-shift" property */
     public Length getBaselineShift() {
         return baselineShift;
     }
-    
+
     /** @return the "dominant-baseline" property */
     public int getDominantBaseline() {
         return dominantBaseline;
     }
-    
+
     /** @return the "letter-spacing" property */
     public Property getLetterSpacing() {
-        return letterSpacing; 
+        return letterSpacing;
     }
 
     /** @return the "line-height" property */
@@ -189,29 +189,29 @@
 
     /** @return the "text-decoration" property. */
     public CommonTextDecoration getTextDecoration() {
-        return textDecoration; 
+        return textDecoration;
     }
-    
+
     /** @return the "word-spacing" property */
     public Property getWordSpacing() {
-        return wordSpacing; 
+        return wordSpacing;
     }
 
     /** @return the "keep-with-next" property */
     public KeepProperty getKeepWithNext() {
         return keepWithNext;
     }
-    
+
     /** @return the "keep-with-previous" property */
     public KeepProperty getKeepWithPrevious() {
         return keepWithPrevious;
     }
-    
+
     /** {@inheritDoc} */
     public String getLocalName() {
         return "character";
     }
-    
+
     /**
      * {@inheritDoc}
      * @return {@link org.apache.fop.fo.Constants#FO_CHARACTER}
@@ -219,16 +219,16 @@
     public int getNameId() {
         return FO_CHARACTER;
     }
-    
+
     private class FOCharIterator extends CharIterator {
 
         private boolean bFirst = true;
         private Character foChar;
-        
+
         FOCharIterator(Character foChar) {
             this.foChar = foChar;
         }
-        
+
         public boolean hasNext() {
             return bFirst;
         }

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/ExternalGraphic.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/ExternalGraphic.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/ExternalGraphic.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -45,7 +45,7 @@
  * inline area that can be added to the area tree.
  */
 public class ExternalGraphic extends AbstractGraphics {
-    
+
     // The value of properties relevant for fo:external-graphic.
     // All but one of the e-g properties are kept in AbstractGraphics
     private String src;
@@ -56,7 +56,7 @@
     private int intrinsicWidth;
     private int intrinsicHeight;
     private Length intrinsicAlignmentAdjust;
-    
+
     /**
      * Create a new ExternalGraphic node that is a child
      * of the given {@link FONode}.
@@ -71,7 +71,7 @@
     public void bind(PropertyList pList) throws FOPException {
         super.bind(pList);
         src = pList.get(PR_SRC).getString();
-        
+
         //Additional processing: obtain the image's intrinsic size and baseline information
         url = URISpecification.getURL(src);
         FOUserAgent userAgent = getUserAgent();
@@ -113,7 +113,7 @@
      * {@inheritDoc}
      * <br>XSL Content Model: empty
      */
-    protected void validateChildNode(Locator loc, String nsURI, String localName) 
+    protected void validateChildNode(Locator loc, String nsURI, String localName)
                 throws ValidationException {
         if (FO_URI.equals(nsURI)) {
             invalidChildError(loc, nsURI, localName);

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Float.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Float.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Float.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Float.java Fri Jul 25 03:55:49 2008
@@ -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.
@@ -39,15 +39,15 @@
     // End of property values
 
     static boolean notImplementedWarningGiven = false;
-    
+
     /**
      * Base constructor
-     * 
+     *
      * @param parent    the parent {@link FONode}
      */
     public Float(FONode parent) {
         super(parent);
-        
+
         if (!notImplementedWarningGiven) {
             getFOValidationEventProducer().unimplementedFeature(this, getName(),
                     getName(), getLocator());
@@ -64,7 +64,7 @@
      * {@inheritDoc}
      * <br>XSL Content Model: (%block;)+
      */
-    protected void validateChildNode(Locator loc, String nsURI, String localName) 
+    protected void validateChildNode(Locator loc, String nsURI, String localName)
                 throws ValidationException {
         if (FO_URI.equals(nsURI)) {
             if (!isBlockItem(nsURI, localName)) {
@@ -84,7 +84,7 @@
     public String getLocalName() {
         return "float";
     }
-    
+
     /**
      * {@inheritDoc}
      * @return {@link org.apache.fop.fo.Constants#FO_FLOAT}



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


Mime
View raw message