Bug 511708 - Use enhanced for loop in eclipse.platform.runtime plug-ins
- Part 5
Change-Id: I8321f562a8dbd769679aa77125221c6f05973f0b
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
diff --git a/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/Util.java b/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/Util.java
index ec5cda8..ab7ae50 100644
--- a/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/Util.java
+++ b/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/Util.java
@@ -103,8 +103,8 @@
if (list == null || list.length == 0)
return null;
StringBuffer result = new StringBuffer();
- for (int i = 0; i < list.length; i++) {
- result.append(list[i]);
+ for (Object element : list) {
+ result.append(element);
result.append(separator);
}
// ignore last comma
diff --git a/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/XMLRootElementContentDescriber2.java b/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/XMLRootElementContentDescriber2.java
index 4f13448..ec9c4ca 100644
--- a/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/XMLRootElementContentDescriber2.java
+++ b/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/XMLRootElementContentDescriber2.java
@@ -238,12 +238,12 @@
IConfigurationElement describerElement = config.getChildren("describer")[0]; //$NON-NLS-1$
IConfigurationElement[] params = describerElement.getChildren("parameter"); //$NON-NLS-1$
String pname = null;
- for (int i = 0; i < params.length; i++) {
- pname = params[i].getAttribute("name"); //$NON-NLS-1$
+ for (IConfigurationElement param : params) {
+ pname = param.getAttribute("name"); //$NON-NLS-1$
if (ELEMENT_TO_FIND.equals(pname)) {
if (elements == null)
elements = new LinkedList<>();
- elements.add(new QualifiedElement(params[i].getAttribute("value"))); //$NON-NLS-1$
+ elements.add(new QualifiedElement(param.getAttribute("value"))); //$NON-NLS-1$
}
}
@@ -251,8 +251,8 @@
// create list of qualified elements
if (elements != null) {
- for (Iterator<QualifiedElement> it = elements.iterator(); it.hasNext();) {
- qualifiedElements.add(it.next());
+ for (QualifiedElement qualifiedElement : elements) {
+ qualifiedElements.add(qualifiedElement);
}
}
elementsToFind = qualifiedElements.toArray(new QualifiedElement[qualifiedElements.size()]);
diff --git a/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/TypeExtension.java b/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/TypeExtension.java
index e826977..e32d006 100644
--- a/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/TypeExtension.java
+++ b/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/TypeExtension.java
@@ -143,8 +143,8 @@
}
}
}
- for (int i= 0; i < fImplements.length; i++) {
- result= fImplements[i].findTypeExtender(manager, namespace, method, staticMethod, forcePluginActivation);
+ for (TypeExtension fImplement : fImplements) {
+ result= fImplement.findTypeExtender(manager, namespace, method, staticMethod, forcePluginActivation);
if (result != CONTINUE)
return result;
}
diff --git a/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/TypeExtensionManager.java b/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/TypeExtensionManager.java
index 1e36dc0..2bc4426 100644
--- a/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/TypeExtensionManager.java
+++ b/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/TypeExtensionManager.java
@@ -166,8 +166,7 @@
IConfigurationElement[] ces= registry.getConfigurationElementsFor(
ExpressionPlugin.getPluginId(),
fExtensionPoint);
- for (int i= 0; i < ces.length; i++) {
- IConfigurationElement config= ces[i];
+ for (IConfigurationElement config : ces) {
String typeAttr= config.getAttribute(TYPE);
List<IConfigurationElement> typeConfigs= fConfigurationElementMap.get(typeAttr);
if (typeConfigs == null) {
diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableWithTotalView.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableWithTotalView.java
index ce01283..b4d0137 100644
--- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableWithTotalView.java
+++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/TableWithTotalView.java
@@ -195,8 +195,8 @@
IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
String result = ""; //$NON-NLS-1$
String[] columnHeaders = getColumnHeaders();
- for (int i = 0; i < columnHeaders.length; i++)
- result += columnHeaders[i] + ","; //$NON-NLS-1$
+ for (String columnHeader : columnHeaders)
+ result += columnHeader + ","; //$NON-NLS-1$
result += "\n\n"; //$NON-NLS-1$
ITableLabelProvider labelProvider = (ITableLabelProvider) viewer.getLabelProvider();
diff --git a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/StateDumper.java b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/StateDumper.java
index bdba59a..fd66d55 100644
--- a/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/StateDumper.java
+++ b/bundles/org.eclipse.core.tools/src/org/eclipse/core/tools/metadata/StateDumper.java
@@ -30,8 +30,8 @@
contents.append("\n"); //$NON-NLS-1$
BundleDescription[] allBundles = state.getBundles();
admin.getStateHelper().sortBundles(allBundles);
- for (int i = 0; i < allBundles.length; i++)
- dumpBundle(allBundles[i], contents);
+ for (BundleDescription allBundle : allBundles)
+ dumpBundle(allBundle, contents);
}
private void dumpBundle(BundleDescription bundle, StringBuffer contents) {
@@ -49,8 +49,8 @@
if (host != null)
dumpHost(host, contents);
BundleSpecification[] required = bundle.getRequiredBundles();
- for (int i = 0; i < required.length; i++)
- dumpRequired(required[i], contents);
+ for (BundleSpecification element : required)
+ dumpRequired(element, contents);
}
private void dumpRequired(BundleSpecification required, StringBuffer contents) {
diff --git a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/session/Setup.java b/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/session/Setup.java
index 36dd7c8..9ffad6e 100644
--- a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/session/Setup.java
+++ b/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/session/Setup.java
@@ -16,7 +16,6 @@
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -243,8 +242,7 @@
}
private void fillEclipseArgs(List<String> params) {
- for (Iterator<Entry<String, String>> i = eclipseArguments.entrySet().iterator(); i.hasNext();) {
- Entry<String, String> entry = i.next();
+ for (Entry<String, String> entry : eclipseArguments.entrySet()) {
params.add('-' + entry.getKey());
if (entry.getValue() != null && entry.getValue().length() > 0) {
params.add(entry.getValue());
@@ -253,8 +251,7 @@
}
private void fillSystemProperties(List<String> command) {
- for (Iterator<Entry<String, String>> iter = systemProperties.entrySet().iterator(); iter.hasNext();) {
- Entry<String, String> entry = iter.next();
+ for (Entry<String, String> entry : systemProperties.entrySet()) {
// null-valued properties are ignored
if (entry.getValue() == null) {
continue;
@@ -270,8 +267,7 @@
}
private void fillVMArgs(List<String> params) {
- for (Iterator<Entry<String, String>> i = vmArguments.entrySet().iterator(); i.hasNext();) {
- Entry<String, String> entry = i.next();
+ for (Entry<String, String> entry : vmArguments.entrySet()) {
params.add('-' + entry.getKey());
if (entry.getValue() != null && entry.getValue().length() > 0) {
params.add(entry.getValue());
@@ -293,8 +289,8 @@
List<String> eclipseArgs = new ArrayList<>();
fillEclipseArgs(eclipseArgs);
StringBuffer result = new StringBuffer();
- for (Iterator<String> i = eclipseArgs.iterator(); i.hasNext();) {
- result.append(i.next());
+ for (String string : eclipseArgs) {
+ result.append(string);
result.append(' ');
}
return result.length() > 0 ? result.substring(0, result.length() - 1) : null;
@@ -328,8 +324,8 @@
List<String> sysProperties = new ArrayList<>();
fillSystemProperties(sysProperties);
StringBuffer result = new StringBuffer();
- for (Iterator<String> i = sysProperties.iterator(); i.hasNext();) {
- result.append(i.next());
+ for (String string : sysProperties) {
+ result.append(string);
result.append(' ');
}
return result.length() > 0 ? result.substring(0, result.length() - 1) : null;
@@ -343,8 +339,8 @@
List<String> vmArgs = new ArrayList<>();
fillVMArgs(vmArgs);
StringBuffer result = new StringBuffer();
- for (Iterator<String> i = vmArgs.iterator(); i.hasNext();) {
- result.append(i.next());
+ for (String string : vmArgs) {
+ result.append(string);
result.append(' ');
}
return result.length() > 0 ? result.substring(0, result.length() - 1) : null;
@@ -365,8 +361,8 @@
if (baseSetups == null) {
return false;
}
- for (int i = 0; i < baseSetups.length; i++) {
- Setup base = manager.getSetup(baseSetups[i]);
+ for (String baseSetup : baseSetups) {
+ Setup base = manager.getSetup(baseSetup);
if (base != null && base.isA(baseOptionSet)) {
return true;
}
@@ -375,11 +371,11 @@
}
public boolean isSatisfied(String[] availableSets) {
- for (int i = 0; i < requiredSets.length; i++) {
+ for (String requiredSet : requiredSets) {
boolean satisfied = false;
for (int j = 0; !satisfied && j < availableSets.length; j++) {
Setup available = manager.getSetup(availableSets[j]);
- if (available != null && available.isA(requiredSets[i])) {
+ if (available != null && available.isA(requiredSet)) {
satisfied = true;
}
}
@@ -482,9 +478,9 @@
String[] commandLine = getCommandLine();
StringBuffer result = new StringBuffer();
result.append("[\n");
- for (int i = 0; i < commandLine.length; i++) {
+ for (String element : commandLine) {
result.append('\t');
- result.append(commandLine[i]);
+ result.append(element);
result.append('\n');
}
result.append(']');
diff --git a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/session/SetupManager.java b/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/session/SetupManager.java
index d79e218..74b514b 100644
--- a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/session/SetupManager.java
+++ b/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/session/SetupManager.java
@@ -16,7 +16,6 @@
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import java.util.StringTokenizer;
import javax.xml.parsers.DocumentBuilder;
@@ -59,8 +58,8 @@
private Collection<Setup> setups;
private static boolean contains(Object[] set, Object element) {
- for (int i = 0; i < set.length; i++) {
- if (element.equals(set[i])) {
+ for (Object setElement : set) {
+ if (element.equals(setElement)) {
return true;
}
}
@@ -118,8 +117,7 @@
public Setup buildSetup(String[] optionSets) {
Setup defaultSetup = Setup.getDefaultSetup(this);
- for (Iterator<Setup> i = setups.iterator(); i.hasNext();) {
- Setup customSetup = i.next();
+ for (Setup customSetup : setups) {
if ((customSetup.getId() == null || contains(optionSets, customSetup.getId())) && customSetup.isSatisfied(optionSets)) {
defaultSetup.merge(customSetup);
}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/WaitingRegistryListener.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/WaitingRegistryListener.java
index 080bb6a..772ccae 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/WaitingRegistryListener.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/WaitingRegistryListener.java
@@ -157,8 +157,7 @@
private void extensionsToString(IExtension[] extensions) {
extensionIDs = new ArrayList<>(extensions.length);
- for (int i = 0; i < extensions.length; i++) {
- IExtension extension = extensions[i];
+ for (IExtension extension : extensions) {
extensionIDs.add(extension.getUniqueIdentifier());
// test navigation: to extension point
@@ -188,8 +187,8 @@
private void extPointsToString(IExtensionPoint[] extensionPoints) {
extPointIDs = new ArrayList<>(extensionPoints.length);
- for (int i = 0; i < extensionPoints.length; i++) {
- extPointIDs.add(extensionPoints[i].getUniqueIdentifier());
+ for (IExtensionPoint extensionPoint : extensionPoints) {
+ extPointIDs.add(extensionPoint.getUniqueIdentifier());
}
}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/XMLExecutableExtension.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/XMLExecutableExtension.java
index 216fc1d..d3f22b2 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/XMLExecutableExtension.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/XMLExecutableExtension.java
@@ -68,9 +68,9 @@
private void checkRegistry(String namespace) {
IConfigurationElement[] elements = simpleRegistry.getConfigurationElementsFor(qualifiedName(namespace, "XMLExecutableExtPoint")); //$NON-NLS-1$
assertTrue(elements.length == 1);
- for (int i = 0; i < elements.length; i++) {
+ for (IConfigurationElement element : elements) {
try {
- Object object = elements[i].createExecutableExtension("class"); //$NON-NLS-1$
+ Object object = element.createExecutableExtension("class"); //$NON-NLS-1$
assertNotNull(object);
} catch (CoreException e) {
assertTrue(false);
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/XMLExtensionCreate.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/XMLExtensionCreate.java
index b016707..e545b2f 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/XMLExtensionCreate.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/XMLExtensionCreate.java
@@ -68,8 +68,7 @@
IExtension[] extensions = extensionPoint.getExtensions();
assertNotNull(extensions);
assertTrue(extensions.length == 1);
- for (int i = 0; i < extensions.length; i++) {
- IExtension extension = extensions[i];
+ for (IExtension extension : extensions) {
String extensionId = extension.getUniqueIdentifier();
assertTrue(extensionId.equals(qualifiedName(namespace, "XMLDirectExtensionID"))); //$NON-NLS-1$
String extensionNamespace = extension.getNamespaceIdentifier();
@@ -78,8 +77,7 @@
assertTrue(extensionContributor.equals(namespace));
IConfigurationElement[] configElements = extension.getConfigurationElements();
assertNotNull(configElements);
- for (int j = 0; j < configElements.length; j++) {
- IConfigurationElement configElement = configElements[j];
+ for (IConfigurationElement configElement : configElements) {
String configElementName = configElement.getName();
assertTrue(configElementName.equals("StorageDevice")); //$NON-NLS-1$
String[] attributeNames = configElement.getAttributeNames();
@@ -94,8 +92,7 @@
IRegistryChangeEvent event = listener.getEvent(5000);
IExtensionDelta[] deltas = event.getExtensionDeltas();
assertTrue(deltas.length == 1); // only one notification
- for (int i = 0; i < deltas.length; i++) {
- IExtensionDelta delta = deltas[i];
+ for (IExtensionDelta delta : deltas) {
assertTrue(delta.getKind() == IExtensionDelta.ADDED);
IExtensionPoint theExtensionPoint = delta.getExtensionPoint();
IExtension theExtension = delta.getExtension();
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/XMLExtensionCreateEclipse.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/XMLExtensionCreateEclipse.java
index 9b429f0..8cdb95a 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/XMLExtensionCreateEclipse.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/XMLExtensionCreateEclipse.java
@@ -51,8 +51,8 @@
assertNotNull(dynamicExtensionPoint);
IConfigurationElement[] elements = eclipseRegistry.getConfigurationElementsFor(uniqueId);
assertTrue(elements.length == 1);
- for (int i = 0; i < elements.length; i++) {
- assertTrue("org.eclipse.core.tests.internal.registry.simple.utils.ExecutableRegistryObject".equals(elements[i].getAttribute("class")));
+ for (IConfigurationElement element : elements) {
+ assertTrue("org.eclipse.core.tests.internal.registry.simple.utils.ExecutableRegistryObject".equals(element.getAttribute("class")));
}
}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubMonitorTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubMonitorTest.java
index 400a440..cdf3e97 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubMonitorTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubMonitorTest.java
@@ -522,8 +522,7 @@
expected.put("style 7 below style 6", new String[] {"", "subTask0", ""});
HashMap<String, String[]> results = new HashMap<>();
- for (int i = 0; i < styles.length; i++) {
- int style = styles[i];
+ for (int style : styles) {
{
TestProgressMonitor top = new TestProgressMonitor();
top.beginTask("", 100);
@@ -536,9 +535,7 @@
results.put(testName, runChildTest(0, top, styled, 100 * styles.length));
}
- for (int j = 0; j < styles.length; j++) {
- int innerStyle = styles[j];
-
+ for (int innerStyle : styles) {
TestProgressMonitor newTop = new TestProgressMonitor();
newTop.beginTask("", 100);
SubMonitor newConverted = SubMonitor.convert(newTop, 100);
@@ -602,8 +599,7 @@
StringBuffer buf = new StringBuffer();
boolean isFirst = true;
- for (int i = 0; i < value.length; i++) {
- String nextValue = value[i];
+ for (String nextValue : value) {
if (!isFirst) {
buf.append(", ");
}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubProgressTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubProgressTest.java
index 1848344..fc99350 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubProgressTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubProgressTest.java
@@ -134,8 +134,7 @@
expected.put("style 4 below style 4", new String[] {"setTaskName1", "beginTask0 beginTask1 subTask1", "setTaskName1"});
HashMap<String, String[]> results = new HashMap<>();
- for (int i = 0; i < styles.length; i++) {
- int style = styles[i];
+ for (int style : styles) {
TestProgressMonitor top = new TestProgressMonitor();
top.beginTask("", 100);
SubProgressMonitor child = new SubProgressMonitor(top, 100, style);
@@ -143,8 +142,7 @@
String testName = "style " + style + " as top-level monitor";
results.put(testName, runChildTest(0, top, child, 100 * styles.length));
- for (int j = 0; j < styles.length; j++) {
- int innerStyle = styles[j];
+ for (int innerStyle : styles) {
SubProgressMonitor innerChild = new SubProgressMonitor(child, 100, innerStyle);
testName = "style " + innerStyle + " below style " + style;
results.put(testName, runChildTest(1, top, innerChild, 100));
@@ -185,8 +183,7 @@
private String concatArray(String[] value) {
StringBuffer buf = new StringBuffer();
boolean isFirst = true;
- for (int i = 0; i < value.length; i++) {
- String nextValue = value[i];
+ for (String nextValue : value) {
if (!isFirst)
buf.append(", ");
isFirst = false;
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/YieldTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/YieldTest.java
index 8772da0..e2e47e7 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/YieldTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/YieldTest.java
@@ -30,8 +30,8 @@
public void cancelAllJobs() {
Job[] jobs = scheduled.toArray(new Job[0]);
- for (int i = 0; i < jobs.length; i++) {
- jobs[i].cancel();
+ for (Job job : jobs) {
+ job.cancel();
}
}
@@ -84,21 +84,21 @@
scheduledJobs = 0;
jobListeners = new IJobChangeListener[] {/* new VerboseJobListener(),*/
new TestJobListener()};
- for (int i = 0; i < jobListeners.length; i++) {
- manager.addJobChangeListener(jobListeners[i]);
+ for (IJobChangeListener jobListener : jobListeners) {
+ manager.addJobChangeListener(jobListener);
}
}
@Override
protected void tearDown() throws Exception {
- for (int i = 0; i < jobListeners.length; i++) {
- if (jobListeners[i] instanceof TestJobListener) {
- ((TestJobListener) jobListeners[i]).cancelAllJobs();
+ for (IJobChangeListener jobListener : jobListeners) {
+ if (jobListener instanceof TestJobListener) {
+ ((TestJobListener) jobListener).cancelAllJobs();
}
}
waitForCompletion();
- for (int i = 0; i < jobListeners.length; i++) {
- manager.removeJobChangeListener(jobListeners[i]);
+ for (IJobChangeListener jobListener : jobListeners) {
+ manager.removeJobChangeListener(jobListener);
}
super.tearDown();
}
@@ -701,8 +701,7 @@
jobs.add(conflictingJob);
}
- for (Iterator<Job> job = jobs.iterator(); job.hasNext();) {
- Job conflict = job.next();
+ for (Job conflict : jobs) {
conflict.schedule();
}
@@ -721,8 +720,7 @@
// wait for jobs to finish within 5s
waitForJobsCompletion(jobs.toArray(new Job[jobs.size()]), 5000);
- for (Iterator<Job> job = jobs.iterator(); job.hasNext();) {
- Job conflict = job.next();
+ for (Job conflict : jobs) {
assertNotNull("Null result for " + conflict, conflict.getResult());
assertTrue(conflict.getResult().isOK());
}
@@ -772,8 +770,7 @@
jobs_A.add(conflictingJob);
}
- for (Iterator<Job> job = jobs_A.iterator(); job.hasNext();) {
- Job conflict = job.next();
+ for (Job conflict : jobs_A) {
conflict.schedule();
}
@@ -829,8 +826,7 @@
jobs_B.add(conflictingJob);
}
- for (Iterator<Job> job = jobs_B.iterator(); job.hasNext();) {
- Job conflict = job.next();
+ for (Job conflict : jobs_B) {
conflict.schedule();
}
@@ -853,14 +849,12 @@
// wait for jobs to finish within 5s
waitForJobsCompletion(jobs_B.toArray(new Job[jobs_B.size()]), 5000);
- for (Iterator<Job> job = jobs_A.iterator(); job.hasNext();) {
- Job conflict = job.next();
+ for (Job conflict : jobs_A) {
assertNotNull("Null result for " + conflict, conflict.getResult());
assertTrue(conflict.getResult().isOK());
}
- for (Iterator<Job> job = jobs_B.iterator(); job.hasNext();) {
- Job conflict = job.next();
+ for (Job conflict : jobs_B) {
assertNotNull("Null result for " + conflict, conflict.getResult());
assertTrue(conflict.getResult().isOK());
}
@@ -1003,8 +997,7 @@
fail("4.99", e);
}
waitForJobsCompletion(jobs.toArray(new Job[jobs.size()]), 20000);
- for (Iterator<Job> job = jobs.iterator(); job.hasNext();) {
- Job conflict = job.next();
+ for (Job conflict : jobs) {
assertTrue(conflict.getResult().isOK());
}
}
