Use jdk 5 for-each loop (Part 1)

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

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

8 files changed, 23 insertions, 38 deletions

diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/console/AbstractConsole.java b/org.eclipse.ui.console/src/org/eclipse/ui/console/AbstractConsole.java
index 5b0d7009f..3539baa6a 100644
--- a/org.eclipse.ui.console/src/org/eclipse/ui/console/AbstractConsole.java
+++ b/org.eclipse.ui.console/src/org/eclipse/ui/console/AbstractConsole.java
@@ -59,8 +59,7 @@ public abstract class AbstractConsole implements IConsole {
 
 		@Override
 		public void consolesAdded(IConsole[] consoles) {
-			for (int i = 0; i < consoles.length; i++) {
-				IConsole console = consoles[i];
+			for (IConsole console : consoles) {
 				if (console == AbstractConsole.this) {
 					initialize();
 				}
@@ -70,8 +69,7 @@ public abstract class AbstractConsole implements IConsole {
 
 		@Override
 		public void consolesRemoved(IConsole[] consoles) {
-			for (int i = 0; i < consoles.length; i++) {
-				IConsole console = consoles[i];
+			for (IConsole console : consoles) {
 				if (console == AbstractConsole.this) {
 					ConsolePlugin.getDefault().getConsoleManager().removeConsoleListener(this);
 					destroy();
diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsole.java b/org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsole.java
index e0cf26783..3f511fc65 100644
--- a/org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsole.java
+++ b/org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsole.java
@@ -571,8 +571,8 @@ public abstract class TextConsole extends AbstractConsole {
 			IDocument doc = getDocument();
 			if (doc != null) {
 				Position[] positions = doc.getPositions(ConsoleHyperlinkPosition.HYPER_LINK_CATEGORY);
-				for (int i = 0; i < positions.length; i++) {
-					ConsoleHyperlinkPosition position = (ConsoleHyperlinkPosition)positions[i];
+				for (Position p : positions) {
+					ConsoleHyperlinkPosition position = (ConsoleHyperlinkPosition) p;
 					if (position.getHyperLink().equals(link)) {
 						return new Region(position.getOffset(), position.getLength());
 					}
diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsoleViewer.java b/org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsoleViewer.java
index c5ffa14bd..32484e794 100644
--- a/org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsoleViewer.java
+++ b/org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsoleViewer.java
@@ -388,8 +388,7 @@ public class TextConsoleViewer extends SourceViewer implements LineStyleListener
 				Position[] overlap = findPosition(offset, length, positions);
 				Color color = JFaceColors.getHyperlinkText(Display.getCurrent());
 				if (overlap != null) {
-					for (int i = 0; i < overlap.length; i++) {
-						Position position = overlap[i];
+					for (Position position : overlap) {
 						StyleRange linkRange = new StyleRange(position.offset, position.length, color, null);
 						linkRange.underline = true;
 						overrideStyleRange(ranges, linkRange);
diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleManager.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleManager.java
index 59ea1d431..911a1e71b 100644
--- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleManager.java
+++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleManager.java
@@ -107,8 +107,7 @@ public class ConsoleManager implements IConsoleManager {
 				}
 
 				IWorkbenchWindow[] workbenchWindows = PlatformUI.getWorkbench().getWorkbenchWindows();
-				for (int i = 0; i < workbenchWindows.length; i++) {
-					IWorkbenchWindow window = workbenchWindows[i];
+				for (IWorkbenchWindow window : workbenchWindows) {
 					if (window != null) {
 						IWorkbenchPage page = window.getActivePage();
 						if (page != null) {
@@ -204,8 +203,7 @@ public class ConsoleManager implements IConsoleManager {
 	public void addConsoles(IConsole[] consoles) {
 		List<IConsole> added = new ArrayList<>(consoles.length);
 		synchronized (fConsoles) {
-			for (int i = 0; i < consoles.length; i++) {
-				IConsole console = consoles[i];
+			for (IConsole console : consoles) {
 				if(console instanceof TextConsole) {
 					TextConsole ioconsole = (TextConsole)console;
 					createPatternMatchListeners(ioconsole);
@@ -225,8 +223,7 @@ public class ConsoleManager implements IConsoleManager {
 	public void removeConsoles(IConsole[] consoles) {
 		List<IConsole> removed = new ArrayList<>(consoles.length);
 		synchronized (fConsoles) {
-			for (int i = 0; i < consoles.length; i++) {
-				IConsole console = consoles[i];
+			for (IConsole console : consoles) {
 				if (fConsoles.remove(console)) {
 					removed.add(console);
 				}
@@ -390,8 +387,7 @@ public class ConsoleManager implements IConsoleManager {
 			fPatternMatchListeners = new ArrayList<>();
 			IExtensionPoint extensionPoint= Platform.getExtensionRegistry().getExtensionPoint(ConsolePlugin.getUniqueIdentifier(), IConsoleConstants.EXTENSION_POINT_CONSOLE_PATTERN_MATCH_LISTENERS);
 			IConfigurationElement[] elements = extensionPoint.getConfigurationElements();
-			for (int i = 0; i < elements.length; i++) {
-				IConfigurationElement config = elements[i];
+			for (IConfigurationElement config : elements) {
 				PatternMatchListenerExtension extension = new PatternMatchListenerExtension(config);
 				fPatternMatchListeners.add(extension);
 			}
@@ -433,15 +429,13 @@ public class ConsoleManager implements IConsoleManager {
 			fPageParticipants = new ArrayList<>();
 			IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(ConsolePlugin.getUniqueIdentifier(), IConsoleConstants.EXTENSION_POINT_CONSOLE_PAGE_PARTICIPANTS);
 			IConfigurationElement[] elements = extensionPoint.getConfigurationElements();
-			for(int i = 0; i < elements.length; i++) {
-				IConfigurationElement config = elements[i];
+			for (IConfigurationElement config : elements) {
 				ConsolePageParticipantExtension extension = new ConsolePageParticipantExtension(config);
 				fPageParticipants.add(extension);
 			}
 		}
 		ArrayList<IConsolePageParticipant> list = new ArrayList<>();
-		for (Iterator<ConsolePageParticipantExtension> i = fPageParticipants.iterator(); i.hasNext();) {
-			ConsolePageParticipantExtension extension = i.next();
+		for (ConsolePageParticipantExtension extension : fPageParticipants) {
 			try {
 				if (extension.isEnabledFor(console)) {
 					list.add(extension.createDelegate());
@@ -461,8 +455,8 @@ public class ConsoleManager implements IConsoleManager {
 			fConsoleFactoryExtensions = new ArrayList<>();
 			IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(ConsolePlugin.getUniqueIdentifier(), IConsoleConstants.EXTENSION_POINT_CONSOLE_FACTORIES);
 			IConfigurationElement[] configurationElements = extensionPoint.getConfigurationElements();
-			for (int i = 0; i < configurationElements.length; i++) {
-				fConsoleFactoryExtensions.add(new ConsoleFactoryExtension(configurationElements[i]));
+			for (IConfigurationElement configurationElement : configurationElements) {
+				fConsoleFactoryExtensions.add(new ConsoleFactoryExtension(configurationElement));
 			}
 		}
 		return fConsoleFactoryExtensions.toArray(new ConsoleFactoryExtension[0]);
diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePatternMatcher.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePatternMatcher.java
index e742ad59f..97dbab694 100644
--- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePatternMatcher.java
+++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePatternMatcher.java
@@ -83,11 +83,11 @@ public class ConsolePatternMatcher implements IDocumentListener {
 				synchronized (fPatterns) {
 					patterns = fPatterns.toArray();
 				}
-				for (int i = 0; i < patterns.length; i++) {
+				for (Object pattern : patterns) {
 					if (monitor.isCanceled()) {
 						break;
 					}
-					CompiledPatternMatchListener notifier = (CompiledPatternMatchListener) patterns[i];
+					CompiledPatternMatchListener notifier = (CompiledPatternMatchListener) pattern;
 					int baseOffset = notifier.end;
 					int lengthToSearch = endOfSearch - baseOffset;
 					if (lengthToSearch > 0) {
diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleView.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleView.java
index e0985b17b..b6730b2dd 100644
--- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleView.java
+++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleView.java
@@ -329,8 +329,8 @@ public class ConsoleView extends PageBookView implements IConsoleView, IConsoleL
 		// initialize page participants
 		IConsolePageParticipant[] consoleParticipants = ((ConsoleManager)getConsoleManager()).getPageParticipants(console);
 		final ListenerList<IConsolePageParticipant> participants = new ListenerList<>();
-		for (int i = 0; i < consoleParticipants.length; i++) {
-			participants.add(consoleParticipants[i]);
+		for (IConsolePageParticipant consoleParticipant : consoleParticipants) {
+			participants.add(consoleParticipant);
 		}
 		fConsoleToPageParticipants.put(console, participants);
 		for (IConsolePageParticipant iConsolePageParticipant : participants) {
@@ -398,13 +398,11 @@ public class ConsoleView extends PageBookView implements IConsoleView, IConsoleL
 	public void consolesAdded(final IConsole[] consoles) {
 		if (isAvailable()) {
 			Runnable r = () -> {
-				for (int i = 0; i < consoles.length; i++) {
+				for (IConsole console : consoles) {
 					if (isAvailable()) {
-						IConsole console = consoles[i];
 						// ensure it's still registered since this is done asynchronously
 						IConsole[] allConsoles = getConsoleManager().getConsoles();
-						for (int j = 0; j < allConsoles.length; j++) {
-							IConsole registered = allConsoles[j];
+						for (IConsole registered : allConsoles) {
 							if (registered.equals(console)) {
 								ConsoleWorkbenchPart part = new ConsoleWorkbenchPart(console, getSite());
 								fConsoleToPart.put(console, part);
@@ -413,7 +411,6 @@ public class ConsoleView extends PageBookView implements IConsoleView, IConsoleL
 								break;
 							}
 						}
-
 					}
 				}
 			};
@@ -425,9 +422,8 @@ public class ConsoleView extends PageBookView implements IConsoleView, IConsoleL
 	public void consolesRemoved(final IConsole[] consoles) {
 		if (isAvailable()) {
 			Runnable r = () -> {
-				for (int i = 0; i < consoles.length; i++) {
+				for (IConsole console : consoles) {
 					if (isAvailable()) {
-						IConsole console = consoles[i];
 						fStack.remove(console);
 						ConsoleWorkbenchPart part = fConsoleToPart.get(console);
 						if (part != null) {
diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/OpenConsoleAction.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/OpenConsoleAction.java
index 6559f6601..1a25fddf3 100644
--- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/OpenConsoleAction.java
+++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/OpenConsoleAction.java
@@ -101,8 +101,7 @@ public class OpenConsoleAction extends Action implements IMenuCreator {
 
 		fMenu= new Menu(parent);
 		int accel = 1;
-		for (int i = 0; i < fFactoryExtensions.length; i++) {
-			ConsoleFactoryExtension extension = fFactoryExtensions[i];
+		for (ConsoleFactoryExtension extension : fFactoryExtensions) {
 			if (!WorkbenchActivityHelper.filterItem(extension) && extension.isEnabled()) {
 				String label = extension.getLabel();
 				ImageDescriptor image = extension.getImageDescriptor();
diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/PatternMatchListenerExtension.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/PatternMatchListenerExtension.java
index 8d226809b..49d598494 100644
--- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/PatternMatchListenerExtension.java
+++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/PatternMatchListenerExtension.java
@@ -59,9 +59,8 @@ public class PatternMatchListenerExtension implements IPluginContribution {
 			String flags = flagsElement.replaceAll("Pattern.", ""); //$NON-NLS-1$ //$NON-NLS-2$
 			String[] tokens = flags.split("\\s\\|\\s"); //$NON-NLS-1$
 			Class<?> clazz = Class.forName("java.util.regex.Pattern"); //$NON-NLS-1$
-
-			for (int i = 0; i < tokens.length; i++) {
-				Field field = clazz.getDeclaredField(tokens[i]);
+			for (String token : tokens) {
+				Field field = clazz.getDeclaredField(token);
 				val |= field.getInt(null);
 			}
 		} catch (ClassNotFoundException e) {