[Fedora-directory-users] PATCH: fedora-directoryconsole builds clean on JDK v1.5

[Graham Leggett]

Hi all,

The attached patch fixes errors compiling on JDK v1.5, caused by the use 
of the now reserved word "enum".

Regards,
Graham
--

diff -r -u
fedora-directoryconsole-1.0-orig/src/com/netscape/admin/dirserv/panel/DefaultIndexManagementPanel.java
fedora-directoryconsole-1.0/src/com/netscape/admin/dirserv/panel/DefaultIndexManagementPanel.java
---
fedora-directoryconsole-1.0-orig/src/com/netscape/admin/dirserv/panel/DefaultIndexManagementPanel.java	2005-12-15
22:30:05.993634000 +0000
+++
fedora-directoryconsole-1.0/src/com/netscape/admin/dirserv/panel/DefaultIndexManagementPanel.java	2005-12-15
22:39:42.845786000 +0000
@@ -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 enumeration = findAttr.getStringValues();
+				 while (!mybool && (enumeration.hasMoreElements())) {
+					 String v = (String) enumeration.nextElement();
 					 Debug.println( "****** IndexManagementPanel.isPluginEntry() value :" +
v);
 					 mybool = ((v != null) && (v.compareToIgnoreCase("nsSlapdPlugin")
== 0 )) ;
 				 }
diff -r -u
fedora-directoryconsole-1.0-orig/src/com/netscape/admin/dirserv/panel/IndexManagementPanel.java
fedora-directoryconsole-1.0/src/com/netscape/admin/dirserv/panel/IndexManagementPanel.java
---
fedora-directoryconsole-1.0-orig/src/com/netscape/admin/dirserv/panel/IndexManagementPanel.java	2005-12-15
22:30:06.002135000 +0000
+++
fedora-directoryconsole-1.0/src/com/netscape/admin/dirserv/panel/IndexManagementPanel.java	2005-12-15
22:38:31.320259000 +0000
@@ -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 enumeration = findAttr.getStringValues();
+				 while (!mybool && (enumeration.hasMoreElements())) {
+					 String v = (String) enumeration.nextElement();
 					 Debug.println( "****** IndexManagementPanel.isPluginEntry() value :" +
v);
 					 mybool = ((v != null) && (v.compareToIgnoreCase("nsSlapdPlugin")
== 0 )) ;
 				 }
diff -r -u
fedora-directoryconsole-1.0-orig/src/com/netscape/admin/dirserv/panel/ObjectClassDialog.java
fedora-directoryconsole-1.0/src/com/netscape/admin/dirserv/panel/ObjectClassDialog.java
---
fedora-directoryconsole-1.0-orig/src/com/netscape/admin/dirserv/panel/ObjectClassDialog.java	2005-12-15
22:30:06.027786000 +0000
+++
fedora-directoryconsole-1.0/src/com/netscape/admin/dirserv/panel/ObjectClassDialog.java	2005-12-15
22:37:56.023430000 +0000
@@ -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 enumeration = _schema.getAttributeNames();
+		while (enumeration.hasMoreElements()) {			
+			String attr = (String)enumeration.nextElement();
 			if (!attr.equals("dncomp") &&
!attr.equals("entrydn")&& 
 			    !attr.equals("entryid") && !attr.equals("parentid"))
{
 				SchemaUtility.InsertElement(_availModel, attr);
diff -r -u
fedora-directoryconsole-1.0-orig/src/com/netscape/admin/dirserv/panel/PluginPanel.java
fedora-directoryconsole-1.0/src/com/netscape/admin/dirserv/panel/PluginPanel.java
---
fedora-directoryconsole-1.0-orig/src/com/netscape/admin/dirserv/panel/PluginPanel.java	2005-12-15
22:30:06.031102000 +0000
+++
fedora-directoryconsole-1.0/src/com/netscape/admin/dirserv/panel/PluginPanel.java	2005-12-15
22:36:58.624254000 +0000
@@ -1072,10 +1072,10 @@
 	    }	    
 	}
 
-	Enumeration enum = _dsEntryFields.keys();
+	Enumeration enumeration = _dsEntryFields.keys();
 
-	while (enum.hasMoreElements()) {
-	    String attributeName = (String)enum.nextElement();
+	while (enumeration.hasMoreElements()) {
+	    String attributeName = (String)enumeration.nextElement();
 	    ((DSEntryTextStrict)_dsEntryFields.get(attributeName)).show();	      
 	}
     }
@@ -1116,10 +1116,10 @@
 	if (_dsEnableState.isModified())
 	    return true;	
 
-	Enumeration enum = _dsEntryFields.keys();
+	Enumeration enumeration = _dsEntryFields.keys();
 
-	while (enum.hasMoreElements()) {
-	    String attributeName = (String)enum.nextElement();
+	while (enumeration.hasMoreElements()) {
+	    String attributeName = (String)enumeration.nextElement();
 	    if (((DSEntryTextStrict)_dsEntryFields.get(attributeName)).isModified())
 		return true;
 	}
diff -r -u
fedora-directoryconsole-1.0-orig/src/com/netscape/admin/dirserv/panel/SchemaObjectClassesPanel.java
fedora-directoryconsole-1.0/src/com/netscape/admin/dirserv/panel/SchemaObjectClassesPanel.java
---
fedora-directoryconsole-1.0-orig/src/com/netscape/admin/dirserv/panel/SchemaObjectClassesPanel.java	2005-12-15
22:30:06.040390000 +0000
+++
fedora-directoryconsole-1.0/src/com/netscape/admin/dirserv/panel/SchemaObjectClassesPanel.java	2005-12-15
22:35:39.351329000 +0000
@@ -202,9 +202,9 @@
 			return;
 		}
 		_ocModel.removeAllElements();
-		Enumeration enum = schema.getObjectClassNames();
-		while (enum.hasMoreElements()) {
-			SchemaUtility.InsertElement(_ocModel, enum.nextElement());
+		Enumeration enumeration = schema.getObjectClassNames();
+		while (enumeration.hasMoreElements()) {
+			SchemaUtility.InsertElement(_ocModel, enumeration.nextElement());
 		}
 	}
 
diff -r -u
fedora-directoryconsole-1.0-orig/src/com/netscape/admin/dirserv/propedit/ChooseObjectClassDialog.java
fedora-directoryconsole-1.0/src/com/netscape/admin/dirserv/propedit/ChooseObjectClassDialog.java
---
fedora-directoryconsole-1.0-orig/src/com/netscape/admin/dirserv/propedit/ChooseObjectClassDialog.java	2005-12-15
22:30:06.054191000 +0000
+++
fedora-directoryconsole-1.0/src/com/netscape/admin/dirserv/propedit/ChooseObjectClassDialog.java	2005-12-15
22:34:48.205207000 +0000
@@ -45,9 +45,9 @@
 		
 		// Extract the list of classes from the schema
 		Vector v = new Vector();
-		Enumeration enum = schema.getObjectClassNames();
-		while (enum.hasMoreElements()) {
-			String objectclass = (String)enum.nextElement();
+		Enumeration enumeration = schema.getObjectClassNames();
+		while (enumeration.hasMoreElements()) {
+			String objectclass = (String)enumeration.nextElement();
 			/* Check that the objectclass is not a forbidden objectclass */
 			boolean isForbidden = false;
 			for (int i=0; i<DSSchemaHelper.FORBIDDEN_OBJECTCLASSES.length; i++) {