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

4 files changed, 12 insertions, 12 deletions

diff --git a/src/java/org/apache/fop/render/afp/extensions/AFPExtensionHandler.java b/src/java/org/apache/fop/render/afp/extensions/AFPExtensionHandler.java
index fca486279..08989c03c 100644
--- a/src/java/org/apache/fop/render/afp/extensions/AFPExtensionHandler.java
+++ b/src/java/org/apache/fop/render/afp/extensions/AFPExtensionHandler.java
@@ -30,7 +30,7 @@ import org.xml.sax.helpers.DefaultHandler;
 /**
  * ContentHandler (parser) for restoring AFPExtension objects from XML.
  */
-public class AFPExtensionHandler extends DefaultHandler 
+public class AFPExtensionHandler extends DefaultHandler
             implements ContentHandlerFactory.ObjectSource {
 
     /** Logger instance */
@@ -38,12 +38,12 @@ public class AFPExtensionHandler extends DefaultHandler
 
     private StringBuffer content = new StringBuffer();
     private Attributes lastAttributes;
-    
+
     private AFPPageSetup returnedObject;
     private ObjectBuiltListener listener;
-    
+
     /** {@inheritDoc} */
-    public void startElement(String uri, String localName, String qName, Attributes attributes) 
+    public void startElement(String uri, String localName, String qName, Attributes attributes)
                 throws SAXException {
         boolean handled = false;
         if (AFPPageSetup.CATEGORY.equals(uri)) {
@@ -62,10 +62,10 @@ public class AFPExtensionHandler extends DefaultHandler
         }
         if (!handled) {
             if (AFPPageSetup.CATEGORY.equals(uri)) {
-                throw new SAXException("Unhandled element " + localName 
+                throw new SAXException("Unhandled element " + localName
                         + " in namespace: " + uri);
             } else {
-                log.warn("Unhandled element " + localName 
+                log.warn("Unhandled element " + localName
                         + " in namespace: " + uri);
             }
         }
@@ -87,7 +87,7 @@ public class AFPExtensionHandler extends DefaultHandler
                 returnedObject.setContent(content.toString());
                 content.setLength(0); //Reset text buffer (see characters())
             }
-        }    
+        }
     }
 
     /** {@inheritDoc} */
diff --git a/src/java/org/apache/fop/render/afp/extensions/AFPExtensionHandlerFactory.java b/src/java/org/apache/fop/render/afp/extensions/AFPExtensionHandlerFactory.java
index efd351c33..e987866df 100644
--- a/src/java/org/apache/fop/render/afp/extensions/AFPExtensionHandlerFactory.java
+++ b/src/java/org/apache/fop/render/afp/extensions/AFPExtensionHandlerFactory.java
@@ -28,7 +28,7 @@ import org.xml.sax.ContentHandler;
 public class AFPExtensionHandlerFactory implements ContentHandlerFactory {
 
     private static final String[] NAMESPACES = new String[] {AFPPageSetup.CATEGORY};
-    
+
     /** {@inheritDoc} */
     public String[] getSupportedNamespaces() {
         return NAMESPACES;
diff --git a/src/java/org/apache/fop/render/afp/extensions/AFPPageSetup.java b/src/java/org/apache/fop/render/afp/extensions/AFPPageSetup.java
index 437222daa..998ce6921 100644
--- a/src/java/org/apache/fop/render/afp/extensions/AFPPageSetup.java
+++ b/src/java/org/apache/fop/render/afp/extensions/AFPPageSetup.java
@@ -26,7 +26,7 @@ public class AFPPageSetup extends AFPExtensionAttachment {
 
     /**
      * Default constructor.
-     * 
+     *
      * @param elementName the name of the setup code object, may be null
      */
     public AFPPageSetup(String elementName) {
@@ -39,7 +39,7 @@ public class AFPPageSetup extends AFPExtensionAttachment {
      * {@inheritDoc}
      */
     public String toString() {
-        return "AFPPageSetup(element-name=" + getElementName() 
+        return "AFPPageSetup(element-name=" + getElementName()
             + " name=" + getName() + " value=" + getValue() + ")";
     }
 }
diff --git a/src/java/org/apache/fop/render/afp/extensions/AbstractAFPExtensionObject.java b/src/java/org/apache/fop/render/afp/extensions/AbstractAFPExtensionObject.java
index ff6d56785..a9bbbcfcf 100644
--- a/src/java/org/apache/fop/render/afp/extensions/AbstractAFPExtensionObject.java
+++ b/src/java/org/apache/fop/render/afp/extensions/AbstractAFPExtensionObject.java
@@ -37,12 +37,12 @@ public abstract class AbstractAFPExtensionObject extends FONode {
      * the AFP extension attachment
      */
     protected AFPExtensionAttachment extensionAttachment;
-    
+
     /**
      * the element name of this extension
      */
     protected String name;
-            
+
     /**
      * @see org.apache.fop.fo.FONode#FONode(FONode)
      * @param parent the parent formatting object