Merged revisions 679052-679352 via svnmerge from

https://svn.eu.apache.org/repos/asf/xmlgraphics/fop/trunk

........
  r679060 | acumiskey | 2008-07-23 11:39:11 +0100 (Wed, 23 Jul 2008) | 2 lines
  
  My bad..  copy paste error I introduced which broke forrest.
........
  r679164 | jeremias | 2008-07-23 20:33:24 +0100 (Wed, 23 Jul 2008) | 1 line
  
  Only update the generated files if any source file is newer than the generated ones.
........
  r679326 | vhennebert | 2008-07-24 10:35:34 +0100 (Thu, 24 Jul 2008) | 2 lines
  
  Fed up with all those trailing whitespaces. Let's remove them all (once... and for all?)
........


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

1 files changed, 7 insertions, 7 deletions

diff --git a/src/java/org/apache/fop/util/text/ChoiceFieldPart.java b/src/java/org/apache/fop/util/text/ChoiceFieldPart.java
index df457a02b..a6a949815 100644
--- a/src/java/org/apache/fop/util/text/ChoiceFieldPart.java
+++ b/src/java/org/apache/fop/util/text/ChoiceFieldPart.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,12 +31,12 @@ import org.apache.fop.util.text.AdvancedMessageFormat.PartFactory;
  * Defines a "choice" field part that works like {@link ChoiceFormat}.
  */
 public class ChoiceFieldPart implements Part {
-    
+
     private static final Pattern VARIABLE_REGEX = Pattern.compile("\\{([^\\}]+)\\}");
-    
+
     private String fieldName;
     private ChoiceFormat choiceFormat;
-    
+
     /**
      * Creates a new choice part.
      * @param fieldName the field name to work on
@@ -72,7 +72,7 @@ public class ChoiceFieldPart implements Part {
     public String toString() {
         return "{" + this.fieldName + ",choice, ....}";
     }
-    
+
     /** Factory for ChoiceFieldPart. */
     public static class Factory implements PartFactory {
 
@@ -85,7 +85,7 @@ public class ChoiceFieldPart implements Part {
         public String getFormat() {
             return "choice";
         }
-        
+
     }
 
 }
\ No newline at end of file