diff options
3 files changed, 18 insertions, 18 deletions
diff --git a/src/java/org/apache/fop/fo/properties/EnumLength.java b/src/java/org/apache/fop/fo/properties/EnumLength.java index a968a0acf..2d45a1966 100755 --- a/src/java/org/apache/fop/fo/properties/EnumLength.java +++ b/src/java/org/apache/fop/fo/properties/EnumLength.java @@ -22,17 +22,17 @@ package org.apache.fop.fo.properties; * A length quantity in XSL which is specified as an enum, such as "auto" */ public class EnumLength extends LengthProperty { - private Property enum; + private Property enumProperty; - public EnumLength(Property enum) { - this.enum = enum; + public EnumLength(Property enumProperty) { + this.enumProperty = enumProperty; } /** * @see org.apache.fop.datatypes.Numeric#getEnum() */ public int getEnum() { - return enum.getEnum(); + return enumProperty.getEnum(); } public boolean isAbsolute() { @@ -43,7 +43,7 @@ public class EnumLength extends LengthProperty { * @return the length in millipoints */ public int getValue() { - log.error("getValue() called on " + enum + " length"); + log.error("getValue() called on " + enumProperty + " length"); return 0; } @@ -52,7 +52,7 @@ public class EnumLength extends LengthProperty { * @return the length in millipoints */ public double getNumericValue() { - log.error("getNumericValue() called on " + enum + " number"); + log.error("getNumericValue() called on " + enumProperty + " number"); return 0; } @@ -60,14 +60,14 @@ public class EnumLength extends LengthProperty { * @see org.apache.fop.fo.properties.Property#getString() */ public String getString() { - return enum.toString(); + return enumProperty.toString(); } /** * @see org.apache.fop.fo.properties.Property#getString() */ public Object getObject() { - return enum.getObject(); + return enumProperty.getObject(); } diff --git a/src/java/org/apache/fop/fo/properties/EnumNumber.java b/src/java/org/apache/fop/fo/properties/EnumNumber.java index 967d0357f..0a9c2bac4 100755 --- a/src/java/org/apache/fop/fo/properties/EnumNumber.java +++ b/src/java/org/apache/fop/fo/properties/EnumNumber.java @@ -22,15 +22,15 @@ package org.apache.fop.fo.properties; * A number quantity in XSL which is specified as an enum, such as "no-limit". */ public class EnumNumber extends NumberProperty { - private Property enum; + private Property enumProperty; - public EnumNumber(Property enum) { + public EnumNumber(Property enumProperty) { super(null); - this.enum = enum; + this.enumProperty = enumProperty; } public int getEnum() { - return enum.getEnum(); + return enumProperty.getEnum(); } /** @@ -38,7 +38,7 @@ public class EnumNumber extends NumberProperty { * @return the length in millipoints */ public int getValue() { - log.error("getValue() called on " + enum + " number"); + log.error("getValue() called on " + enumProperty + " number"); return 0; } @@ -47,7 +47,7 @@ public class EnumNumber extends NumberProperty { * @return the length in millipoints */ public double getNumericValue() { - log.error("getNumericValue() called on " + enum + " number"); + log.error("getNumericValue() called on " + enumProperty + " number"); return 0; } @@ -55,14 +55,14 @@ public class EnumNumber extends NumberProperty { * @see org.apache.fop.fo.properties.Property#getString() */ public String getString() { - return enum.toString(); + return enumProperty.toString(); } /** * @see org.apache.fop.fo.properties.Property#getString() */ public Object getObject() { - return enum.getObject(); + return enumProperty.getObject(); } diff --git a/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java b/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java index a6aed80a0..004281416 100644 --- a/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java +++ b/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java @@ -196,9 +196,9 @@ class TextAttributesConverter { } */ - private static void attrBlockTextAlign(int enum, RtfAttributes rtfAttr) { + private static void attrBlockTextAlign(int alignment, RtfAttributes rtfAttr) { String rtfValue = null; - switch (enum) { + switch (alignment) { case Constants.CENTER: rtfValue = RtfText.ALIGN_CENTER; break; |