[Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv/panel DefaultIndexManagementPanel.java, 1.1.1.1, 1.2 IndexManagementPanel.java, 1.1.1.1, 1.2 ObjectClassDialog.java, 1.1.1.1, 1.2 PluginPanel.java, 1.1.1.1, 1.2 SchemaObjectClassesPanel.java, 1.1.1.1, 1.2

[Doctor Conrad]

Author: nkinder

Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel
In directory
cvs-int.fedora.redhat.com:/tmp/cvs-serv19117/src/com/netscape/admin/dirserv/panel

Modified Files:
	DefaultIndexManagementPanel.java IndexManagementPanel.java 
	ObjectClassDialog.java PluginPanel.java 
	SchemaObjectClassesPanel.java 
Log Message:
177696 - Changed usage of enum keyword as a variable name for Java 1.5 compatibility


Index: DefaultIndexManagementPanel.java
===================================================================
RCS file:
/cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/DefaultIndexManagementPanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- DefaultIndexManagementPanel.java	18 Jul 2005 00:55:57 -0000	1.1.1.1
+++ DefaultIndexManagementPanel.java	13 Jan 2006 22:53:13 -0000	1.2
@@ -902,9 +902,9 @@
 			 LDAPAttribute findAttr =
 				 res.getAttribute( "objectclass");
 			 if( (findAttr != null ) && (findAttr.size() > 0) ) {
-				 Enumeration enum = findAttr.getStringValues();
-				 while (!mybool && (enum.hasMoreElements())) {
-					 String v = (String) enum.nextElement();
+				 Enumeration enumVals = findAttr.getStringValues();
+				 while (!mybool && (enumVals.hasMoreElements())) {
+					 String v = (String) enumVals.nextElement();
 					 Debug.println( "****** IndexManagementPanel.isPluginEntry() value :" +
v);
 					 mybool = ((v != null) && (v.compareToIgnoreCase("nsSlapdPlugin")
== 0 )) ;
 				 }


Index: IndexManagementPanel.java
===================================================================
RCS file:
/cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/IndexManagementPanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- IndexManagementPanel.java	18 Jul 2005 00:55:58 -0000	1.1.1.1
+++ IndexManagementPanel.java	13 Jan 2006 22:53:13 -0000	1.2
@@ -1074,9 +1074,9 @@
 			 LDAPAttribute findAttr =
 				 res.getAttribute( "objectclass");
 			 if( (findAttr != null ) && (findAttr.size() > 0) ) {
-				 Enumeration enum = findAttr.getStringValues();
-				 while (!mybool && (enum.hasMoreElements())) {
-					 String v = (String) enum.nextElement();
+				 Enumeration enumVals = findAttr.getStringValues();
+				 while (!mybool && (enumVals.hasMoreElements())) {
+					 String v = (String) enumVals.nextElement();
 					 Debug.println( "****** IndexManagementPanel.isPluginEntry() value :" +
v);
 					 mybool = ((v != null) && (v.compareToIgnoreCase("nsSlapdPlugin")
== 0 )) ;
 				 }


Index: ObjectClassDialog.java
===================================================================
RCS file:
/cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/ObjectClassDialog.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ObjectClassDialog.java	18 Jul 2005 00:56:02 -0000	1.1.1.1
+++ ObjectClassDialog.java	13 Jan 2006 22:53:13 -0000	1.2
@@ -128,9 +128,9 @@
     private void updateAvailAttrList() {		
 		if (_availModel.size() != 0)
 			_availModel.removeAllElements();
-		Enumeration enum = _schema.getAttributeNames();
-		while (enum.hasMoreElements()) {			
-			String attr = (String)enum.nextElement();
+		Enumeration enumAttrs = _schema.getAttributeNames();
+		while (enumAttrs.hasMoreElements()) {			
+			String attr = (String)enumAttrs.nextElement();
 			if (!attr.equals("dncomp") &&
!attr.equals("entrydn")&& 
 			    !attr.equals("entryid") && !attr.equals("parentid"))
{
 				SchemaUtility.InsertElement(_availModel, attr);


Index: PluginPanel.java
===================================================================
RCS file:
/cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/PluginPanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- PluginPanel.java	18 Jul 2005 00:56:03 -0000	1.1.1.1
+++ PluginPanel.java	13 Jan 2006 22:53:13 -0000	1.2
@@ -1072,10 +1072,10 @@
 	    }	    
 	}
 
-	Enumeration enum = _dsEntryFields.keys();
+	Enumeration enumAttrs = _dsEntryFields.keys();
 
-	while (enum.hasMoreElements()) {
-	    String attributeName = (String)enum.nextElement();
+	while (enumAttrs.hasMoreElements()) {
+	    String attributeName = (String)enumAttrs.nextElement();
 	    ((DSEntryTextStrict)_dsEntryFields.get(attributeName)).show();	      
 	}
     }
@@ -1116,10 +1116,10 @@
 	if (_dsEnableState.isModified())
 	    return true;	
 
-	Enumeration enum = _dsEntryFields.keys();
+	Enumeration enumAttrs = _dsEntryFields.keys();
 
-	while (enum.hasMoreElements()) {
-	    String attributeName = (String)enum.nextElement();
+	while (enumAttrs.hasMoreElements()) {
+	    String attributeName = (String)enumAttrs.nextElement();
 	    if (((DSEntryTextStrict)_dsEntryFields.get(attributeName)).isModified())
 		return true;
 	}


Index: SchemaObjectClassesPanel.java
===================================================================
RCS file:
/cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/SchemaObjectClassesPanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- SchemaObjectClassesPanel.java	18 Jul 2005 00:56:04 -0000	1.1.1.1
+++ SchemaObjectClassesPanel.java	13 Jan 2006 22:53:13 -0000	1.2
@@ -202,9 +202,9 @@
 			return;
 		}
 		_ocModel.removeAllElements();
-		Enumeration enum = schema.getObjectClassNames();
-		while (enum.hasMoreElements()) {
-			SchemaUtility.InsertElement(_ocModel, enum.nextElement());
+		Enumeration enumObjclasses = schema.getObjectClassNames();
+		while (enumObjclasses.hasMoreElements()) {
+			SchemaUtility.InsertElement(_ocModel, enumObjclasses.nextElement());
 		}
 	}