Use jdk 5 for-each loop (Part 3)

Replace simple uses of Iterator with a corresponding for-each loop. Also
add missing braces on loops as necessary.

Change-Id: I143bc5e03ef6f52a8b80897d61d20b3619c9dad8
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>

9 files changed, 35 insertions, 39 deletions

diff --git a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/MidiLaunchShortcut.java b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/MidiLaunchShortcut.java
index 521edaf02..fde0493d5 100644
--- a/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/MidiLaunchShortcut.java
+++ b/org.eclipse.debug.examples.ui/src/org/eclipse/debug/examples/ui/midi/launcher/MidiLaunchShortcut.java
@@ -71,8 +71,7 @@ public class MidiLaunchShortcut implements ILaunchShortcut {
 		List<ILaunchConfiguration> candiates = new ArrayList<>();
 		try {
 			ILaunchConfiguration[] configurations = getLaunchManager().getLaunchConfigurations(getLaunchType());
-			for (int i = 0; i < configurations.length; i++) {
-				ILaunchConfiguration configuration = configurations[i];
+			for (ILaunchConfiguration configuration : configurations) {
 				IResource[] resources = configuration.getMappedResources();
 				if (resources != null && resources.length == 1 &&
 						resources[0].equals(file)) {
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/breakpoint/BreakpointOrderingTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/breakpoint/BreakpointOrderingTests.java
index 5d28ab511..2b764fbdc 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/breakpoint/BreakpointOrderingTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/breakpoint/BreakpointOrderingTests.java
@@ -407,8 +407,8 @@ public class BreakpointOrderingTests extends AbstractDebugTest {
 			}
 			assertFalse(failed);
 		} finally {
-			for (int index = 0; index < testBps.length; index++) {
-				testBps[index].delete();
+			for (TestBreakpoint testBp : testBps) {
+				testBp.delete();
 			}
 		}
 	}
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/AbstractLaunchTest.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/AbstractLaunchTest.java
index a2513b107..c892767c5 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/AbstractLaunchTest.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/AbstractLaunchTest.java
@@ -65,8 +65,7 @@ public abstract class AbstractLaunchTest extends AbstractDebugTest {
 	protected ILaunchConfiguration getLaunchConfiguration(String name) throws CoreException {
 		ILaunchManager manager = getLaunchManager();
 		ILaunchConfiguration[] configurations = manager.getLaunchConfigurations();
-		for (int i = 0; i < configurations.length; i++) {
-			ILaunchConfiguration config = configurations[i];
+		for (ILaunchConfiguration config : configurations) {
 			if (config.getName().equals(name)) {
 				return config;
 			}
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/ArgumentsPrinter.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/ArgumentsPrinter.java
index b3c21e9b7..d97e4d811 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/ArgumentsPrinter.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/ArgumentsPrinter.java
@@ -18,8 +18,7 @@ package org.eclipse.debug.tests.launching;
  */
 public class ArgumentsPrinter {
 	public static void main(String[] args) {
-		for (int i = 0; i < args.length; i++) {
-			String arg = args[i];
+		for (String arg : args) {
 			System.out.println(arg);
 		}
 	}
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/DebugFileStore.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/DebugFileStore.java
index 47fd1d7fa..4928cf0c1 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/DebugFileStore.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/DebugFileStore.java
@@ -64,8 +64,7 @@ public class DebugFileStore extends FileStore {
 		URI[] uris = DebugFileSystem.getDefault().getFileURIs();
 		List<String> children = new ArrayList<>();
 		IPath me = getPath();
-		for (int i = 0; i < uris.length; i++) {
-			URI id = uris[i];
+		for (URI id : uris) {
 			Path path = new Path(id.getPath());
 			if (path.segmentCount() > 0) {
 				if (path.removeLastSegments(1).equals(me)) {
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchConfigurationTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchConfigurationTests.java
index a702ff4dc..e35e9e74a 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchConfigurationTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchConfigurationTests.java
@@ -288,8 +288,8 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau
 	 * array of handles.
 	 */
 	protected boolean existsIn(ILaunchConfiguration[] configs, ILaunchConfiguration config) {
-		for (int i = 0; i < configs.length; i++) {
-			if (configs[i].equals(config)) {
+		for (ILaunchConfiguration c : configs) {
+			if (c.equals(config)) {
 				return true;
 			}
 		}
@@ -830,16 +830,16 @@ public class LaunchConfigurationTests extends AbstractLaunchTest implements ILau
 		project.close(null);
 		ILaunchConfiguration[] during = getLaunchManager().getLaunchConfigurations();
 		boolean local = true;
-		for (int i = 0; i < during.length; i++) {
+		for (ILaunchConfiguration d : during) {
 			// must be local, or not from the closed project
-			local = local && (during[i].isLocal() || !during[i].getFile().getProject().equals(project));
+			local = local && (d.isLocal() || !d.getFile().getProject().equals(project));
 		}
 		project.open(null);
 		assertTrue("Should only be local configs when closed", local); //$NON-NLS-1$
 		ILaunchConfiguration[] after = getLaunchManager().getLaunchConfigurations();
 		assertTrue("Should be same number of configs after openning", after.length == before.length); //$NON-NLS-1$
-		for (int i = 0; i < before.length; i++) {
-			assertTrue("Config should exist after openning", existsIn(after, before[i])); //$NON-NLS-1$
+		for (ILaunchConfiguration b : before) {
+			assertTrue("Config should exist after openning", existsIn(after, b)); //$NON-NLS-1$
 		}
 
 		// cleanup
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchFavoriteTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchFavoriteTests.java
index 27a4edf1a..aec5de711 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchFavoriteTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchFavoriteTests.java
@@ -157,8 +157,8 @@ public class LaunchFavoriteTests extends AbstractLaunchTest {
 		if (size != -1) {
 			assertEquals("Favorites wrong size", size, favorites.length); //$NON-NLS-1$
 		}
-		for (int i = 0; i < favorites.length; i++) {
-			if (configuration.equals(favorites[i])) {
+		for (ILaunchConfiguration favorite : favorites) {
+			if (configuration.equals(favorite)) {
 				return true;
 			}
 		}
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchManagerTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchManagerTests.java
index 9d026000d..6a5a7d6bd 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchManagerTests.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchManagerTests.java
@@ -243,8 +243,8 @@ public class LaunchManagerTests extends AbstractLaunchTest {
 	void hasCancellingLaunches(int count) {
 		ILaunch[] launches = getLaunchManager().getLaunches();
 		int num = 0;
-		for (int i = 0; i < launches.length; i++) {
-			if (launches[i] instanceof CancellingLaunch) {
+		for (ILaunch launche : launches) {
+			if (launche instanceof CancellingLaunch) {
 				num++;
 			}
 		}
@@ -268,8 +268,8 @@ public class LaunchManagerTests extends AbstractLaunchTest {
 			hasCancellingLaunches(0);
 		} finally {
 			ILaunch[] launches = getLaunchManager().getLaunches();
-			for (int i = 0; i < launches.length; i++) {
-				getLaunchManager().removeLaunch(launches[i]);
+			for (ILaunch launche : launches) {
+				getLaunchManager().removeLaunch(launche);
 			}
 			config.delete();
 		}
@@ -292,8 +292,8 @@ public class LaunchManagerTests extends AbstractLaunchTest {
 			hasCancellingLaunches(0);
 		} finally {
 			ILaunch[] launches = getLaunchManager().getLaunches();
-			for (int i = 0; i < launches.length; i++) {
-				getLaunchManager().removeLaunch(launches[i]);
+			for (ILaunch launche : launches) {
+				getLaunchManager().removeLaunch(launche);
 			}
 			config.delete();
 		}
@@ -317,8 +317,8 @@ public class LaunchManagerTests extends AbstractLaunchTest {
 										// launch
 		} finally {
 			ILaunch[] launches = getLaunchManager().getLaunches();
-			for (int i = 0; i < launches.length; i++) {
-				getLaunchManager().removeLaunch(launches[i]);
+			for (ILaunch launche : launches) {
+				getLaunchManager().removeLaunch(launche);
 			}
 			config.delete();
 		}
@@ -350,9 +350,9 @@ public class LaunchManagerTests extends AbstractLaunchTest {
 					for (int i = 0; i < config.length && !stop[0]; i++) {
 						config[i] = getLaunchConfiguration("Name" + i); //$NON-NLS-1$
 					}
-					for (int i = 0; i < config.length; i++) {
-						if (config[i] != null) {
-							config[i].delete();
+					for (ILaunchConfiguration c : config) {
+						if (c != null) {
+							c.delete();
 						}
 					}
 				} catch (CoreException e) {
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/TestModelUpdatesListener.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/TestModelUpdatesListener.java
index 25bf98439..1f5fa2c73 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/TestModelUpdatesListener.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/TestModelUpdatesListener.java
@@ -305,8 +305,8 @@ public class TestModelUpdatesListener implements IViewerUpdateListener, ILabelUp
 			addUpdates(viewer, treePath, (TestElement) treePath.getLastSegment(), 0, STATE_UPDATES);
 		}
 		IModelDelta[] childDeltas = pendingDelta.getChildDeltas();
-		for (int i = 0; i < childDeltas.length; i++) {
-			addStateUpdates(viewer, childDeltas[i], deltaFlags);
+		for (IModelDelta childDelta : childDeltas) {
+			addStateUpdates(viewer, childDelta, deltaFlags);
 		}
 	}
 
@@ -374,8 +374,8 @@ public class TestModelUpdatesListener implements IViewerUpdateListener, ILabelUp
 	}
 
 	public static boolean isFiltered(Object element, ViewerFilter[] filters) {
-		for (int i = 0; i < filters.length; i++) {
-			if (!filters[i].select(null, null, element)) {
+		for (ViewerFilter filter : filters) {
+			if (!filter.select(null, null, element)) {
 				return true;
 			}
 		}
@@ -416,8 +416,8 @@ public class TestModelUpdatesListener implements IViewerUpdateListener, ILabelUp
 					fChildrenUpdatesScheduled.put(path, childrenIndexes);
 				}
 
-				for (int i = 0; i < children.length; i++) {
-					addUpdates(viewer, path.createChildPath(children[i]), children[i], filters, levels, flags);
+				for (TestElement child : children) {
+					addUpdates(viewer, path.createChildPath(child), child, filters, levels, flags);
 				}
 			}
 
@@ -430,8 +430,8 @@ public class TestModelUpdatesListener implements IViewerUpdateListener, ILabelUp
 			fProxyModels.add(element.getModel());
 		}
 		TestElement[] children = element.getChildren();
-		for (int i = 0; i < children.length; i++) {
-			addProxies(children[i]);
+		for (TestElement child : children) {
+			addProxies(child);
 		}
 	}
 
@@ -779,9 +779,9 @@ public class TestModelUpdatesListener implements IViewerUpdateListener, ILabelUp
 			buf.append("fJobError = " + fJobError); //$NON-NLS-1$
 			if (fJobError.getException() != null) {
 				StackTraceElement[] trace = fJobError.getException().getStackTrace();
-				for (int i = 0; i < trace.length; i++) {
+				for (StackTraceElement t : trace) {
 					buf.append("\n\t\t"); //$NON-NLS-1$
-					buf.append(trace[i]);
+					buf.append(t);
 				}
 			}
 		}