diff options
author | admiyo <admiyo@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-11-04 19:48:54 +0000 |
---|---|---|
committer | admiyo <admiyo@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-11-04 19:48:54 +0000 |
commit | 4f97d6f686b00237d06bd34c70f8cad5abbff74d (patch) | |
tree | 29f460096a3e1db43ae16e8b1c6713d6047d15dc /pki/base/util/src/netscape/security/util | |
parent | 5b4ff55e683c897a7b48fed2717bb0e7e7049b21 (diff) | |
download | pki-4f97d6f686b00237d06bd34c70f8cad5abbff74d.tar.gz pki-4f97d6f686b00237d06bd34c70f8cad5abbff74d.tar.xz pki-4f97d6f686b00237d06bd34c70f8cad5abbff74d.zip |
Cleanup imports
Automated changes done by Eclipse
Minor tweak to one file where Eclipse was tring to find an import for Any
Due to finding it in an annotated comment.
https://bugzilla.redhat.com/show_bug.cgi?id=728303
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@2292 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/util/src/netscape/security/util')
16 files changed, 129 insertions, 57 deletions
diff --git a/pki/base/util/src/netscape/security/util/ASN1CharStrConvMap.java b/pki/base/util/src/netscape/security/util/ASN1CharStrConvMap.java index cacde77c8..5df6baef8 100644 --- a/pki/base/util/src/netscape/security/util/ASN1CharStrConvMap.java +++ b/pki/base/util/src/netscape/security/util/ASN1CharStrConvMap.java @@ -17,8 +17,13 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.util; -import java.util.*; -import sun.io.*; +import java.util.Enumeration; +import java.util.Hashtable; + +import sun.io.ByteToCharConverter; +import sun.io.ByteToCharUTF8; +import sun.io.CharToByteConverter; +import sun.io.CharToByteUTF8; /** * Maps a ASN.1 character string type to a CharToByte and ByteToChar converter. diff --git a/pki/base/util/src/netscape/security/util/ArraySet.java b/pki/base/util/src/netscape/security/util/ArraySet.java index f6f43efd4..822b752ff 100644 --- a/pki/base/util/src/netscape/security/util/ArraySet.java +++ b/pki/base/util/src/netscape/security/util/ArraySet.java @@ -17,7 +17,12 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.util; -import java.util.*; +import java.util.AbstractSet; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; /** * This class implements the Set interface, backed by an ArrayList. It is diff --git a/pki/base/util/src/netscape/security/util/ByteToCharPrintable.java b/pki/base/util/src/netscape/security/util/ByteToCharPrintable.java index c42b457d0..0607ad2e8 100644 --- a/pki/base/util/src/netscape/security/util/ByteToCharPrintable.java +++ b/pki/base/util/src/netscape/security/util/ByteToCharPrintable.java @@ -19,8 +19,8 @@ package netscape.security.util; import sun.io.ByteToCharConverter; import sun.io.ConversionBufferFullException; -import sun.io.UnknownCharacterException; import sun.io.MalformedInputException; +import sun.io.UnknownCharacterException; /** * Converts bytes in ASN.1 Printable String character set to unicode diff --git a/pki/base/util/src/netscape/security/util/ByteToCharUnicode.java b/pki/base/util/src/netscape/security/util/ByteToCharUnicode.java index 717081be7..312b8a22b 100644 --- a/pki/base/util/src/netscape/security/util/ByteToCharUnicode.java +++ b/pki/base/util/src/netscape/security/util/ByteToCharUnicode.java @@ -16,11 +16,9 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- package netscape.security.util; -import java.io.*; - -import sun.io.ByteToCharConverter; +import sun.io.ByteToCharUnicodeBig; +import sun.io.ByteToCharUnicodeLittle; import sun.io.ConversionBufferFullException; -import sun.io.UnknownCharacterException; import sun.io.MalformedInputException; /** diff --git a/pki/base/util/src/netscape/security/util/ByteToCharUniversalString.java b/pki/base/util/src/netscape/security/util/ByteToCharUniversalString.java index 57b678dd8..77165b7fe 100644 --- a/pki/base/util/src/netscape/security/util/ByteToCharUniversalString.java +++ b/pki/base/util/src/netscape/security/util/ByteToCharUniversalString.java @@ -17,7 +17,9 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.util; -import sun.io.*; +import sun.io.ByteToCharConverter; +import sun.io.ConversionBufferFullException; +import sun.io.UnknownCharacterException; /** * Converts bytes in ASN.1 UniversalString character set to unicode diff --git a/pki/base/util/src/netscape/security/util/CertPrettyPrint.java b/pki/base/util/src/netscape/security/util/CertPrettyPrint.java index 1f2c78c6c..caf7e6481 100644 --- a/pki/base/util/src/netscape/security/util/CertPrettyPrint.java +++ b/pki/base/util/src/netscape/security/util/CertPrettyPrint.java @@ -18,16 +18,25 @@ package netscape.security.util; -import java.io.*; -import java.util.*; -import java.text.*; +import java.security.MessageDigest; import java.security.PublicKey; import java.security.cert.Certificate; -import java.security.MessageDigest; -import netscape.security.util.*; -import netscape.security.x509.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkcs7.*; +import java.text.DateFormat; +import java.util.Locale; +import java.util.ResourceBundle; +import java.util.TimeZone; + +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.Extension; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.SET; +import org.mozilla.jss.pkcs7.ContentInfo; +import org.mozilla.jss.pkcs7.SignedData; /** diff --git a/pki/base/util/src/netscape/security/util/CharToBytePrintable.java b/pki/base/util/src/netscape/security/util/CharToBytePrintable.java index 09b3afefe..970f7782f 100644 --- a/pki/base/util/src/netscape/security/util/CharToBytePrintable.java +++ b/pki/base/util/src/netscape/security/util/CharToBytePrintable.java @@ -19,8 +19,8 @@ package netscape.security.util; import sun.io.CharToByteConverter; import sun.io.ConversionBufferFullException; -import sun.io.UnknownCharacterException; import sun.io.MalformedInputException; +import sun.io.UnknownCharacterException; /** * Converts a string of ASN.1 PrintableString characters to PrintableString diff --git a/pki/base/util/src/netscape/security/util/CrlPrettyPrint.java b/pki/base/util/src/netscape/security/util/CrlPrettyPrint.java index 7bb851d4d..ba74a0d73 100644 --- a/pki/base/util/src/netscape/security/util/CrlPrettyPrint.java +++ b/pki/base/util/src/netscape/security/util/CrlPrettyPrint.java @@ -18,12 +18,17 @@ package netscape.security.util; -import java.io.*; -import java.util.*; -import java.text.*; -import netscape.security.util.*; -import netscape.security.x509.*; -import java.security.*; +import java.text.DateFormat; +import java.util.Iterator; +import java.util.Locale; +import java.util.ResourceBundle; +import java.util.Set; +import java.util.TimeZone; + +import netscape.security.x509.CRLExtensions; +import netscape.security.x509.Extension; +import netscape.security.x509.RevokedCertImpl; +import netscape.security.x509.X509CRLImpl; /** diff --git a/pki/base/util/src/netscape/security/util/DerInputStream.java b/pki/base/util/src/netscape/security/util/DerInputStream.java index 38564bf71..fb73b761e 100644 --- a/pki/base/util/src/netscape/security/util/DerInputStream.java +++ b/pki/base/util/src/netscape/security/util/DerInputStream.java @@ -17,12 +17,11 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.util; -import java.io.InputStream; import java.io.IOException; -import java.io.EOFException; +import java.io.InputStream; import java.util.Calendar; -import java.util.GregorianCalendar; import java.util.Date; +import java.util.GregorianCalendar; import java.util.TimeZone; import java.util.Vector; diff --git a/pki/base/util/src/netscape/security/util/DerOutputStream.java b/pki/base/util/src/netscape/security/util/DerOutputStream.java index 618afc095..be42322fa 100644 --- a/pki/base/util/src/netscape/security/util/DerOutputStream.java +++ b/pki/base/util/src/netscape/security/util/DerOutputStream.java @@ -17,15 +17,16 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.util; -import java.io.FilterOutputStream; import java.io.ByteArrayOutputStream; -import java.io.OutputStream; import java.io.IOException; +import java.io.OutputStream; import java.text.SimpleDateFormat; -import java.util.*; - -import java.util.Comparator; import java.util.Arrays; +import java.util.Calendar; +import java.util.Comparator; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.TimeZone; import sun.io.CharToByteConverter; diff --git a/pki/base/util/src/netscape/security/util/DerValue.java b/pki/base/util/src/netscape/security/util/DerValue.java index bc2bf45e3..58ef8eccc 100644 --- a/pki/base/util/src/netscape/security/util/DerValue.java +++ b/pki/base/util/src/netscape/security/util/DerValue.java @@ -17,13 +17,14 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.util; -import java.io.*; -import java.util.*; - -import sun.io.ByteToCharConverter; +import java.io.ByteArrayInputStream; +import java.io.DataInputStream; +import java.io.IOException; +import java.io.InputStream; import netscape.security.x509.AVAValueConverter; import netscape.security.x509.GenericValueConverter; +import sun.io.ByteToCharConverter; /** * Represents a single DER-encoded value. DER encoding rules are a subset diff --git a/pki/base/util/src/netscape/security/util/ExtPrettyPrint.java b/pki/base/util/src/netscape/security/util/ExtPrettyPrint.java index 40e4b65df..2e57eac17 100644 --- a/pki/base/util/src/netscape/security/util/ExtPrettyPrint.java +++ b/pki/base/util/src/netscape/security/util/ExtPrettyPrint.java @@ -18,15 +18,65 @@ package netscape.security.util; -import java.io.*; -import java.util.*; -import java.text.*; import java.math.BigInteger; -import netscape.security.util.*; -import netscape.security.extensions.*; -import netscape.security.x509.*; -import java.security.*; +import java.text.DateFormat; +import java.util.Enumeration; +import java.util.ResourceBundle; +import java.util.Vector; + +import netscape.security.extensions.AccessDescription; +import netscape.security.extensions.AuthInfoAccessExtension; +import netscape.security.extensions.CertificateScopeEntry; +import netscape.security.extensions.CertificateScopeOfUseExtension; +import netscape.security.extensions.ExtendedKeyUsageExtension; +import netscape.security.extensions.InhibitAnyPolicyExtension; +import netscape.security.extensions.NSCertTypeExtension; +import netscape.security.extensions.OCSPNoCheckExtension; +import netscape.security.extensions.PresenceServerExtension; +import netscape.security.extensions.SubjectInfoAccessExtension; +import netscape.security.x509.Attribute; +import netscape.security.x509.AuthorityKeyIdentifierExtension; +import netscape.security.x509.BasicConstraintsExtension; +import netscape.security.x509.CPSuri; +import netscape.security.x509.CRLDistributionPoint; +import netscape.security.x509.CRLDistributionPointsExtension; import netscape.security.x509.CRLDistributionPointsExtension.Reason; +import netscape.security.x509.CRLNumberExtension; +import netscape.security.x509.CRLReasonExtension; +import netscape.security.x509.CertificateIssuerExtension; +import netscape.security.x509.CertificatePoliciesExtension; +import netscape.security.x509.CertificatePolicyInfo; +import netscape.security.x509.CertificatePolicyMap; +import netscape.security.x509.DeltaCRLIndicatorExtension; +import netscape.security.x509.DisplayText; +import netscape.security.x509.Extension; +import netscape.security.x509.FreshestCRLExtension; +import netscape.security.x509.GeneralName; +import netscape.security.x509.GeneralNameInterface; +import netscape.security.x509.GeneralNames; +import netscape.security.x509.HoldInstructionExtension; +import netscape.security.x509.InvalidityDateExtension; +import netscape.security.x509.IssuerAlternativeNameExtension; +import netscape.security.x509.IssuingDistributionPoint; +import netscape.security.x509.IssuingDistributionPointExtension; +import netscape.security.x509.KeyIdentifier; +import netscape.security.x509.KeyUsageExtension; +import netscape.security.x509.NSCCommentExtension; +import netscape.security.x509.NameConstraintsExtension; +import netscape.security.x509.NoticeReference; +import netscape.security.x509.OIDMap; +import netscape.security.x509.PolicyConstraintsExtension; +import netscape.security.x509.PolicyMappingsExtension; +import netscape.security.x509.PolicyQualifierInfo; +import netscape.security.x509.PolicyQualifiers; +import netscape.security.x509.PrivateKeyUsageExtension; +import netscape.security.x509.Qualifier; +import netscape.security.x509.RDN; +import netscape.security.x509.SerialNumber; +import netscape.security.x509.SubjectAlternativeNameExtension; +import netscape.security.x509.SubjectDirAttributesExtension; +import netscape.security.x509.SubjectKeyIdentifierExtension; +import netscape.security.x509.UserNotice; /** diff --git a/pki/base/util/src/netscape/security/util/ObjectIdentifier.java b/pki/base/util/src/netscape/security/util/ObjectIdentifier.java index fed9637af..505db7a9b 100644 --- a/pki/base/util/src/netscape/security/util/ObjectIdentifier.java +++ b/pki/base/util/src/netscape/security/util/ObjectIdentifier.java @@ -17,7 +17,8 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.util; -import java.io.*; +import java.io.IOException; +import java.io.Serializable; import java.util.StringTokenizer; diff --git a/pki/base/util/src/netscape/security/util/PrettyPrintFormat.java b/pki/base/util/src/netscape/security/util/PrettyPrintFormat.java index 3522d2355..94a5d18c7 100644 --- a/pki/base/util/src/netscape/security/util/PrettyPrintFormat.java +++ b/pki/base/util/src/netscape/security/util/PrettyPrintFormat.java @@ -17,9 +17,6 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.util; -import java.io.*; -import java.util.*; -import java.text.*; /** * This class will display the certificate content in predefined diff --git a/pki/base/util/src/netscape/security/util/PrettyPrintResources.java b/pki/base/util/src/netscape/security/util/PrettyPrintResources.java index 8f24edd68..45b08206f 100644 --- a/pki/base/util/src/netscape/security/util/PrettyPrintResources.java +++ b/pki/base/util/src/netscape/security/util/PrettyPrintResources.java @@ -18,9 +18,10 @@ package netscape.security.util; -import java.util.*; -import netscape.security.x509.*; -import netscape.security.extensions.*; +import java.util.ListResourceBundle; + +import netscape.security.extensions.NSCertTypeExtension; +import netscape.security.x509.KeyUsageExtension; /** diff --git a/pki/base/util/src/netscape/security/util/PubKeyPrettyPrint.java b/pki/base/util/src/netscape/security/util/PubKeyPrettyPrint.java index 880355fb5..669e4c222 100644 --- a/pki/base/util/src/netscape/security/util/PubKeyPrettyPrint.java +++ b/pki/base/util/src/netscape/security/util/PubKeyPrettyPrint.java @@ -18,14 +18,12 @@ package netscape.security.util; -import java.io.*; -import java.util.*; -import java.text.*; -import java.security.cert.*; -import netscape.security.util.*; -import netscape.security.x509.*; +import java.security.PublicKey; +import java.util.Locale; +import java.util.ResourceBundle; + import netscape.security.provider.RSAPublicKey; -import java.security.*; +import netscape.security.x509.X509Key; /** |