Commit 785ad020 authored by Jon Roberts's avatar Jon Roberts
Browse files

Fix IETF library use of Java 1.5 enum keyword (ITS#4163)

parent 01da83f2
...@@ -201,20 +201,20 @@ public class LDAPSchema extends LDAPEntry ...@@ -201,20 +201,20 @@ public class LDAPSchema extends LDAPEntry
{ {
class AttrEnumWrapper implements Enumeration class AttrEnumWrapper implements Enumeration
{ {
private Enumeration enum; private Enumeration enumer;
AttrEnumWrapper( Enumeration enum) AttrEnumWrapper( Enumeration enumer)
{ {
this.enum = enum; this.enumer = enumer;
return; return;
} }
public boolean hasMoreElements() public boolean hasMoreElements()
{ {
return enum.hasMoreElements(); return enumer.hasMoreElements();
} }
public Object nextElement() throws NoSuchElementException public Object nextElement() throws NoSuchElementException
{ {
return new LDAPAttributeSchema( return new LDAPAttributeSchema(
(com.novell.ldap.LDAPAttributeSchema)enum.nextElement()); (com.novell.ldap.LDAPAttributeSchema)enumer.nextElement());
} }
} }
return new AttrEnumWrapper( schema.getAttributeSchemas()); return new AttrEnumWrapper( schema.getAttributeSchemas());
...@@ -230,20 +230,20 @@ public class LDAPSchema extends LDAPEntry ...@@ -230,20 +230,20 @@ public class LDAPSchema extends LDAPEntry
{ {
class ObjEnumWrapper implements Enumeration class ObjEnumWrapper implements Enumeration
{ {
private Enumeration enum; private Enumeration enumer;
ObjEnumWrapper( Enumeration enum) ObjEnumWrapper( Enumeration enumer)
{ {
this.enum = enum; this.enumer = enumer;
return; return;
} }
public boolean hasMoreElements() public boolean hasMoreElements()
{ {
return enum.hasMoreElements(); return enumer.hasMoreElements();
} }
public Object nextElement() throws NoSuchElementException public Object nextElement() throws NoSuchElementException
{ {
return new LDAPObjectClassSchema( return new LDAPObjectClassSchema(
(com.novell.ldap.LDAPObjectClassSchema)enum.nextElement()); (com.novell.ldap.LDAPObjectClassSchema)enumer.nextElement());
} }
} }
return new ObjEnumWrapper( schema.getObjectClassSchemas()); return new ObjEnumWrapper( schema.getObjectClassSchemas());
...@@ -259,20 +259,20 @@ public class LDAPSchema extends LDAPEntry ...@@ -259,20 +259,20 @@ public class LDAPSchema extends LDAPEntry
{ {
class MatchEnumWrapper implements Enumeration class MatchEnumWrapper implements Enumeration
{ {
private Enumeration enum; private Enumeration enumer;
MatchEnumWrapper( Enumeration enum) MatchEnumWrapper( Enumeration enumer)
{ {
this.enum = enum; this.enumer = enumer;
return; return;
} }
public boolean hasMoreElements() public boolean hasMoreElements()
{ {
return enum.hasMoreElements(); return enumer.hasMoreElements();
} }
public Object nextElement() throws NoSuchElementException public Object nextElement() throws NoSuchElementException
{ {
return new LDAPMatchingRuleSchema( return new LDAPMatchingRuleSchema(
(com.novell.ldap.LDAPMatchingRuleSchema)enum.nextElement()); (com.novell.ldap.LDAPMatchingRuleSchema)enumer.nextElement());
} }
} }
return new MatchEnumWrapper( schema.getMatchingRuleSchemas()); return new MatchEnumWrapper( schema.getMatchingRuleSchemas());
...@@ -288,20 +288,20 @@ public class LDAPSchema extends LDAPEntry ...@@ -288,20 +288,20 @@ public class LDAPSchema extends LDAPEntry
{ {
class UseEnumWrapper implements Enumeration class UseEnumWrapper implements Enumeration
{ {
private Enumeration enum; private Enumeration enumer;
UseEnumWrapper( Enumeration enum) UseEnumWrapper( Enumeration enumer)
{ {
this.enum = enum; this.enumer = enumer;
return; return;
} }
public boolean hasMoreElements() public boolean hasMoreElements()
{ {
return enum.hasMoreElements(); return enumer.hasMoreElements();
} }
public Object nextElement() throws NoSuchElementException public Object nextElement() throws NoSuchElementException
{ {
return new LDAPMatchingRuleUseSchema( return new LDAPMatchingRuleUseSchema(
(com.novell.ldap.LDAPMatchingRuleUseSchema)enum.nextElement()); (com.novell.ldap.LDAPMatchingRuleUseSchema)enumer.nextElement());
} }
} }
return new UseEnumWrapper( schema.getMatchingRuleUseSchemas()); return new UseEnumWrapper( schema.getMatchingRuleUseSchemas());
...@@ -317,20 +317,20 @@ public class LDAPSchema extends LDAPEntry ...@@ -317,20 +317,20 @@ public class LDAPSchema extends LDAPEntry
{ {
class StructEnumWrapper implements Enumeration class StructEnumWrapper implements Enumeration
{ {
private Enumeration enum; private Enumeration enumer;
StructEnumWrapper( Enumeration enum) StructEnumWrapper( Enumeration enumer)
{ {
this.enum = enum; this.enumer = enumer;
return; return;
} }
public boolean hasMoreElements() public boolean hasMoreElements()
{ {
return enum.hasMoreElements(); return enumer.hasMoreElements();
} }
public Object nextElement() throws NoSuchElementException public Object nextElement() throws NoSuchElementException
{ {
return new LDAPDITStructureRuleSchema( return new LDAPDITStructureRuleSchema(
(com.novell.ldap.LDAPDITStructureRuleSchema)enum.nextElement()); (com.novell.ldap.LDAPDITStructureRuleSchema)enumer.nextElement());
} }
} }
return new StructEnumWrapper( schema.getDITStructureRuleSchemas()); return new StructEnumWrapper( schema.getDITStructureRuleSchemas());
...@@ -346,20 +346,20 @@ public class LDAPSchema extends LDAPEntry ...@@ -346,20 +346,20 @@ public class LDAPSchema extends LDAPEntry
{ {
class ContentEnumWrapper implements Enumeration class ContentEnumWrapper implements Enumeration
{ {
private Enumeration enum; private Enumeration enumer;
ContentEnumWrapper( Enumeration enum) ContentEnumWrapper( Enumeration enumer)
{ {
this.enum = enum; this.enumer = enumer;
return; return;
} }
public boolean hasMoreElements() public boolean hasMoreElements()
{ {
return enum.hasMoreElements(); return enumer.hasMoreElements();
} }
public Object nextElement() throws NoSuchElementException public Object nextElement() throws NoSuchElementException
{ {
return new LDAPDITContentRuleSchema( return new LDAPDITContentRuleSchema(
(com.novell.ldap.LDAPDITContentRuleSchema)enum.nextElement()); (com.novell.ldap.LDAPDITContentRuleSchema)enumer.nextElement());
} }
} }
return new ContentEnumWrapper( schema.getDITContentRuleSchemas()); return new ContentEnumWrapper( schema.getDITContentRuleSchemas());
...@@ -375,20 +375,20 @@ public class LDAPSchema extends LDAPEntry ...@@ -375,20 +375,20 @@ public class LDAPSchema extends LDAPEntry
{ {
class NameEnumWrapper implements Enumeration class NameEnumWrapper implements Enumeration
{ {
private Enumeration enum; private Enumeration enumer;
NameEnumWrapper( Enumeration enum) NameEnumWrapper( Enumeration enumer)
{ {
this.enum = enum; this.enumer = enumer;
return; return;
} }
public boolean hasMoreElements() public boolean hasMoreElements()
{ {
return enum.hasMoreElements(); return enumer.hasMoreElements();
} }
public Object nextElement() throws NoSuchElementException public Object nextElement() throws NoSuchElementException
{ {
return new LDAPNameFormSchema( return new LDAPNameFormSchema(
(com.novell.ldap.LDAPNameFormSchema)enum.nextElement()); (com.novell.ldap.LDAPNameFormSchema)enumer.nextElement());
} }
} }
return new NameEnumWrapper( schema.getNameFormSchemas()); return new NameEnumWrapper( schema.getNameFormSchemas());
...@@ -404,20 +404,20 @@ public class LDAPSchema extends LDAPEntry ...@@ -404,20 +404,20 @@ public class LDAPSchema extends LDAPEntry
{ {
class SyntaxEnumWrapper implements Enumeration class SyntaxEnumWrapper implements Enumeration
{ {
private Enumeration enum; private Enumeration enumer;
SyntaxEnumWrapper( Enumeration enum) SyntaxEnumWrapper( Enumeration enumer)
{ {
this.enum = enum; this.enumer = enumer;
return; return;
} }
public boolean hasMoreElements() public boolean hasMoreElements()
{ {
return enum.hasMoreElements(); return enumer.hasMoreElements();
} }
public Object nextElement() throws NoSuchElementException public Object nextElement() throws NoSuchElementException
{ {
return new LDAPSyntaxSchema( return new LDAPSyntaxSchema(
(com.novell.ldap.LDAPSyntaxSchema)enum.nextElement()); (com.novell.ldap.LDAPSyntaxSchema)enumer.nextElement());
} }
} }
return new SyntaxEnumWrapper( schema.getSyntaxSchemas()); return new SyntaxEnumWrapper( schema.getSyntaxSchemas());
......
Markdown is supported
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