Author: dbrosius
Date: Thu Jul 28 03:58:16 2011
New Revision: 1151716
URL: http://svn.apache.org/viewvc?rev=1151716&view=rev
Log:
switch to using enhanced for loops
Modified:
commons/proper/bcel/trunk/src/examples/Package.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Unknown.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationEntryGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ArrayElementValueGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionList.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MethodGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/BCELFactory.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassPath.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/InstructionFinder.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/Verifier.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactory.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java
Modified: commons/proper/bcel/trunk/src/examples/Package.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Package.java?rev=1151716&r1=1151715&r2=1151716&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/examples/Package.java (original)
+++ commons/proper/bcel/trunk/src/examples/Package.java Thu Jul 28 03:58:16 2011
@@ -20,7 +20,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
@@ -175,10 +174,8 @@ public class Package {
// create the jar
JarOutputStream jarFile = new JarOutputStream(new
FileOutputStream(defaultJar));
jarFile.setLevel(5); // use compression
- Iterator<String> keys = allClasses.keySet().iterator();
- int written = 0 ;
- while(keys.hasNext()){ // add entries for every class
- String name = keys.next();
+ int written = 0;
+ for (String name : allClasses.keySet()) { // add entries for every class
JavaClass claz = allClasses.get(name);
ZipEntry zipEntry = new ZipEntry(name+".class");
byte[] bytes = claz.getBytes() ;
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Unknown.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Unknown.java?rev=1151716&r1=1151715&r2=1151716&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Unknown.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Unknown.java
Thu Jul 28 03:58:16 2011
@@ -21,7 +21,6 @@ import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import org.apache.bcel.Constants;
@@ -53,10 +52,7 @@ public final class Unknown extends Attri
*/
static Unknown[] getUnknownAttributes() {
Unknown[] unknowns = new Unknown[unknown_attributes.size()];
- Iterator<Unknown> entries = unknown_attributes.values().iterator();
- for (int i = 0; entries.hasNext(); i++) {
- unknowns[i] = entries.next();
- }
+ unknown_attributes.values().toArray(unknowns);
unknown_attributes.clear();
return unknowns;
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java?rev=1151716&r1=1151715&r2=1151716&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java
Thu Jul 28 03:58:16 2011
@@ -31,7 +31,6 @@ import java.io.PrintWriter;
import java.io.Reader;
import java.io.Writer;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.zip.GZIPInputStream;
@@ -1387,10 +1386,11 @@ public abstract class Utility {
int countInvisible = 0;
// put the annotations in the right output stream
- for (int i=0; i<vec.size(); i++) {
- AnnotationEntryGen a = vec.get(i);
- if (a.isRuntimeVisible()) countVisible++;
- else countInvisible++;
+ for (AnnotationEntryGen a : vec) {
+ if (a.isRuntimeVisible())
+ countVisible++;
+ else
+ countInvisible++;
}
ByteArrayOutputStream rvaBytes = new ByteArrayOutputStream();
@@ -1402,10 +1402,11 @@ public abstract class Utility {
riaDos.writeShort(countInvisible);
// put the annotations in the right output stream
- for (int i=0; i<vec.size(); i++) {
- AnnotationEntryGen a = vec.get(i);
- if (a.isRuntimeVisible()) a.dump(rvaDos);
- else a.dump(riaDos);
+ for (AnnotationEntryGen a : vec) {
+ if (a.isRuntimeVisible())
+ a.dump(rvaDos);
+ else
+ a.dump(riaDos);
}
rvaDos.close();
@@ -1453,23 +1454,15 @@ public abstract class Utility {
int totalVisCount = 0;
int invisCount[] = new int[vec.length];
int totalInvisCount = 0;
- try
- {
- for (int i = 0; i < vec.length; i++)
- {
- List<AnnotationEntryGen> l = vec[i];
- if (l != null)
- {
- for (Iterator<AnnotationEntryGen> iter
= l.iterator(); iter.hasNext();)
- {
- AnnotationEntryGen element =
iter.next();
- if (element.isRuntimeVisible())
- {
+ try {
+ for (int i = 0; i < vec.length; i++) {
+ if (vec[i] != null) {
+ for (AnnotationEntryGen element : vec[i]) {
+ if (element.isRuntimeVisible())
{
visCount[i]++;
totalVisCount++;
}
- else
- {
+ else {
invisCount[i]++;
totalInvisCount++;
}
@@ -1480,15 +1473,10 @@ public abstract class Utility {
ByteArrayOutputStream rvaBytes = new
ByteArrayOutputStream();
DataOutputStream rvaDos = new
DataOutputStream(rvaBytes);
rvaDos.writeByte(vec.length); // First goes number of
parameters
- for (int i = 0; i < vec.length; i++)
- {
+ for (int i = 0; i < vec.length; i++) {
rvaDos.writeShort(visCount[i]);
- if (visCount[i] > 0)
- {
- List<AnnotationEntryGen> l = vec[i];
- for (Iterator<AnnotationEntryGen> iter
= l.iterator(); iter.hasNext();)
- {
- AnnotationEntryGen element =
iter.next();
+ if (visCount[i] > 0) {
+ for (AnnotationEntryGen element :
vec[i]) {
if (element.isRuntimeVisible())
element.dump(rvaDos);
}
@@ -1499,15 +1487,10 @@ public abstract class Utility {
ByteArrayOutputStream riaBytes = new
ByteArrayOutputStream();
DataOutputStream riaDos = new
DataOutputStream(riaBytes);
riaDos.writeByte(vec.length); // First goes number of
parameters
- for (int i = 0; i < vec.length; i++)
- {
+ for (int i = 0; i < vec.length; i++) {
riaDos.writeShort(invisCount[i]);
- if (invisCount[i] > 0)
- {
- List<AnnotationEntryGen> l = vec[i];
- for (Iterator<AnnotationEntryGen> iter
= l.iterator(); iter.hasNext();)
- {
- AnnotationEntryGen element =
iter.next();
+ if (invisCount[i] > 0) {
+ for (AnnotationEntryGen element :
vec[i]) {
if (!element.isRuntimeVisible())
element.dump(riaDos);
}
@@ -1523,27 +1506,23 @@ public abstract class Utility {
if (totalInvisCount > 0)
riaIndex =
cp.addUtf8("RuntimeInvisibleParameterAnnotations");
List<Attribute> newAttributes = new
ArrayList<Attribute>();
- if (totalVisCount > 0)
- {
+ if (totalVisCount > 0) {
newAttributes
.add(new
RuntimeVisibleParameterAnnotations(rvaIndex,
rvaData.length,
new DataInputStream(new ByteArrayInputStream(rvaData)), cp.getConstantPool()));
}
- if (totalInvisCount > 0)
- {
+ if (totalInvisCount > 0) {
newAttributes
.add(new
RuntimeInvisibleParameterAnnotations(riaIndex,
riaData.length,
new DataInputStream(new ByteArrayInputStream(riaData)), cp.getConstantPool()));
}
return newAttributes.toArray(new
Attribute[newAttributes.size()]);
}
- catch (IOException e)
- {
+ catch (IOException e) {
System.err
.println("IOException whilst processing
parameter annotations");
e.printStackTrace();
}
return null;
}
-
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationEntryGen.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationEntryGen.java?rev=1151716&r1=1151715&r2=1151716&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationEntryGen.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationEntryGen.java
Thu Jul 28 03:58:16 2011
@@ -21,7 +21,6 @@ import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.apache.bcel.classfile.AnnotationEntry;
@@ -88,9 +87,7 @@ public class AnnotationEntryGen
{
AnnotationEntry a = new AnnotationEntry(typeIndex,
cpool.getConstantPool(),
isRuntimeVisible);
- for (Iterator<ElementValuePairGen> iter = evs.iterator();
iter.hasNext();)
- {
- ElementValuePairGen element = iter.next();
+ for (ElementValuePairGen element : evs) {
a.addElementNameValuePair(element.getElementNameValuePair());
}
return a;
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ArrayElementValueGen.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ArrayElementValueGen.java?rev=1151716&r1=1151715&r2=1151716&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ArrayElementValueGen.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ArrayElementValueGen.java
Thu Jul 28 03:58:16 2011
@@ -20,7 +20,6 @@ package org.apache.bcel.generic;
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.apache.bcel.classfile.ArrayElementValue;
@@ -59,9 +58,7 @@ public class ArrayElementValueGen extend
{
ElementValue[] immutableData = new ElementValue[evalues.size()];
int i = 0;
- for (Iterator<ElementValueGen> iter = evalues.iterator();
iter.hasNext();)
- {
- ElementValueGen element = iter.next();
+ for (ElementValueGen element : evalues) {
immutableData[i++] = element.getElementValue();
}
return new ArrayElementValue(type, immutableData, cpGen
@@ -88,9 +85,7 @@ public class ArrayElementValueGen extend
{
dos.writeByte(type); // u1 type of value (ARRAY == '[')
dos.writeShort(evalues.size());
- for (Iterator<ElementValueGen> iter = evalues.iterator();
iter.hasNext();)
- {
- ElementValueGen element = iter.next();
+ for (ElementValueGen element : evalues) {
element.dump(dos);
}
}
@@ -99,12 +94,11 @@ public class ArrayElementValueGen extend
{
StringBuffer sb = new StringBuffer();
sb.append("[");
- for (Iterator<ElementValueGen> iter = evalues.iterator();
iter.hasNext();)
- {
- ElementValueGen element = iter.next();
+ String comma = "";
+ for (ElementValueGen element : evalues) {
+ sb.append(comma);
+ comma = ",";
sb.append(element.stringifyValue());
- if (iter.hasNext())
- sb.append(",");
}
sb.append("]");
return sb.toString();
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassGen.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassGen.java?rev=1151716&r1=1151715&r2=1151716&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassGen.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassGen.java
Thu Jul 28 03:58:16 2011
@@ -18,7 +18,6 @@
package org.apache.bcel.generic;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.apache.bcel.Constants;
@@ -329,8 +328,7 @@ public class ClassGen extends AccessFlag
/** @return field object with given name, or null
*/
public Field containsField( String name ) {
- for (Iterator<Field> e = field_vec.iterator(); e.hasNext();) {
- Field f = e.next();
+ for (Field f : field_vec) {
if (f.getName().equals(name)) {
return f;
}
@@ -342,8 +340,7 @@ public class ClassGen extends AccessFlag
/** @return method object with given name and signature, or null
*/
public Method containsMethod( String name, String signature ) {
- for (Iterator<Method> e = method_vec.iterator(); e.hasNext();) {
- Method m = e.next();
+ for (Method m : method_vec) {
if (m.getName().equals(name) &&
m.getSignature().equals(signature)) {
return m;
}
@@ -555,8 +552,8 @@ public class ClassGen extends AccessFlag
*/
public void update() {
if (observers != null) {
- for (Iterator<ClassObserver> e = observers.iterator();
e.hasNext();) {
- e.next().notify(this);
+ for (ClassObserver observer : observers) {
+ observer.notify(this);
}
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldGen.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldGen.java?rev=1151716&r1=1151715&r2=1151716&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldGen.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldGen.java
Thu Jul 28 03:58:16 2011
@@ -18,7 +18,6 @@
package org.apache.bcel.generic;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.apache.bcel.Constants;
import org.apache.bcel.classfile.AnnotationEntry;
@@ -289,8 +288,8 @@ public class FieldGen extends FieldGenOr
*/
public void update() {
if (observers != null) {
- for (Iterator<FieldObserver> e = observers.iterator();
e.hasNext();) {
- e.next().notify(this);
+ for (FieldObserver observer : observers ) {
+ observer.notify(this);
}
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionList.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionList.java?rev=1151716&r1=1151715&r2=1151716&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionList.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionList.java
Thu Jul 28 03:58:16 2011
@@ -995,7 +995,7 @@ public class InstructionList implements
/**
- * @return Enumeration that lists all instructions (handles)
+ * @return iterator that lists all instructions (handles)
*/
public Iterator<InstructionHandle> iterator() {
return new Iterator<InstructionHandle>() {
@@ -1271,8 +1271,8 @@ public class InstructionList implements
*/
public void update() {
if (observers != null) {
- for (Iterator<InstructionListObserver> e = observers.iterator();
e.hasNext();) {
- e.next().notify(this);
+ for (InstructionListObserver observer : observers) {
+ observer.notify(this);
}
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MethodGen.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MethodGen.java?rev=1151716&r1=1151715&r2=1151716&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MethodGen.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MethodGen.java
Thu Jul 28 03:58:16 2011
@@ -19,7 +19,6 @@ package org.apache.bcel.generic;
import java.util.ArrayList;
import java.util.Hashtable;
-import java.util.Iterator;
import java.util.List;
import java.util.Stack;
import org.apache.bcel.Constants;
@@ -1061,8 +1060,8 @@ public class MethodGen extends FieldGenO
*/
public void update() {
if (observers != null) {
- for (Iterator<MethodObserver> e = observers.iterator();
e.hasNext();) {
- e.next().notify(this);
+ for (MethodObserver observer : observers) {
+ observer.notify(this);
}
}
}
@@ -1088,8 +1087,8 @@ public class MethodGen extends FieldGenO
}
if (throws_vec.size() > 0) {
- for (Iterator<String> e = throws_vec.iterator(); e.hasNext();) {
- buf.append("\n\t\tthrows ").append(e.next());
+ for (String throwsDescriptor : throws_vec) {
+ buf.append("\n\t\tthrows ").append(throwsDescriptor);
}
}
return buf.toString();
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/BCELFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/BCELFactory.java?rev=1151716&r1=1151715&r2=1151716&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/BCELFactory.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/BCELFactory.java
Thu Jul 28 03:58:16 2011
@@ -20,7 +20,6 @@ package org.apache.bcel.util;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -305,8 +304,7 @@ class BCELFactory extends EmptyVisitor {
private void updateBranchTargets() {
- for (Iterator<BranchInstruction> i = branches.iterator();
i.hasNext();) {
- BranchInstruction bi = i.next();
+ for (BranchInstruction bi : branches) {
BranchHandle bh = (BranchHandle) branch_map.get(bi);
int pos = bh.getPosition();
String name = bi.getName() + "_" + pos;
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassPath.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassPath.java?rev=1151716&r1=1151715&r2=1151716&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassPath.java
(original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassPath.java
Thu Jul 28 03:58:16 2011
@@ -28,7 +28,6 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Enumeration;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.StringTokenizer;
@@ -150,8 +149,8 @@ public class ClassPath implements Serial
getPathComponents(boot_path, list);
List<String> dirs = new ArrayList<String>();
getPathComponents(ext_path, dirs);
- for (Iterator<String> e = dirs.iterator(); e.hasNext();) {
- File ext_dir = new File(e.next());
+ for (String d : dirs) {
+ File ext_dir = new File(d);
String[] extensions = ext_dir.list(new FilenameFilter() {
public boolean accept( File dir, String name ) {
@@ -166,11 +165,11 @@ public class ClassPath implements Serial
}
}
StringBuffer buf = new StringBuffer();
- for (Iterator<String> e = list.iterator(); e.hasNext();) {
- buf.append(e.next());
- if (e.hasNext()) {
- buf.append(File.pathSeparatorChar);
- }
+ String separator = "";
+ for (String path : list) {
+ buf.append(separator);
+ separator = File.pathSeparator;
+ buf.append(path);
}
return buf.toString().intern();
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/InstructionFinder.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/InstructionFinder.java?rev=1151716&r1=1151715&r2=1151716&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/InstructionFinder.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/InstructionFinder.java
Thu Jul 28 03:58:16 2011
@@ -363,8 +363,7 @@ public class InstructionFinder {
map.put("fstore", precompile(Constants.FSTORE_0,
Constants.FSTORE_3, Constants.FSTORE));
map.put("astore", precompile(Constants.ASTORE_0,
Constants.ASTORE_3, Constants.ASTORE));
// Compile strings
- for (Iterator<String> i = map.keySet().iterator();
i.hasNext();) {
- String key = i.next();
+ for (String key : map.keySet()) {
String value = map.get(key);
char ch = value.charAt(1); // Omit already precompiled
patterns
if (ch < OFFSET) {
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/Verifier.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/Verifier.java?rev=1151716&r1=1151715&r2=1151716&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/Verifier.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/Verifier.java
Thu Jul 28 03:58:16 2011
@@ -19,7 +19,6 @@ package org.apache.bcel.verifier;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -160,9 +159,7 @@ public class Verifier {
messages.add("Pass 2: " + p2m[i]);
}
}
- Iterator<Pass3aVerifier> p3as = p3avs.values().iterator();
- while (p3as.hasNext()) {
- Pass3aVerifier pv = p3as.next();
+ for (Pass3aVerifier pv : p3avs.values()) {
String[] p3am = pv.getMessages();
int meth = pv.getMethodNo();
for (int i = 0; i < p3am.length; i++) {
@@ -171,9 +168,7 @@ public class Verifier {
+ "'): " + p3am[i]);
}
}
- Iterator<Pass3bVerifier> p3bs = p3bvs.values().iterator();
- while (p3bs.hasNext()) {
- Pass3bVerifier pv = p3bs.next();
+ for (Pass3bVerifier pv : p3bvs.values()) {
String[] p3bm = pv.getMessages();
int meth = pv.getMethodNo();
for (int i = 0; i < p3bm.length; i++) {
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactory.java?rev=1151716&r1=1151715&r2=1151716&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactory.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactory.java
Thu Jul 28 03:58:16 2011
@@ -18,7 +18,6 @@
package org.apache.bcel.verifier;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Vector;
@@ -73,9 +72,7 @@ public class VerifierFactory {
*/
private static void notify( String fully_qualified_classname ) {
// notify the observers
- Iterator<VerifierFactoryObserver> i = observers.iterator();
- while (i.hasNext()) {
- VerifierFactoryObserver vfo = i.next();
+ for (VerifierFactoryObserver vfo : observers) {
vfo.update(fully_qualified_classname);
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java?rev=1151716&r1=1151715&r2=1151716&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java
Thu Jul 28 03:58:16 2011
@@ -20,7 +20,6 @@ package org.apache.bcel.verifier.structu
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -142,10 +141,8 @@ public class Subroutines{
if (localVariable == UNSET){
throw new
AssertionViolatedException("setLeavingRET() called for top-level 'subroutine'
or forgot to set local variable first.");
}
- Iterator<InstructionHandle> iter =
instructions.iterator();
InstructionHandle ret = null;
- while(iter.hasNext()){
- InstructionHandle actual = iter.next();
+ for (InstructionHandle actual : instructions) {
if (actual.getInstruction() instanceof RET){
if (ret != null){
throw new
StructuralCodeConstraintException("Subroutine with more then one RET detected:
'"+ret+"' and '"+actual+"'.");
@@ -235,11 +232,10 @@ public class Subroutines{
}
_getRecursivelyAccessedLocalsIndicesHelper(s,
this.subSubs());
int[] ret = new int[s.size()];
- Iterator<Integer> i = s.iterator();
int j=-1;
- while (i.hasNext()){
+ for (Integer index : s) {
j++;
- ret[j] = i.next().intValue();
+ ret[j] = index.intValue();
}
return ret;
}
@@ -270,9 +266,7 @@ public class Subroutines{
throw new AssertionViolatedException("This
subroutine object must be built up completely before calculating accessed
locals.");
}
{
- Iterator<InstructionHandle> i = instructions.iterator();
- while (i.hasNext()){
- InstructionHandle ih = i.next();
+ for (InstructionHandle ih : instructions) {
// RET is not a LocalVariableInstruction in the
current version of BCEL.
if (ih.getInstruction() instanceof
LocalVariableInstruction || ih.getInstruction() instanceof RET){
int idx = ((IndexedInstruction)
(ih.getInstruction())).getIndex();
@@ -297,11 +291,10 @@ public class Subroutines{
{
int[] ret = new int[acc.size()];
- Iterator<Integer> i = acc.iterator();
int j=-1;
- while (i.hasNext()){
+ for (Integer accessedLocal : acc) {
j++;
- ret[j] = i.next().intValue();
+ ret[j] = accessedLocal.intValue();
}
return ret;
}
@@ -313,9 +306,8 @@ public class Subroutines{
public Subroutine[] subSubs(){
Set<Subroutine> h = new HashSet<Subroutine>();
- Iterator<InstructionHandle> i = instructions.iterator();
- while (i.hasNext()){
- Instruction inst = i.next().getInstruction();
+ for (InstructionHandle ih : instructions) {
+ Instruction inst = ih.getInstruction();
if (inst instanceof JsrInstruction){
InstructionHandle targ =
((JsrInstruction) inst).getTarget();
h.add(getSubroutine(targ));
@@ -391,10 +383,8 @@ public class Subroutines{
}
// Build up the database.
- Iterator<InstructionHandle> iter = sub_leaders.iterator();
- while (iter.hasNext()){
+ for (InstructionHandle astore : sub_leaders) {
SubroutineImpl sr = new SubroutineImpl();
- InstructionHandle astore = iter.next();
sr.setLocalVariable( ((ASTORE)
(astore.getInstruction())).getIndex() );
subroutines.put(astore, sr);
}
@@ -422,10 +412,8 @@ public class Subroutines{
Map<InstructionHandle, Integer> colors = new
HashMap<InstructionHandle, Integer>(); //Graph colouring. Key:
InstructionHandle, Value: Integer .
- iter = sub_leaders.iterator();
- while (iter.hasNext()){
+ for (InstructionHandle actual : sub_leaders) {
// Do some BFS with "actual" as the root of the graph.
- InstructionHandle actual = iter.next();
// Init colors
for (int i=0; i<all.length; i++){
colors.put(all[i], WHITE);
@@ -478,9 +466,7 @@ public class Subroutines{
for (int i=0; i<handlers.length; i++){
InstructionHandle _protected = handlers[i].getStartPC();
while (_protected !=
handlers[i].getEndPC().getNext()){// Note the inclusive/inclusive notation of
"generic API" exception handlers!
- Iterator<Subroutine> subs =
subroutines.values().iterator();
- while (subs.hasNext()){
- Subroutine sub = subs.next();
+ for (Subroutine sub : subroutines.values()) {
if (sub != subroutines.get(all[0])){
// We don't want to forbid top-level exception handlers.
if (sub.contains(_protected)){
throw new
StructuralCodeConstraintException("Subroutine instruction '"+_protected+"' is
protected by an exception handler, '"+handlers[i]+"'. This is forbidden by the
JustIce verifier due to its clear definition of subroutines.");
@@ -564,9 +550,7 @@ public class Subroutines{
* @see #getTopLevel()
*/
public Subroutine subroutineOf(InstructionHandle any){
- Iterator<Subroutine> i = subroutines.values().iterator();
- while (i.hasNext()){
- Subroutine s = i.next();
+ for (Subroutine s : subroutines.values()) {
if (s.contains(any)) {
return s;
}
