Use jdk 5 for-each loop
Replace simple uses of Iterator with a corresponding for-loop. Also add
missing braces on loops as necessary.
Change-Id: I65627ce25213873ab170be66f96773000302152c
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
diff --git a/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/FileCache.java b/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/FileCache.java
index 0276891..a8a4e44 100644
--- a/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/FileCache.java
+++ b/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/FileCache.java
@@ -124,8 +124,8 @@
if (target.isDirectory()) {
File[] children = target.listFiles();
if (children != null) {
- for (int i = 0, imax = children.length; i < imax; i++) {
- clearImmutableFlag(children[i]);
+ for (File element : children) {
+ clearImmutableFlag(element);
}
}
} else {
diff --git a/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/Convert.java b/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/Convert.java
index c356594..567d4e5 100644
--- a/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/Convert.java
+++ b/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/Convert.java
@@ -63,10 +63,10 @@
long longValue = 0L;
// See method convertLongToBytes(long) for algorithm details.
- for (int i = 0; i < value.length; i++) {
+ for (byte element : value) {
// Left shift has no effect through first iteration of loop.
longValue <<= 8;
- longValue ^= value[i] & 0xFF;
+ longValue ^= element & 0xFF;
}
return longValue;
diff --git a/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFile.java b/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFile.java
index 848dc9b..5652d7a 100644
--- a/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFile.java
+++ b/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFile.java
@@ -237,15 +237,15 @@
list = EMPTY_STRING_ARRAY;
int parentLength = pathToDelete.length();
boolean failedRecursive = false;
- for (int i = 0, imax = list.length; i < imax; i++) {
+ for (String element : list) {
if (monitor.isCanceled()) {
throw new OperationCanceledException();
}
// Optimized creation of child path object
- StringBuilder childBuffer = new StringBuilder(parentLength + list[i].length() + 1);
+ StringBuilder childBuffer = new StringBuilder(parentLength + element.length() + 1);
childBuffer.append(pathToDelete);
childBuffer.append(File.separatorChar);
- childBuffer.append(list[i]);
+ childBuffer.append(element);
String childName = childBuffer.toString();
// Try best effort on all children so put logical OR at end.
failedRecursive = !internalDelete(new java.io.File(childName), childName, status, monitor) || failedRecursive;
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/events/ResourceDelta.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/events/ResourceDelta.java
index 35d4883..f09ceb3 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/events/ResourceDelta.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/events/ResourceDelta.java
@@ -108,10 +108,9 @@
//iterate over the path and find matching child delta
ResourceDelta current = this;
segments: for (int i = 0; i < segmentCount; i++) {
- IResourceDelta[] currentChildren = current.children;
- for (int j = 0, jmax = currentChildren.length; j < jmax; j++) {
- if (currentChildren[j].getFullPath().lastSegment().equals(path.segment(i))) {
- current = (ResourceDelta) currentChildren[j];
+ for (IResourceDelta element : current.children) {
+ if (element.getFullPath().lastSegment().equals(path.segment(i))) {
+ current = (ResourceDelta) element;
continue segments;
}
}
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/DeleteVisitor.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/DeleteVisitor.java
index 9133838..c4bf28a 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/DeleteVisitor.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/DeleteVisitor.java
@@ -132,8 +132,8 @@
protected boolean shouldSkip(IResource resource) {
if (skipList == null)
return false;
- for (int i = 0; i < skipList.size(); i++)
- if (equals(resource, skipList.get(i)))
+ for (Resource element : skipList)
+ if (equals(resource, element))
return true;
return false;
}
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/WorkspaceTreeReader_1.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/WorkspaceTreeReader_1.java
index 7bd5588..8f33545 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/WorkspaceTreeReader_1.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/WorkspaceTreeReader_1.java
@@ -46,8 +46,7 @@
try {
ArrayList<BuilderPersistentInfo> infos = null;
String projectName = null;
- for (int i = 0; i < buildersToBeLinked.size(); i++) {
- BuilderPersistentInfo info = buildersToBeLinked.get(i);
+ for (BuilderPersistentInfo info : buildersToBeLinked) {
if (!info.getProjectName().equals(projectName)) {
if (infos != null) { // if it is not the first iteration
IProject project = workspace.getRoot().getProject(projectName);
diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/MultiProjectBuildTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/MultiProjectBuildTest.java
index 457af16..26955fa 100644
--- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/MultiProjectBuildTest.java
+++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/MultiProjectBuildTest.java
@@ -67,10 +67,9 @@
protected void dirty(final IProject[] projects) throws CoreException {
getWorkspace().run((IWorkspaceRunnable) monitor -> {
for (IProject project : projects) {
- IResource[] members = project.members();
- for (int j = 0; j < members.length; j++) {
- if (members[j].getType() == IResource.FILE && !members[j].getName().equals(IProjectDescription.DESCRIPTION_FILE_NAME)) {
- ((IFile) members[j]).setContents(getRandomContents(), true, true, null);
+ for (IResource member : project.members()) {
+ if (member.getType() == IResource.FILE && !member.getName().equals(IProjectDescription.DESCRIPTION_FILE_NAME)) {
+ ((IFile) member).setContents(getRandomContents(), true, true, null);
}
}
}
diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/filesystem/ram/MemoryTree.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/filesystem/ram/MemoryTree.java
index bee51ec..065760b 100644
--- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/filesystem/ram/MemoryTree.java
+++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/filesystem/ram/MemoryTree.java
@@ -51,8 +51,7 @@
* @return
*/
Node getChild(String name) {
- for (int i = 0, imax = children.size(); i < imax; i++) {
- Node child = children.get(i);
+ for (Node child : children) {
if (child.getInfo(false).getName().equals(name)) {
return child;
}
diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ISynchronizerTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ISynchronizerTest.java
index ad3060d..ff2202d 100644
--- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ISynchronizerTest.java
+++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ISynchronizerTest.java
@@ -261,10 +261,9 @@
final IProject[] projects = getWorkspace().getRoot().getProjects();
IWorkspaceRunnable body = monitor -> {
for (IProject project : projects) {
- IResource[] children = project.members();
- for (int j = 0; j < children.length; j++) {
- if (!children[j].getName().equals(IProjectDescription.DESCRIPTION_FILE_NAME)) {
- children[j].delete(false, getMonitor());
+ for (IResource element : project.members()) {
+ if (!element.getName().equals(IProjectDescription.DESCRIPTION_FILE_NAME)) {
+ element.delete(false, getMonitor());
}
}
}
@@ -300,8 +299,7 @@
// remove the sync info for the immediate children of the projects.
body = monitor -> {
for (IProject project : projects) {
- IResource[] children = project.members(true);
- for (IResource element : children) {
+ for (IResource element : project.members(true)) {
synchronizer.setSyncInfo(qname, element, null);
}
}
diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkerTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkerTest.java
index 65c2db9..86c56be 100644
--- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkerTest.java
+++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkerTest.java
@@ -595,8 +595,8 @@
} catch (CoreException e) {
fail("1.0", e);
}
- for (int i = 0; i < markers.length; i++) {
- assertTrue("1.1", !markers[i].exists());
+ for (IMarker marker : markers) {
+ assertTrue("1.1", !marker.exists());
}
// Check that an empty collection of markers can be removed.
