Mercurial > hg > release > icedtea-web-1.3

changeset 441:4a89a9c1a662

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Refactored two loops to for-each loops in JCV
author Adam Domurad <adomurad@redhat.com>
date Tue, 19 Jun 2012 10:26:44 -0400
parents 8869ef29f987
children 36f006d911f7
files ChangeLog netx/net/sourceforge/jnlp/tools/JarCertVerifier.java
diffstat 2 files changed, 8 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Jun 19 15:40:28 2012 +0200
+++ b/ChangeLog	Tue Jun 19 10:26:44 2012 -0400
@@ -1,3 +1,8 @@
+2012-06-18  Adam Domurad  <adomurad@redhat.com>
+
+	* netx/net/sourceforge/jnlp/tools/JarCertVerifier.java
+	(verifyJar): two for loops made into for-each loops
+
 2012-06-19  Jiri Vanek  <jvanek@redhat.com>
 
 	various test for browser engine
--- a/netx/net/sourceforge/jnlp/tools/JarCertVerifier.java	Tue Jun 19 15:40:28 2012 +0200
+++ b/netx/net/sourceforge/jnlp/tools/JarCertVerifier.java	Tue Jun 19 10:26:44 2012 -0400
@@ -183,9 +183,7 @@
         verifiedJars = new ArrayList<String>();
         unverifiedJars = new ArrayList<String>();
 
-        for (int i = 0; i < jars.size(); i++) {
-
-            JARDesc jar = jars.get(i);
+        for (JARDesc jar : jars) {
 
             try {
 
@@ -242,10 +240,9 @@
             Vector<JarEntry> entriesVec = new Vector<JarEntry>();
             byte[] buffer = new byte[8192];
 
-            JarEntry je;
             Enumeration<JarEntry> entries = jarFile.entries();
             while (entries.hasMoreElements()) {
-                je = entries.nextElement();
+                JarEntry je = entries.nextElement();
                 entriesVec.addElement(je);
 
                 InputStream is = jarFile.getInputStream(je);
@@ -265,12 +262,10 @@
             if (jarFile.getManifest() != null) {
                 if (verbose)
                     System.out.println();
-                Enumeration<JarEntry> e = entriesVec.elements();
 
                 long now = System.currentTimeMillis();
 
-                while (e.hasMoreElements()) {
-                    je = e.nextElement();
+                for (JarEntry je : entriesVec) {
                     String name = je.getName();
                     CodeSigner[] signers = je.getCodeSigners();
                     boolean isSigned = (signers != null);
@@ -352,7 +347,6 @@
                         addToDetails(R("SNotYetValidCert"));
                 }
             }
-
         } catch (Exception e) {
             e.printStackTrace();
             throw e;