jdk-sandbox: comparison jdk/src/share/classes/sun/security/tools/JarSigner.java

equal deleted inserted replaced

-:f273c0d04215
+:f47f211cd627
 PrivateKey privateKey;          // private key
 KeyStore store;                 // the keystore specified by -keystore
 // or the default keystore, never null
 String keystore; // key store file
-List<String> crlfiles = new ArrayList<String>();  // CRL files to add
+List<String> crlfiles = new ArrayList<>();  // CRL files to add
 boolean nullStream = false; // null keystore input stream (NONE)
 boolean token = false; // token-based keystore
 String jarfile;  // jar files to sign or verify
 String alias;    // alias to sign jar with
-List<String> ckaliases = new ArrayList<String>(); // aliases in -verify
+List<String> ckaliases = new ArrayList<>(); // aliases in -verify
 char[] storepass; // keystore password
 boolean protectedPath; // protected authentication path
 String storetype; // keystore type
 String providerName; // provider name
 Vector<String> providers = null; // list of providers
 // arguments for provider constructors
-HashMap<String,String> providerArgs = new HashMap<String, String>();
+HashMap<String,String> providerArgs = new HashMap<>();
 char[] keypass; // private key password
 String sigfile; // name of .SF file
 String sigalg; // name of signature algorithm
 String digestalg = "SHA-256"; // name of digest algorithm
 String signedjar; // output filename
 getAliasInfo(alias);
 crls = new HashSet<X509CRL>();
 if (crlfiles.size() > 0 || autoCRL) {
 CertificateFactory fac =
 CertificateFactory.getInstance("X509");
-List<CRL> list = new ArrayList<CRL>();
+List<CRL> list = new ArrayList<>();
 for (String file: crlfiles) {
 Collection<? extends CRL> tmp = KeyTool.loadCRLs(file);
 for (CRL crl: tmp) {
 if (crl instanceof X509CRL) {
 crls.add((X509CRL)crl);
 boolean anySigned = false;  // if there exists entry inside jar signed
 JarFile jf = null;
 try {
 jf = new JarFile(jarName, true);
-Vector<JarEntry> entriesVec = new Vector<JarEntry>();
+Vector<JarEntry> entriesVec = new Vector<>();
 byte[] buffer = new byte[8192];
 Enumeration<JarEntry> entries = jf.entries();
 while (entries.hasMoreElements()) {
 JarEntry je = entries.nextElement();
 Manifest man = jf.getManifest();
 // The map to record display info, only used when -verbose provided
 //      key: signer info string
 //      value: the list of files with common key
-Map<String,List<String>> output =
+Map<String,List<String>> output = new LinkedHashMap<>();
-new LinkedHashMap<String,List<String>>();
 if (man != null) {
 if (verbose != null) System.out.println();
 Enumeration<JarEntry> e = entriesVec.elements();
 return new StringBuilder().append(tab).append("[")
 .append(signTimeForm.format(source)).append("]").toString();
 }
-private Map<CodeSigner,Integer> cacheForInKS =
+private Map<CodeSigner,Integer> cacheForInKS = new IdentityHashMap<>();
-new IdentityHashMap<CodeSigner,Integer>();
 private int inKeyStoreForOneSigner(CodeSigner signer) {
 if (cacheForInKS.containsKey(signer)) {
 return cacheForInKS.get(signer);
 }
 }
 cacheForInKS.put(signer, result);
 return result;
 }
-Hashtable<Certificate, String> storeHash =
+Hashtable<Certificate, String> storeHash = new Hashtable<>();
-new Hashtable<Certificate, String>();
 int inKeyStore(CodeSigner[] signers) {
 if (signers == null)
 return 0;
 *   compare it with the one in the manifest; if they are
 *   different, replace the hash in the manifest with the newly
 *   generated one. (This may invalidate existing signatures!)
 */
 BASE64Encoder encoder = new JarBASE64Encoder();
-Vector<ZipEntry> mfFiles = new Vector<ZipEntry>();
+Vector<ZipEntry> mfFiles = new Vector<>();
 boolean wasSigned = false;
 for (Enumeration<? extends ZipEntry> enum_=zipFile.entries();
 enum_.hasMoreElements();) {
 }
 return false;
 }
-Map<CodeSigner,String> cacheForSignerInfo = new IdentityHashMap<CodeSigner,String>();
+Map<CodeSigner,String> cacheForSignerInfo = new IdentityHashMap<>();
 /**
 * Returns a string of singer info, with a newline at the end
 */
 private String signerInfo(CodeSigner signer, String tab, long now) {
 if (is != null) {
 is.close();
 }
 }
 }
-Set<TrustAnchor> tas = new HashSet<TrustAnchor>();
+Set<TrustAnchor> tas = new HashSet<>();
 try {
 KeyStore caks = KeyTool.getCacertsKeyStore();
 if (caks != null) {
 Enumeration<String> aliases = caks.aliases();
 while (aliases.hasMoreElements()) {

changeset 7977	f47f211cd627
parent 7525	16d2b5e6517a
child 8556	d3d6e4643560