Author: sebb
Date: Mon Oct 24 16:58:45 2011
New Revision: 1188231
URL: http://svn.apache.org/viewvc?rev=1188231&view=rev
Log:
Generic for loops
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ConvertListeners.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=1188231&r1=1188230&r2=1188231&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Mon Oct 24
16:58:45 2011
@@ -817,9 +817,8 @@ public class JMeter implements JMeterPlu
* @param tree
*/
public static void convertSubTree(HashTree tree) {
- Iterator<Object> iter = new LinkedList<Object>(tree.list()).iterator();
- while (iter.hasNext()) {
- Object o = iter.next();
+ LinkedList<Object> copyList = new LinkedList<Object>(tree.list());
+ for (Object o : copyList) {
if (o instanceof TestElement) {
TestElement item = (TestElement) o;
if (item.isEnabled()) {
@@ -953,9 +952,7 @@ public class JMeter implements JMeterPlu
println("Tidying up remote @ "+new Date(now)+" ("+now+")");
if (engines!=null){ // it will be null unless remoteStop = true
println("Exitting remote servers");
- Iterator<JMeterEngine> it = engines.iterator();
- while(it.hasNext()){
- JMeterEngine e = it.next();
+ for (JMeterEngine e : engines){
e.exit();
}
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java?rev=1188231&r1=1188230&r2=1188231&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
Mon Oct 24 16:58:45 2011
@@ -361,10 +361,8 @@ public class GenericController extends A
}
protected void fireIterationStart() {
- Iterator<LoopIterationListener> iter = iterationListeners.iterator();
LoopIterationEvent event = new LoopIterationEvent(this,
getIterCount());
- while (iter.hasNext()) {
- LoopIterationListener item = iter.next();
+ for (LoopIterationListener item : iterationListeners) {
item.iterationStart(event);
}
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ConvertListeners.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ConvertListeners.java?rev=1188231&r1=1188230&r2=1188231&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ConvertListeners.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ConvertListeners.java
Mon Oct 24 16:58:45 2011
@@ -19,7 +19,6 @@
package org.apache.jmeter.engine;
import java.rmi.RemoteException;
-import java.util.Iterator;
import org.apache.jmeter.samplers.RemoteListenerWrapper;
import org.apache.jmeter.samplers.RemoteSampleListener;
@@ -50,9 +49,7 @@ public class ConvertListeners implements
* {@inheritDoc}
*/
public void addNode(Object node, HashTree subTree) {
- Iterator<?> iter = subTree.list().iterator();
- while (iter.hasNext()) {
- Object item = iter.next();
+ for (Object item : subTree.list()) {
if (item instanceof AbstractThreadGroup) {
log.debug("num threads = " + ((AbstractThreadGroup)
item).getNumThreads());
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java?rev=1188231&r1=1188230&r2=1188231&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
Mon Oct 24 16:58:45 2011
@@ -24,7 +24,6 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.IOException;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -93,11 +92,10 @@ public class FunctionHelper extends JDia
try {
List<String> functionClasses =
ClassFinder.findClassesThatExtend(JMeterUtils.getSearchPaths(),
new Class[] { Function.class }, true);
- Iterator<String> iter = functionClasses.iterator();
String[] functionNames = new String[functionClasses.size()];
int count = 0;
- while (iter.hasNext()) {
- Class<?> cl = Class.forName(iter.next());
+ for (String clazz : functionClasses) {
+ Class<?> cl = Class.forName(clazz);
functionNames[count] = ((Function)
cl.newInstance()).getReferenceKey();
functionMap.put(functionNames[count], cl);
count++;
@@ -116,9 +114,7 @@ public class FunctionHelper extends JDia
Arguments args = new Arguments();
Function function = (Function) ((Class<?>)
functionMap.get(functionList.getText())).newInstance();
List<String> argumentDesc = function.getArgumentDesc();
- Iterator<String> iter = argumentDesc.iterator();
- while (iter.hasNext()) {
- String help = iter.next();
+ for (String help : argumentDesc) {
args.addArgument(help, ""); //$NON-NLS-1$
}
parameterPanel.configure(args);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
