Removed trailing whitespace and enabled corresponding RegexpSingleline Checkstyle rule

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

34 files changed, 63 insertions, 65 deletions

diff --git a/checkstyle-5.5.xml b/checkstyle-5.5.xml
index 4c00faf67..7d59fea00 100644
--- a/checkstyle-5.5.xml
+++ b/checkstyle-5.5.xml
@@ -22,12 +22,10 @@
   <!-- ===================================================================================================== -->
 
   <!-- ===================================================================================================== -->
-  <!-- produces 46 new errors 
   <module name="RegexpSingleline">
     <property name="format" value="\s+$"/>
     <property name="message" value="Line has trailing spaces."/>
   </module>
-  -->
   <!-- ===================================================================================================== -->
 
   <!-- ===================================================================================================== -->
diff --git a/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiTestData.java b/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiTestData.java
index c78880c74..ec210db33 100644
--- a/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiTestData.java
+++ b/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiTestData.java
@@ -994,7 +994,7 @@ public final class GenerateBidiTestData {
         int[] la = new int [ levels.size() ];
         int k = 0;
         for ( Iterator it = levels.iterator(); it.hasNext(); ) {
-            la [ k++ ] = ( (Integer) it.next() ).intValue(); 
+            la [ k++ ] = ( (Integer) it.next() ).intValue();
         }
         return la;
     }
@@ -1050,7 +1050,7 @@ public final class GenerateBidiTestData {
                     if ( it.hasNext() ) {
                         r = ( (Integer) it.next() ).intValue();
                     }
-                } 
+                }
                 ra [ i ] = r;
             }
             return ra;
