ITS#4501 Replace use of 'enum' as an identifier.

Java 1.5 made 'enum' a keyword, which may not be used as an identifier.

src/com/octetstring/jdbcLdap/jndi/Delete.java

@@ -54,9 +54,9 @@ public class Delete {
 		else {
 			try {
 				
-				LDAPSearchResults enum = res.searchUpInsJldap(del);
-				while (enum.hasMore()) {
-					LDAPEntry entry = enum.next(); 
+				LDAPSearchResults entries = res.searchUpInsJldap(del);
+				while (entries.hasMore()) {
+					LDAPEntry entry = entries.next();
 					con.delete(entry.getDN());
 					count++;
 				}

src/com/octetstring/jdbcLdap/jndi/Update.java

@@ -53,10 +53,10 @@ public class Update {
 		
 		try {
 			if (update.getSearchScope() != 0) {
-				LDAPSearchResults enum = res.searchUpInsJldap(update);
-				//System.out.println("enum.hasMore : " + enum.hasMore());
-				while (enum.hasMore()) {
-					seres =  enum.next();
+				LDAPSearchResults entries = res.searchUpInsJldap(update);
+				//System.out.println("entries.hasMore : " + entries.hasMore());
+				while (entries.hasMore()) {
+					seres =  entries.next();
 					buf.setLength(0);
 					
 					name = seres.getDN();

src/com/octetstring/jdbcLdap/jndi/UpdateEntry.java

@@ -112,9 +112,9 @@ public class UpdateEntry {
 		try {
 			int count = 0;
 			if (stmt.getSearchScope() != 0) {
-				LDAPSearchResults enum = res.searchUpInsJldap(stmt);
-				while (enum.hasMore()) {
-					entry = enum.next();
+				LDAPSearchResults entries = res.searchUpInsJldap(stmt);
+				while (entries.hasMore()) {
+					entry = entries.next();
 					buf.setLength(0);
 					
 					name = entry.getDN();

src/com/octetstring/jdbcLdap/junit/sql/TestResultSet.java

@@ -65,10 +65,10 @@ public class TestResultSet extends junit.framework.TestCase {
         String field;
         
         
-        LDAPMessageQueue enum = (LDAPMessageQueue) sel.executeQuery();
+        LDAPMessageQueue queue = (LDAPMessageQueue) sel.executeQuery();
         
         UnpackResults pack = new UnpackResults(con);
-        pack.unpackJldap(enum,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),sel.getSqlStore().getRevFieldMap());
+        pack.unpackJldap(queue,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),sel.getSqlStore().getRevFieldMap());
         
         LdapResultSet rs = new LdapResultSet(con,null,pack,sel.getBaseContext());
         
@@ -135,10 +135,10 @@ public class TestResultSet extends junit.framework.TestCase {
         String field;
         StringBuffer buf = new StringBuffer();
         
-        LDAPMessageQueue enum = (LDAPMessageQueue) sel.executeQuery();
+        LDAPMessageQueue queue = (LDAPMessageQueue) sel.executeQuery();
         
         UnpackResults pack = new UnpackResults(con);
-        pack.unpackJldap(enum,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),sel.getSqlStore().getRevFieldMap());
+        pack.unpackJldap(queue,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),sel.getSqlStore().getRevFieldMap());
         
         LdapResultSet rs = new LdapResultSet(con,null,pack,sel.getBaseContext());
         

src/com/octetstring/jdbcLdap/junit/sql/TestSelectRetrieve.java

@@ -213,9 +213,9 @@ public class TestSelectRetrieve extends junit.framework.TestCase {
     
     /**
      *Loads a NamingEnumeration into a LinkedList
-     *@param enum Search Results
+     *@param naming Search Results
      */
-    LinkedList load(NamingEnumeration enum) throws Exception {
+    LinkedList load(NamingEnumeration naming) throws Exception {
         LinkedList list = new LinkedList();
         LinkedList row;
         SearchResult res;
@@ -227,9 +227,9 @@ public class TestSelectRetrieve extends junit.framework.TestCase {
         String val;
         Object obj;
         
-        while (enum.hasMore()) {
+        while (naming.hasMore()) {
             row = new LinkedList();
-            res = (SearchResult) enum.next();
+            res = (SearchResult) naming.next();
             //System.out.println(res.getName());
             atts = (Attributes) res.getAttributes();
             

src/com/octetstring/jdbcLdap/junit/sql/TestUnpack.java

@@ -67,10 +67,10 @@ public class TestUnpack extends junit.framework.TestCase {
         
         
         
-        LDAPMessageQueue enum = (LDAPMessageQueue) sel.executeQuery();
+        LDAPMessageQueue queue = (LDAPMessageQueue) sel.executeQuery();
         
         UnpackResults pack = new UnpackResults(con);
-        pack.unpackJldap(enum,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null);
+        pack.unpackJldap(queue,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null);
         
         ArrayList fieldsExp = new ArrayList();
         
@@ -186,12 +186,12 @@ public class TestUnpack extends junit.framework.TestCase {
 				String field;
         
         
-				LDAPMessageQueue enum = (LDAPMessageQueue) sel.executeQuery();
+				LDAPMessageQueue queue = (LDAPMessageQueue) sel.executeQuery();
         
-				System.out.println(enum);
+				System.out.println(queue);
 				
 				UnpackResults pack = new UnpackResults(con);
-				pack.unpackJldap(enum,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null);
+				pack.unpackJldap(queue,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null);
         
         
 				ArrayList fieldsExp = new ArrayList();
@@ -263,10 +263,10 @@ public class TestUnpack extends junit.framework.TestCase {
         String field;
         
         
-        LDAPMessageQueue enum = (LDAPMessageQueue) sel.executeQuery();
+        LDAPMessageQueue queue = (LDAPMessageQueue) sel.executeQuery();
         
         UnpackResults pack = new UnpackResults(con);
-        pack.unpackJldap(enum,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null);
+        pack.unpackJldap(queue,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null);
         
         
         ArrayList fieldsExp = new ArrayList();
@@ -356,10 +356,10 @@ public class TestUnpack extends junit.framework.TestCase {
         String field;
         
         
-        LDAPMessageQueue enum = (LDAPMessageQueue) sel.executeQuery();
+        LDAPMessageQueue queue = (LDAPMessageQueue) sel.executeQuery();
         
         UnpackResults pack = new UnpackResults(con);
-        pack.unpackJldap(enum,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null);
+        pack.unpackJldap(queue,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null);
         
         ArrayList fieldsExp = new ArrayList();
         
@@ -470,11 +470,11 @@ public class TestUnpack extends junit.framework.TestCase {
         sel.getArgs()[0] = "Peons";
         sel.getArgs()[1] = "A*";
         
-        LDAPMessageQueue enum = (LDAPMessageQueue) sel.executeQuery();
-        //if (! enum.hasMore()) System.out.println("no results");
+        LDAPMessageQueue queue = (LDAPMessageQueue) sel.executeQuery();
+        //if (! queue.hasMore()) System.out.println("no results");
         
         UnpackResults pack = new UnpackResults(con);
-        pack.unpackJldap(enum,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null);
+        pack.unpackJldap(queue,sel.getRetrieveDN(),sel.getSqlStore().getFrom(),con.getBaseDN(),null);
         
         ArrayList fieldsExp = new ArrayList();