Now compiles under JDK 5.0

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

diff --git a/src/java/org/apache/fop/fo/properties/EnumLength.java b/src/java/org/apache/fop/fo/properties/EnumLength.java
index a968a0acfe1b9b80a17181f4acdae7f6ce27b797..2d45a1966f18d87526377ea12005b9618c2e3ff1 100755 (executable)
--- 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 967d0357f640ac30869d7b28608fcea67f7cb5ea..0a9c2bac4b5886fddf629cf1ab60902077ea3d84 100755 (executable)
--- 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 a6aed80a0e80c0f85871317f51710cef10bb4e06..004281416522f01c154b114faa600b8ee0474cdc 100644 (file)
--- 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;