Restored JDK 1.5 compatibility.

Bug: http://issues.apache.org/bugzilla/show_bug.cgi?id=33645
Submitted by: Oskar Berggren <d99beo.at.dtek.chalmers.se>

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

diff --git a/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java b/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java
index 8385013c63becc73332916232a0e0f376ec81007..a48fd170fd2aa53e01715a9fb60a2384dd7d7c57 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java
+++ b/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java
@@ -72,51 +72,51 @@ public class CommonTextDecoration {
         Iterator i = list.iterator();
         while (i.hasNext()) {
             Property prop = (Property)i.next(); 
-            int enum = prop.getEnum();
-            if (enum == Constants.EN_NONE) {
+            int prop_enum = prop.getEnum();
+            if (prop_enum == Constants.EN_NONE) {
                 if (deco != null) {
                     deco.decoration = 0;
                 }
                 return deco;
-            } else if (enum == Constants.EN_UNDERLINE) {
+            } else if (prop_enum == Constants.EN_UNDERLINE) {
                 if (deco == null) {
                     deco = new CommonTextDecoration();
                 }
                 deco.decoration |= UNDERLINE;
                 deco.underColor = pList.get(Constants.PR_COLOR).getColorType();
-            } else if (enum == Constants.EN_NO_UNDERLINE) {
+            } else if (prop_enum == Constants.EN_NO_UNDERLINE) {
                 if (deco != null) {
                     deco.decoration &= OVERLINE | LINE_THROUGH | BLINK;
                     deco.underColor = pList.get(Constants.PR_COLOR).getColorType();
                 }
-            } else if (enum == Constants.EN_OVERLINE) {
+            } else if (prop_enum == Constants.EN_OVERLINE) {
                 if (deco == null) {
                     deco = new CommonTextDecoration();
                 }
                 deco.decoration |= OVERLINE;
                 deco.overColor = pList.get(Constants.PR_COLOR).getColorType();
-            } else if (enum == Constants.EN_NO_OVERLINE) {
+            } else if (prop_enum == Constants.EN_NO_OVERLINE) {
                 if (deco != null) {
                     deco.decoration &= UNDERLINE | LINE_THROUGH | BLINK;
                     deco.overColor = pList.get(Constants.PR_COLOR).getColorType();
                 }
-            } else if (enum == Constants.EN_LINE_THROUGH) {
+            } else if (prop_enum == Constants.EN_LINE_THROUGH) {
                 if (deco == null) {
                     deco = new CommonTextDecoration();
                 }
                 deco.decoration |= LINE_THROUGH;
                 deco.throughColor = pList.get(Constants.PR_COLOR).getColorType();
-            } else if (enum == Constants.EN_NO_LINE_THROUGH) {
+            } else if (prop_enum == Constants.EN_NO_LINE_THROUGH) {
                 if (deco != null) {
                     deco.decoration &= UNDERLINE | OVERLINE | BLINK;
                     deco.throughColor = pList.get(Constants.PR_COLOR).getColorType();
                 }
-            } else if (enum == Constants.EN_BLINK) {
+            } else if (prop_enum == Constants.EN_BLINK) {
                 if (deco == null) {
                     deco = new CommonTextDecoration();
                 }
                 deco.decoration |= BLINK;
-            } else if (enum == Constants.EN_NO_BLINK) {
+            } else if (prop_enum == Constants.EN_NO_BLINK) {
                 if (deco != null) {
                     deco.decoration &= UNDERLINE | OVERLINE | LINE_THROUGH;
                 }

diff --git a/src/java/org/apache/fop/fo/properties/TextDecorationProperty.java b/src/java/org/apache/fop/fo/properties/TextDecorationProperty.java
index ef5c08500c96504874d3d3548089e3b6f9cf4636..70bd7a57e3bf77371bc31dd69f71ee9f4f92bdae 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/TextDecorationProperty.java
+++ b/src/java/org/apache/fop/fo/properties/TextDecorationProperty.java
@@ -71,11 +71,11 @@ public class TextDecorationProperty extends ListProperty {
                 if (prop instanceof EnumProperty) {
                     //skip
                 } else if (prop instanceof NCnameProperty) {
-                    Property enum = checkEnumValues(((NCnameProperty)prop).getString());
-                    if (enum == null) {
+                    Property prop_enum = checkEnumValues(((NCnameProperty)prop).getString());
+                    if (prop_enum == null) {
                         throw new PropertyException("Illegal enum value: " + prop.getString());
                     }
-                    l.set(i, enum);
+                    l.set(i, prop_enum);
                 } else {
                     throw new PropertyException("Invalid content for text-decoration "
                             + "property: " + prop);