xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vhenneb...@apache.org
Subject svn commit: r679326 [11/33] - in /xmlgraphics/fop/trunk: examples/embedding/java/embedding/ examples/embedding/java/embedding/events/ examples/embedding/java/embedding/intermediate/ examples/embedding/java/embedding/model/ examples/embedding/java/embed...
Date Thu, 24 Jul 2008 09:37:16 GMT
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PageBreakShorthandParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PageBreakShorthandParser.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PageBreakShorthandParser.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PageBreakShorthandParser.java Thu Jul 24 02:35:34 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,9 +28,9 @@
  * Used to set the corresponding keep-* and break-* properties.
  */
 public class PageBreakShorthandParser implements ShorthandParser {
-    
+
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public Property getValueForProperty(int propId,
                                                Property property,
@@ -38,11 +38,11 @@
                                                PropertyList propertyList)
                     throws PropertyException {
 
-        if (propId == Constants.PR_KEEP_WITH_PREVIOUS 
+        if (propId == Constants.PR_KEEP_WITH_PREVIOUS
                 || propId == Constants.PR_KEEP_WITH_NEXT
                 || propId == Constants.PR_KEEP_TOGETHER) {
             if (property.getEnum() == Constants.EN_AVOID) {
-                return maker.make(null, Constants.CP_WITHIN_PAGE, 
+                return maker.make(null, Constants.CP_WITHIN_PAGE,
                             propertyList, "always", propertyList.getFObj());
             }
         } else if (propId == Constants.PR_BREAK_BEFORE

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PageDimensionMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PageDimensionMaker.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PageDimensionMaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PageDimensionMaker.java Thu Jul 24 02:35:34 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.
@@ -26,38 +26,38 @@
 
 /**
  * Custom Maker for page-height / page-width
- * 
+ *
  */
 public class PageDimensionMaker extends LengthProperty.Maker {
-    
+
     /**
      * Constructor
-     * 
+     *
      * @param propId    the property Id
      */
     public PageDimensionMaker(int propId) {
         super(propId);
     }
-    
+
     /**
-     * Check the value of the page-width / page-height property. 
+     * Check the value of the page-width / page-height property.
      * Return the default or user-defined fallback in case the value
      * was specified as "auto"
-     * 
+     *
      * @see PropertyMaker#get(int, PropertyList, boolean, boolean)
      */
     public Property get(int subpropId, PropertyList propertyList,
-                        boolean tryInherit, boolean tryDefault) 
+                        boolean tryInherit, boolean tryDefault)
             throws PropertyException {
-        
-        Property p = super.get(0, propertyList, tryInherit, tryDefault);    
+
+        Property p = super.get(0, propertyList, tryInherit, tryDefault);
         FObj fo = propertyList.getFObj();
         String fallbackValue = (propId == Constants.PR_PAGE_HEIGHT)
             ? fo.getUserAgent().getPageHeight()
                     : fo.getUserAgent().getPageWidth();
-        
+
         if (p.getEnum() == Constants.EN_INDEFINITE) {
-            int otherId = (propId == Constants.PR_PAGE_HEIGHT) 
+            int otherId = (propId == Constants.PR_PAGE_HEIGHT)
                 ? Constants.PR_PAGE_WIDTH : Constants.PR_PAGE_HEIGHT;
             int writingMode = propertyList.get(Constants.PR_WRITING_MODE).getEnum();
             int refOrientation = propertyList.get(Constants.PR_REFERENCE_ORIENTATION)
@@ -66,10 +66,10 @@
                     && propertyList.getExplicit(otherId).getEnum() == Constants.EN_INDEFINITE) {
                 //both set to "indefinite":
                 //determine which one of the two defines the dimension
-                //in block-progression-direction, and set the other to 
+                //in block-progression-direction, and set the other to
                 //"auto"
                 if ((writingMode != Constants.EN_TB_RL
-                        && (refOrientation == 0 
+                        && (refOrientation == 0
                                 || refOrientation == 180
                                 || refOrientation == -180))
                      || (writingMode == Constants.EN_TB_RL
@@ -94,7 +94,7 @@
         } else if (p.isAuto()) {
             return make(propertyList, fallbackValue, fo);
         }
-        
+
         return p;
-    }    
+    }
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PercentLength.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PercentLength.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PercentLength.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PercentLength.java Thu Jul 24 02:35:34 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 @@
  * a percent specified length quantity in XSL
  */
 public class PercentLength extends LengthProperty {
-    
+
     /**
      * The percentage itself, expressed as a decimal value, e.g. for 95%, set
      * the value to .95
@@ -39,7 +39,7 @@
      * {@link #factor} should be applied to compute the actual length
      */
     private PercentBase lbase = null;
-    
+
     private double resolvedValue;
 
     /**
@@ -63,9 +63,9 @@
     }
 
     /**
-     * Used during property resolution to check for 
+     * Used during property resolution to check for
      * negative percentages
-     * 
+     *
      * @return the percentage value
      */
     protected double getPercentage() {
@@ -95,7 +95,7 @@
             return 0;
         }
     }
-    
+
     /** {@inheritDoc} */
     public String getString() {
         return (factor * 100.0) + "%";
@@ -103,7 +103,7 @@
 
     /**
      * Return the length of this PercentLength.
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public int getValue() {
         return (int) getNumericValue();
@@ -113,12 +113,12 @@
     public int getValue(PercentBaseContext context) {
         return (int) getNumericValue(context);
     }
-    
+
     /**
      * @return the String equivalent of this
      */
     public String toString() {
-        StringBuffer sb = 
+        StringBuffer sb =
             new StringBuffer(PercentLength.class.getName())
                 .append("[factor=").append(factor)
                 .append(",lbase=").append(lbase).append("]");

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PositionShorthandParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PositionShorthandParser.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PositionShorthandParser.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PositionShorthandParser.java Thu Jul 24 02:35:34 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,15 +27,15 @@
  * values for absolute-position and relative-position.
  */
 public class PositionShorthandParser implements ShorthandParser {
-    
+
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public Property getValueForProperty(int propId,
             Property property,
             PropertyMaker maker,
             PropertyList propertyList) {
-        
+
         int propVal = property.getEnum();
         if (propId == Constants.PR_ABSOLUTE_POSITION) {
             switch (propVal) {

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/Property.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/Property.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/Property.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/Property.java Thu Jul 24 02:35:34 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.
@@ -34,7 +34,7 @@
  * Base class for all property objects
  */
 public class Property {
-    
+
     /** Logger for all property classes */
     protected static Log log = LogFactory.getLog(PropertyMaker.class);
 
@@ -134,7 +134,7 @@
     public boolean isAuto() {
         return (getEnum() == Constants.EN_AUTO);
     }
-    
+
     /**
      * This method expects to be overridden by subclasses
      * @return char property value

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyCache.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyCache.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyCache.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyCache.java Thu Jul 24 02:35:34 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,35 +28,35 @@
  *  The public access points are overloaded <code>fetch()</code> methods
  *  that each correspond to a cached type.
  *  It is designed especially to be used concurrently by multiple threads,
- *  drawing heavily upon the principles behind Java 1.5's 
- *  <code>ConcurrentHashMap</code>. 
+ *  drawing heavily upon the principles behind Java 1.5's
+ *  <code>ConcurrentHashMap</code>.
  */
 public final class PropertyCache {
 
-    /** bitmask to apply to the hash to get to the 
+    /** bitmask to apply to the hash to get to the
      *  corresponding cache segment */
     private static final int SEGMENT_MASK = 0x1F;
-    /** 
+    /**
      * Indicates whether the cache should be used at all
      * Can be controlled by the system property:
      *   org.apache.fop.fo.properties.use-cache
      */
     private final boolean useCache;
-    
+
     /** the segments array (length = 32) */
     private CacheSegment[] segments = new CacheSegment[SEGMENT_MASK + 1];
     /** the table of hash-buckets */
     private CacheEntry[] table = new CacheEntry[8];
-    
+
     private Class runtimeType;
-    
+
     final boolean[] votesForRehash = new boolean[SEGMENT_MASK + 1];
-    
+
     /* same hash function as used by java.util.HashMap */
     private static int hash(Object x) {
         return hash(x.hashCode());
     }
-    
+
     private static int hash(int hashCode) {
         int h = hashCode;
         h += ~(h << 9);
@@ -65,32 +65,32 @@
         h ^= (h >>> 10);
         return h;
     }
-    
+
     /* shortcut function */
     private static boolean eq(Object p, Object q) {
         return (p == q || (p != null && p.equals(q)));
     }
-    
+
     /* Class modeling a cached entry */
     private final class CacheEntry extends WeakReference {
         volatile CacheEntry nextEntry;
         final int hash;
-        
+
         /* main constructor */
         public CacheEntry(Object p, CacheEntry nextEntry, ReferenceQueue refQueue) {
             super(p, refQueue);
             this.nextEntry = nextEntry;
             this.hash = p.hashCode();
         }
-        
+
     }
-    
+
     /* Wrapper objects to synchronize on */
     private final class CacheSegment {
         private int count = 0;
         private volatile ReferenceQueue staleEntries = new ReferenceQueue();
-    }    
-    
+    }
+
     private void cleanSegment(int segmentIndex) {
         CacheEntry entry;
         CacheSegment segment = segments[segmentIndex];
@@ -145,7 +145,7 @@
             }
         }
     }
-    
+
     /*
      * Puts a new instance in the cache.
      * If the total number of entries for the corresponding
@@ -154,14 +154,14 @@
      * entries.
      */
     private void put(Object o) {
-        
+
         int hash = hash(o);
         CacheSegment segment = segments[hash & SEGMENT_MASK];
-        
+
         synchronized (segment) {
             int index = hash & (table.length - 1);
             CacheEntry entry = table[index];
-            
+
             if (entry == null) {
                 entry = new CacheEntry(o, null, segment.staleEntries);
                 table[index] = entry;
@@ -176,23 +176,23 @@
                     segment.count++;
                 }
             }
-            
+
             if (segment.count > (2 * table.length)) {
                 cleanSegment(hash & SEGMENT_MASK);
             }
         }
     }
-    
+
 
     /* Gets a cached instance. Returns null if not found */
     private Object get(Object o) {
-        
+
         int hash = hash(o);
         int index = hash & (table.length - 1);
-        
+
         CacheEntry entry = table[index];
         Object q;
-        
+
         /* try non-synched first */
         for (CacheEntry e = entry; e != null; e = e.nextEntry) {
             if (e.hash == o.hashCode()
@@ -201,7 +201,7 @@
                 return q;
             }
         }
-        
+
         /* retry synched, only if the above attempt did not succeed,
          * as another thread may, in the meantime, have added a
          * corresponding entry */
@@ -218,14 +218,14 @@
         }
         return null;
     }
-    
+
     /*
      * Recursively acquires locks on all 32 segments,
      * extends the cache and redistributes the entries.
-     * 
+     *
      */
     private void rehash(int index) {
-        
+
         CacheSegment seg = segments[index];
         synchronized (seg) {
             if (index > 0) {
@@ -239,9 +239,9 @@
                     for (int i = segments.length; --i >= 0;) {
                         segments[i].count = 0;
                     }
-                    
+
                     CacheEntry[] newTable = new CacheEntry[newLength];
-                    
+
                     int hash, idx;
                     Object o;
                     newLength--;
@@ -250,7 +250,7 @@
                             if ((o = c.get()) != null) {
                                 hash = c.hash;
                                 idx = hash & newLength;
-                                newTable[idx] = new CacheEntry(o, newTable[idx], 
+                                newTable[idx] = new CacheEntry(o, newTable[idx],
                                         segments[hash & SEGMENT_MASK].staleEntries);
                                 segments[hash & SEGMENT_MASK].count++;
                             }
@@ -261,10 +261,10 @@
             }
         }
     }
-    
+
     /**
      *  Default constructor.
-     *  
+     *
      *  @param c    Runtime type of the objects that will be stored in the cache
      */
     public PropertyCache(Class c) {
@@ -278,13 +278,13 @@
         }
         this.runtimeType = c;
     }
-    
+
     /**
      *  Generic fetch() method.
-     *  Checks if the given <code>Object</code> is present in the cache - 
-     *  if so, returns a reference to the cached instance. 
+     *  Checks if the given <code>Object</code> is present in the cache -
+     *  if so, returns a reference to the cached instance.
      *  Otherwise the given object is added to the cache and returned.
-     *  
+     *
      *  @param obj   the Object to check for
      *  @return  the cached instance
      */
@@ -292,81 +292,81 @@
         if (!this.useCache) {
             return obj;
         }
-        
+
         if (obj == null) {
             return null;
         }
 
         Object cacheEntry = get(obj);
         if (cacheEntry != null) {
-            return cacheEntry;                
+            return cacheEntry;
         }
         put(obj);
         return obj;
     }
-    
+
     /**
-     *  Checks if the given {@link Property} is present in the cache - 
-     *  if so, returns a reference to the cached instance. 
+     *  Checks if the given {@link Property} is present in the cache -
+     *  if so, returns a reference to the cached instance.
      *  Otherwise the given object is added to the cache and returned.
-     *  
+     *
      *  @param prop the Property instance to check for
      *  @return the cached instance
      */
     public final Property fetch(Property prop) {
-        
+
         return (Property) fetch((Object) prop);
     }
-    
+
     /**
-     *  Checks if the given {@link CommonHyphenation} is present in the cache - 
-     *  if so, returns a reference to the cached instance. 
+     *  Checks if the given {@link CommonHyphenation} is present in the cache -
+     *  if so, returns a reference to the cached instance.
      *  Otherwise the given object is added to the cache and returned.
-     *  
+     *
      *  @param chy the CommonHyphenation instance to check for
      *  @return the cached instance
      */
     public final CommonHyphenation fetch(CommonHyphenation chy) {
-        
+
         return (CommonHyphenation) fetch((Object) chy);
     }
-    
+
     /**
-     *  Checks if the given {@link CommonFont} is present in the cache - 
-     *  if so, returns a reference to the cached instance. 
+     *  Checks if the given {@link CommonFont} is present in the cache -
+     *  if so, returns a reference to the cached instance.
      *  Otherwise the given object is added to the cache and returned.
-     *  
+     *
      *  @param cf the CommonFont instance to check for
      *  @return the cached instance
      */
     public final CommonFont fetch(CommonFont cf) {
-        
+
         return (CommonFont) fetch((Object) cf);
     }
 
     /**
-     *  Checks if the given {@link CommonBorderPaddingBackground} is present in the cache - 
-     *  if so, returns a reference to the cached instance. 
+     *  Checks if the given {@link CommonBorderPaddingBackground} is present in the cache -
+     *  if so, returns a reference to the cached instance.
      *  Otherwise the given object is added to the cache and returned.
-     *  
+     *
      *  @param cbpb the CommonBorderPaddingBackground instance to check for
      *  @return the cached instance
      */
     public final CommonBorderPaddingBackground fetch(CommonBorderPaddingBackground cbpb) {
-        
+
         return (CommonBorderPaddingBackground) fetch((Object) cbpb);
     }
 
     /**
-     *  Checks if the given {@link CommonBorderPaddingBackground.BorderInfo} is present in the cache - 
-     *  if so, returns a reference to the cached instance. 
+     *  Checks if the given {@link CommonBorderPaddingBackground.BorderInfo} is present in the cache -
+     *  if so, returns a reference to the cached instance.
      *  Otherwise the given object is added to the cache and returned.
-     *  
+     *
      *  @param bi the BorderInfo instance to check for
      *  @return the cached instance
      */
     public final CommonBorderPaddingBackground.BorderInfo fetch(CommonBorderPaddingBackground.BorderInfo bi) {
-        
+
         return (CommonBorderPaddingBackground.BorderInfo) fetch((Object) bi);
     }
 
@@ -374,6 +374,6 @@
     public String toString() {
         return super.toString() + "[runtimeType=" + this.runtimeType + "]";
     }
-    
-    
+
+
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyMaker.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyMaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyMaker.java Thu Jul 24 02:35:34 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.
@@ -123,8 +123,8 @@
 
     /**
      * Add a enum constant.
-     * @param constant the enum constant 
-     * @param value the Property value to use when the constant is specified 
+     * @param constant the enum constant
+     * @param value the Property value to use when the constant is specified
      */
     public void addEnum(String constant, Property value) {
         if (enums == null) {
@@ -138,16 +138,16 @@
      * @param subproperty the PropertyMaker for the subproperty
      */
     public void addSubpropMaker(PropertyMaker subproperty) {
-        throw new RuntimeException("Unable to add subproperties " + getClass()); 
+        throw new RuntimeException("Unable to add subproperties " + getClass());
     }
 
     /**
-     * Return a subproperty maker for the subpropertyId. 
-     * @param subpropertyId The subpropertyId of the maker. 
+     * Return a subproperty maker for the subpropertyId.
+     * @param subpropertyId The subpropertyId of the maker.
      * @return The subproperty maker.
      */
     public PropertyMaker getSubpropMaker(int subpropertyId) {
-        throw new RuntimeException("Unable to add subproperties"); 
+        throw new RuntimeException("Unable to add subproperties");
     }
 
     /**
@@ -155,7 +155,7 @@
      * shorthands list. Later the Integers are replaced with references
      * to the actual shorthand property makers.
      * @param shorthand a property maker thar is that is checked for
-     *        shorthand values. 
+     *        shorthand values.
      */
     public void addShorthand(PropertyMaker shorthand) {
         if (shorthands == null) {
@@ -197,7 +197,7 @@
     }
 
     /**
-     * Set the percent base identifier for this maker. 
+     * Set the percent base identifier for this maker.
      * @param percentBase the percent base (ex. LengthBase.FONTSIZE)
      */
     public void setPercentBase(int percentBase) {
@@ -205,9 +205,9 @@
     }
 
     /**
-     * Set the setByShorthand flag which only is applicable for subproperty 
-     * makers. It should be true for the subproperties which must be 
-     * assigned a value when the base property is assigned a attribute 
+     * Set the setByShorthand flag which only is applicable for subproperty
+     * makers. It should be true for the subproperties which must be
+     * assigned a value when the base property is assigned a attribute
      * value directly.
      * @param setByShorthand true if this subproperty must be set when the base property is set
      */
@@ -217,7 +217,7 @@
 
     /**
      * Set the correspoding property information.
-     * @param corresponding a corresponding maker where the 
+     * @param corresponding a corresponding maker where the
      *        isForcedCorresponding and compute methods are delegated to.
      */
     public void setCorresponding(CorrespondingPropertyMaker corresponding) {
@@ -225,7 +225,7 @@
     }
 
     /**
-     * Create a new empty property. Must be overriden in compound 
+     * Create a new empty property. Must be overriden in compound
      * subclasses.
      * @return a new instance of the Property for which this is a maker.
      */
@@ -243,13 +243,13 @@
      * @param propertyList the applicable property list
      * @param tryInherit true if inherited properties should be examined.
      * @return the property value
-     * @throws PropertyException if there is a problem evaluating the property 
+     * @throws PropertyException if there is a problem evaluating the property
      */
-    public Property findProperty(PropertyList propertyList, 
+    public Property findProperty(PropertyList propertyList,
                                  boolean tryInherit)
                 throws PropertyException {
         Property p = null;
-        
+
         if (log.isTraceEnabled()) {
             log.trace("PropertyMaker.findProperty: "
                   + FOPropertyMapping.getPropertyName(propId)
@@ -267,9 +267,9 @@
                 p = this.compute(propertyList);
             }
         }
-        if (p == null && tryInherit) {    
+        if (p == null && tryInherit) {
             // else inherit (if has parent and is inheritable)
-            PropertyList parentPropertyList = propertyList.getParentPropertyList(); 
+            PropertyList parentPropertyList = propertyList.getParentPropertyList();
             if (parentPropertyList != null && isInherited()) {
                 p = parentPropertyList.get(propId, true, false);
             }
@@ -287,8 +287,8 @@
      * @param propertyList The PropertyList object being built for this FO.
      * @param tryInherit true if inherited properties should be examined.
      * @param tryDefault true if the default value should be returned.
-     * @return the property value 
-     * @throws PropertyException if there is a problem evaluating the property 
+     * @return the property value
+     * @throws PropertyException if there is a problem evaluating the property
      */
     public Property get(int subpropertyId, PropertyList propertyList,
                         boolean tryInherit, boolean tryDefault)
@@ -370,7 +370,7 @@
     }
 
     /**
-     * Return the default value.   
+     * Return the default value.
      * @param propertyList The PropertyList object being built for this FO.
      * @return the Property object corresponding to the parameters
      * @throws PropertyException for invalid or inconsisten FO input
@@ -422,7 +422,7 @@
                                                 .getExplicit(getPropId());
                     if (parentExplicit == null) {
                         log.warn(FOPropertyMapping.getPropertyName(getPropId())
-                                + "=\"inherit\" on " + propertyList.getFObj().getName() 
+                                + "=\"inherit\" on " + propertyList.getFObj().getName()
                                 + ", but no explicit value found on the parent FO.");
                     }
                 }
@@ -436,7 +436,7 @@
                 newProp = PropertyParser.parse(pvalue,
                                                   new PropertyInfo(this,
                                                   propertyList));
-            } 
+            }
             if (newProp != null) {
                 newProp = convertProperty(newProp, propertyList, fo);
             }
@@ -475,7 +475,7 @@
 
     /**
      * Converts a shorthand property
-     * 
+     *
      * @param propertyList  the propertyList for which to convert
      * @param prop          the shorthand property
      * @param fo            ...
@@ -538,7 +538,7 @@
      * file specifies a length value equivalent for these keywords,
      * such as "0.5pt" for "thin".
      * @param keyword the string value of property attribute.
-     * @return a String containing a parseable equivalent or null if 
+     * @return a String containing a parseable equivalent or null if
      * the passed value isn't a keyword initializer for this Property
      */
     protected String checkValueKeywords(String keyword) {
@@ -549,7 +549,7 @@
             }
         }
         // TODO: should return null here?
-        return keyword;            
+        return keyword;
     }
 
     /**
@@ -642,7 +642,7 @@
         }
         return null;
     }
-    
+
     /** @return the name of the property this maker is used for. */
     public String getName() {
         return FOPropertyMapping.getPropertyName(propId);
@@ -650,7 +650,7 @@
 
     /**
      * Return a clone of the makers. Used by useGeneric() to clone the
-     * subproperty makers of the generic compound makers. 
+     * subproperty makers of the generic compound makers.
      * {@inheritDoc}
      */
     public Object clone() {

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ReferenceOrientationMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ReferenceOrientationMaker.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ReferenceOrientationMaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ReferenceOrientationMaker.java Thu Jul 24 02:35:34 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.
@@ -35,16 +35,16 @@
     public ReferenceOrientationMaker(int propId) {
         super(propId);
     }
-    
+
     /**
      * Check the value of the reference-orientation property.
-     * 
-     * {@inheritDoc} 
+     *
+     * {@inheritDoc}
      */
     public Property get(int subpropId, PropertyList propertyList,
-                        boolean tryInherit, boolean tryDefault) 
+                        boolean tryInherit, boolean tryDefault)
             throws PropertyException {
-        
+
         Property p = super.get(0, propertyList, tryInherit, tryDefault);
         int ro = 0;
         if (p != null) {

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ShorthandParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ShorthandParser.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ShorthandParser.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ShorthandParser.java Thu Jul 24 02:35:34 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/trunk/src/java/org/apache/fop/fo/properties/SpaceProperty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/SpaceProperty.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/SpaceProperty.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/SpaceProperty.java Thu Jul 24 02:35:34 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.
@@ -47,7 +47,7 @@
 
         /**
          * Create a new empty instance of SpaceProperty.
-         * @return the new instance. 
+         * @return the new instance.
          */
         public Property makeNewProperty() {
             return new SpaceProperty();
@@ -69,7 +69,7 @@
 
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void setComponent(int cmpId, Property cmpnValue,
                              boolean bIsDefault) {
@@ -138,10 +138,10 @@
 
     public String toString() {
         return "Space[" +
-        "min:" + getMinimum(null).getObject() + 
-        ", max:" + getMaximum(null).getObject() + 
-        ", opt:" + getOptimum(null).getObject() + 
-        ", precedence:" + precedence.getObject() + 
+        "min:" + getMinimum(null).getObject() +
+        ", max:" + getMaximum(null).getObject() +
+        ", opt:" + getOptimum(null).getObject() +
+        ", precedence:" + precedence.getObject() +
         ", conditionality:" + conditionality.getObject() + "]";
     }
 

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/SpacingPropertyMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/SpacingPropertyMaker.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/SpacingPropertyMaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/SpacingPropertyMaker.java Thu Jul 24 02:35:34 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.
@@ -26,7 +26,7 @@
 
 /**
  * A maker which creates 'letter-spacing' and 'word-spacing' properties.
- * These two properties properties are standard space properties with 
+ * These two properties properties are standard space properties with
  * additinal support for the 'normal' enum value.
  */
 
@@ -42,7 +42,7 @@
     /**
      * Support for the 'normal' value.
      */
-    public Property convertProperty(Property p, 
+    public Property convertProperty(Property p,
                                        PropertyList propertyList,
                                        FObj fo) throws PropertyException {
         if (p.getEnum() == Constants.EN_NORMAL) {

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/StringProperty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/StringProperty.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/StringProperty.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/StringProperty.java Thu Jul 24 02:35:34 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.
@@ -81,13 +81,13 @@
         }
 
     }
-    
+
     /** cache containing all canonical StringProperty instances */
     private static final PropertyCache cache = new PropertyCache(StringProperty.class);
-    
+
     /** canonical instance for empty strings */
     public static final StringProperty EMPTY_STRING_PROPERTY = new StringProperty("");
-    
+
     private final String str;
 
     /**
@@ -99,7 +99,7 @@
     }
 
     /**
-     * Return the canonical StringProperty instance 
+     * Return the canonical StringProperty instance
      * corresponding to the given string value
      * @param str   the base String
      * @return  the canonical instance
@@ -112,7 +112,7 @@
                        new StringProperty(str));
         }
     }
-    
+
     /** @return the Object equivalent of this property */
     public Object getObject() {
         return this.str;
@@ -135,7 +135,7 @@
         }
         return false;
     }
-    
+
     /** {@inheritDoc} */
     public int hashCode() {
         return str.hashCode();

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TableBorderPrecedence.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TableBorderPrecedence.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TableBorderPrecedence.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TableBorderPrecedence.java Thu Jul 24 02:35:34 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.
@@ -36,10 +36,10 @@
     public TableBorderPrecedence(int propId) {
         super(propId);
     }
-    
+
     /**
      * Set default precedence according to the parent FObj
-     * 
+     *
      * {@inheritDoc}
      */
     public Property make(PropertyList propertyList) throws PropertyException {

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TableColLength.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TableColLength.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TableColLength.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TableColLength.java Thu Jul 24 02:35:34 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.
@@ -41,7 +41,7 @@
     private double tcolUnits;
 
     /**
-     * The column the column-units are defined on. 
+     * The column the column-units are defined on.
      */
     private FObj column;
 

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TextDecorationProperty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TextDecorationProperty.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TextDecorationProperty.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TextDecorationProperty.java Thu Jul 24 02:35:34 2008
@@ -84,7 +84,7 @@
             }
             return lst;
         }
-        
+
     }
 
     /**
@@ -156,5 +156,5 @@
             addProperty(prop);
         }
     }
-    
+
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java Thu Jul 24 02:35:34 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/trunk/src/java/org/apache/fop/fo/properties/VerticalAlignShorthandParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/VerticalAlignShorthandParser.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/VerticalAlignShorthandParser.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/VerticalAlignShorthandParser.java Thu Jul 24 02:35:34 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,13 +23,13 @@
 
 /**
  * A shorthand parser for the vertical-align shorthand. It is used to set
- * values for alignment-baseline, alignment-adjust, baseline-shift 
+ * values for alignment-baseline, alignment-adjust, baseline-shift
  * and dominant-baseline.
  */
 public class VerticalAlignShorthandParser implements ShorthandParser, Constants {
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public Property getValueForProperty(int propId,
                                         Property property,

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/WhiteSpaceShorthandParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/WhiteSpaceShorthandParser.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/WhiteSpaceShorthandParser.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/WhiteSpaceShorthandParser.java Thu Jul 24 02:35:34 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,7 +32,7 @@
 public class WhiteSpaceShorthandParser implements ShorthandParser {
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public Property getValueForProperty(int propId, Property property,
             PropertyMaker maker, PropertyList propertyList)

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/XMLLangShorthandParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/XMLLangShorthandParser.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/XMLLangShorthandParser.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/XMLLangShorthandParser.java Thu Jul 24 02:35:34 2008
@@ -25,14 +25,14 @@
 public class XMLLangShorthandParser extends GenericShorthandParser {
 
     private static final char HYPHEN_MINUS = '-';
-    
+
     /** {@inheritDoc} */
     public Property getValueForProperty(int propId,
                                         Property property,
                                         PropertyMaker maker,
                                         PropertyList propertyList)
                     throws PropertyException {
-        
+
         String shorthandValue = property.getString();
         int hyphenIndex = shorthandValue.indexOf(HYPHEN_MINUS);
         if (propId == Constants.PR_LANGUAGE) {

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/AbstractCodePointMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/AbstractCodePointMapping.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/AbstractCodePointMapping.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/AbstractCodePointMapping.java Thu Jul 24 02:35:34 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,7 +38,7 @@
     private char[] unicodeMap; //code point to Unicode char
     private String[] charNameMap; //all character names in the encoding
     private Map fallbackMap; //Here we accumulate all mappings we have found through substitution
-    
+
     /**
      * Main constructor.
      * @param name the name of the encoding
@@ -140,7 +140,7 @@
                 bot = mid + 1;
             }
         }
-        
+
         //Fallback: using cache
         synchronized (this) {
             if (fallbackMap != null) {
@@ -164,7 +164,7 @@
                 }
             }
         }
-        
+
         putFallbackCharacter(c, NOT_FOUND_CODE_POINT);
         return NOT_FOUND_CODE_POINT;
     }
@@ -177,7 +177,7 @@
             this.fallbackMap.put(new Character(c), new Character(mapTo));
         }
     }
-    
+
     /**
      * Returns the main Unicode value that is associated with the given code point in the encoding.
      * Note that multiple Unicode values can theoretically be mapped to one code point in the
@@ -200,10 +200,10 @@
         System.arraycopy(this.unicodeMap, 0, copy, 0, this.unicodeMap.length);
         return copy;
     }
-    
+
     /**
      * Returns the index of a character/glyph with the given name. Note that this
-     * method is relatively slow and should only be used for fallback operations.  
+     * method is relatively slow and should only be used for fallback operations.
      * @param charName the character name
      * @return the index of the character in the encoding or -1 if it doesn't exist
      */
@@ -219,7 +219,7 @@
         }
         return -1;
     }
-    
+
     /** {@inheritDoc} */
     public String[] getCharNameMap() {
         if (this.charNameMap != null) {
@@ -235,7 +235,7 @@
                 if (c != CharUtilities.NOT_A_CHARACTER) {
                     String charName = Glyphs.charToGlyphName(c);
                     if (charName.length() > 0) {
-                        derived[i] = charName; 
+                        derived[i] = charName;
                     }
                 }
             }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/BFEntry.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/BFEntry.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/BFEntry.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/BFEntry.java Thu Jul 24 02:35:34 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,14 +16,14 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.fonts;
 
 /**
  * This is just a holder class for bfentries, groups of characters of a base font (bf).
  */
 public class BFEntry {
-    
+
     private int unicodeStart;
     private int unicodeEnd;
     private int glyphStartIndex;

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/Base14Font.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/Base14Font.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/Base14Font.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/Base14Font.java Thu Jul 24 02:35:34 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.fonts;
 
 /**

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CIDFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CIDFont.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CIDFont.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CIDFont.java Thu Jul 24 02:35:34 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/trunk/src/java/org/apache/fop/fonts/CIDFontType.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CIDFontType.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CIDFontType.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CIDFontType.java Thu Jul 24 02:35:34 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.fonts;
 
 import org.apache.avalon.framework.ValuedEnum;
@@ -59,8 +59,8 @@
             throw new IllegalArgumentException("Invalid CID font type: " + name);
         }
     }
-    
-    
+
+
     /**
      * Returns the CID FontType by value.
      * @param value Value of the CID font type to look up
@@ -75,5 +75,5 @@
             throw new IllegalArgumentException("Invalid CID font type: " + value);
         }
     }
-    
+
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CIDSubset.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CIDSubset.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CIDSubset.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CIDSubset.java Thu Jul 24 02:35:34 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,10 +54,10 @@
      * usedCharsIndex contains new glyph, original char (char selector -> Unicode)
      */
     private Map/*<Integer, Character>*/ usedCharsIndex = new java.util.HashMap();
-    
+
     public CIDSubset() {
     }
-    
+
     /**
      * Adds the initial 3 glyphs which are the same for all CID subsets.
      */
@@ -73,7 +73,7 @@
         usedGlyphsIndex.put(new Integer(2), new Integer(2));
         usedGlyphsCount++;
     }
-    
+
     /**
      * Returns the original index of the glyph inside the (non-subset) font's glyph list. This
      * index can be used to access the character width information, for example.
@@ -88,7 +88,7 @@
             return -1;
         }
     }
-    
+
     /**
      * Returns the Unicode value for a subset index (character selector). If there's no such
      * Unicode value, the "NOT A CHARACTER" (0xFFFF) is returned.
@@ -103,7 +103,7 @@
             return CharUtilities.NOT_A_CHARACTER;
         }
     }
-    
+
     /**
      * Maps a character to a character selector for a font subset. If the character isn't in the
      * subset, yet, it is added and a new character selector returned. Otherwise, the already
@@ -139,7 +139,7 @@
     public Map/*<Integer, Integer>*/ getSubsetGlyphs() {
         return Collections.unmodifiableMap(this.usedGlyphs);
     }
-    
+
     /**
      * Returns a char array containing all Unicode characters that are in the subset.
      * @return a char array with all used Unicode characters
@@ -159,7 +159,7 @@
     public int getSubsetSize() {
         return this.usedGlyphsCount;
     }
-    
+
     /**
      * Returns a BitSet with bits set for each available glyph index.
      * @return a BitSet indicating available glyph indices
@@ -173,5 +173,5 @@
         }
         return bitset;
     }
-    
+
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CustomFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CustomFont.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CustomFont.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CustomFont.java Thu Jul 24 02:35:34 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,7 +39,7 @@
     private String embedFileName = null;
     private String embedResourceName = null;
     private FontResolver resolver = null;
-    
+
     private int capHeight = 0;
     private int xHeight = 0;
     private int ascender = 0;
@@ -72,7 +72,7 @@
     public String getFullName() {
         return fullName;
     }
-    
+
     /**
      * Returns the font family names.
      * @return the font family names (a Set of Strings)
@@ -117,7 +117,7 @@
         if (resolver != null && embedFileName != null) {
             result = resolver.resolve(embedFileName);
             if (result == null) {
-                throw new IOException("Unable to resolve Source '" 
+                throw new IOException("Unable to resolve Source '"
                         + embedFileName + "' for embedded font");
             }
         }
@@ -194,7 +194,7 @@
     public int getFlags() {
         return flags;
     }
-    
+
     /** {@inheritDoc} */
     public boolean isSymbolicFont() {
         return ((getFlags() & 4) != 0) || "ZapfDingbatsEncoding".equals(getEncodingName());
@@ -210,7 +210,7 @@
     public int getWeight() {
         return this.weight;
     }
-    
+
     /**
      * {@inheritDoc}
      */
@@ -293,20 +293,20 @@
     public void setFullName(String name) {
         this.fullName = name;
     }
-    
+
     /** {@inheritDoc} */
     public void setFamilyNames(Set names) {
         this.familyNames = new java.util.HashSet(names);
     }
-    
+
     /**
      * Sets the font's subfamily name.
      * @param subFamilyName the subfamily name of the font
      */
     public void setFontSubFamilyName(String subFamilyName) {
-        this.fontSubName = subFamilyName;        
+        this.fontSubName = subFamilyName;
     }
-    
+
     /**
      * {@inheritDoc}
      */
@@ -374,7 +374,7 @@
         weight = Math.min(900, weight);
         this.weight = weight;
     }
-    
+
     /**
      * {@inheritDoc}
      */
@@ -439,7 +439,7 @@
         }
         this.kerning.put(key, value);
     }
-    
+
     /**
      * Replaces the existing kerning map with a new one.
      * @param kerningMap the kerning map (Map<Integer, Map<Integer, Integer>, the integers are

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/EmbedFontInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/EmbedFontInfo.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/EmbedFontInfo.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/EmbedFontInfo.java Thu Jul 24 02:35:34 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/trunk/src/java/org/apache/fop/fonts/Font.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/Font.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/Font.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/Font.java Thu Jul 24 02:35:34 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/trunk/src/java/org/apache/fop/fonts/FontCache.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontCache.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontCache.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontCache.java Thu Jul 24 02:35:34 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/trunk/src/java/org/apache/fop/fonts/FontCollection.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontCollection.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontCollection.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontCollection.java Thu Jul 24 02:35:34 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/trunk/src/java/org/apache/fop/fonts/FontDescriptor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontDescriptor.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontDescriptor.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontDescriptor.java Thu Jul 24 02:35:34 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/trunk/src/java/org/apache/fop/fonts/FontEventAdapter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventAdapter.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventAdapter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventAdapter.java Thu Jul 24 02:35:34 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.fonts;
 
 import java.util.Map;
@@ -32,7 +32,7 @@
 public class FontEventAdapter implements FontEventListener {
 
     private EventBroadcaster eventBroadcaster;
-    
+
     /**
      * Creates a new FontEventAdapter.
      * @param broadcaster the event broadcaster to send the generated events to
@@ -40,7 +40,7 @@
     public FontEventAdapter(EventBroadcaster broadcaster) {
         this.eventBroadcaster = broadcaster;
     }
-    
+
     /**
      * Returns the event group ID.
      * @return the event group ID
@@ -48,7 +48,7 @@
     protected String getEventGroupID() {
         return getClass().getName();
     }
-    
+
     /** {@inheritDoc} */
     public void fontSubstituted(Object source, FontTriplet requested, FontTriplet effective) {
         Map params = new java.util.HashMap();
@@ -78,5 +78,5 @@
                 EventSeverity.WARN, params);
         this.eventBroadcaster.broadcastEvent(ev);
     }
-    
+
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventListener.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventListener.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventListener.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventListener.java Thu Jul 24 02:35:34 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.fonts;
 
 
@@ -48,5 +48,5 @@
      * @param fontName the name of the font
      */
     void glyphNotAvailable(Object source, char ch, String fontName);
-    
+
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfo.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfo.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfo.java Thu Jul 24 02:35:34 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.
@@ -56,7 +56,7 @@
     /** look up a font-name to get a font (that implements FontMetrics at least) */
     private Map/*<String,FontMetrics>*/ fonts = null; //(String = font key)
 
-    /** 
+    /**
      *  a collection of missing fonts; used to make sure the user gets
      *  a warning for a missing font only once (not every time the font is used)
      */
@@ -141,7 +141,7 @@
 
     /**
      * Log warning about duplicate font triplets.
-     * 
+     *
      * @param triplet the duplicate font triplet
      * @param replacing true iff the new font will replace the old one
      * @param oldKey the old internal font name
@@ -231,7 +231,7 @@
         if (key != null) {
             internalFontKey = getInternalFontKey(key);
         }
-        
+
         if (!substFont && internalFontKey == null) {
             return null;
         }
@@ -374,10 +374,10 @@
         if (families.length == 0) {
             throw new IllegalArgumentException("Specify at least one font family");
         }
-        
+
         // try matching without substitutions
         List/*<FontTriplet>*/ matchedTriplets = fontLookup(families, style, weight, false);
-        
+
         // if there are no matching font triplets found try with substitutions
         if (matchedTriplets.size() == 0) {
             matchedTriplets = fontLookup(families, style, weight, true);
@@ -395,13 +395,13 @@
             throw new IllegalStateException(
                         "fontLookup must return an array with at least one "
                         + "FontTriplet on the last call. Lookup: " + sb.toString());
-            
+
         }
         FontTriplet[] fontTriplets = new FontTriplet[matchedTriplets.size()];
         matchedTriplets.toArray(fontTriplets);
-        
+
         // found some matching fonts so return them
-        return fontTriplets; 
+        return fontTriplets;
     }
 
     private Set/*<FontTriplet>*/ getLoggedFontKeys() {

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontLoader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontLoader.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontLoader.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontLoader.java Thu Jul 24 02:35:34 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.
@@ -97,7 +97,7 @@
             boolean embedded, FontResolver resolver) throws IOException {
         return loadFont(fontUrl.toExternalForm(), subFontName, embedded, resolver);
     }
-    
+
     /**
      * Loads a custom font from a URI. In the case of Type 1 fonts, the PFB file must be specified.
      * @param fontFileURI the URI to the font
@@ -128,14 +128,14 @@
      * @throws IOException In case of an I/O error
      * @throws MalformedURLException If an invalid URL is built
      */
-    public static InputStream openFontUri(FontResolver resolver, String uri) 
+    public static InputStream openFontUri(FontResolver resolver, String uri)
                     throws IOException, MalformedURLException {
         InputStream in = null;
         if (resolver != null) {
             Source source = resolver.resolve(uri);
             if (source == null) {
-                String err = "Cannot load font: failed to create Source for font file " 
-                    + uri; 
+                String err = "Cannot load font: failed to create Source for font file "
+                    + uri;
                 throw new IOException(err);
             }
             if (source instanceof StreamSource) {
@@ -146,7 +146,7 @@
             }
             if (in == null) {
                 String err = "Cannot load font: failed to create InputStream from"
-                    + " Source for font file " + uri; 
+                    + " Source for font file " + uri;
                 throw new IOException(err);
             }
         } else {
@@ -154,7 +154,7 @@
         }
         return in;
     }
-        
+
     /**
      * Reads/parses the font data.
      * @throws IOException In case of an I/O error

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontManagerConfigurator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontManagerConfigurator.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontManagerConfigurator.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontManagerConfigurator.java Thu Jul 24 02:35:34 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/trunk/src/java/org/apache/fop/fonts/FontMetrics.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontMetrics.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontMetrics.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontMetrics.java Thu Jul 24 02:35:34 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.fonts;
 
 import java.util.Map;
@@ -33,31 +33,31 @@
      * @return the font name
      */
     String getFontName();
-    
+
     /**
      * Returns the font's full name (Example: "Helvetica Bold Oblique").
      * @return the font's full name
      */
     String getFullName();
-    
+
     /**
      * Returns the font's family names as a Set of Strings (Example: "Helvetica").
      * @return the font's family names (a Set of Strings)
      */
     Set getFamilyNames();
-    
+
     /**
      * Returns the font name for font embedding (may include a prefix, Example: "1E28bcArialMT").
      * @return the name for font embedding
      */
     String getEmbedFontName();
-    
+
     /**
      * Returns the type of the font.
      * @return the font type
      */
     FontType getFontType();
-    
+
 
     /**
      * Returns the maximum ascent of the font described by this
@@ -66,7 +66,7 @@
      * @return ascent in milliponts
      */
     int getMaxAscent(int size);
-    
+
     /**
      * Returns the ascent of the font described by this
      * FontMetrics object. It returns the nominal ascent within the em box.
@@ -74,15 +74,15 @@
      * @return ascent in milliponts
      */
     int getAscender(int size);
-    
+
     /**
      * Returns the size of a capital letter measured from the font's baseline.
      * @param size font size
      * @return height of capital characters
      */
     int getCapHeight(int size);
-    
-    
+
+
     /**
      * Returns the descent of the font described by this
      * FontMetrics object.
@@ -90,8 +90,8 @@
      * @return descent in milliponts
      */
     int getDescender(int size);
-    
-    
+
+
     /**
      * Determines the typical font height of this
      * FontMetrics object
@@ -117,17 +117,17 @@
      * @return an array of widths
      */
     int[] getWidths();
-    
+
     /**
      * Indicates if the font has kering information.
      * @return True, if kerning is available.
      */
     boolean hasKerningInfo();
-        
+
     /**
      * Returns the kerning map for the font.
      * @return the kerning map
      */
     Map getKerningInfo();
-    
+
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontReader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontReader.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontReader.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontReader.java Thu Jul 24 02:35:34 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.
@@ -154,7 +154,7 @@
     }
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void startElement(String uri, String localName, String qName,
                              Attributes attributes) throws SAXException {
@@ -222,7 +222,7 @@
     }
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void endElement(String uri, String localName, String qName) throws SAXException {
         String content = text.toString().trim();
@@ -298,7 +298,7 @@
     }
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void characters(char[] ch, int start, int length) {
         text.append(ch, start, length);

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontResolver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontResolver.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontResolver.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontResolver.java Thu Jul 24 02:35:34 2008
@@ -35,5 +35,5 @@
      * @return A Source object, or null if the href could not resolved.
      */
     Source resolve(String href);
-    
+
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontSelector.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontSelector.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontSelector.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontSelector.java Thu Jul 24 02:35:34 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,7 +54,7 @@
 
     /**
      * Selects a font which is able to display the given character.
-     * 
+     *
      * @param fobj
      *            a Character object containing the character and its
      *            attributes.
@@ -70,7 +70,7 @@
 
     /**
      * Selects a font which is able to display the given character.
-     * 
+     *
      * @param c
      *            character to find.
      * @param text
@@ -87,7 +87,7 @@
 
     /**
      * Selects a font which is able to display the most of the given characters.
-     * 
+     *
      * @param charSeq
      *            Text to go through
      * @param firstIndex

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontSetup.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontSetup.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontSetup.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontSetup.java Thu Jul 24 02:35:34 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/trunk/src/java/org/apache/fop/fonts/FontTriplet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontTriplet.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontTriplet.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontTriplet.java Thu Jul 24 02:35:34 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/trunk/src/java/org/apache/fop/fonts/FontType.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontType.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontType.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontType.java Thu Jul 24 02:35:34 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.fonts;
 
 import org.apache.avalon.framework.ValuedEnum;
@@ -82,8 +82,8 @@
             throw new IllegalArgumentException("Invalid font type: " + name);
         }
     }
-    
-    
+
+
     /**
      * Returns the FontType by value.
      * @param value Value of the font type to look up
@@ -106,5 +106,5 @@
             throw new IllegalArgumentException("Invalid font type: " + value);
         }
     }
-    
+
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontUtil.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontUtil.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontUtil.java Thu Jul 24 02:35:34 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.



---------------------------------------------------------------------
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