Author: sebb
Date: Fri Jun 25 16:36:17 2010
New Revision: 958031
URL: http://svn.apache.org/viewvc?rev=958031&view=rev
Log:
Raw types
Missing @Override marker
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SMIMEAssertionGui.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java?rev=958031&r1=958030&r2=958031&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
Fri Jun 25 16:36:17 2010
@@ -123,12 +123,12 @@ public class SMIMEAssertion {
try {
CertStore certs = s.getCertificatesAndCRLs("Collection", "BC");
SignerInformationStore signers = s.getSignerInfos();
- Iterator signerIt = signers.getSigners().iterator();
+ Iterator<?> signerIt = signers.getSigners().iterator();
if (signerIt.hasNext()) {
SignerInformation signer = (SignerInformation) signerIt.next();
- Iterator certIt = certs.getCertificates(signer.getSID())
+ Iterator<?> certIt = certs.getCertificates(signer.getSID())
.iterator();
if (certIt.hasNext()) {
@@ -163,7 +163,7 @@ public class SMIMEAssertion {
String email = testElement.getSignerEmail();
if (email.trim().length() > 0) {
- List emailfromCert = getEmailFromCert(cert);
+ List<String> emailfromCert =
getEmailFromCert(cert);
if (!emailfromCert.contains(email)) {
res.setFailure(true);
failureMessage
@@ -287,22 +287,22 @@ public class SMIMEAssertion {
* @return a List of all email addresses found
* @throws CertificateException
*/
- private static List getEmailFromCert(X509Certificate cert)
+ private static List<String> getEmailFromCert(X509Certificate cert)
throws CertificateException {
List<String> res = new ArrayList<String>();
X509Principal subject = PrincipalUtil.getSubjectX509Principal(cert);
- Iterator addressIt = subject.getValues(X509Principal.EmailAddress)
+ Iterator<?> addressIt = subject.getValues(X509Principal.EmailAddress)
.iterator();
while (addressIt.hasNext()) {
String address = (String) addressIt.next();
res.add(address);
}
- Iterator subjectAltNamesIt = X509ExtensionUtil
+ Iterator<?> subjectAltNamesIt = X509ExtensionUtil
.getSubjectAlternativeNames(cert).iterator();
while (subjectAltNamesIt.hasNext()) {
- List altName = (List) subjectAltNamesIt.next();
+ List<?> altName = (List<?>) subjectAltNamesIt.next();
int type = ((Integer) altName.get(0)).intValue();
if (type == GeneralName.rfc822Name) {
String address = (String) altName.get(1);
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SMIMEAssertionGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SMIMEAssertionGui.java?rev=958031&r1=958030&r2=958031&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SMIMEAssertionGui.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SMIMEAssertionGui.java
Fri Jun 25 16:36:17 2010
@@ -182,6 +182,7 @@ import org.apache.jorphan.gui.layout.Ver
return panel;
}
+ @Override
public void configure(TestElement el) {
super.configure(el);
SMIMEAssertionTestElement smimeAssertion = (SMIMEAssertionTestElement)
el;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
