You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2016/02/13 15:56:18 UTC
svn commit: r1730225 - in /jmeter/trunk/src/core/org/apache/jmeter:
config/gui/ gui/ gui/action/ gui/tree/ plugin/ reporters/ samplers/
save/converters/ testbeans/gui/ testelement/ testelement/property/ threads/
util/
Author: pmouawad
Date: Sat Feb 13 14:56:17 2016
New Revision: 1730225
URL: http://svn.apache.org/viewvc?rev=1730225&view=rev
Log:
Used foreach where possible.
Patch by Graham Russell Part 4
https://github.com/apache/jmeter/pull/114
Modified:
jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
jmeter/trunk/src/core/org/apache/jmeter/gui/JMeterFileFilter.java
jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java
jmeter/trunk/src/core/org/apache/jmeter/plugin/PluginManager.java
jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java
jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java
jmeter/trunk/src/core/org/apache/jmeter/testelement/TestPlan.java
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/MultiProperty.java
jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterVariables.java
jmeter/trunk/src/core/org/apache/jmeter/util/BSFJavaScriptEngine.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java?rev=1730225&r1=1730224&r2=1730225&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java Sat Feb 13 14:56:17 2016
@@ -47,7 +47,7 @@ import org.apache.jmeter.config.Argument
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.gui.util.HeaderAsPropertyRenderer;
import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.testelement.property.PropertyIterator;
+import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.GuiUtils;
import org.apache.jorphan.gui.ObjectTableModel;
@@ -254,9 +254,8 @@ public class ArgumentsPanel extends Abst
super.configure(el);
if (el instanceof Arguments) {
tableModel.clearData();
- PropertyIterator iter = ((Arguments) el).iterator();
- while (iter.hasNext()) {
- Argument arg = (Argument) iter.next().getObjectValue();
+ for (JMeterProperty jMeterProperty : ((Arguments) el)) {
+ Argument arg = (Argument) jMeterProperty.getObjectValue();
tableModel.addRow(arg);
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/JMeterFileFilter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/JMeterFileFilter.java?rev=1730225&r1=1730224&r2=1730225&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/JMeterFileFilter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/JMeterFileFilter.java Sat Feb 13 14:56:17 2016
@@ -92,8 +92,8 @@ public class JMeterFileFilter extends ja
return true;
}
- for (int i = 0; i < exts.length; i++) {
- if (filename.endsWith(exts[i])) {
+ for (String ext : exts) {
+ if (filename.endsWith(ext)) {
return true;
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java?rev=1730225&r1=1730224&r2=1730225&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java Sat Feb 13 14:56:17 2016
@@ -64,7 +64,7 @@ public class SavePropertyDialog extends
private SampleSaveConfiguration saveConfig;
- public SavePropertyDialog(){
+ public SavePropertyDialog() {
log.warn("Constructor only intended for use in testing"); // $NON-NLS-1$
}
/**
@@ -82,10 +82,10 @@ public class SavePropertyDialog extends
initDialog();
}
- private int countMethods(Method[] m) {
+ private int countMethods(Method[] methods) {
int count = 0;
- for (int i = 0; i < m.length; i++) {
- if (m[i].getName().startsWith(NAME_SAVE_PFX)) {
+ for (Method method : methods) {
+ if (method.getName().startsWith(NAME_SAVE_PFX)) {
count++;
}
}
@@ -98,14 +98,14 @@ public class SavePropertyDialog extends
int x = (countMethods(methods) / 3) + 1;
log.debug("grid panel is " + 3 + " by " + x);
JPanel checkPanel = new JPanel(new GridLayout(x, 3));
- for (int i = 0; i < methods.length; i++) {
- String name = methods[i].getName();
- if (name.startsWith(NAME_SAVE_PFX) && methods[i].getParameterTypes().length == 0) {
+ for (Method method : methods) {
+ String name = method.getName();
+ if (name.startsWith(NAME_SAVE_PFX) && method.getParameterTypes().length == 0) {
try {
name = name.substring(NAME_SAVE_PFX_LEN);
JCheckBox check = new JCheckBox(
- JMeterUtils.getResString(RESOURCE_PREFIX + name)
- ,((Boolean) methods[i].invoke(saveConfig, new Object[0])).booleanValue());
+ JMeterUtils.getResString(RESOURCE_PREFIX + name),
+ ((Boolean) method.invoke(saveConfig, new Object[0])).booleanValue());
checkPanel.add(check, BorderLayout.NORTH);
check.addActionListener(this);
String actionCommand = NAME_SET_PREFIX + name; // $NON-NLS-1$
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java?rev=1730225&r1=1730224&r2=1730225&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java Sat Feb 13 14:56:17 2016
@@ -70,10 +70,10 @@ public class EnableComponent implements
private void toggleComponents(JMeterTreeNode[] nodes) {
GuiPackage pack = GuiPackage.getInstance();
- for (int i = 0; i < nodes.length; i++) {
- boolean enable = !nodes[i].isEnabled();
- nodes[i].setEnabled(enable);
- pack.getGui(nodes[i].getTestElement()).setEnabled(enable);
+ for (JMeterTreeNode node : nodes) {
+ boolean enable = !node.isEnabled();
+ node.setEnabled(enable);
+ pack.getGui(node.getTestElement()).setEnabled(enable);
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java?rev=1730225&r1=1730224&r2=1730225&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java Sat Feb 13 14:56:17 2016
@@ -56,8 +56,8 @@ public class LookAndFeelCommand implemen
static {
UIManager.LookAndFeelInfo[] lfs = JMeterMenuBar.getAllLAFs();
- for (int i = 0; i < lfs.length; i++) {
- commands.add(ActionNames.LAF_PREFIX + lfs[i].getClassName());
+ for (UIManager.LookAndFeelInfo lf : lfs) {
+ commands.add(ActionNames.LAF_PREFIX + lf.getClassName());
}
String jMeterLaf = getJMeterLaf();
if (log.isInfoEnabled()) {
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java?rev=1730225&r1=1730224&r2=1730225&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java Sat Feb 13 14:56:17 2016
@@ -52,6 +52,7 @@ import org.apache.jmeter.save.SaveServic
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.TestPlan;
import org.apache.jmeter.testelement.WorkBench;
+import org.apache.jmeter.threads.ThreadGroup;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.collections.HashTree;
import org.apache.jorphan.collections.ListedHashTree;
@@ -146,10 +147,10 @@ public class Save implements Command {
TestElement element = GuiPackage.getInstance().createTestElement(TestFragmentControllerGui.class.getName());
HashTree hashTree = new ListedHashTree();
HashTree tfTree = hashTree.add(new JMeterTreeNode(element, null));
- for (int i = 0; i < nodes.length; i++) {
+ for (JMeterTreeNode node : nodes) {
// Clone deeply current node
TreeCloner cloner = new TreeCloner(false);
- GuiPackage.getInstance().getTreeModel().getCurrentSubTree(nodes[i]).traverse(cloner);
+ GuiPackage.getInstance().getTreeModel().getCurrentSubTree(node).traverse(cloner);
// Add clone to tfTree
tfTree.add(cloner.getClonedTree());
}
@@ -408,9 +409,9 @@ public class Save implements Command {
* @param nodes
*/
private static final boolean checkAcceptableForTestFragment(JMeterTreeNode[] nodes) {
- for (int i = 0; i < nodes.length; i++) {
- Object userObject = nodes[i].getUserObject();
- if(userObject instanceof org.apache.jmeter.threads.ThreadGroup ||
+ for (JMeterTreeNode node : nodes) {
+ Object userObject = node.getUserObject();
+ if (userObject instanceof ThreadGroup ||
userObject instanceof TestPlan) {
return false;
}
@@ -420,9 +421,8 @@ public class Save implements Command {
// package protected to allow access from test code
void convertSubTree(HashTree tree) {
- Iterator<Object> iter = new LinkedList<>(tree.list()).iterator();
- while (iter.hasNext()) {
- JMeterTreeNode item = (JMeterTreeNode) iter.next();
+ for (Object o : new LinkedList<>(tree.list())) {
+ JMeterTreeNode item = (JMeterTreeNode) o;
convertSubTree(tree.getTree(item));
TestElement testElement = item.getTestElement(); // requires JMeterTreeNode
tree.replaceKey(item, testElement);
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java?rev=1730225&r1=1730224&r2=1730225&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java Sat Feb 13 14:56:17 2016
@@ -101,9 +101,8 @@ public class JMeterTreeModel extends Def
* <code>subTree</code>
*/
public HashTree addSubTree(HashTree subTree, JMeterTreeNode current) throws IllegalUserActionException {
- Iterator<Object> iter = subTree.list().iterator();
- while (iter.hasNext()) {
- TestElement item = (TestElement) iter.next();
+ for (Object o : subTree.list()) {
+ TestElement item = (TestElement) o;
if (item instanceof TestPlan) {
TestPlan tp = (TestPlan) item;
current = (JMeterTreeNode) ((JMeterTreeNode) getRoot()).getChildAt(0);
Modified: jmeter/trunk/src/core/org/apache/jmeter/plugin/PluginManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/plugin/PluginManager.java?rev=1730225&r1=1730224&r2=1730225&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/plugin/PluginManager.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/plugin/PluginManager.java Sat Feb 13 14:56:17 2016
@@ -52,19 +52,19 @@ public final class PluginManager {
String[][] icons = plugin.getIconMappings();
ClassLoader classloader = plugin.getClass().getClassLoader();
- for (int i = 0; i < icons.length; i++) {
- URL resource = classloader.getResource(icons[i][1].trim());
+ for (String[] icon : icons) {
+ URL resource = classloader.getResource(icon[1].trim());
if (resource == null) {
- log.warn("Can't find icon for " + icons[i][0] + " - " + icons[i][1]);
+ log.warn("Can't find icon for " + icon[0] + " - " + icon[1]);
} else {
- GUIFactory.registerIcon(icons[i][0], new ImageIcon(resource));
- if (icons[i].length > 2 && icons[i][2] != null) {
- URL resource2 = classloader.getResource(icons[i][2].trim());
+ GUIFactory.registerIcon(icon[0], new ImageIcon(resource));
+ if (icon.length > 2 && icon[2] != null) {
+ URL resource2 = classloader.getResource(icon[2].trim());
if (resource2 == null) {
- log.info("Can't find disabled icon for " + icons[i][0] + " - " + icons[i][2]);
+ log.info("Can't find disabled icon for " + icon[0] + " - " + icon[2]);
} else {
- GUIFactory.registerDisabledIcon(icons[i][0], new ImageIcon(resource2));
+ GUIFactory.registerDisabledIcon(icon[0], new ImageIcon(resource2));
}
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java?rev=1730225&r1=1730224&r2=1730225&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java Sat Feb 13 14:56:17 2016
@@ -180,12 +180,11 @@ private static class GraphPanel extends
public float getMax() {
float maxValue = 0;
- for (int t = 0; t < keys.size(); t++) {
- String key = keys.get(t);
+ for (String key : keys) {
List<Integer> temp = data.get(key);
- for (int j = 0; j < temp.size(); j++) {
- float f = temp.get(j).intValue();
+ for (Integer t : temp) {
+ float f = t.intValue();
maxValue = Math.max(f, maxValue);
}
@@ -201,12 +200,11 @@ private static class GraphPanel extends
public float getMin() {
float minValue = 9999999;
- for (int t = 0; t < keys.size(); t++) {
- String key = keys.get(t);
+ for (String key : keys) {
List<Integer> temp = data.get(key);
- for (int j = 0; j < temp.size(); j++) {
- float f = temp.get(j).intValue();
+ for (Integer t : temp) {
+ float f = t.intValue();
minValue = Math.min(f, minValue);
}
@@ -261,12 +259,11 @@ private static class GraphPanel extends
float maxValue = 0;
float minValue = 999999;
- for (int t = 0; t < keys.size(); t++) {
- String key = keys.get(t);
+ for (String key : keys) {
List<Integer> temp = data.get(key);
- for (int j = 0; j < temp.size(); j++) {
- float f = temp.get(j).intValue();
+ for (Integer t : temp) {
+ float f = t.intValue();
minValue = Math.min(f, minValue);
maxValue = Math.max(f, maxValue);
@@ -321,8 +318,7 @@ private static class GraphPanel extends
public int getDataWidth() {
int size = 0;
- for (int t = 0; t < keys.size(); t++) {
- String key = keys.get(t);
+ for (String key : keys) {
size = Math.max(size, data.get(key).size());
}
return size;
Modified: jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java?rev=1730225&r1=1730224&r2=1730225&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java Sat Feb 13 14:56:17 2016
@@ -147,11 +147,11 @@ public class ResultSaver extends Abstrac
* @param c sample counter
*/
private void processSample(SampleResult s, Counter c) {
- saveSample(s, c.num++);
- SampleResult[] sr = s.getSubResults();
- for (int i = 0; i < sr.length; i++) {
- processSample(sr[i], c);
- }
+ saveSample(s, c.num++);
+ SampleResult[] sampleResults = s.getSubResults();
+ for (SampleResult sampleResult : sampleResults) {
+ processSample(sampleResult, c);
+ }
}
/**
Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java?rev=1730225&r1=1730224&r2=1730225&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java Sat Feb 13 14:56:17 2016
@@ -846,8 +846,8 @@ public class SampleResult implements Ser
return false;
}
}
- for (int i = 0; i < BINARY_TYPES.length; i++){
- if (ct.startsWith(BINARY_TYPES[i])){
+ for (String binaryType : BINARY_TYPES) {
+ if (ct.startsWith(binaryType)) {
return true;
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java?rev=1730225&r1=1730224&r2=1730225&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java Sat Feb 13 14:56:17 2016
@@ -241,9 +241,9 @@ public class SampleResultConverter exten
SampleSaveConfiguration save) {
if (save.saveSubresults()) {
SampleResult[] subResults = res.getSubResults();
- for (int i = 0; i < subResults.length; i++) {
- subResults[i].setSaveConfig(save);
- writeItem(subResults[i], context, writer);
+ for (SampleResult subResult : subResults) {
+ subResult.setSaveConfig(save);
+ writeItem(subResult, context, writer);
}
}
}
@@ -264,8 +264,8 @@ public class SampleResultConverter exten
SampleSaveConfiguration save) {
if (save.saveAssertions()) {
AssertionResult[] assertionResults = res.getAssertionResults();
- for (int i = 0; i < assertionResults.length; i++) {
- writeItem(assertionResults[i], context, writer);
+ for (AssertionResult assertionResult : assertionResults) {
+ writeItem(assertionResult, context, writer);
}
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java?rev=1730225&r1=1730224&r2=1730225&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java Sat Feb 13 14:56:17 2016
@@ -177,8 +177,8 @@ class WrapperEditor extends PropertyEdit
if (tags == null) {
return false;
}
- for (int i = 0; i < tags.length; i++) {
- if (tags[i].equals(text)) {
+ for (String tag : tags) {
+ if (tag.equals(text)) {
return true;
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/testelement/TestPlan.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testelement/TestPlan.java?rev=1730225&r1=1730224&r2=1730225&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testelement/TestPlan.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testelement/TestPlan.java Sat Feb 13 14:56:17 2016
@@ -256,9 +256,9 @@ public class TestPlan extends AbstractTe
}
// we set the classpath
String[] paths = this.getTestPlanClasspathArray();
- for (int idx=0; idx < paths.length; idx++) {
- NewDriver.addURL(paths[idx]);
- log.info("add " + paths[idx] + " to classpath");
+ for (String path : paths) {
+ NewDriver.addURL(path);
+ log.info("add " + path + " to classpath");
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java?rev=1730225&r1=1730224&r2=1730225&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java Sat Feb 13 14:56:17 2016
@@ -144,9 +144,8 @@ public class CollectionProperty extends
try {
@SuppressWarnings("unchecked") // value is of type Collection<JMeterProperty>
Collection<JMeterProperty> newCol = value.getClass().newInstance();
- PropertyIterator iter = iterator();
- while (iter.hasNext()) {
- newCol.add(iter.next().clone());
+ for (JMeterProperty jMeterProperty : this) {
+ newCol.add(jMeterProperty.clone());
}
return newCol;
} catch (Exception e) {
Modified: jmeter/trunk/src/core/org/apache/jmeter/testelement/property/MultiProperty.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/MultiProperty.java?rev=1730225&r1=1730224&r2=1730225&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testelement/property/MultiProperty.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testelement/property/MultiProperty.java Sat Feb 13 14:56:17 2016
@@ -61,9 +61,8 @@ public abstract class MultiProperty exte
@Override
public void setRunningVersion(boolean running) {
super.setRunningVersion(running);
- PropertyIterator iter = iterator();
- while (iter.hasNext()) {
- iter.next().setRunningVersion(running);
+ for (JMeterProperty jMeterProperty : this) {
+ jMeterProperty.setRunningVersion(running);
}
}
@@ -86,9 +85,7 @@ public abstract class MultiProperty exte
}
log.debug("merging in " + prop.getClass());
if (prop instanceof MultiProperty) {
- PropertyIterator iter = ((MultiProperty) prop).iterator();
- while (iter.hasNext()) {
- JMeterProperty item = iter.next();
+ for (JMeterProperty item : ((MultiProperty) prop)) {
addProperty(item);
}
} else {
Modified: jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java?rev=1730225&r1=1730224&r2=1730225&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java Sat Feb 13 14:56:17 2016
@@ -709,9 +709,9 @@ public class JMeterThread implements Run
if (scopedAssertion.isScopeChildren(scope) || scopedAssertion.isScopeAll(scope)){
SampleResult[] children = parent.getSubResults();
boolean childError = false;
- for (int i=0;i <children.length; i++){
- processAssertion(children[i], assertion);
- if (!children[i].isSuccessful()){
+ for (SampleResult childSampleResult : children) {
+ processAssertion(childSampleResult, assertion);
+ if (!childSampleResult.isSuccessful()) {
childError = true;
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterVariables.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterVariables.java?rev=1730225&r1=1730224&r2=1730225&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterVariables.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterVariables.java Sat Feb 13 14:56:17 2016
@@ -49,11 +49,10 @@ public class JMeterVariables {
}
private void preloadVariables(){
- for (int i = 0; i < PRE_LOAD.length; i++){
- String property=PRE_LOAD[i];
- String value=JMeterUtils.getProperty(property);
- if (value != null){
- variables.put(property,value);
+ for (String property : PRE_LOAD) {
+ String value = JMeterUtils.getProperty(property);
+ if (value != null) {
+ variables.put(property, value);
}
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/util/BSFJavaScriptEngine.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/BSFJavaScriptEngine.java?rev=1730225&r1=1730224&r2=1730225&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/BSFJavaScriptEngine.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/BSFJavaScriptEngine.java Sat Feb 13 14:56:17 2016
@@ -225,12 +225,8 @@ public class BSFJavaScriptEngine extends
global = new ImporterTopLevel(cx);
Scriptable bsf = Context.toObject(new BSFFunctions(mgr, this), global);
global.put("bsf", global, bsf);
-
- for(
- @SuppressWarnings("unchecked")
- Iterator<BSFDeclaredBean> it = declaredBeans.iterator();
- it.hasNext();) {
- declareBean(it.next());
+ for (BSFDeclaredBean declaredBean : (Iterable<BSFDeclaredBean>) declaredBeans) {
+ declareBean(declaredBean);
}
}
catch (Throwable t) {