@@ -1155,7 +1155,7 @@ public final class GenerateBidiTestData {
             int k = 0;
             ta [ k++ ] = bitset;
             for ( Iterator it = classes.iterator(); it.hasNext(); ) {
-                ta [ k++ ] = ( (Integer) it.next() ).intValue(); 
+                ta [ k++ ] = ( (Integer) it.next() ).intValue();
             }
             return ta;
         } else {
diff --git a/src/java/org/apache/fop/afp/fonts/CharactersetEncoder.java b/src/java/org/apache/fop/afp/fonts/CharactersetEncoder.java
index 17d1acda1..229123a82 100644
--- a/src/java/org/apache/fop/afp/fonts/CharactersetEncoder.java
+++ b/src/java/org/apache/fop/afp/fonts/CharactersetEncoder.java
@@ -212,7 +212,7 @@ public abstract class CharactersetEncoder {
 
         /**
          * The bytes
-         * 
+         *
          * @return the bytes
          */
         public byte[] getBytes() {
diff --git a/src/java/org/apache/fop/afp/goca/GraphicsCharacterString.java b/src/java/org/apache/fop/afp/goca/GraphicsCharacterString.java
index a70aeb74f..b86cf250f 100644
--- a/src/java/org/apache/fop/afp/goca/GraphicsCharacterString.java
+++ b/src/java/org/apache/fop/afp/goca/GraphicsCharacterString.java
@@ -84,7 +84,7 @@ public class GraphicsCharacterString extends AbstractGraphicsCoord {
      * @return the text string as an encoded byte array
      * @throws UnsupportedEncodingException, CharacterCodingException
      */
-    private byte[] getStringAsBytes() throws UnsupportedEncodingException, 
+    private byte[] getStringAsBytes() throws UnsupportedEncodingException,
             CharacterCodingException {
         return charSet.encodeChars(str).getBytes();
     }
diff --git a/src/java/org/apache/fop/complexscripts/bidi/BidiConstants.java b/src/java/org/apache/fop/complexscripts/bidi/BidiConstants.java
index ef29223be..6349417f6 100644
--- a/src/java/org/apache/fop/complexscripts/bidi/BidiConstants.java
+++ b/src/java/org/apache/fop/complexscripts/bidi/BidiConstants.java
@@ -83,7 +83,7 @@ public interface BidiConstants {
     int SURROGATE   = 20;
 
     // other constants
-    /** last 
+    /** last
     /** maximum bidirectional levels */
     int MAX_LEVELS  = 61;
     /** override flag */
diff --git a/src/java/org/apache/fop/complexscripts/fonts/GlyphDefinitionTable.java b/src/java/org/apache/fop/complexscripts/fonts/GlyphDefinitionTable.java
index 62a502eb0..18bf018dc 100644
--- a/src/java/org/apache/fop/complexscripts/fonts/GlyphDefinitionTable.java
+++ b/src/java/org/apache/fop/complexscripts/fonts/GlyphDefinitionTable.java
@@ -140,7 +140,7 @@ public class GlyphDefinitionTable extends GlyphTable {
     /**
      * Determine glyph class.
      * @param gid a glyph identifier (index)
-     * @return a pre-defined glyph class (GLYPH_CLASS_BASE|GLYPH_CLASS_LIGATURE|GLYPH_CLASS_MARK|GLYPH_CLASS_COMPONENT). 
+     * @return a pre-defined glyph class (GLYPH_CLASS_BASE|GLYPH_CLASS_LIGATURE|GLYPH_CLASS_MARK|GLYPH_CLASS_COMPONENT).
      */
     public int getGlyphClass ( int gid ) {
         if ( gct != null ) {
diff --git a/src/java/org/apache/fop/complexscripts/fonts/GlyphMappingTable.java b/src/java/org/apache/fop/complexscripts/fonts/GlyphMappingTable.java
index 6c4b0bf37..e91c1d6b0 100644
--- a/src/java/org/apache/fop/complexscripts/fonts/GlyphMappingTable.java
+++ b/src/java/org/apache/fop/complexscripts/fonts/GlyphMappingTable.java
@@ -162,7 +162,7 @@ public class GlyphMappingTable {
             if ( ( i = Arrays.binarySearch ( sa, gid ) ) >= 0 ) {
                 mi = getMappedIndex ( gid, sa [ i ], ma [ i ] );                // matches start of (some) range
             } else if ( ( i = - ( i + 1 ) ) == 0 ) {
-                mi = -1;                                                        // precedes first range 
+                mi = -1;                                                        // precedes first range
             } else if ( gid > ea [ --i ] ) {
                 mi = -1;                                                        // follows preceding (or last) range
             } else {
diff --git a/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java b/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java
index 07a0077bf..48d5e4789 100644
--- a/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java
+++ b/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java
@@ -1749,7 +1749,7 @@ public class GlyphPositioningTable extends GlyphTable {
 
         /**
          * Instantiate a DeviceTable.
-         * @param startSize the 
+         * @param startSize the
          * @param endSize the ending (scaled) size
          * @param deltas adjustments for each scaled size
          */
diff --git a/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionState.java b/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionState.java
index 4af8c371e..8aca846ae 100644
--- a/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionState.java
+++ b/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionState.java
@@ -107,7 +107,7 @@ public class GlyphSubstitutionState extends GlyphProcessingState {
      */
     public void putGlyph ( int glyph, GlyphSequence.CharAssociation a, Object predication ) {
         if ( ! ogb.hasRemaining() ) {
-            ogb = growBuffer ( ogb ); 
+            ogb = growBuffer ( ogb );
         }
         ogb.put ( glyph );
         if ( predications && ( predication != null ) ) {
diff --git a/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java b/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java
index e17c8012c..dfed0cc39 100644
--- a/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java
+++ b/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java
@@ -562,7 +562,7 @@ public class GlyphSubstitutionTable extends GlyphTable {
                 return false;
             } else {
                 LigatureSet ls = getLigatureSetForCoverageIndex ( ci, gi );
-                if ( ls != null ) { 
+                if ( ls != null ) {
                     boolean reverse = false;
                     GlyphTester ignores = ss.getIgnoreDefault();
                     int[] counts = ss.getGlyphsAvailable ( 0, reverse, ignores );
@@ -1334,7 +1334,7 @@ public class GlyphSubstitutionTable extends GlyphTable {
      */
     public static class Ligature {
 
-        private final int ligature;                     // (resulting) ligature glyph 
+        private final int ligature;                     // (resulting) ligature glyph
         private final int[] components;                 // component glyph codes (note that first component is implied)
 
         /**
diff --git a/src/java/org/apache/fop/complexscripts/fonts/GlyphTable.java b/src/java/org/apache/fop/complexscripts/fonts/GlyphTable.java
index f95ee8778..73697f6a7 100644
--- a/src/java/org/apache/fop/complexscripts/fonts/GlyphTable.java
+++ b/src/java/org/apache/fop/complexscripts/fonts/GlyphTable.java
@@ -267,7 +267,7 @@ public class GlyphTable {
         }
         return (UseSpec[]) uss.toArray ( new UseSpec [ uss.size() ] );
     }
-    
+
     /** {@inheritDoc} */
     public String toString() {
         StringBuffer sb = new StringBuffer(super.toString());
@@ -442,7 +442,7 @@ public class GlyphTable {
         // frozen state
         private GlyphSubtable[] subtablesArray;
         private static GlyphSubtable[] subtablesArrayEmpty       = new GlyphSubtable[0];
-        
+
         /**
          * Instantiate a LookupTable.
          * @param id the lookup table's identifier
@@ -742,7 +742,7 @@ public class GlyphTable {
         /**
          * Construct a glyph lookup table use specification.
          * @param lookupTable a glyph lookup table
-         * @param feature a feature that caused lookup table selection 
+         * @param feature a feature that caused lookup table selection
          */
         public UseSpec ( LookupTable lookupTable, String feature ) {
             this.lookupTable = lookupTable;
diff --git a/src/java/org/apache/fop/complexscripts/fonts/OTFAdvancedTypographicTableReader.java b/src/java/org/apache/fop/complexscripts/fonts/OTFAdvancedTypographicTableReader.java
index 1de69c459..dc5da80f8 100644
--- a/src/java/org/apache/fop/complexscripts/fonts/OTFAdvancedTypographicTableReader.java
+++ b/src/java/org/apache/fop/complexscripts/fonts/OTFAdvancedTypographicTableReader.java
@@ -1995,7 +1995,7 @@ public final class OTFAdvancedTypographicTableReader {
                 if (log.isDebugEnabled()) {
                     log.debug(tableTag + " pair set table value[" + i + "][" + j + "]: " + pv);
                 }
-            }            
+            }
         }
         // store results
         seMapping = ct;
@@ -2222,7 +2222,7 @@ public final class OTFAdvancedTypographicTableReader {
                 if (log.isDebugEnabled()) {
                     log.debug(tableTag + " mark-to-base positioning base anchor[" + i + "][" + j + "]: " + a);
                 }
-            }            
+            }
         }
         // store results
         seMapping = mct;
@@ -2463,7 +2463,7 @@ public final class OTFAdvancedTypographicTableReader {
                 if (log.isDebugEnabled()) {
                     log.debug(tableTag + " mark-to-mark positioning mark #2 anchor[" + i + "][" + j + "]: " + a);
                 }
-            }            
+            }
         }
         // store results
         seMapping = mct1;
@@ -3113,7 +3113,7 @@ public final class OTFAdvancedTypographicTableReader {
         case GPOSLookupType.SINGLE:
             subtableFormat = readSinglePosTable ( lookupType, lookupFlags, subtableOffset );
             break;
-        case GPOSLookupType.PAIR:           
+        case GPOSLookupType.PAIR:
             subtableFormat = readPairPosTable ( lookupType, lookupFlags, subtableOffset );
             break;
         case GPOSLookupType.CURSIVE:
@@ -3286,7 +3286,7 @@ public final class OTFAdvancedTypographicTableReader {
         for ( int i = 0; i < nl; i++ ) {
             lgto [ i ] = in.readTTFUShort();
         }
-        
+
         // dump info if debugging
         if (log.isDebugEnabled()) {
             log.debug(tableTag + " ligature caret coverage table offset: " + co );
diff --git a/src/java/org/apache/fop/complexscripts/util/CharScript.java b/src/java/org/apache/fop/complexscripts/util/CharScript.java
index c0a2f8ee4..b52c5a806 100644
--- a/src/java/org/apache/fop/complexscripts/util/CharScript.java
+++ b/src/java/org/apache/fop/complexscripts/util/CharScript.java
@@ -44,7 +44,7 @@ public final class CharScript {
     // The following script codes are based on ISO 15924. Codes less than 1000 are
     // official assignments from 15924; those equal to or greater than 1000 are FOP
     // implementation specific.
-    // 
+    //
     /** hebrew script constant */
     public static final int SCRIPT_HEBREW                               = 125;  // 'hebr'
     /** mongolian script constant */
@@ -557,17 +557,17 @@ public final class CharScript {
      * @return true if character belongs to han (unified cjk) script
      */
     public static boolean isHan ( int c ) {
-        if ( ( c >= 0x3400 ) && ( c <= 0x4DBF ) ) {             
+        if ( ( c >= 0x3400 ) && ( c <= 0x4DBF ) ) {
             return true; // cjk unified ideographs extension a
-        } else if ( ( c >= 0x4E00 ) && ( c <= 0x9FFF ) ) {      
+        } else if ( ( c >= 0x4E00 ) && ( c <= 0x9FFF ) ) {
             return true; // cjk unified ideographs
-        } else if ( ( c >= 0xF900 ) && ( c <= 0xFAFF ) ) {      
+        } else if ( ( c >= 0xF900 ) && ( c <= 0xFAFF ) ) {
             return true; // cjk compatibility ideographs
-        } else if ( ( c >= 0x20000 ) && ( c <= 0x2A6DF ) ) {    
+        } else if ( ( c >= 0x20000 ) && ( c <= 0x2A6DF ) ) {
             return true; // cjk unified ideographs extension b
-        } else if ( ( c >= 0x2A700 ) && ( c <= 0x2B73F ) ) {    
+        } else if ( ( c >= 0x2A700 ) && ( c <= 0x2B73F ) ) {
             return true; // cjk unified ideographs extension c
-        } else if ( ( c >= 0x2F800 ) && ( c <= 0x2FA1F ) ) {    
+        } else if ( ( c >= 0x2F800 ) && ( c <= 0x2FA1F ) ) {
             return true; // cjk compatibility ideographs supplement
         } else {
             return false;
diff --git a/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java b/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java
index 47b158491..1f52be954 100644
--- a/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java
+++ b/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java
@@ -842,7 +842,7 @@ public class GlyphSequence implements Cloneable {
             }
             if ( predicationMergers != null ) {
                 predicationMergers.put ( key, pm );
-            }            
+            }
         }
 
         /**
diff --git a/src/java/org/apache/fop/complexscripts/util/NumberConverter.java b/src/java/org/apache/fop/complexscripts/util/NumberConverter.java
index b80014b19..27cefa553 100644
--- a/src/java/org/apache/fop/complexscripts/util/NumberConverter.java
+++ b/src/java/org/apache/fop/complexscripts/util/NumberConverter.java
@@ -397,7 +397,7 @@ public class NumberConverter {
 
     /**
      * Format NUMBER as word according to TYPE, which must be either
-     * Character.UPPERCASE_LETTER, Character.LOWERCASE_LETTER, or 
+     * Character.UPPERCASE_LETTER, Character.LOWERCASE_LETTER, or
      * Character.TITLECASE_LETTER. Makes use of this.language to
      * determine language of word.
      * @param number to be formatted
diff --git a/src/java/org/apache/fop/complexscripts/util/UTF32.java b/src/java/org/apache/fop/complexscripts/util/UTF32.java
index 9df2020f0..44f1a48d1 100644
--- a/src/java/org/apache/fop/complexscripts/util/UTF32.java
+++ b/src/java/org/apache/fop/complexscripts/util/UTF32.java
@@ -36,7 +36,7 @@ public final class UTF32 {
      * Convert Java string (UTF-16) to a Unicode scalar array (UTF-32).
      * Note that if there are any non-BMP encoded characters present in the
      * input, then the number of entries in the output array will be less
-     * than the number of elements in the input string. Any 
+     * than the number of elements in the input string. Any
      * @param s input string
      * @param substitution value to substitute for ill-formed surrogate
      * @param errorOnSubstitution throw runtime exception (IllegalArgumentException) in
diff --git a/src/java/org/apache/fop/fo/properties/URIProperty.java b/src/java/org/apache/fop/fo/properties/URIProperty.java
index 60c3a2067..9da01570c 100644
--- a/src/java/org/apache/fop/fo/properties/URIProperty.java
+++ b/src/java/org/apache/fop/fo/properties/URIProperty.java
@@ -144,5 +144,5 @@ public class URIProperty extends Property {
             return p;
         }
     }
-    
+
 }
diff --git a/src/java/org/apache/fop/fonts/LazyFont.java b/src/java/org/apache/fop/fonts/LazyFont.java
index 7474c17f1..ab4b71739 100644
--- a/src/java/org/apache/fop/fonts/LazyFont.java
+++ b/src/java/org/apache/fop/fonts/LazyFont.java
@@ -89,7 +89,7 @@ public class LazyFont extends Typeface implements FontDescriptor, Substitutable,
         sbuf.append(",advanced=" + useAdvanced);
         sbuf.append('}');
         return sbuf.toString();
-    }   
+    }
 
     private void load(boolean fail) {
         if (!isMetricsLoaded) {
diff --git a/src/java/org/apache/fop/layoutmgr/AreaAdditionUtil.java b/src/java/org/apache/fop/layoutmgr/AreaAdditionUtil.java
index 1bacbd29b..97484aaab 100644
--- a/src/java/org/apache/fop/layoutmgr/AreaAdditionUtil.java
+++ b/src/java/org/apache/fop/layoutmgr/AreaAdditionUtil.java
@@ -49,7 +49,7 @@ public final class AreaAdditionUtil {
         if (bslm != null) {
             bslm.addId();
         }
-        
+
         // "unwrap" the NonLeafPositions stored in parentIter
         // and put them in a new list;
         LinkedList<Position> positionList = new LinkedList<Position>();
diff --git a/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java b/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java
index f05efb40f..7e55c31f6 100644
--- a/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java
+++ b/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java
@@ -640,7 +640,7 @@ public abstract class BreakingAlgorithm {
                 this.par.add(0, KnuthPenalty.DUMMY_ZERO_PENALTY);
             }
         }
-        
+
         // content would overflow, insert empty line/page and try again
         return createNode(
                 lastTooLong.previous.position, lastTooLong.previous.line + 1, 1,
diff --git a/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java b/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
index 2add8e7f9..1ea3c84d4 100644
--- a/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
@@ -215,7 +215,7 @@ public class FlowLayoutManager extends BlockStackingLayoutManager
     protected List<ListElement> getNextChildElements(LayoutManager childLM, LayoutContext context,
             LayoutContext childLC, int alignment, Stack<LayoutManager> lmStack,
             Position restartPosition, LayoutManager restartLM) {
-        
+
         List<ListElement> childElements;
         if (lmStack == null) {
             childElements = childLM.getNextKnuthElements(childLC, alignment);
diff --git a/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
index 0ec6de43b..645a78527 100644
--- a/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
@@ -1103,7 +1103,7 @@ public class TextLayoutManager extends LeafNodeLayoutManager {
 
         for (int i = thisStart; i < lastIndex; i++) {
             char currentChar = foText.charAt(i);
-            
+
             //character width
             int charWidth = font.getCharWidth(currentChar);
             wordIPD = wordIPD.plus(charWidth);
diff --git a/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java b/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
index 7930e62ab..cb66f2abb 100644
--- a/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
+++ b/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
@@ -85,10 +85,10 @@ public abstract class AbstractPathOrientedRenderer extends PrintRenderer {
 
         int level = block.getBidiLevel();
         if ( ( level == -1 ) || ( ( level & 1 ) == 0 ) ) {
-            startx += block.getStartIndent() / 1000f; 
+            startx += block.getStartIndent() / 1000f;
             startx -= borderPaddingStart;
         } else {
-            startx += block.getEndIndent() / 1000f; 
+            startx += block.getEndIndent() / 1000f;
             startx -= borderPaddingEnd;
         }
 
diff --git a/src/java/org/apache/fop/render/AbstractRenderer.java b/src/java/org/apache/fop/render/AbstractRenderer.java
index a2d74bd8d..770f5a797 100644
--- a/src/java/org/apache/fop/render/AbstractRenderer.java
+++ b/src/java/org/apache/fop/render/AbstractRenderer.java
@@ -553,9 +553,9 @@ public abstract class AbstractRenderer
                 if ( parent != null ) {
                     int level = parent.getBidiLevel();
                     if ( ( level == -1 ) || ( ( level & 1 ) == 0 ) ) {
-                        currentIPPosition += parent.getStartIndent(); 
+                        currentIPPosition += parent.getStartIndent();
                     } else {
-                        currentIPPosition += parent.getEndIndent(); 
+                        currentIPPosition += parent.getEndIndent();
                     }
                 }
                 renderLineArea(line);
@@ -624,9 +624,9 @@ public abstract class AbstractRenderer
         int bl = line.getBidiLevel();
         if ( bl >= 0 ) {
             if ( ( bl & 1 ) == 0 ) {
-                currentIPPosition += line.getStartIndent(); 
+                currentIPPosition += line.getStartIndent();
             } else {
-                currentIPPosition += line.getEndIndent(); 
+                currentIPPosition += line.getEndIndent();
                 // if line's content overflows line area, then
                 // ensure that overflow is drawn (extends)
                 // outside of left side of line area
@@ -636,7 +636,7 @@ public abstract class AbstractRenderer
                 }
             }
         } else {
-            currentIPPosition += line.getStartIndent(); 
+            currentIPPosition += line.getStartIndent();
         }
         for (int i = 0, l = children.size(); i < l; i++) {
             InlineArea inline = (InlineArea) children.get(i);
diff --git a/src/java/org/apache/fop/render/intermediate/IFRenderer.java b/src/java/org/apache/fop/render/intermediate/IFRenderer.java
index ba308eadb..e5c1f98c7 100644
--- a/src/java/org/apache/fop/render/intermediate/IFRenderer.java
+++ b/src/java/org/apache/fop/render/intermediate/IFRenderer.java
@@ -962,7 +962,7 @@ public class IFRenderer extends AbstractPathOrientedRenderer {
 
         // warn if link trait found but not allowed, else create link
         if (linkTraitFound) {
-            StructureTreeElement structElem 
+            StructureTreeElement structElem
                     = (StructureTreeElement) ip.getTrait(Trait.STRUCTURE_TREE_ELEMENT);
             action.setStructureTreeElement(structElem);
             Link link = new Link(action, ipRect);
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java
index 0cbd1f686..95e7ff3e5 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java
@@ -443,7 +443,7 @@ public class RtfTextrun extends RtfContainer {
                 if (e instanceof RtfParagraphBreak) {
                     //If the element before was a paragraph break or a bookmark
                     //they will be hidden and are therefore not considered as visible
-                    if (!(aBefore instanceof RtfParagraphBreak) 
+                    if (!(aBefore instanceof RtfParagraphBreak)
                      && !(aBefore instanceof RtfBookmark)) {
                       lastParagraphBreak = (RtfParagraphBreak)e;
                     }
@@ -467,7 +467,7 @@ public class RtfTextrun extends RtfContainer {
 
         //write all children
         boolean bPrevPar = false;
-        boolean bBookmark = false; 
+        boolean bBookmark = false;
         boolean bFirst = true;
         for (Iterator it = getChildren().iterator(); it.hasNext();) {
             final RtfElement e = (RtfElement)it.next();
diff --git a/test/java/org/apache/fop/complexscripts/bidi/BidiAlgorithmTestCase.java b/test/java/org/apache/fop/complexscripts/bidi/BidiAlgorithmTestCase.java
index 41115df98..6593ef1ba 100644
--- a/test/java/org/apache/fop/complexscripts/bidi/BidiAlgorithmTestCase.java
+++ b/test/java/org/apache/fop/complexscripts/bidi/BidiAlgorithmTestCase.java
@@ -67,7 +67,7 @@ public class BidiAlgorithmTestCase {
         0, -1                                   // all test sets
     };
 
-    // instrumentation 
+    // instrumentation
     private int includedSequences;
     private int excludedSequences;
     private int passedSequences;
diff --git a/test/java/org/apache/fop/complexscripts/fonts/GDEFTestCase.java b/test/java/org/apache/fop/complexscripts/fonts/GDEFTestCase.java
index 162b5d241..d9f9c4fec 100644
--- a/test/java/org/apache/fop/complexscripts/fonts/GDEFTestCase.java
+++ b/test/java/org/apache/fop/complexscripts/fonts/GDEFTestCase.java
@@ -3165,7 +3165,7 @@ public class GDEFTestCase {
     private TTXFile findTTX ( String fid ) {
         String pn = findTTXPath ( fid );
         assertTrue ( pn != null );
-        try { 
+        try {
             TTXFile tf = TTXFile.getFromCache ( pn );
             return tf;
         } catch ( Exception e ) {
diff --git a/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java b/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java
index 881587b8e..a2b2f7fba 100644
--- a/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java
+++ b/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java
@@ -422,7 +422,7 @@ public class GPOSTestCase implements ScriptContextTester, GlyphContextTester {
     private TTXFile findTTX ( String fid ) {
         String pn = findTTXPath ( fid );
         assertTrue ( pn != null );
-        try { 
+        try {
             TTXFile tf = TTXFile.getFromCache ( pn );
             return tf;
         } catch ( Exception e ) {
diff --git a/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java b/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java
index e3f122b15..8510f5e1f 100644
--- a/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java
+++ b/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java
@@ -2220,7 +2220,7 @@ public class GSUBTestCase implements ScriptContextTester, GlyphContextTester {
     private TTXFile findTTX ( String fid ) {
         String pn = findTTXPath ( fid );
         assertTrue ( pn != null );
-        try { 
+        try {
             TTXFile tf = TTXFile.getFromCache ( pn );
             return tf;
         } catch ( Exception e ) {
diff --git a/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFile.java b/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFile.java
index 4be0fedd8..cc695ad42 100644
--- a/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFile.java
+++ b/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFile.java
@@ -3301,7 +3301,7 @@ public class TTXFile {
         Integer gid = glyphIds.get ( glyph );
         if ( gid != null ) {
             if ( gmap != null ) {
-                Integer cid = gmap.get ( gid ); 
+                Integer cid = gmap.get ( gid );
                 if ( cid != null ) {
                     return cid.intValue();
                 }
diff --git a/test/java/org/apache/fop/complexscripts/util/NumberConverterTestCase.java b/test/java/org/apache/fop/complexscripts/util/NumberConverterTestCase.java
index 55506b550..385612b3a 100644
--- a/test/java/org/apache/fop/complexscripts/util/NumberConverterTestCase.java
+++ b/test/java/org/apache/fop/complexscripts/util/NumberConverterTestCase.java
@@ -208,7 +208,7 @@ public class NumberConverterTestCase {
 
     static private String[][] formatRomanUpper =
     {
-        
+
         { "I" },
         { "0", "0" },
         { "1", "I" },
@@ -477,7 +477,7 @@ public class NumberConverterTestCase {
         { "999999", "bdwgm" },
         { "1000000", "bdwgn" },
     };
-    
+
     static private String[][] formatAlphabeticLatinUpper =
     {
         { "A" },
@@ -498,7 +498,7 @@ public class NumberConverterTestCase {
         { "999999", "BDWGM" },
         { "1000000", "BDWGN" },
     };
-    
+
     static private String[][] formatAlphabeticArabicHijai =
     {
         { "\u0627", null, null, "alphabetic" },
@@ -539,7 +539,7 @@ public class NumberConverterTestCase {
         { "999999", "\u0623\u0638\u0636\u0635\u062E" },
         { "1000000", "\u0623\u0638\u0636\u0635\u062F" },
     };
-    
+
     static private String[][] formatAlphabeticArabicAbjadi =
     {
         { "\u0627", null, null, "traditional" },
@@ -580,7 +580,7 @@ public class NumberConverterTestCase {
         { "999999", "\u0623\u0641\u0633\u0646\u0632" },
         { "1000000", "\u0623\u0641\u0633\u0646\u062D" },
     };
-    
+
     static private String[][] formatNumeralArabicAbjadi =
     {
         { "\u0623", null, null, "traditional" },
@@ -628,7 +628,7 @@ public class NumberConverterTestCase {
         { "1999", "\u063A\u0638\u0635\u0637" },
         { "2000", "2000" },
     };
-    
+
     static private String[][] formatAlphabeticHebrew =
     {
         { "\u05D0", null, null, "alphabetic" },
@@ -668,7 +668,7 @@ public class NumberConverterTestCase {
         { "999999", "\u05D0\u05DA\u05E9\u05E7\u05E5" },
         { "1000000", "\u05D0\u05DA\u05E9\u05E8\u05D0" },
     };
-    
+
     static private String[][] formatNumeralHebrewGematria =
     {
         { "\u05D0", null, null, "traditional" },
@@ -716,7 +716,7 @@ public class NumberConverterTestCase {
         { "1999", "\u05D0\u05F3\u05EA\u05EA\u05F4\u05E7\u05E6\u05D8" },
         { "2000", "2000" },
     };
-    
+
     static private String[][] formatAlphabeticThai =
     {
         { "\u0E01", null, null, "alphabetic" },
@@ -737,7 +737,7 @@ public class NumberConverterTestCase {
         { "999999", "\u0E0B\u0E20\u0E17\u0E0B" },
         { "1000000", "\u0E0B\u0E20\u0E17\u0E0C" },
     };
-    
+
     static private String[][] formatWordEnglishLower =
     {
         { "w", null, null, null, null, "eng" },
diff --git a/test/java/org/apache/fop/fotreetest/ext/AssertElement.java b/test/java/org/apache/fop/fotreetest/ext/AssertElement.java
index f4a76d7ed..5070984d1 100644
--- a/test/java/org/apache/fop/fotreetest/ext/AssertElement.java
+++ b/test/java/org/apache/fop/fotreetest/ext/AssertElement.java
@@ -61,7 +61,7 @@ public class AssertElement extends TestObj {
 
         ResultCollector collector = ResultCollector.getInstance();
         String propName = attlist.getValue("property");
-        String expected = attlist.getValue("expected");        
+        String expected = attlist.getValue("expected");
         String component = null;
         int dotIndex = propName.indexOf('.');
         if (dotIndex >= 0) {
diff --git a/test/java/org/apache/fop/pdf/PDFDocumentTestCase.java b/test/java/org/apache/fop/pdf/PDFDocumentTestCase.java
index f65d73872..8965635b9 100644
--- a/test/java/org/apache/fop/pdf/PDFDocumentTestCase.java
+++ b/test/java/org/apache/fop/pdf/PDFDocumentTestCase.java
@@ -42,10 +42,10 @@ public class PDFDocumentTestCase {
         StringBuilder textBuffer = new StringBuilder();
         String testString = "This is a test string, just some arbitrary data.";
         textBuffer.append(testString);
-        
+
         PDFDocument.flushTextBuffer(textBuffer, out);
         assertEquals(testString, out.toString());
-        
+
         // Should reset the textBuffer
         assertEquals(0, textBuffer.length());
         assertEquals("", textBuffer.toString());