Author: sebb
Date: Mon Oct 24 16:48:52 2011
New Revision: 1188220
URL: http://svn.apache.org/viewvc?rev=1188220&view=rev
Log:
Generic for loops
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/SwitchController.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/sampler/DebugSampler.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphAccumModel.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java?rev=1188220&r1=1188219&r2=1188220&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java
Mon Oct 24 16:48:52 2011
@@ -20,7 +20,6 @@ package org.apache.jmeter.assertions;
import java.io.Serializable;
import java.util.Collection;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -65,12 +64,10 @@ public class CompareAssertion extends Ab
private void compareTime(CompareAssertionResult result) {
if (compareTime >= 0) {
- Iterator<SampleResult> iter = responses.iterator();
long prevTime = -1;
SampleResult prevResult = null;
boolean success = true;
- while (iter.hasNext()) {
- SampleResult sResult = iter.next();
+ for(SampleResult sResult : responses) {
long currentTime = sResult.getTime();
if (prevTime != -1) {
success = Math.abs(prevTime - currentTime) <= compareTime;
@@ -100,12 +97,10 @@ public class CompareAssertion extends Ab
private void compareContent(CompareAssertionResult result) {
if (compareContent) {
- Iterator<SampleResult> iter = responses.iterator();
String prevContent = null;
SampleResult prevResult = null;
boolean success = true;
- while (iter.hasNext()) {
- SampleResult sResult = iter.next();
+ for (SampleResult sResult : responses) {
String currentContent = sResult.getResponseDataAsString();
currentContent = filterString(currentContent);
if (prevContent != null) {
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/SwitchController.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/SwitchController.java?rev=1188220&r1=1188219&r2=1188220&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/SwitchController.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/SwitchController.java
Mon Oct 24 16:48:52 2011
@@ -19,8 +19,6 @@
package org.apache.jmeter.control;
import java.io.Serializable;
-import java.util.Iterator;
-
import org.apache.jmeter.samplers.Sampler;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.property.StringProperty;
@@ -107,11 +105,9 @@ public class SwitchController extends Ge
}
private int scanControllerNames(String sel){
- Iterator<TestElement> iter = getSubControllers().iterator();
int i = 0;
int default_pos = Integer.MAX_VALUE;
- while(iter.hasNext()) {
- TestElement el = iter.next();
+ for(TestElement el : getSubControllers()) {
String name=el.getName();
if (name.equals(sel)) {
return i;
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/sampler/DebugSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/sampler/DebugSampler.java?rev=1188220&r1=1188219&r2=1188220&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/sampler/DebugSampler.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/sampler/DebugSampler.java
Mon Oct 24 16:48:52 2011
@@ -21,7 +21,6 @@ package org.apache.jmeter.sampler;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
-import java.util.Iterator;
import java.util.Map;
import java.util.Set;
@@ -92,9 +91,7 @@ public class DebugSampler extends Abstra
return m1.compareTo(m2);
}
});
- Iterator<Map.Entry<Object, Object>> i = al.iterator();
- while(i.hasNext()){
- Map.Entry<Object, Object> me = i.next();
+ for(Map.Entry<Object, Object> me : al){
sb.append(me.getKey());
sb.append("=");
sb.append(me.getValue());
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphAccumModel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphAccumModel.java?rev=1188220&r1=1188219&r2=1188220&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphAccumModel.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphAccumModel.java
Mon Oct 24 16:48:52 2011
@@ -20,7 +20,6 @@ package org.apache.jmeter.visualizers;
import java.io.Serializable;
import java.util.Collections;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -165,11 +164,10 @@ public class GraphAccumModel implements
*/
protected void fireDataChanged() {
log.debug("Start : fireDataChanged1");
- Iterator<GraphAccumListener> iter = listeners.iterator();
if (bigChange) {
- while (iter.hasNext()) {
- iter.next().updateGui();
+ for (GraphAccumListener gal : listeners) {
+ gal.updateGui();
}
bigChange = false;
} else {
@@ -183,11 +181,8 @@ public class GraphAccumModel implements
* not need to rescale graph.
*/
protected void quickUpdate(SampleResult s) {
- Iterator<GraphAccumListener> iter = listeners.iterator();
- {
- while (iter.hasNext()) {
- iter.next().updateGui(s);
- }
- }
+ for (GraphAccumListener gal : listeners) {
+ gal.updateGui(s);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
