diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2012-01-12 18:53:36 -0600 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-01-18 12:55:59 -0600 |
| commit | 2a535f04f7b7bf670b19b95801e25178af5c91f9 (patch) | |
| tree | 5e8356739fecf71d6b132e026d95ffb52bf2cdbf /pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java | |
| parent | 9115902d5d3ffa4ac905f5d1f9fbd18a8e99622c (diff) | |
| download | pki-2a535f04f7b7bf670b19b95801e25178af5c91f9.tar.gz pki-2a535f04f7b7bf670b19b95801e25178af5c91f9.tar.xz pki-2a535f04f7b7bf670b19b95801e25178af5c91f9.zip | |
Added generics (part 1).
This patch is based on Adam's patch. It brings down the warnings
from 6139 to 4648.
Ticket #2
Diffstat (limited to 'pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java')
| -rw-r--r-- | pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java index dde150485..0ae550707 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java @@ -456,8 +456,13 @@ public class RestoreKeyCertPanel extends WizardPanelBase { s1.append("ca.connector.KRA"); } - content = "op=get&names=cloning.token,instanceId,internaldb.basedn,internaldb.ldapauth.password,internaldb.replication.password,internaldb.ldapconn.host,internaldb.ldapconn.port,internaldb.ldapauth.bindDN" - + c1.toString() + "&substores=" + s1.toString() + "&xmlOutput=true&sessionID=" + session_id; + content = + "op=get&names=cloning.token,instanceId,internaldb.basedn,internaldb.ldapauth.password,internaldb.replication.password,internaldb.ldapconn.host,internaldb.ldapconn.port,internaldb.ldapauth.bindDN" + + c1.toString() + + "&substores=" + + s1.toString() + + "&xmlOutput=true&sessionID=" + + session_id; boolean success = updateConfigEntries(master_hostname, master_port, true, "/" + cstype + "/admin/" + cstype + "/getConfigEntries", content, config, response); if (!success) { @@ -562,8 +567,8 @@ public class RestoreKeyCertPanel extends WizardPanelBase { KeyWrapper wrapper = token.getKeyWrapper(KeyWrapAlgorithm.DES3_CBC_PAD); wrapper.initUnwrap(sk, param); - org.mozilla.jss.crypto.PrivateKey pp = wrapper.unwrapPrivate(encpkey, getPrivateKeyType(publickey), - publickey); + org.mozilla.jss.crypto.PrivateKey pp = + wrapper.unwrapPrivate(encpkey, getPrivateKeyType(publickey), publickey); } catch (Exception e) { CMS.debug("RestoreKeyCertPanel importkeycert: Exception=" + e.toString()); @@ -604,8 +609,8 @@ public class RestoreKeyCertPanel extends WizardPanelBase { | InternalCertificate.VALID_CA); } else if (name.startsWith("auditSigningCert")) { InternalCertificate icert = (InternalCertificate) xcert; - icert.setObjectSigningTrust(InternalCertificate.USER | InternalCertificate.VALID_PEER - | InternalCertificate.TRUSTED_PEER); + icert.setObjectSigningTrust(InternalCertificate.USER + | InternalCertificate.VALID_PEER | InternalCertificate.TRUSTED_PEER); } } else cm.importCACertPackage(cert); |