diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMServlet.java')
| -rw-r--r-- | pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMServlet.java | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMServlet.java index 9428ecce0..ba5650542 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMServlet.java @@ -44,10 +44,10 @@ public class ConfigHSMServlet extends ConfigBaseServlet { */ private static final long serialVersionUID = -330521231753992202L; private CryptoManager mCryptoManager = null; - private Vector mSupportedModules = null; + private Vector<Module> mSupportedModules = null; private Vector mOtherModules = null; private String mDefaultTok = null; - private Hashtable mCurrModTable = new Hashtable(); + private Hashtable<String, PK11Module> mCurrModTable = new Hashtable<String, PK11Module>(); public void init(ServletConfig config) throws ServletException { super.init(config); @@ -57,10 +57,11 @@ public class ConfigHSMServlet extends ConfigBaseServlet { try { // getting existing modules mCryptoManager = CryptoManager.getInstance(); - Enumeration modules = mCryptoManager.getModules(); + @SuppressWarnings("unchecked") + Enumeration<PK11Module> modules = mCryptoManager.getModules(); while (modules.hasMoreElements()) { - PK11Module mod = (PK11Module) modules.nextElement(); + PK11Module mod = modules.nextElement(); CMS.debug("ConfigHSMServlet: got module " + mod.getName()); mCurrModTable.put(mod.getName(), mod); @@ -77,16 +78,16 @@ public class ConfigHSMServlet extends ConfigBaseServlet { * Modules not listed as supported modules */ public void loadOtherModules() { - Enumeration m = mCurrModTable.elements(); + Enumeration<PK11Module> m = mCurrModTable.elements(); mOtherModules = new Vector(); while (m.hasMoreElements()) { - PK11Module mod = (PK11Module) m.nextElement(); - Enumeration s = mSupportedModules.elements(); + PK11Module mod = m.nextElement(); + Enumeration<Module> s = mSupportedModules.elements(); boolean found = false; while (s.hasMoreElements()) { - Module sm = (Module) s.nextElement(); + Module sm = s.nextElement(); if (mod.getName().equals(sm.getCommonName())) { found = true; @@ -111,11 +112,12 @@ public class ConfigHSMServlet extends ConfigBaseServlet { * find all tokens belonging to a module and load the Module */ public void loadModTokens(Module module, PK11Module mod) { - Enumeration tokens = mod.getTokens(); + @SuppressWarnings("unchecked") + Enumeration<CryptoToken> tokens = mod.getTokens(); while (tokens.hasMoreElements()) { try { - CryptoToken token = (CryptoToken) tokens.nextElement(); + CryptoToken token = tokens.nextElement(); CMS.debug("ConfigHSMServlet: token nick name=" + token.getName()); CMS.debug( @@ -145,7 +147,7 @@ public class ConfigHSMServlet extends ConfigBaseServlet { // getting supported security modules // a Vectgor of Modules - mSupportedModules = new Vector(); + mSupportedModules = new Vector<Module>(); // read from conf store all supported modules try { int count = CMS.getConfigStore().getInteger( @@ -172,7 +174,7 @@ public class ConfigHSMServlet extends ConfigBaseServlet { CMS.debug("ConfigHSMServlet: module found: " + cn); module.setFound(true); // add token info to module vector - PK11Module m = (PK11Module) mCurrModTable.get(cn); + PK11Module m = mCurrModTable.get(cn); loadModTokens(module, m); } @@ -180,7 +182,7 @@ public class ConfigHSMServlet extends ConfigBaseServlet { CMS.debug("ConfigHSMServlet: adding module " + cn); // add module to set if (!mSupportedModules.contains(module)) { - mSupportedModules.addElement((Object) module); + mSupportedModules.addElement(module); } }// for |