using enum as variable name caused issues in Java 7 compiler
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/61dd472c Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/61dd472c Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/61dd472c Branch: refs/heads/develop Commit: 61dd472ca4761737948162ea73a37fff94a01bb7 Parents: 708c359 Author: Alex Harui <aha...@apache.org> Authored: Tue Jan 21 14:54:31 2014 -0800 Committer: Alex Harui <aha...@apache.org> Committed: Tue Jan 21 14:55:06 2014 -0800 ---------------------------------------------------------------------- .../flex/forks/velocity/runtime/parser/Parser.java | 4 ++-- .../org/apache/flex/forks/velocity/texen/Generator.java | 12 ++++++------ .../flex/forks/velocity/util/EnumerationIterator.java | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/61dd472c/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/Parser.java ---------------------------------------------------------------------- diff --git a/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/Parser.java b/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/Parser.java index 86292b4..59755a7 100644 --- a/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/Parser.java +++ b/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/runtime/parser/Parser.java @@ -3235,8 +3235,8 @@ public class Parser/*@bgen(jjtree)*/implements ParserTreeConstants, ParserConsta jj_expentry[i] = jj_lasttokens[i]; } boolean exists = false; - for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) { - int[] oldentry = (int[])(enum.nextElement()); + for (java.util.Enumeration enm = jj_expentries.elements(); enm.hasMoreElements();) { + int[] oldentry = (int[])(enm.nextElement()); if (oldentry.length == jj_expentry.length) { exists = true; for (int i = 0; i < jj_expentry.length; i++) { http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/61dd472c/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/Generator.java ---------------------------------------------------------------------- diff --git a/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/Generator.java b/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/Generator.java index 75231d4..5f645b5 100644 --- a/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/Generator.java +++ b/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/texen/Generator.java @@ -451,10 +451,10 @@ public class Generator */ protected void fillContextHash (Context context, Hashtable objs) { - Enumeration enum = objs.keys(); - while (enum.hasMoreElements()) + Enumeration enm = objs.keys(); + while (enm.hasMoreElements()) { - String key = enum.nextElement().toString(); + String key = enm.nextElement().toString(); context.put (key, objs.get(key)); } } @@ -479,11 +479,11 @@ public class Generator */ protected void fillContextProperties (Context context) { - Enumeration enum = props.propertyNames(); + Enumeration enm = props.propertyNames(); - while (enum.hasMoreElements()) + while (enm.hasMoreElements()) { - String nm = (String)enum.nextElement(); + String nm = (String)enm.nextElement(); if (nm.startsWith ("context.objects.")) { http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/61dd472c/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/EnumerationIterator.java ---------------------------------------------------------------------- diff --git a/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/EnumerationIterator.java b/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/EnumerationIterator.java index 2a81f9a..c09f68a 100644 --- a/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/EnumerationIterator.java +++ b/modules/thirdparty/velocity/src/java/org/apache/flex/forks/velocity/util/EnumerationIterator.java @@ -30,17 +30,17 @@ public class EnumerationIterator implements Iterator /** * The enumeration to iterate. */ - private Enumeration enum = null; + private Enumeration enm = null; /** * Creates a new iteratorwrapper instance for the specified * Enumeration. * - * @param enum The Enumeration to wrap. + * @param enm The Enumeration to wrap. */ - public EnumerationIterator( Enumeration enum) + public EnumerationIterator( Enumeration enm) { - this.enum = enum; + this.enm = enm; } /** @@ -50,7 +50,7 @@ public class EnumerationIterator implements Iterator */ public Object next() { - return enum.nextElement(); + return enm.nextElement(); } /** @@ -60,7 +60,7 @@ public class EnumerationIterator implements Iterator */ public boolean hasNext() { - return enum.hasMoreElements(); + return enm.hasMoreElements(); } /**
