Author: sebb
Date: Mon Oct 24 16:46:59 2011
New Revision: 1188217
URL: http://svn.apache.org/viewvc?rev=1188217&view=rev
Log:
Generic for loops
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SortedHashTree.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/ClassFilter.java
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java?rev=1188217&r1=1188216&r2=1188217&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java
(original)
+++ jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java
Mon Oct 24 16:46:59 2011
@@ -514,14 +514,11 @@ public class Data implements Serializabl
*/
public String[] getColumn(String columnName) {
String[] returnValue;
- Object o;
List<?> temp = data.get(columnName);
if (temp != null) {
returnValue = new String[temp.size()];
- Iterator<?> it = temp.iterator();
int index = 0;
- while (it.hasNext()) {
- o = it.next();
+ for (Object o : temp) {
if (o != null) {
if (o instanceof String) {
returnValue[index++] = (String) o;
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java?rev=1188217&r1=1188216&r2=1188217&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
(original)
+++
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
Mon Oct 24 16:46:59 2011
@@ -175,9 +175,7 @@ public class HashTree implements Seriali
* @param newTree
*/
public void add(HashTree newTree) {
- Iterator<?> iter = newTree.list().iterator();
- while (iter.hasNext()) {
- Object item = iter.next();
+ for (Object item : newTree.list()) {
add(item);
getTree(item).add(newTree.getTree(item));
}
@@ -192,9 +190,8 @@ public class HashTree implements Seriali
*/
public HashTree(Collection<?> keys) {
data = new HashMap<Object, HashTree>();
- Iterator<?> it = keys.iterator();
- while (it.hasNext()) {
- data.put(it.next(), new HashTree());
+ for (Object o : keys) {
+ data.put(o, new HashTree());
}
}
@@ -413,9 +410,8 @@ public class HashTree implements Seriali
* Collection of Keys to be added to HashTree.
*/
public void add(Collection<?> keys) {
- Iterator<?> it = keys.iterator();
- while (it.hasNext()) {
- add(it.next());
+ for (Object o : keys) {
+ add(o);
}
}
@@ -556,9 +552,7 @@ public class HashTree implements Seriali
protected HashTree addTreePath(Collection<?> treePath) {
HashTree tree = this;
- Iterator<?> iter = treePath.iterator();
- while (iter.hasNext()) {
- Object temp = iter.next();
+ for (Object temp : treePath) {
tree.add(temp);
tree = tree.getTree(temp);
}
@@ -613,9 +607,7 @@ public class HashTree implements Seriali
}
protected void cloneTree(HashTree newTree) {
- Iterator<?> iter = list().iterator();
- while (iter.hasNext()) {
- Object key = iter.next();
+ for (Object key : list()) {
newTree.set(key, (HashTree) getTree(key).clone());
}
}
@@ -962,9 +954,7 @@ public class HashTree implements Seriali
* @see HashTreeTraverser
*/
public void traverse(HashTreeTraverser visitor) {
- Iterator<?> iter = list().iterator();
- while (iter.hasNext()) {
- Object item = iter.next();
+ for (Object item : list()) {
visitor.addNode(item, getTree(item));
getTree(item).traverseInto(visitor);
}
@@ -979,9 +969,7 @@ public class HashTree implements Seriali
if (list().size() == 0) {
visitor.processPath();
} else {
- Iterator<?> iter = list().iterator();
- while (iter.hasNext()) {
- Object item = iter.next();
+ for (Object item : list()) {
final HashTree treeItem = getTree(item);
visitor.addNode(item, treeItem);
treeItem.traverseInto(visitor);
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java?rev=1188217&r1=1188216&r2=1188217&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java
(original)
+++
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java
Mon Oct 24 16:46:59 2011
@@ -23,7 +23,6 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.Collection;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
@@ -56,9 +55,7 @@ public class ListedHashTree extends Hash
public ListedHashTree(Collection<?> keys) {
this();
- Iterator<?> it = keys.iterator();
- while (it.hasNext()) {
- Object temp = it.next();
+ for (Object temp : keys) {
data.put(temp, new ListedHashTree());
order.add(temp);
}
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SortedHashTree.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SortedHashTree.java?rev=1188217&r1=1188216&r2=1188217&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SortedHashTree.java
(original)
+++
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SortedHashTree.java
Mon Oct 24 16:46:59 2011
@@ -21,7 +21,6 @@ package org.apache.jorphan.collections;
import java.io.Serializable;
import java.util.Collection;
import java.util.Comparator;
-import java.util.Iterator;
import java.util.TreeMap;
/**
@@ -59,17 +58,15 @@ public class SortedHashTree extends Hash
public SortedHashTree(Collection<?> keys) {
this();
- Iterator<?> it = keys.iterator();
- while (it.hasNext()) {
- data.put(it.next(), new SortedHashTree());
+ for (Object key : keys) {
+ data.put(key, new SortedHashTree());
}
}
public SortedHashTree(Collection<?> keys, Comparator<? super Object>
comper) {
this(comper);
- Iterator<?> it = keys.iterator();
- while (it.hasNext()) {
- data.put(it.next(), new SortedHashTree(comper));
+ for (Object key : keys) {
+ data.put(key, new SortedHashTree(comper));
}
}
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java?rev=1188217&r1=1188216&r2=1188217&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
(original)
+++
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
Mon Oct 24 16:46:59 2011
@@ -27,7 +27,6 @@ import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.StringTokenizer;
@@ -276,9 +275,8 @@ public final class ClassFinder {
// Now eliminate any classpath entries that do not "match" the search
List<String> listPaths = getClasspathMatches(strPathsOrJars);
if (log.isDebugEnabled()) {
- Iterator<String> tIter = listPaths.iterator();
- while (tIter.hasNext()) {
- log.debug("listPaths : " + tIter.next());
+ for (String path : listPaths) {
+ log.debug("listPaths : " + path);
}
}
@@ -293,9 +291,8 @@ public final class ClassFinder {
findClassesInPaths(listPaths, listClasses);
if (log.isDebugEnabled()) {
log.debug("listClasses.size()="+listClasses.size());
- Iterator<String> tIter = listClasses.iterator();
- while (tIter.hasNext()) {
- log.debug("listClasses : " + tIter.next());
+ for (String clazz : listClasses) {
+ log.debug("listClasses : " + clazz);
}
}
@@ -548,9 +545,8 @@ public final class ClassFinder {
}
private static void findClassesInPaths(List<String> listPaths, Set<String>
listClasses) throws IOException {
- Iterator<String> iterPaths = listPaths.iterator();
- while (iterPaths.hasNext()) {
- findClassesInOnePath(iterPaths.next(), listClasses);
+ for (String path : listPaths) {
+ findClassesInOnePath(path, listClasses);
}
}
Modified:
jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/ClassFilter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/ClassFilter.java?rev=1188217&r1=1188216&r2=1188217&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/ClassFilter.java
(original)
+++
jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/ClassFilter.java
Mon Oct 24 16:46:59 2011
@@ -18,7 +18,6 @@
package org.apache.jmeter.protocol.java.control.gui;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
class ClassFilter {
@@ -46,10 +45,8 @@ class ClassFilter {
}
Object[] filterArray(List<String> items) {
- Iterator<String> itr = items.iterator();
ArrayList<Object> newlist = new ArrayList<Object>();
- while (itr.hasNext()) {
- String item = itr.next();
+ for (String item : items) {
if (include(item)) {
newlist.add(item);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
