Author: sebb
Date: Mon Oct 24 16:49:54 2011
New Revision: 1188223
URL: http://svn.apache.org/viewvc?rev=1188223&view=rev
Log:
Generic for loops
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/UndoVariableReplacement.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/ValueReplacer.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java?rev=1188223&r1=1188222&r2=1188223&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java
Mon Oct 24 16:49:54 2011
@@ -134,9 +134,7 @@ public class CompoundVariable implements
}
boolean testDynamic = false;
StringBuilder results = new StringBuilder();
- Iterator<Object> iter = compiledComponents.iterator();
- while (iter.hasNext()) {
- Object item = iter.next();
+ for (Object item : compiledComponents) {
if (item instanceof Function) {
testDynamic = true;
try {
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java?rev=1188223&r1=1188222&r2=1188223&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
Mon Oct 24 16:49:54 2011
@@ -21,8 +21,8 @@
*/
package org.apache.jmeter.engine.util;
-import java.util.Iterator;
import java.util.Map;
+import java.util.Map.Entry;
import org.apache.jmeter.functions.InvalidVariableException;
import org.apache.jmeter.testelement.property.JMeterProperty;
@@ -69,11 +69,10 @@ public class ReplaceFunctionsWithStrings
PatternMatcher pm = JMeterUtils.getMatcher();
Pattern pattern = null;
PatternCompiler compiler = new Perl5Compiler();
- Iterator<String> iter = getVariables().keySet().iterator();
String input = prop.getStringValue();
- while (iter.hasNext()) {
- String key = iter.next();
- String value = getVariables().get(key);
+ for(Entry<String, String> entry : getVariables().entrySet()){
+ String key = entry.getKey();
+ String value = entry.getValue();
if (regexMatch) {
try {
pattern = compiler.compile(value);
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/UndoVariableReplacement.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/UndoVariableReplacement.java?rev=1188223&r1=1188222&r2=1188223&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/UndoVariableReplacement.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/UndoVariableReplacement.java
Mon Oct 24 16:49:54 2011
@@ -21,7 +21,6 @@
*/
package org.apache.jmeter.engine.util;
-import java.util.Iterator;
import java.util.Map;
import org.apache.jmeter.functions.InvalidVariableException;
@@ -37,11 +36,10 @@ public class UndoVariableReplacement ext
}
public JMeterProperty transformValue(JMeterProperty prop) throws
InvalidVariableException {
- Iterator<String> iter = getVariables().keySet().iterator();
String input = prop.getStringValue();
- while (iter.hasNext()) {
- String key = iter.next();
- String value = getVariables().get(key);
+ for (Map.Entry<String, String> entry : getVariables().entrySet()) {
+ String key = entry.getKey();
+ String value = entry.getValue();
input = StringUtilities.substitute(input, "${" + key + "}", value);
}
StringProperty newProp = new StringProperty(prop.getName(), input);
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/ValueReplacer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/ValueReplacer.java?rev=1188223&r1=1188222&r2=1188223&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/ValueReplacer.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/ValueReplacer.java
Mon Oct 24 16:49:54 2011
@@ -20,7 +20,6 @@ package org.apache.jmeter.engine.util;
import java.util.Collection;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -68,9 +67,8 @@ public class ValueReplacer {
private void setProperties(TestElement el, Collection<JMeterProperty>
newProps) {
el.clear();
- Iterator<JMeterProperty> iter = newProps.iterator();
- while (iter.hasNext()) {
- el.setProperty(iter.next());
+ for (JMeterProperty jmp : newProps) {
+ el.setProperty(jmp);
}
}
@@ -126,9 +124,8 @@ public class ValueReplacer {
MultiProperty multiVal = (MultiProperty) val;
Collection<JMeterProperty> newValues =
replaceValues(multiVal.iterator(), transform);
multiVal.clear();
- Iterator<JMeterProperty> propIter = newValues.iterator();
- while (propIter.hasNext()) {
- multiVal.addProperty(propIter.next());
+ for (JMeterProperty jmp : newValues) {
+ multiVal.addProperty(jmp);
}
if (log.isDebugEnabled()) {
log.debug("Replacement result: " + multiVal);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
