diff options
author | Adam Young <ayoung@redhat.com> | 2011-11-17 11:30:34 -0500 |
---|---|---|
committer | Adam Young <ayoung@redhat.com> | 2011-12-22 16:39:30 -0500 |
commit | 90c761917754c18c18e9df643e8dd60368a3510f (patch) | |
tree | 4553442aa950fffa16c80ee33cfaa2b0f77424d6 /pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java | |
parent | be9ed32e9a4435e15ea60f61d0ea39a1917f0afd (diff) | |
download | pki-90c761917754c18c18e9df643e8dd60368a3510f.tar.gz pki-90c761917754c18c18e9df643e8dd60368a3510f.tar.xz pki-90c761917754c18c18e9df643e8dd60368a3510f.zip |
Type safety for CMS and by extension, much of common
Diffstat (limited to 'pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java')
-rw-r--r-- | pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java b/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java index e812cf10..2c17d088 100644 --- a/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java +++ b/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java @@ -408,7 +408,7 @@ public class CMSEngine implements ICMSEngine { } ACL acl = null; - Vector rights = null; + Vector<String> rights = null; int idx1 = resACLs.indexOf(":"); if (idx1 <= 0) { @@ -446,7 +446,7 @@ public class CMSEngine implements ICMSEngine { } if (rightsString != null) { - rights = new Vector(); + rights = new Vector<String>(); StringTokenizer rtok = new StringTokenizer(rightsString, ","); while (rtok.hasMoreTokens()) { @@ -645,11 +645,11 @@ public class CMSEngine implements ICMSEngine { return new ArgBlock(); } - public IArgBlock createArgBlock(Hashtable httpReq) { + public IArgBlock createArgBlock(Hashtable<String, String> httpReq) { return new ArgBlock(httpReq); } - public IArgBlock createArgBlock(String realm, Hashtable httpReq) { + public IArgBlock createArgBlock(String realm, Hashtable<String, String> httpReq) { return new ArgBlock(realm, httpReq); } @@ -827,11 +827,11 @@ public class CMSEngine implements ICMSEngine { return new HttpRequestEncoder(); } - public Enumeration getSubsystemNames() { + public Enumeration<String> getSubsystemNames() { return mSSReg.keys(); } - public Enumeration getSubsystems() { + public Enumeration<ISubsystem> getSubsystems() { return mSSReg.elements(); } @@ -859,7 +859,7 @@ public class CMSEngine implements ICMSEngine { IConfigStore ssconfig = mConfig.getSubStore(PROP_SUBSYSTEM); // count number of dyn loaded subsystems. - Enumeration ssnames = ssconfig.getSubStoreNames(); + Enumeration<String> ssnames = ssconfig.getSubStoreNames(); int nsubsystems = 0; for (nsubsystems = 0; ssnames.hasMoreElements(); nsubsystems++) @@ -1310,12 +1310,12 @@ public class CMSEngine implements ICMSEngine { } public void getSubjAltNameConfigDefaultParams(String name, - Vector params) { + Vector<String> params) { GeneralNameUtil.SubjAltNameGN.getDefaultParams(name, params); } public void getSubjAltNameConfigExtendedPluginInfo(String name, - Vector params) { + Vector<String> params) { GeneralNameUtil.SubjAltNameGN.getExtendedPluginInfo(name, params); } @@ -1333,22 +1333,22 @@ public class CMSEngine implements ICMSEngine { } public void getGeneralNameConfigDefaultParams(String name, - boolean isValueConfigured, Vector params) { + boolean isValueConfigured, Vector<String> params) { GeneralNameUtil.GeneralNameConfig.getDefaultParams(name, isValueConfigured, params); } public void getGeneralNamesConfigDefaultParams(String name, - boolean isValueConfigured, Vector params) { + boolean isValueConfigured, Vector<String> params) { GeneralNameUtil.GeneralNamesConfig.getDefaultParams(name, isValueConfigured, params); } public void getGeneralNameConfigExtendedPluginInfo(String name, - boolean isValueConfigured, Vector info) { + boolean isValueConfigured, Vector<String> info) { GeneralNameUtil.GeneralNameConfig.getExtendedPluginInfo(name, isValueConfigured, info); } public void getGeneralNamesConfigExtendedPluginInfo(String name, - boolean isValueConfigured, Vector info) { + boolean isValueConfigured, Vector<String> info) { GeneralNameUtil.GeneralNamesConfig.getExtendedPluginInfo(name, isValueConfigured, info); } @@ -1514,7 +1514,7 @@ public class CMSEngine implements ICMSEngine { } public void terminateRequests() { - java.util.Enumeration e = CommandQueue.mCommandQueue.keys(); + Enumeration e = CommandQueue.mCommandQueue.keys(); while (e.hasMoreElements()) { Object thisRequest = e.nextElement(); |