Browse Source

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
tags/Alt-Design_pre_awt_renderer_import
Peter Bernard West 20 years ago
parent
commit
57f72cee89
34 changed files with 66 additions and 72 deletions
  1. 2
    2
      src/java/org/apache/fop/fo/properties/ActiveState.java
  2. 2
    2
      src/java/org/apache/fop/fo/properties/AlignmentAdjust.java
  3. 2
    2
      src/java/org/apache/fop/fo/properties/AlignmentBaseline.java
  4. 4
    5
      src/java/org/apache/fop/fo/properties/Background.java
  5. 5
    6
      src/java/org/apache/fop/fo/properties/BackgroundPosition.java
  6. 0
    1
      src/java/org/apache/fop/fo/properties/BorderColor.java
  7. 2
    2
      src/java/org/apache/fop/fo/properties/BorderCommonStyle.java
  8. 3
    2
      src/java/org/apache/fop/fo/properties/BorderCommonWidth.java
  9. 0
    1
      src/java/org/apache/fop/fo/properties/BorderStyle.java
  10. 0
    1
      src/java/org/apache/fop/fo/properties/BorderWidth.java
  11. 2
    2
      src/java/org/apache/fop/fo/properties/BreakCommon.java
  12. 2
    2
      src/java/org/apache/fop/fo/properties/CaptionSide.java
  13. 2
    2
      src/java/org/apache/fop/fo/properties/Clear.java
  14. 2
    3
      src/java/org/apache/fop/fo/properties/ColorCommon.java
  15. 2
    2
      src/java/org/apache/fop/fo/properties/ColorNonTransparent.java
  16. 2
    2
      src/java/org/apache/fop/fo/properties/DominantBaseline.java
  17. 2
    2
      src/java/org/apache/fop/fo/properties/Float.java
  18. 3
    3
      src/java/org/apache/fop/fo/properties/Font.java
  19. 2
    2
      src/java/org/apache/fop/fo/properties/FontFamily.java
  20. 2
    2
      src/java/org/apache/fop/fo/properties/FontSize.java
  21. 2
    2
      src/java/org/apache/fop/fo/properties/FontStretch.java
  22. 0
    1
      src/java/org/apache/fop/fo/properties/FontWeight.java
  23. 2
    2
      src/java/org/apache/fop/fo/properties/ForcePageCount.java
  24. 2
    2
      src/java/org/apache/fop/fo/properties/Margin.java
  25. 2
    2
      src/java/org/apache/fop/fo/properties/PageBreakCommon.java
  26. 2
    2
      src/java/org/apache/fop/fo/properties/RegionName.java
  27. 2
    2
      src/java/org/apache/fop/fo/properties/RenderingIntent.java
  28. 2
    2
      src/java/org/apache/fop/fo/properties/RuleStyle.java
  29. 2
    2
      src/java/org/apache/fop/fo/properties/TextAlign.java
  30. 2
    2
      src/java/org/apache/fop/fo/properties/TextAlignLast.java
  31. 1
    1
      src/java/org/apache/fop/fo/properties/TextDecoration.java
  32. 2
    2
      src/java/org/apache/fop/fo/properties/VerticalAlign.java
  33. 2
    2
      src/java/org/apache/fop/fo/properties/WhiteSpaceTreatment.java
  34. 2
    2
      src/java/org/apache/fop/fo/properties/WritingMode.java

+ 2
- 2
src/java/org/apache/fop/fo/properties/ActiveState.java View File

@@ -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));
}
}


+ 2
- 2
src/java/org/apache/fop/fo/properties/AlignmentAdjust.java View File

@@ -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));
}
}


+ 2
- 2
src/java/org/apache/fop/fo/properties/AlignmentBaseline.java View File

@@ -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));
}
}


+ 4
- 5
src/java/org/apache/fop/fo/properties/Background.java View File

@@ -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());

+ 5
- 6
src/java/org/apache/fop/fo/properties/BackgroundPosition.java View File

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

+ 0
- 1
src/java/org/apache/fop/fo/properties/BorderColor.java View File

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

+ 2
- 2
src/java/org/apache/fop/fo/properties/BorderCommonStyle.java View File

@@ -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));
}
}


+ 3
- 2
src/java/org/apache/fop/fo/properties/BorderCommonWidth.java View File

@@ -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
*/

+ 0
- 1
src/java/org/apache/fop/fo/properties/BorderStyle.java View File

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

+ 0
- 1
src/java/org/apache/fop/fo/properties/BorderWidth.java View File

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

+ 2
- 2
src/java/org/apache/fop/fo/properties/BreakCommon.java View File

@@ -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));
}
}


+ 2
- 2
src/java/org/apache/fop/fo/properties/CaptionSide.java View File

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

+ 2
- 2
src/java/org/apache/fop/fo/properties/Clear.java View File

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

+ 2
- 3
src/java/org/apache/fop/fo/properties/ColorCommon.java View File

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

+ 2
- 2
src/java/org/apache/fop/fo/properties/ColorNonTransparent.java View File

@@ -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));
}

+ 2
- 2
src/java/org/apache/fop/fo/properties/DominantBaseline.java View File

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

+ 2
- 2
src/java/org/apache/fop/fo/properties/Float.java View File

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

+ 3
- 3
src/java/org/apache/fop/fo/properties/Font.java View File

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

+ 2
- 2
src/java/org/apache/fop/fo/properties/FontFamily.java View File

@@ -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));
}
}


+ 2
- 2
src/java/org/apache/fop/fo/properties/FontSize.java View File

@@ -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));
}
}


+ 2
- 2
src/java/org/apache/fop/fo/properties/FontStretch.java View File

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

+ 0
- 1
src/java/org/apache/fop/fo/properties/FontWeight.java View File

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

+ 2
- 2
src/java/org/apache/fop/fo/properties/ForcePageCount.java View File

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

+ 2
- 2
src/java/org/apache/fop/fo/properties/Margin.java View File

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

+ 2
- 2
src/java/org/apache/fop/fo/properties/PageBreakCommon.java View File

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

+ 2
- 2
src/java/org/apache/fop/fo/properties/RegionName.java View File

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

+ 2
- 2
src/java/org/apache/fop/fo/properties/RenderingIntent.java View File

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

+ 2
- 2
src/java/org/apache/fop/fo/properties/RuleStyle.java View File

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

+ 2
- 2
src/java/org/apache/fop/fo/properties/TextAlign.java View File

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

+ 2
- 2
src/java/org/apache/fop/fo/properties/TextAlignLast.java View File

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

+ 1
- 1
src/java/org/apache/fop/fo/properties/TextDecoration.java View File

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

+ 2
- 2
src/java/org/apache/fop/fo/properties/VerticalAlign.java View File

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

+ 2
- 2
src/java/org/apache/fop/fo/properties/WhiteSpaceTreatment.java View File

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

+ 2
- 2
src/java/org/apache/fop/fo/properties/WritingMode.java View File

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

Loading…
Cancel
Save