Author: sebb
Date: Mon Oct 24 16:56:50 2011
New Revision: 1188229
URL: http://svn.apache.org/viewvc?rev=1188229&view=rev
Log:
Generic for loops
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/ListenerNotifier.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/SamplePackage.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java?rev=1188229&r1=1188228&r2=1188229&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
Mon Oct 24 16:56:50 2011
@@ -645,9 +645,7 @@ public class JMeterThread implements Run
@SuppressWarnings("deprecation") // OK to call TestBeanHelper.prepare()
private void checkAssertions(List<Assertion> assertions, SampleResult
parent, JMeterContext threadContext) {
- Iterator<Assertion> iter = assertions.iterator();
- while (iter.hasNext()) {
- Assertion assertion = iter.next();
+ for (Assertion assertion : assertions) {
TestBeanHelper.prepare((TestElement) assertion);
if (assertion instanceof AbstractScopedAssertion){
AbstractScopedAssertion scopedAssertion =
(AbstractScopedAssertion) assertion;
@@ -711,9 +709,7 @@ public class JMeterThread implements Run
ex.process();
}
} else {
- iter = extractors.listIterator(); // start at the beginning
- while (iter.hasNext()) {
- PostProcessor ex = iter.next();
+ for (PostProcessor ex : extractors) {
TestBeanHelper.prepare((TestElement) ex);
ex.process();
}
@@ -722,9 +718,7 @@ public class JMeterThread implements Run
@SuppressWarnings("deprecation") // OK to call TestBeanHelper.prepare()
private void runPreProcessors(List<PreProcessor> preProcessors) {
- Iterator<PreProcessor> iter = preProcessors.iterator();
- while (iter.hasNext()) {
- PreProcessor ex = iter.next();
+ for (PreProcessor ex : preProcessors) {
if (log.isDebugEnabled()) {
log.debug("Running preprocessor: " + ((AbstractTestElement)
ex).getName());
}
@@ -736,9 +730,7 @@ public class JMeterThread implements Run
@SuppressWarnings("deprecation") // OK to call TestBeanHelper.prepare()
private void delay(List<Timer> timers) {
long sum = 0;
- Iterator<Timer> iter = timers.iterator();
- while (iter.hasNext()) {
- Timer timer = iter.next();
+ for (Timer timer : timers) {
TestBeanHelper.prepare((TestElement) timer);
sum += timer.delay();
}
@@ -753,9 +745,7 @@ public class JMeterThread implements Run
void notifyTestListeners() {
threadVars.incIteration();
- Iterator<TestListener> iter = testListeners.iterator();
- while (iter.hasNext()) {
- TestListener listener = iter.next();
+ for (TestListener listener : testListeners) {
if (listener instanceof TestElement) {
listener.testIterationStart(new LoopIterationEvent(controller,
threadVars.getIteration()));
((TestElement) listener).recoverRunningVersion();
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/ListenerNotifier.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/ListenerNotifier.java?rev=1188229&r1=1188228&r2=1188229&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/ListenerNotifier.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/ListenerNotifier.java
Mon Oct 24 16:56:50 2011
@@ -29,7 +29,6 @@
package org.apache.jmeter.threads;
-import java.util.Iterator;
import java.util.List;
//import org.apache.commons.collections.Buffer;
@@ -79,10 +78,8 @@ public class ListenerNotifier {
*/
@SuppressWarnings("deprecation") // TestBeanHelper.prepare() is OK
public void notifyListeners(SampleEvent res, List<SampleListener>
listeners) {
- Iterator<SampleListener> iter = listeners.iterator();
- while (iter.hasNext()) {
+ for (SampleListener sampleListener : listeners) {
try {
- SampleListener sampleListener = iter.next();
TestBeanHelper.prepare((TestElement) sampleListener);
sampleListener.sampleOccurred(res);
} catch (RuntimeException e) {
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/SamplePackage.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/SamplePackage.java?rev=1188229&r1=1188228&r2=1188229&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/SamplePackage.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/SamplePackage.java
Mon Oct 24 16:56:50 2011
@@ -18,7 +18,6 @@
package org.apache.jmeter.threads;
-import java.util.Iterator;
import java.util.List;
import org.apache.jmeter.assertions.Assertion;
@@ -81,18 +80,18 @@ public class SamplePackage {
}
private void setRunningVersion(List<?> list, boolean running) {
- @SuppressWarnings("unchecked") // All implementations extend
TestElement
- Iterator<? extends TestElement> iter = (Iterator<? extends
TestElement>) list.iterator();
- while (iter.hasNext()) {
- iter.next().setRunningVersion(running);
+ @SuppressWarnings("unchecked") // all implementations extend
TestElement
+ List<TestElement> telist = (List<TestElement>)list;
+ for (TestElement te : telist) {
+ te.setRunningVersion(running);
}
}
private void recoverRunningVersion(List<?> list) {
@SuppressWarnings("unchecked") // All implementations extend
TestElement
- Iterator<? extends TestElement> iter = (Iterator<? extends
TestElement>) list.iterator();
- while (iter.hasNext()) {
- iter.next().recoverRunningVersion();
+ List<TestElement> telist = (List<TestElement>)list;
+ for (TestElement te : telist) {
+ te.recoverRunningVersion();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
