Skip to content
Snippets Groups Projects
Verified Commit fa6c4c44 authored by Fredrik Roubert's avatar Fredrik Roubert
Browse files

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

Java 1.5 made 'enum' a keyword, which may not be used as an identifier.
parent 578fba58
No related branches found
No related tags found
1 merge request!6ITS#4501 Update code base to Java8.
Hide whitespace changes
Inline Side-by-side
Showing
with 30 additions and 30 deletions
src/com/octetstring/jdbcLdap/jndi/Delete.java
+ 3
− 3
View file @ fa6c4c44
...@@ -54,9 +54,9 @@ public class Delete { ...@@ -54,9 +54,9 @@ public class Delete {
else { else {
try { try {
LDAPSearchResults enum = res.searchUpInsJldap(del); LDAPSearchResults entries = res.searchUpInsJldap(del);
while (enum.hasMore()) { while (entries.hasMore()) {
LDAPEntry entry = enum.next(); LDAPEntry entry = entries.next();
con.delete(entry.getDN()); con.delete(entry.getDN());
count++; count++;
} }
......
src/com/octetstring/jdbcLdap/jndi/Update.java
+ 4
− 4
View file @ fa6c4c44
...@@ -53,10 +53,10 @@ public class Update { ...@@ -53,10 +53,10 @@ public class Update {
try { try {
if (update.getSearchScope() != 0) { if (update.getSearchScope() != 0) {
LDAPSearchResults enum = res.searchUpInsJldap(update); LDAPSearchResults entries = res.searchUpInsJldap(update);
//System.out.println("enum.hasMore : " + enum.hasMore()); //System.out.println("entries.hasMore : " + entries.hasMore());
while (enum.hasMore()) { while (entries.hasMore()) {
seres = enum.next(); seres = entries.next();
buf.setLength(0); buf.setLength(0);
name = seres.getDN(); name = seres.getDN();
......
src/com/octetstring/jdbcLdap/jndi/UpdateEntry.java
+ 3
− 3
View file @ fa6c4c44
...@@ -112,9 +112,9 @@ public class UpdateEntry { ...@@ -112,9 +112,9 @@ public class UpdateEntry {
try { try {
int count = 0; int count = 0;
if (stmt.getSearchScope() != 0) { if (stmt.getSearchScope() != 0) {
LDAPSearchResults enum = res.searchUpInsJldap(stmt); LDAPSearchResults entries = res.searchUpInsJldap(stmt);
while (enum.hasMore()) { while (entries.hasMore()) {
entry = enum.next(); entry = entries.next();
buf.setLength(0); buf.setLength(0);
name = entry.getDN(); name = entry.getDN();
......
src/com/octetstring/jdbcLdap/junit/sql/TestResultSet.java
+ 4
− 4
View file @ fa6c4c44
...@@ -65,10 +65,10 @@ public class TestResultSet extends junit.framework.TestCase { ...@@ -65,10 +65,10 @@ public class TestResultSet extends junit.framework.TestCase {
String field; String field;
LDAPMessageQueue enum = (LDAPMessageQueue) sel.executeQuery(); LDAPMessageQueue queue = (LDAPMessageQueue) sel.executeQuery();
UnpackResults pack = new UnpackResults(con); 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()); LdapResultSet rs = new LdapResultSet(con,null,pack,sel.getBaseContext());
...@@ -135,10 +135,10 @@ public class TestResultSet extends junit.framework.TestCase { ...@@ -135,10 +135,10 @@ public class TestResultSet extends junit.framework.TestCase {
String field; String field;
StringBuffer buf = new StringBuffer(); StringBuffer buf = new StringBuffer();
LDAPMessageQueue enum = (LDAPMessageQueue) sel.executeQuery(); LDAPMessageQueue queue = (LDAPMessageQueue) sel.executeQuery();
UnpackResults pack = new UnpackResults(con); 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()); LdapResultSet rs = new LdapResultSet(con,null,pack,sel.getBaseContext());
......
src/com/octetstring/jdbcLdap/junit/sql/TestSelectRetrieve.java
+ 4
− 4
View file @ fa6c4c44
...@@ -213,9 +213,9 @@ public class TestSelectRetrieve extends junit.framework.TestCase { ...@@ -213,9 +213,9 @@ public class TestSelectRetrieve extends junit.framework.TestCase {
/** /**
*Loads a NamingEnumeration into a LinkedList *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 list = new LinkedList();
LinkedList row; LinkedList row;
SearchResult res; SearchResult res;
...@@ -227,9 +227,9 @@ public class TestSelectRetrieve extends junit.framework.TestCase { ...@@ -227,9 +227,9 @@ public class TestSelectRetrieve extends junit.framework.TestCase {
String val; String val;
Object obj; Object obj;
while (enum.hasMore()) { while (naming.hasMore()) {
row = new LinkedList(); row = new LinkedList();
res = (SearchResult) enum.next(); res = (SearchResult) naming.next();
//System.out.println(res.getName()); //System.out.println(res.getName());
atts = (Attributes) res.getAttributes(); atts = (Attributes) res.getAttributes();
......
src/com/octetstring/jdbcLdap/junit/sql/TestUnpack.java
+ 12
− 12
View file @ fa6c4c44
...@@ -67,10 +67,10 @@ public class TestUnpack extends junit.framework.TestCase { ...@@ -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); 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(); ArrayList fieldsExp = new ArrayList();
...@@ -186,12 +186,12 @@ public class TestUnpack extends junit.framework.TestCase { ...@@ -186,12 +186,12 @@ public class TestUnpack extends junit.framework.TestCase {
String field; 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); 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(); ArrayList fieldsExp = new ArrayList();
...@@ -263,10 +263,10 @@ public class TestUnpack extends junit.framework.TestCase { ...@@ -263,10 +263,10 @@ public class TestUnpack extends junit.framework.TestCase {
String field; String field;
LDAPMessageQueue enum = (LDAPMessageQueue) sel.executeQuery(); LDAPMessageQueue queue = (LDAPMessageQueue) sel.executeQuery();
UnpackResults pack = new UnpackResults(con); 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(); ArrayList fieldsExp = new ArrayList();
...@@ -356,10 +356,10 @@ public class TestUnpack extends junit.framework.TestCase { ...@@ -356,10 +356,10 @@ public class TestUnpack extends junit.framework.TestCase {
String field; String field;
LDAPMessageQueue enum = (LDAPMessageQueue) sel.executeQuery(); LDAPMessageQueue queue = (LDAPMessageQueue) sel.executeQuery();
UnpackResults pack = new UnpackResults(con); 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(); ArrayList fieldsExp = new ArrayList();
...@@ -470,11 +470,11 @@ public class TestUnpack extends junit.framework.TestCase { ...@@ -470,11 +470,11 @@ public class TestUnpack extends junit.framework.TestCase {
sel.getArgs()[0] = "Peons"; sel.getArgs()[0] = "Peons";
sel.getArgs()[1] = "A*"; sel.getArgs()[1] = "A*";
LDAPMessageQueue enum = (LDAPMessageQueue) sel.executeQuery(); LDAPMessageQueue queue = (LDAPMessageQueue) sel.executeQuery();
//if (! enum.hasMore()) System.out.println("no results"); //if (! queue.hasMore()) System.out.println("no results");
UnpackResults pack = new UnpackResults(con); 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(); ArrayList fieldsExp = new ArrayList();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment