Removed redundant casts.

Flagged by Eclipse.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@197138 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/fo/properties/ActiveState.java b/src/java/org/apache/fop/fo/properties/ActiveState.java
index 476e4fcbc4c5074076c5794e92fb7920e2aecd53..c5eb6ed12100fcb6d67e0496561f352711ebdd34 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/ActiveState.java
+++ b/src/java/org/apache/fop/fo/properties/ActiveState.java
@@ -100,8 +100,8 @@ public class ActiveState extends Property  {
     static {
        rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
        for (int i = 1; i < rwEnums.length; i++ ) {
-           rwEnumHash.put((Object)rwEnums[i],
-                               (Object) Ints.consts.get(i));
+           rwEnumHash.put(rwEnums[i],
+                               Ints.consts.get(i));
        }
     }
 

diff --git a/src/java/org/apache/fop/fo/properties/AlignmentAdjust.java b/src/java/org/apache/fop/fo/properties/AlignmentAdjust.java
index 1d40ba8d9e6640875443cbc0eff696263bb9e5ec..ff5f3a1816642c676961a459d6ea29d6b62509e0 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/AlignmentAdjust.java
+++ b/src/java/org/apache/fop/fo/properties/AlignmentAdjust.java
@@ -113,8 +113,8 @@ public class AlignmentAdjust extends Property  {
     static {
        rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
        for (int i = 1; i < rwEnums.length; i++ ) {
-           rwEnumHash.put((Object)rwEnums[i],
-                               (Object) Ints.consts.get(i));
+           rwEnumHash.put(rwEnums[i],
+                               Ints.consts.get(i));
        }
     }
 

diff --git a/src/java/org/apache/fop/fo/properties/AlignmentBaseline.java b/src/java/org/apache/fop/fo/properties/AlignmentBaseline.java
index edc7587b117969f8b037b0399d2bc0c611b05c47..bd90ab0a8d54db081ca67d7adcba82295c8ce3c4 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/AlignmentBaseline.java
+++ b/src/java/org/apache/fop/fo/properties/AlignmentBaseline.java
@@ -112,8 +112,8 @@ public class AlignmentBaseline extends Property  {
     static {
        rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
        for (int i = 1; i < rwEnums.length; i++ ) {
-           rwEnumHash.put((Object)rwEnums[i],
-                               (Object) Ints.consts.get(i));
+           rwEnumHash.put(rwEnums[i],
+                               Ints.consts.get(i));
        }
     }
 

diff --git a/src/java/org/apache/fop/fo/properties/Background.java b/src/java/org/apache/fop/fo/properties/Background.java
index 9ddb72b3c37940fa561060f347c1ba886a610c98..fee9fdf89fb6f018880660f7406e7d7095fe61ec 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/Background.java
+++ b/src/java/org/apache/fop/fo/properties/Background.java
@@ -127,10 +127,9 @@ public class Background extends Property  {
      * @param propindex - the <tt>int</tt> property index.
      * @param foNode - the <tt>FONode</tt> on which this expression is being
      * parsed.
-     * @value - the <tt>PropertyValue</tt> passed from
-     * <i>PropertyParser.parse()</i>.
-     * @return the refined <tt>PropertyValue</tt>.
-     * @throws <tt>PropertyException</tt>.
+     * @param value  passed from <i>PropertyParser.parse()</i>
+     * @return the refined <tt>PropertyValue</tt>
+     * @throws PropertyException
      */
     public PropertyValue refineParsing
                         (int propindex, FONode foNode, PropertyValue value)
@@ -184,7 +183,7 @@ public class Background extends Property  {
        if (value.size() == 0)
            throw new PropertyException
                            ("Empty list for Background");
-       ListIterator elements = ((PropertyValueList)value).listIterator();
+       ListIterator elements = value.listIterator();
 
        scanning_elements: while (elements.hasNext()) {
            PropertyValue pval = (PropertyValue)(elements.next());

diff --git a/src/java/org/apache/fop/fo/properties/BackgroundPosition.java b/src/java/org/apache/fop/fo/properties/BackgroundPosition.java
index 6c511a14a77a762a7d240656c47410a914356671..405ce9393e9b6ca775255c16443eafc31d0fee71 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/BackgroundPosition.java
+++ b/src/java/org/apache/fop/fo/properties/BackgroundPosition.java
@@ -150,14 +150,13 @@ public class BackgroundPosition extends Property  {
 
     /**
      * Do the work for the three argument refineParsing method.
-     * @param propindex - the <tt>int</tt> property index.
-     * @param foNode - the <tt>FONode</tt> being built
+     * @param propindex  the property index.
+     * @param foNode  the FONode being built
      * @param value <tt>PropertyValue</tt> returned by the parser
-     * @param nested <tt>boolean</tt> indicating whether this method is
+     * @param nested  indicates whether this method is
      * called normally (false), or as part of another <i>refineParsing</i>
-     * method.
-     * @return <tt>PropertyValue</tt> the verified value
-     * @see #refineParsing(FOTree,PropertyValue)
+     * method
+     * @return  the verified <tt>PropertyValue</tt>
      */
     public PropertyValue refineParsing
         (int propindex, FONode foNode, PropertyValue value, boolean nested)

diff --git a/src/java/org/apache/fop/fo/properties/BorderColor.java b/src/java/org/apache/fop/fo/properties/BorderColor.java
index 491432455e9bd3d9d8dc83271cd62051a874ce4c..e9312353169e3c54622d1840b3b3ab056708834e 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/BorderColor.java
+++ b/src/java/org/apache/fop/fo/properties/BorderColor.java
@@ -130,7 +130,6 @@ public class BorderColor extends ColorTransparent {
      * called normally (false), or as part of another <i>refineParsing</i>
      * method.
      * @return <tt>PropertyValue</tt> the verified value
-     * @see #refineParsing(FONode,PropertyValue)
      */
     public PropertyValue refineParsing
         (int propindex, FONode foNode, PropertyValue value, boolean nested)

diff --git a/src/java/org/apache/fop/fo/properties/BorderCommonStyle.java b/src/java/org/apache/fop/fo/properties/BorderCommonStyle.java
index 053de02836433f8b90d88034db9cce45973cf4f9..8e25ddb28ef22845d18422220dd0238d599c0df9 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/BorderCommonStyle.java
+++ b/src/java/org/apache/fop/fo/properties/BorderCommonStyle.java
@@ -88,8 +88,8 @@ public class BorderCommonStyle extends Property  {
     static {
        rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
        for (int i = 1; i < rwEnums.length; i++ ) {
-           rwEnumHash.put((Object)rwEnums[i],
-                               (Object) Ints.consts.get(i));
+           rwEnumHash.put(rwEnums[i],
+                               Ints.consts.get(i));
        }
     }
 

diff --git a/src/java/org/apache/fop/fo/properties/BorderCommonWidth.java b/src/java/org/apache/fop/fo/properties/BorderCommonWidth.java
index c8cc74a1c9d0a730e9e75becffec94d5972de60f..3cf12c68519d03a2a06721dc68c119334152836f 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/BorderCommonWidth.java
+++ b/src/java/org/apache/fop/fo/properties/BorderCommonWidth.java
@@ -83,8 +83,9 @@ public class BorderCommonWidth extends Property  {
     // terms must be manually changed.
 
     /**
-     * @param <tt>int</tt> property index
-     * @param <tt>int</tt> mappedEnum enumeration value
+     * @param node  the FONode with an expressing the property
+     * @param property  the property index
+     * @param enum  the mappedEnum enumeration value
      * @return <tt>Numeric[]</tt> containing the values corresponding
      * to the MappedNumeric enumeration constants for border width
      */

diff --git a/src/java/org/apache/fop/fo/properties/BorderStyle.java b/src/java/org/apache/fop/fo/properties/BorderStyle.java
index c78888a74a6e3481939c2b25905b4b13dedc2b8a..94f67c77b3b8545d6c725d3a494f33504e4b2e42 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/BorderStyle.java
+++ b/src/java/org/apache/fop/fo/properties/BorderStyle.java
@@ -129,7 +129,6 @@ public class BorderStyle extends BorderCommonStyle  {
      * called normally (false), or as part of another <i>refineParsing</i>
      * method.
      * @return <tt>PropertyValue</tt> the verified value
-     * @see #refineParsing(FONode,PropertyValue)
      */
     public PropertyValue refineParsing
         (int propindex, FONode foNode, PropertyValue value, boolean nested)

diff --git a/src/java/org/apache/fop/fo/properties/BorderWidth.java b/src/java/org/apache/fop/fo/properties/BorderWidth.java
index 144c2ed3a8326f0527f841fc5718633e24622395..3833b1f813cedbd836a08a5e4fdbd768047359e1 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/BorderWidth.java
+++ b/src/java/org/apache/fop/fo/properties/BorderWidth.java
@@ -137,7 +137,6 @@ public class BorderWidth extends BorderCommonWidth {
      * called normally (false), or as part of another <i>refineParsing</i>
      * method.
      * @return <tt>PropertyValue</tt> the verified value
-     * @see #refineParsing(FONode,PropertyValue)
      */
     public PropertyValue refineParsing
         (int propindex, FONode foNode, PropertyValue value, boolean nested)

diff --git a/src/java/org/apache/fop/fo/properties/BreakCommon.java b/src/java/org/apache/fop/fo/properties/BreakCommon.java
index 4c9167a15a43de768f45a06d3a91940db15717e7..6d6a19c19bfa5f263c9e0e968d9b8510332027be 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/BreakCommon.java
+++ b/src/java/org/apache/fop/fo/properties/BreakCommon.java
@@ -74,8 +74,8 @@ public class BreakCommon extends Property  {
     static {
         rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
         for (int i = 1; i < rwEnums.length; i++ ) {
-            rwEnumHash.put((Object)rwEnums[i],
-                                (Object) Ints.consts.get(i));
+            rwEnumHash.put(rwEnums[i],
+                                Ints.consts.get(i));
         }
     }
 

diff --git a/src/java/org/apache/fop/fo/properties/CaptionSide.java b/src/java/org/apache/fop/fo/properties/CaptionSide.java
index 8b69035293175770cf3fd0767af4edf917218d42..eb82de6e83b5e98bcad66f47302ca2c4fab47c31 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/CaptionSide.java
+++ b/src/java/org/apache/fop/fo/properties/CaptionSide.java
@@ -116,8 +116,8 @@ public class CaptionSide extends Property  {
     static {
         rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
         for (int i = 1; i < rwEnums.length; i++ ) {
-            rwEnumHash.put((Object)rwEnums[i],
-                                (Object) Ints.consts.get(i));
+            rwEnumHash.put(rwEnums[i],
+                                Ints.consts.get(i));
         }
     }
     public int getEnumIndex(String enum)

diff --git a/src/java/org/apache/fop/fo/properties/Clear.java b/src/java/org/apache/fop/fo/properties/Clear.java
index 89887ca39ccd1eec79888b9f79c1ca40e46b49f9..c70376f73f42c8282365881b6bb0f390517c8184 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/Clear.java
+++ b/src/java/org/apache/fop/fo/properties/Clear.java
@@ -101,8 +101,8 @@ public class Clear extends Property  {
     static {
         rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
         for (int i = 1; i < rwEnums.length; i++ ) {
-            rwEnumHash.put((Object)rwEnums[i],
-                                (Object) Ints.consts.get(i));
+            rwEnumHash.put(rwEnums[i],
+                                Ints.consts.get(i));
         }
     }
     public int getEnumIndex(String enum)

diff --git a/src/java/org/apache/fop/fo/properties/ColorCommon.java b/src/java/org/apache/fop/fo/properties/ColorCommon.java
index ae47a7dcf3d8a1268a9391a394b228c77a9c4ade..3f322d96e85cf6d580da21c3dc0d29ec7a777ada 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/ColorCommon.java
+++ b/src/java/org/apache/fop/fo/properties/ColorCommon.java
@@ -109,11 +109,11 @@ public class ColorCommon extends Property  {
      * The argument must be either a ColorType already, in which case
      * it is returned unchanged, or an NCName whose string value is a
      * standard color or 'transparent'.
-     * @param propindex the index of the property to which this value is
+     * @param property the index of the property to which this value is
      * being applied.
      * @param value <tt>PropertyValue</tt>
      * @return <tt>ColorValue</tt> equivalent of the argument
-     * @exception <tt>PropertyException</tt>
+     * @exception PropertyException
      */
     protected static ColorType getColor(int property, PropertyValue value)
             throws PropertyException
@@ -185,7 +185,6 @@ public class ColorCommon extends Property  {
      * called normally (false), or as part of another <i>refineParsing</i>
      * method.
      * @return <tt>PropertyValue</tt> the verified value
-     * @see #refineParsing(FONode,PropertyValue)
      */
     public PropertyValue refineParsing
         (int propindex, FONode foNode, PropertyValue value, boolean nested)

diff --git a/src/java/org/apache/fop/fo/properties/ColorNonTransparent.java b/src/java/org/apache/fop/fo/properties/ColorNonTransparent.java
index e63e7e31e45d2bb2c4432c389872c5289de5f1fd..afdb5911bde82640535e09be2f81981c29a0ffa1 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/ColorNonTransparent.java
+++ b/src/java/org/apache/fop/fo/properties/ColorNonTransparent.java
@@ -69,8 +69,8 @@ public class ColorNonTransparent extends ColorCommon  {
     static {
        rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
        for (int i = 1; i < rwEnums.length - 1; i++ ) {
-           rwEnumHash.put((Object)rwEnums[i],
-                               (Object) Ints.consts.get(i));
+           rwEnumHash.put(rwEnums[i],
+                               Ints.consts.get(i));
        }
         rwEnumHash.put("grey", Ints.consts.get(ColorCommon.GRAY));
     }

diff --git a/src/java/org/apache/fop/fo/properties/DominantBaseline.java b/src/java/org/apache/fop/fo/properties/DominantBaseline.java
index 71d57e3a8464b9b182372fa50ccd9a2d146d36d3..dd28120d3685415481532598309fc26e876d0b22 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/DominantBaseline.java
+++ b/src/java/org/apache/fop/fo/properties/DominantBaseline.java
@@ -111,8 +111,8 @@ public class DominantBaseline extends Property  {
     static {
         rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
         for (int i = 1; i < rwEnums.length; i++ ) {
-            rwEnumHash.put((Object)rwEnums[i],
-                                (Object) Ints.consts.get(i));
+            rwEnumHash.put(rwEnums[i],
+                                Ints.consts.get(i));
         }
     }
     public int getEnumIndex(String enum)

diff --git a/src/java/org/apache/fop/fo/properties/Float.java b/src/java/org/apache/fop/fo/properties/Float.java
index e68acf031139591da888573f29a2d8304592c05c..ee47e2fec2cae7a1db5f08302e372e7c10f818fa 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/Float.java
+++ b/src/java/org/apache/fop/fo/properties/Float.java
@@ -100,8 +100,8 @@ public class Float extends Property  {
     static {
         rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
         for (int i = 1; i < rwEnums.length; i++ ) {
-            rwEnumHash.put((Object)rwEnums[i],
-                                (Object) Ints.consts.get(i));
+            rwEnumHash.put(rwEnums[i],
+                                Ints.consts.get(i));
         }
     }
     public int getEnumIndex(String enum)

diff --git a/src/java/org/apache/fop/fo/properties/Font.java b/src/java/org/apache/fop/fo/properties/Font.java
index b153f8520c719a8c7d9fae6b64f4cdd0532fefae..2f707b826165fb8af280e2ccf159067110f958b8 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/Font.java
+++ b/src/java/org/apache/fop/fo/properties/Font.java
@@ -118,8 +118,8 @@ public class Font extends Property  {
     static {
         rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
         for (int i = 1; i < rwEnums.length; i++ ) {
-            rwEnumHash.put((Object)rwEnums[i],
-                                (Object) Ints.consts.get(i));
+            rwEnumHash.put(rwEnums[i],
+                                Ints.consts.get(i));
         }
     }
 
@@ -349,7 +349,7 @@ public class Font extends Property  {
      * @return <tt>PropertyValueList</tt> containing a
      * <tt>PropertyValue</tt> for each property in the expansion of the
      * shorthand.
-     * @exception PropertyValueException
+     * @exception PropertyException
      */
     private static PropertyValueList
             processSpaceSepList(FONode foNode,

diff --git a/src/java/org/apache/fop/fo/properties/FontFamily.java b/src/java/org/apache/fop/fo/properties/FontFamily.java
index 575b38c953c326f26c44a63e724df7e3a592c5e4..d1f80156b25106122777bc3907456bba459d18f7 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/FontFamily.java
+++ b/src/java/org/apache/fop/fo/properties/FontFamily.java
@@ -106,8 +106,8 @@ public class FontFamily extends Property  {
     static {
         rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
         for (int i = 1; i < rwEnums.length; i++ ) {
-            rwEnumHash.put((Object)rwEnums[i],
-                                (Object) Ints.consts.get(i));
+            rwEnumHash.put(rwEnums[i],
+                                Ints.consts.get(i));
         }
     }
 

diff --git a/src/java/org/apache/fop/fo/properties/FontSize.java b/src/java/org/apache/fop/fo/properties/FontSize.java
index 62a7b514c543bbff747e441c57346a4f450c9920..41e4bfa25da1efdd4ccafb98c0b43ef30fdf1c84 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/FontSize.java
+++ b/src/java/org/apache/fop/fo/properties/FontSize.java
@@ -148,8 +148,8 @@ public class FontSize extends Property  {
     static {
         rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
         for (int i = 1; i < rwEnums.length; i++ ) {
-            rwEnumHash.put((Object)rwEnums[i],
-                                (Object) Ints.consts.get(i));
+            rwEnumHash.put(rwEnums[i],
+                                Ints.consts.get(i));
         }
     }
 

diff --git a/src/java/org/apache/fop/fo/properties/FontStretch.java b/src/java/org/apache/fop/fo/properties/FontStretch.java
index a2f4dcfff711976455b6c9b958e353e34d99ba04..2e54a86df734af041be2117f3ceffdea84aafb4b 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/FontStretch.java
+++ b/src/java/org/apache/fop/fo/properties/FontStretch.java
@@ -121,8 +121,8 @@ public class FontStretch extends Property  {
     static {
         rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
         for (int i = 1; i < rwEnums.length; i++ ) {
-            rwEnumHash.put((Object)rwEnums[i],
-                                (Object) Ints.consts.get(i));
+            rwEnumHash.put(rwEnums[i],
+                                Ints.consts.get(i));
         }
     }
     public int getEnumIndex(String enum)

diff --git a/src/java/org/apache/fop/fo/properties/FontWeight.java b/src/java/org/apache/fop/fo/properties/FontWeight.java
index e61f37d408c8639b195cc99bace429db77c80af1..73c4f1e03a395eca97e3fd75d80257a668dabaab 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/FontWeight.java
+++ b/src/java/org/apache/fop/fo/properties/FontWeight.java
@@ -124,7 +124,6 @@ public class FontWeight extends Property  {
      * called normally (false), or as part of another <i>refineParsing</i>
      * method.
      * @return <tt>PropertyValue</tt> the verified value
-     * @see #refineParsing(FONode,PropertyValue)
      */
     public PropertyValue refineParsing
         (int propindex, FONode foNode, PropertyValue value, boolean nested)

diff --git a/src/java/org/apache/fop/fo/properties/ForcePageCount.java b/src/java/org/apache/fop/fo/properties/ForcePageCount.java
index e88fa444906f1068dcacb347584da0300b2d5895..3e8c1e1f8e9f1f6c1709b63002cf902436f00169 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/ForcePageCount.java
+++ b/src/java/org/apache/fop/fo/properties/ForcePageCount.java
@@ -100,8 +100,8 @@ public class ForcePageCount extends Property  {
     static {
         rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
         for (int i = 1; i < rwEnums.length; i++ ) {
-            rwEnumHash.put((Object)rwEnums[i],
-                                (Object) Ints.consts.get(i));
+            rwEnumHash.put(rwEnums[i],
+                                Ints.consts.get(i));
         }
     }
     public int getEnumIndex(String enum)

diff --git a/src/java/org/apache/fop/fo/properties/Margin.java b/src/java/org/apache/fop/fo/properties/Margin.java
index 1cb6b4eff1bb9ed2fb8ecb0250f296b7e04dad5d..7ffb74fa4f2223524db4252011ebfdef3b228899 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/Margin.java
+++ b/src/java/org/apache/fop/fo/properties/Margin.java
@@ -182,7 +182,7 @@ public class Margin extends Property  {
      * @return <tt>PropertyValue</t> the same value, with its property set
      *  to the <i>property</i> argument, if it is an Auto or a
      * <tt>Numeric</tt> distance
-     * @exception <tt>PropertyException</tt> if the conditions are not met
+     * @exception PropertyException if the conditions are not met
      */
     private static PropertyValue autoOrDistance
                                     (PropertyValue value, int property)
@@ -202,7 +202,7 @@ public class Margin extends Property  {
      * @param value <tt>PropertyValue</tt> the value being tested
      * @return <tt>PropertyValue</t> the same value if it is an Auto or a
      * <tt>Numeric</tt> distance
-     * @exception <tt>PropertyException</tt> if the conditions are not met
+     * @exception PropertyException if the conditions are not met
      */
     private static PropertyValue autoOrDistance(PropertyValue value)
         throws PropertyException

diff --git a/src/java/org/apache/fop/fo/properties/PageBreakCommon.java b/src/java/org/apache/fop/fo/properties/PageBreakCommon.java
index f8859a133bec1cded6e228423bfe2bc87ec57383..ef5635a03afc813877eec6e762d9e7fa9595b661 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/PageBreakCommon.java
+++ b/src/java/org/apache/fop/fo/properties/PageBreakCommon.java
@@ -108,8 +108,8 @@ public class PageBreakCommon extends Property  {
     static {
         rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
         for (int i = 1; i < rwEnums.length; i++ ) {
-            rwEnumHash.put((Object)rwEnums[i],
-                                (Object) Ints.consts.get(i));
+            rwEnumHash.put(rwEnums[i],
+                                Ints.consts.get(i));
         }
     }
     public int getEnumIndex(String enum)

diff --git a/src/java/org/apache/fop/fo/properties/RegionName.java b/src/java/org/apache/fop/fo/properties/RegionName.java
index 7b92860bb909506d0754d2920f1b192d394820cf..4a3dca824927e00a31f1a06fa82e6906936cb803 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/RegionName.java
+++ b/src/java/org/apache/fop/fo/properties/RegionName.java
@@ -103,8 +103,8 @@ public class RegionName extends Property  {
     static {
         rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
         for (int i = 1; i < rwEnums.length; i++ ) {
-            rwEnumHash.put((Object)rwEnums[i],
-                                (Object) Ints.consts.get(i));
+            rwEnumHash.put(rwEnums[i],
+                                Ints.consts.get(i));
         }
     }
     public int getEnumIndex(String enum)

diff --git a/src/java/org/apache/fop/fo/properties/RenderingIntent.java b/src/java/org/apache/fop/fo/properties/RenderingIntent.java
index cdb7888fd9489b6ea66b63d644acd09bc8ddb2d7..c4d3166a8b7fb69c496121ac516fa8b4c5bbdceb 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/RenderingIntent.java
+++ b/src/java/org/apache/fop/fo/properties/RenderingIntent.java
@@ -97,8 +97,8 @@ public class RenderingIntent extends Property  {
     static {
         rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
         for (int i = 1; i < rwEnums.length; i++ ) {
-            rwEnumHash.put((Object)rwEnums[i],
-                                (Object) Ints.consts.get(i));
+            rwEnumHash.put(rwEnums[i],
+                                Ints.consts.get(i));
         }
     }
     public int getEnumIndex(String enum)

diff --git a/src/java/org/apache/fop/fo/properties/RuleStyle.java b/src/java/org/apache/fop/fo/properties/RuleStyle.java
index 901ebb6c3540b0bd3b2b612722343424af1912b9..71c98213dafe6e5d695986d4ff145f1865d7f98e 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/RuleStyle.java
+++ b/src/java/org/apache/fop/fo/properties/RuleStyle.java
@@ -109,8 +109,8 @@ public class RuleStyle extends Property  {
     static {
         rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
         for (int i = 1; i < rwEnums.length; i++ ) {
-            rwEnumHash.put((Object)rwEnums[i],
-                                (Object) Ints.consts.get(i));
+            rwEnumHash.put(rwEnums[i],
+                                Ints.consts.get(i));
         }
     }
     public int getEnumIndex(String enum)

diff --git a/src/java/org/apache/fop/fo/properties/TextAlign.java b/src/java/org/apache/fop/fo/properties/TextAlign.java
index 912e37cec71425805be9d81c0fef515dcd053f6b..06acb388bbd68c2fc76243c4ee6b1a25a177aaad 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/TextAlign.java
+++ b/src/java/org/apache/fop/fo/properties/TextAlign.java
@@ -115,8 +115,8 @@ public class TextAlign extends Property  {
     static {
         rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
         for (int i = 1; i < rwEnums.length; i++ ) {
-            rwEnumHash.put((Object)rwEnums[i],
-                                (Object) Ints.consts.get(i));
+            rwEnumHash.put(rwEnums[i],
+                                Ints.consts.get(i));
         }
     }
     public int getEnumIndex(String enum)

diff --git a/src/java/org/apache/fop/fo/properties/TextAlignLast.java b/src/java/org/apache/fop/fo/properties/TextAlignLast.java
index 04a9f13b0f7e2652bf26d7a7d7fbde0d8b57ac0b..ba686b68adfd00a2c9342648c67fc8d0afbd1b03 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/TextAlignLast.java
+++ b/src/java/org/apache/fop/fo/properties/TextAlignLast.java
@@ -117,8 +117,8 @@ public class TextAlignLast extends Property  {
     static {
         rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
         for (int i = 1; i < rwEnums.length; i++ ) {
-            rwEnumHash.put((Object)rwEnums[i],
-                                (Object) Ints.consts.get(i));
+            rwEnumHash.put(rwEnums[i],
+                                Ints.consts.get(i));
         }
     }
     public int getEnumIndex(String enum)

diff --git a/src/java/org/apache/fop/fo/properties/TextDecoration.java b/src/java/org/apache/fop/fo/properties/TextDecoration.java
index 392072941b51883b99172b9ec7479f81f0979678..35ca16244aaf11dc5051cc1341cbbca4e1cfd778 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/TextDecoration.java
+++ b/src/java/org/apache/fop/fo/properties/TextDecoration.java
@@ -158,7 +158,7 @@ public class TextDecoration extends Property  {
             }
         } else { // list is a PropertyValueList
             ssList = spaceSeparatedList((PropertyValueList)list);
-            iter = ((PropertyValueList)ssList).iterator();
+            iter = ssList.iterator();
             while (iter.hasNext()) {
                 Object value = iter.next();
                 if (value instanceof NCName)

diff --git a/src/java/org/apache/fop/fo/properties/VerticalAlign.java b/src/java/org/apache/fop/fo/properties/VerticalAlign.java
index 788935285c023c19fb897413f8a796641e0c4b39..dafcfb021196e7b8c04e53e7d012f5dbb8b09c4a 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/VerticalAlign.java
+++ b/src/java/org/apache/fop/fo/properties/VerticalAlign.java
@@ -114,8 +114,8 @@ public class VerticalAlign extends Property  {
     static {
         rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
         for (int i = 1; i < rwEnums.length; i++ ) {
-            rwEnumHash.put((Object)rwEnums[i],
-                                (Object) Ints.consts.get(i));
+            rwEnumHash.put(rwEnums[i],
+                                Ints.consts.get(i));
         }
     }
     public int getEnumIndex(String enum)

diff --git a/src/java/org/apache/fop/fo/properties/WhiteSpaceTreatment.java b/src/java/org/apache/fop/fo/properties/WhiteSpaceTreatment.java
index 5200fcd935ca9e723135477cf684c12f0570cd5d..9ee0121dfc7cc1ee29bfc70bd277c27b8aba59ef 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/WhiteSpaceTreatment.java
+++ b/src/java/org/apache/fop/fo/properties/WhiteSpaceTreatment.java
@@ -107,8 +107,8 @@ public class WhiteSpaceTreatment extends Property  {
     static {
         rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
         for (int i = 1; i < rwEnums.length; i++ ) {
-            rwEnumHash.put((Object)rwEnums[i],
-                                (Object) Ints.consts.get(i));
+            rwEnumHash.put(rwEnums[i],
+                                Ints.consts.get(i));
         }
     }
     public int getEnumIndex(String enum)

diff --git a/src/java/org/apache/fop/fo/properties/WritingMode.java b/src/java/org/apache/fop/fo/properties/WritingMode.java
index 3a6ff396610e1aeb1155ca4a3ef47520af1a96cb..e5dd862c4901ab44e118a30b822fd5be9d0e5dc3 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/WritingMode.java
+++ b/src/java/org/apache/fop/fo/properties/WritingMode.java
@@ -109,8 +109,8 @@ public class WritingMode extends Property  {
     static {
         rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
         for (int i = 1; i < rwEnums.length; i++ ) {
-            rwEnumHash.put((Object)rwEnums[i],
-                                (Object) Ints.consts.get(i));
+            rwEnumHash.put(rwEnums[i],
+                                Ints.consts.get(i));
         }
     }
     public int getEnumIndex(String enum)