Author: sebb
Date: Mon Oct 24 16:55:55 2011
New Revision: 1188228
URL: http://svn.apache.org/viewvc?rev=1188228&view=rev
Log:
Generic for loops
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ResetSearchCommand.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeCommand.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanel.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/HoldSampleSender.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/HashTreeConverter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java?rev=1188228&r1=1188227&r2=1188228&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
Mon Oct 24 16:55:55 2011
@@ -24,7 +24,6 @@ import java.awt.event.ActionListener;
import java.lang.reflect.Modifier;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -73,11 +72,8 @@ public final class ActionRouter implemen
log.error("performAction(" + actionCommand + ")
updateCurrentGui() on" + e.toString() + " caused", err);
JMeterUtils.reportErrorToUser("Problem updating GUI - see log
file for details");
}
- Set<Command> commandObjects = commands.get(actionCommand);
- Iterator<Command> iter = commandObjects.iterator();
- while (iter.hasNext()) {
+ for (Command c : commands.get(actionCommand)) {
try {
- Command c = iter.next();
preActionPerformed(c.getClass(), e);
c.doAction(e);
postActionPerformed(c.getClass(), e);
@@ -105,45 +101,29 @@ public final class ActionRouter implemen
public Set<Command> getAction(String actionName) {
Set<Command> set = new HashSet<Command>();
- Set<Command> commandObjects = commands.get(actionName);
- Iterator<Command> iter = commandObjects.iterator();
- while (iter.hasNext()) {
+ for (Command c : commands.get(actionName)) {
try {
- set.add(iter.next());
+ set.add(c);
} catch (Exception err) {
- log.error("", err);
+ log.error("Could not add Command", err);
}
}
return set;
}
public Command getAction(String actionName, Class<?> actionClass) {
- Set<Command> commandObjects = commands.get(actionName);
- Iterator<Command> iter = commandObjects.iterator();
- while (iter.hasNext()) {
- try {
- Command com = iter.next();
- if (com.getClass().equals(actionClass)) {
- return com;
- }
- } catch (Exception err) {
- log.error("", err);
+ for (Command com : commands.get(actionName)) {
+ if (com.getClass().equals(actionClass)) {
+ return com;
}
}
return null;
}
public Command getAction(String actionName, String className) {
- Set<Command> commandObjects = commands.get(actionName);
- Iterator<Command> iter = commandObjects.iterator();
- while (iter.hasNext()) {
- try {
- Command com = iter.next();
- if (com.getClass().getName().equals(className)) {
- return com;
- }
- } catch (Exception err) {
- log.error("", err);
+ for (Command com : commands.get(actionName)) {
+ if (com.getClass().getName().equals(className)) {
+ return com;
}
}
return null;
@@ -258,28 +238,21 @@ public final class ActionRouter implemen
}
private void populateCommandMap() {
- List<String> listClasses;
- Command command;
- Class<?> commandClass;
try {
- listClasses =
ClassFinder.findClassesThatExtend(JMeterUtils.getSearchPaths(), new Class[] {
Class
- .forName("org.apache.jmeter.gui.action.Command") });
+ List<String> listClasses = ClassFinder.findClassesThatExtend(
+ JMeterUtils.getSearchPaths(),
+ new Class[]
{Class.forName("org.apache.jmeter.gui.action.Command") }); // $NON-NLS-1$
commands = new HashMap<String, Set<Command>>(listClasses.size());
if (listClasses.size() == 0) {
log.fatalError("!!!!!Uh-oh, didn't find any action
handlers!!!!!");
throw new JMeterError("No action handlers found - check
JMeterHome and libraries");
}
- Iterator<String> iterClasses;
- iterClasses = listClasses.iterator();
- while (iterClasses.hasNext()) {
- String strClassName = iterClasses.next();
- if (strClassName.startsWith("org.apache.jmeter.gui")) {
- commandClass = Class.forName(strClassName);
+ for (String strClassName : listClasses) {
+ if (strClassName.startsWith("org.apache.jmeter.gui")) { //
$NON-NLS-1$
+ Class<?> commandClass = Class.forName(strClassName);
if (!Modifier.isAbstract(commandClass.getModifiers())) {
- command = (Command) commandClass.newInstance();
- Iterator<String> iter =
command.getActionNames().iterator();
- while (iter.hasNext()) {
- String commandName = iter.next();
+ Command command = (Command) commandClass.newInstance();
+ for (String commandName : command.getActionNames()) {
Set<Command> commandObjects =
commands.get(commandName);
if (commandObjects == null) {
commandObjects = new HashSet<Command>();
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java?rev=1188228&r1=1188227&r2=1188228&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java Mon
Oct 24 16:55:55 2011
@@ -20,7 +20,6 @@ package org.apache.jmeter.gui.action;
import java.awt.event.ActionEvent;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Set;
import org.apache.jmeter.gui.GuiPackage;
@@ -66,19 +65,15 @@ public class Clear implements Command {
JMeterGUIComponent guiComp = guiPackage.getCurrentGui();
guiComp.clearGui();
} else {
- Iterator<?> iter =
guiPackage.getTreeModel().getNodesOfType(Clearable.class).iterator();
- while (iter.hasNext()) {
- JMeterTreeNode node = null;
- JMeterGUIComponent guiComp = null;
- try {
- node = (JMeterTreeNode) iter.next();
- guiComp = guiPackage.getGui(node.getTestElement());
- if (guiComp instanceof Clearable){
- Clearable item = (Clearable) guiComp;
+ for (JMeterTreeNode node :
guiPackage.getTreeModel().getNodesOfType(Clearable.class)) {
+ JMeterGUIComponent guiComp =
guiPackage.getGui(node.getTestElement());
+ if (guiComp instanceof Clearable){
+ Clearable item = (Clearable) guiComp;
+ try {
item.clearData();
+ } catch (Exception ex) {
+ log.error("Can't clear: "+node+" "+guiComp, ex);
}
- } catch (Exception ex) {
- log.error("Can't clear: "+node+" "+guiComp, ex);
}
}
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ResetSearchCommand.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ResetSearchCommand.java?rev=1188228&r1=1188227&r2=1188228&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ResetSearchCommand.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ResetSearchCommand.java
Mon Oct 24 16:55:55 2011
@@ -20,7 +20,6 @@ package org.apache.jmeter.gui.action;
import java.awt.event.ActionEvent;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -47,15 +46,10 @@ public class ResetSearchCommand extends
public void doAction(ActionEvent e) {
GuiPackage guiPackage = GuiPackage.getInstance();
JMeterTreeModel jMeterTreeModel = guiPackage.getTreeModel();
- Iterator<?> iter =
jMeterTreeModel.getNodesOfType(Searchable.class).iterator();
- while (iter.hasNext()) {
- JMeterTreeNode jMeterTreeNode = (JMeterTreeNode) iter.next();
+ for (JMeterTreeNode jMeterTreeNode :
jMeterTreeModel.getNodesOfType(Searchable.class)) {
if (jMeterTreeNode.getUserObject() instanceof Searchable){
List<JMeterTreeNode> matchingNodes =
jMeterTreeNode.getPathToThreadGroup();
- for (Iterator<JMeterTreeNode> iterator =
matchingNodes.iterator(); iterator
- .hasNext();) {
- JMeterTreeNode jMeterTreeNode2 = iterator
- .next();
+ for (JMeterTreeNode jMeterTreeNode2 : matchingNodes) {
jMeterTreeNode2.setMarkedBySearch(false);
}
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeCommand.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeCommand.java?rev=1188228&r1=1188227&r2=1188228&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeCommand.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeCommand.java
Mon Oct 24 16:55:55 2011
@@ -64,11 +64,9 @@ public class SearchTreeCommand extends A
ActionRouter.getInstance().doActionNow(new ActionEvent(e.getSource(),
e.getID(), ActionNames.SEARCH_RESET));
GuiPackage guiPackage = GuiPackage.getInstance();
JMeterTreeModel jMeterTreeModel = guiPackage.getTreeModel();
- Iterator<?> iter =
jMeterTreeModel.getNodesOfType(Searchable.class).iterator();
Set<JMeterTreeNode> nodes = new HashSet<JMeterTreeNode>();
- while (iter.hasNext()) {
+ for (JMeterTreeNode jMeterTreeNode :
jMeterTreeModel.getNodesOfType(Searchable.class)) {
try {
- JMeterTreeNode jMeterTreeNode = (JMeterTreeNode) iter.next();
if (jMeterTreeNode.getUserObject() instanceof Searchable){
Searchable searchable = (Searchable)
jMeterTreeNode.getUserObject();
List<JMeterTreeNode> matchingNodes =
jMeterTreeNode.getPathToThreadGroup();
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java?rev=1188228&r1=1188227&r2=1188228&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
Mon Oct 24 16:55:55 2011
@@ -23,7 +23,6 @@ import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -181,9 +180,8 @@ public class FileListPanel extends JPane
}
private void fireFileChanged() {
- Iterator<ChangeListener> iter = listeners.iterator();
- while (iter.hasNext()) {
- iter.next().stateChanged(new ChangeEvent(this));
+ for (ChangeListener cl : listeners) {
+ cl.stateChanged(new ChangeEvent(this));
}
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanel.java?rev=1188228&r1=1188227&r2=1188228&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanel.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanel.java Mon
Oct 24 16:55:55 2011
@@ -20,7 +20,6 @@ package org.apache.jmeter.gui.util;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -142,9 +141,8 @@ public class FilePanel extends Horizonta
}
private void fireFileChanged() {
- Iterator<ChangeListener> iter = listeners.iterator();
- while (iter.hasNext()) {
- iter.next().stateChanged(new ChangeEvent(this));
+ for (ChangeListener cl : listeners) {
+ cl.stateChanged(new ChangeEvent(this));
}
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java?rev=1188228&r1=1188227&r2=1188228&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
Mon Oct 24 16:55:55 2011
@@ -26,7 +26,6 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -332,9 +331,7 @@ public final class MenuFactory {
*/
public static JMenu makeMenu(Collection<MenuInfo> menuInfo, String
actionCommand, String menuName) {
JMenu menu = new JMenu(menuName);
- Iterator<MenuInfo> iter = menuInfo.iterator();
- while (iter.hasNext()) {
- MenuInfo info = iter.next();
+ for (MenuInfo info : menuInfo) {
menu.add(makeMenuItem(info, actionCommand));
}
return menu;
@@ -421,9 +418,7 @@ public final class MenuFactory {
List<String> guiClasses =
ClassFinder.findClassesThatExtend(JMeterUtils.getSearchPaths(), new Class[] {
JMeterGUIComponent.class, TestBean.class });
Collections.sort(guiClasses);
- Iterator<String> iter = guiClasses.iterator();
- while (iter.hasNext()) {
- String name = iter.next();
+ for (String name : guiClasses) {
/*
* JMeterTreeNode and TestBeanGUI are special GUI classes, and
@@ -673,9 +668,7 @@ public final class MenuFactory {
* Sort loaded menus
*/
private static void sortPluginMenus() {
- Iterator<List<MenuInfo>> it = menuMap.values().iterator();
- while (it.hasNext()) {
- List<MenuInfo> menuToSort = it.next();
+ for (List<MenuInfo> menuToSort : menuMap.values()) {
Collections.sort(menuToSort, new MenuInfoComparator());
}
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java?rev=1188228&r1=1188227&r2=1188228&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
Mon Oct 24 16:55:55 2011
@@ -32,7 +32,6 @@ import java.io.PrintWriter;
import java.io.RandomAccessFile;
import java.io.Serializable;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import org.apache.jmeter.engine.event.LoopIterationEvent;
@@ -538,9 +537,7 @@ public class ResultCollector extends Abs
}
private void finalizeFileOutput() {
- Iterator<Map.Entry<String,ResultCollector.FileEntry>> it =
files.entrySet().iterator();
- while(it.hasNext()){
- Map.Entry<String,ResultCollector.FileEntry> me = it.next();
+ for(Map.Entry<String,ResultCollector.FileEntry> me : files.entrySet()){
log.debug("Closing: "+me.getKey());
FileEntry fe = me.getValue();
writeFileEnd(fe.pw, fe.config);
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/HoldSampleSender.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/HoldSampleSender.java?rev=1188228&r1=1188227&r2=1188228&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/HoldSampleSender.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/HoldSampleSender.java
Mon Oct 24 16:55:55 2011
@@ -21,7 +21,6 @@ package org.apache.jmeter.samplers;
import org.apache.log.Logger;
import org.apache.jorphan.logging.LoggingManager;
-import java.util.Iterator;
import java.util.List;
import java.util.ArrayList;
import java.io.Serializable;
@@ -62,9 +61,7 @@ public class HoldSampleSender implements
log.debug("Test ended()");
try {
synchronized (sampleStore) {
- Iterator<SampleEvent> i = sampleStore.iterator();
- while (i.hasNext()) {
- SampleEvent se = i.next();
+ for (SampleEvent se : sampleStore) {
listener.sampleOccurred(se);
}
}
@@ -86,9 +83,7 @@ public class HoldSampleSender implements
public void testEnded(String host) {
log.debug("Test Ended on " + host);
try {
- Iterator<SampleEvent> i = sampleStore.iterator();
- while (i.hasNext()) {
- SampleEvent se = i.next();
+ for (SampleEvent se : sampleStore) {
listener.sampleOccurred(se);
}
listener.testEnded(host);
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java?rev=1188228&r1=1188227&r2=1188228&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java Mon
Oct 24 16:55:55 2011
@@ -27,11 +27,8 @@ import java.io.OutputStreamWriter;
import java.io.OutputStream;
import java.io.Writer;
import java.lang.reflect.InvocationTargetException;
-import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
-import java.util.Map.Entry;
-
import java.nio.charset.Charset;
import org.apache.jmeter.reporters.ResultCollectorHelper;
@@ -208,12 +205,10 @@ public class SaveService {
try {
Properties nameMap = loadProperties();
// now create the aliases
- Iterator<Entry<Object, Object>> it = nameMap.entrySet().iterator();
- while (it.hasNext()) {
- Map.Entry<Object, Object> me = it.next();
+ for (Map.Entry<Object, Object> me : nameMap.entrySet()) {
String key = (String) me.getKey();
String val = (String) me.getValue();
- if (!key.startsWith("_")) {
+ if (!key.startsWith("_")) { // $NON-NLS-1$
makeAlias(key, val);
} else {
// process special keys
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/HashTreeConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/HashTreeConverter.java?rev=1188228&r1=1188227&r2=1188228&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/HashTreeConverter.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/HashTreeConverter.java
Mon Oct 24 16:55:55 2011
@@ -18,8 +18,6 @@
package org.apache.jmeter.save.converters;
-import java.util.Iterator;
-
import org.apache.jorphan.collections.HashTree;
import com.thoughtworks.xstream.mapper.Mapper;
@@ -49,9 +47,7 @@ public class HashTreeConverter extends A
@Override
public void marshal(Object arg0, HierarchicalStreamWriter writer,
MarshallingContext context) {
HashTree tree = (HashTree) arg0;
- Iterator<?> iter = tree.list().iterator();
- while (iter.hasNext()) {
- Object item = iter.next();
+ for (Object item : tree.list()) {
writeItem(item, context, writer);
writeItem(tree.getTree(item), context, writer);
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java?rev=1188228&r1=1188227&r2=1188228&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java
Mon Oct 24 16:55:55 2011
@@ -32,7 +32,6 @@ import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.Writer;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import java.util.Random;
@@ -374,9 +373,7 @@ public class FileServer {
}
public synchronized void closeFiles() throws IOException {
- Iterator<Map.Entry<String, FileEntry>> iter =
files.entrySet().iterator();
- while (iter.hasNext()) {
- Map.Entry<String, FileEntry> me = iter.next();
+ for (Map.Entry<String, FileEntry> me : files.entrySet()) {
closeFile(me.getKey(),me.getValue() );
}
files.clear();
@@ -406,9 +403,7 @@ public class FileServer {
}
boolean filesOpen() { // package access for test code only
- Iterator<FileEntry> iter = files.values().iterator();
- while (iter.hasNext()) {
- FileEntry fileEntry = iter.next();
+ for (FileEntry fileEntry : files.values()) {
if (fileEntry.inputOutputObject != null) {
return true;
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java?rev=1188228&r1=1188227&r2=1188228&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
Mon Oct 24 16:55:55 2011
@@ -19,7 +19,6 @@
package org.apache.jmeter.testelement.property;
import java.util.Collection;
-import java.util.Iterator;
import java.util.Map;
import org.apache.jmeter.testelement.TestElement;
@@ -284,10 +283,8 @@ public abstract class AbstractProperty i
}
protected Collection<JMeterProperty>
normalizeList(Collection<JMeterProperty> coll) {
- Iterator<?> iter = coll.iterator();
Collection<JMeterProperty> newColl = null;
- while (iter.hasNext()) {
- Object item = iter.next();
+ for (Object item : coll) {
if (newColl == null) {
try {
@SuppressWarnings("unchecked") // coll is of the correct
type
@@ -312,10 +309,8 @@ public abstract class AbstractProperty i
* objects, appropriate for a MapProperty object.
*/
protected Map normalizeMap(Map coll) {
- Iterator<Map.Entry<?,?>> iter = coll.entrySet().iterator();
Map<Object, JMeterProperty> newColl = null;
- while (iter.hasNext()) {
- Map.Entry<?,?> entry = iter.next();
+ for (Map.Entry<?,?> entry : ((Map<?,?>)coll).entrySet()) {
Object item = entry.getKey();
Object prop = entry.getValue();
if (newColl == null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
