Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/security In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22640/src/com/netscape/management/client/security
Modified Files: CertInstallCertPage.java CertRequestWizard.java ClientAuthPanel.java EncryptionPanel.java Log Message: Bug(s) fixed: 180544 Bug Description: Building Console fails with Java 1.5. This is because "enum" has been added as a reserved keyword in Java 1.5, and we use it as a variable name.
There is also a warning issued during build time about our usage of Method.invoke(). We are passing a "null" as the second parameter, but invoke() is overloaded and the compiler has to guess about which method to use. Reviewed by: Rich Files: see diffs Branch: HEAD Fix Description: Renamed our "enum" variable names. Added a cast to our usage of Method.invoke() to avoid a compiler warning. Platforms tested: RHEL4 Flag Day: no Doc impact: no QA impact: should be covered by regular nightly and manual testing New Tests integrated into TET: none
Index: CertInstallCertPage.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/security/CertInstallCertPage.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- CertInstallCertPage.java 18 Jul 2005 00:34:15 -0000 1.1.1.1 +++ CertInstallCertPage.java 8 Feb 2006 22:13:18 -0000 1.2 @@ -282,9 +282,9 @@ );
Debug.println("Restore session data"); - Enumeration enum = pref.getNames(); - while (enum.hasMoreElements()) { - String name = enum.nextElement().toString(); + Enumeration names_enum = pref.getNames(); + while (names_enum.hasMoreElements()) { + String name = names_enum.nextElement().toString(); ic.setProperty(name, pref.getString(name)); }
Index: CertRequestWizard.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/security/CertRequestWizard.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- CertRequestWizard.java 29 Nov 2005 18:37:06 -0000 1.2 +++ CertRequestWizard.java 8 Feb 2006 22:13:18 -0000 1.3 @@ -214,9 +214,9 @@ "cn=CSRSession,"+consoleInfo.getCurrentDN() );
- Enumeration enum = ic.getPropertyNames(); - while (enum.hasMoreElements()) { - String attr = enum.nextElement().toString(); + Enumeration names_enum = ic.getPropertyNames(); + while (names_enum.hasMoreElements()) { + String attr = names_enum.nextElement().toString(); pref.set(attr, ic.getProperty(attr)); }
Index: ClientAuthPanel.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/security/ClientAuthPanel.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- ClientAuthPanel.java 18 Jul 2005 00:34:16 -0000 1.1.1.1 +++ ClientAuthPanel.java 8 Feb 2006 22:13:18 -0000 1.2 @@ -113,9 +113,9 @@ * @param enable true to enable all buttons, false to disable and gray out all buttons */ public void setEnabled(boolean enable) { - Enumeration enum = buttonGroup.getElements(); - while (enum.hasMoreElements()) { - ((JRadioButton)(enum.nextElement())).setEnabled(enable); + Enumeration button_enum = buttonGroup.getElements(); + while (button_enum.hasMoreElements()) { + ((JRadioButton)(button_enum.nextElement())).setEnabled(enable); } }
Index: EncryptionPanel.java =================================================================== RCS file: /cvs/dirsec/console/src/com/netscape/management/client/security/EncryptionPanel.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- EncryptionPanel.java 18 Jul 2005 00:34:17 -0000 1.1.1.1 +++ EncryptionPanel.java 8 Feb 2006 22:13:18 -0000 1.2 @@ -308,10 +308,10 @@ cert.setActionCommand("EVENT_HANDLE_DISABLED"); cert.removeAllItems(); Hashtable selectedDev = (Hashtable)(_secDevice.get((String)(device.getSelectedItem()))); - Enumeration enum = selectedDev.keys(); + Enumeration device_enum = selectedDev.keys(); DefaultComboBoxModel comboModel = (DefaultComboBoxModel) cert.getModel(); - while (enum.hasMoreElements()) { - String key = (String)(enum.nextElement()); + while (device_enum.hasMoreElements()) { + String key = (String)(device_enum.nextElement()); if (key.startsWith("CERT")) { String certName = (String)selectedDev.get(key); // Multiple certs with the same name can exit (bug 558903)