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: If19c53c97e5017842dd178828baaf05fd7852064
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>

44 files changed, 127 insertions, 144 deletions

diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet100.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet100.java
index ff664ff413..4ff5ef3c64 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet100.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet100.java
@@ -35,8 +35,8 @@ public static void main(String[] args) {
 	text.setBounds(clientArea.x + 10, clientArea.y + 10, 150, 150);
 	Font initialFont = text.getFont();
 	FontData[] fontData = initialFont.getFontData();
-	for (int i = 0; i < fontData.length; i++) {
-		fontData[i].setHeight(24);
+	for (FontData element : fontData) {
+		element.setHeight(24);
 	}
 	Font newFont = new Font(display, fontData);
 	text.setFont(newFont);
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet106.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet106.java
index 17504033ff..425afa9050 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet106.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet106.java
@@ -43,7 +43,8 @@ public static void main (String [] args) {
 			item.setText (j, "Item " + i);
 		}
 	}
-	for (int i=0; i<columns.length; i++) columns [i].pack ();
+	for (TableColumn col : columns)
+		col.pack ();
 	Button button = new Button (shell, SWT.PUSH);
 	final int index = 1;
 	button.setText ("Insert Column " + index + "a");
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet115.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet115.java
index c51279ab33..6849a2ac1d 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet115.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet115.java
@@ -36,11 +36,9 @@ public static void main (String [] args) {
 	c2.setLayout (new RowLayout ());
 	final Composite [] composites = new Composite [] {c1, c2};
 	Listener radioGroup = event -> {
-		for (int i=0; i<composites.length; i++) {
-			Composite composite = composites [i];
+		for (Composite composite : composites) {
 			Control [] children = composite.getChildren ();
-			for (int j=0; j<children.length; j++) {
-				Control child = children [j];
+			for (Control child : children) {
 				if (child instanceof Button) {
 					Button button1 = (Button) child;
 					if ((button1.getStyle () & SWT.RADIO) != 0) button1.setSelection (false);
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet122.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet122.java
index 887d56c05d..d4048a45c1 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet122.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet122.java
@@ -66,10 +66,9 @@ public static void main(String[] args) {
 		String selection = text.getSelectionText();
 		copyItem.setEnabled(selection.length() > 0);
 		// is paste valid?
-		TransferData[] available = cb.getAvailableTypes();
 		boolean enabled = false;
-		for (int i = 0; i < available.length; i++) {
-			if (TextTransfer.getInstance().isSupportedType(available[i])) {
+		for (TransferData transfer : cb.getAvailableTypes()) {
+			if (TextTransfer.getInstance().isSupportedType(transfer)) {
 				enabled = true;
 				break;
 			}
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet126.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet126.java
index 6000a190d1..651c98bab2 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet126.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet126.java
@@ -40,25 +40,25 @@ public static void main(String[] args) {
 		new TableItem (table, SWT.NONE);
 	}
 	TableItem [] items = table.getItems ();
-	for (int i=0; i<items.length; i++) {
+	for (TableItem item : items) {
 		TableEditor editor = new TableEditor (table);
 		CCombo combo = new CCombo (table, SWT.NONE);
 		combo.setText("CCombo");
 		combo.add("item 1");
 		combo.add("item 2");
 		editor.grabHorizontal = true;
-		editor.setEditor(combo, items[i], 0);
+		editor.setEditor(combo, item, 0);
 		editor = new TableEditor (table);
 		Text text = new Text (table, SWT.NONE);
 		text.setText("Text");
 		editor.grabHorizontal = true;
-		editor.setEditor(text, items[i], 1);
+		editor.setEditor(text, item, 1);
 		editor = new TableEditor (table);
 		Button button = new Button (table, SWT.CHECK);
 		button.pack ();
 		editor.minimumWidth = button.getSize ().x;
 		editor.horizontalAlignment = SWT.LEFT;
-		editor.setEditor (button, items[i], 2);
+		editor.setEditor (button, item, 2);
 	}
 	shell.pack ();
 	shell.open ();
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet135.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet135.java
index 2ccb60c76b..c95019edeb 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet135.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet135.java
@@ -181,8 +181,7 @@ public class Snippet135 {
 		});
 
 		File[] roots = File.listRoots();
-		for (int i = 0; i < roots.length; i++) {
-			File file = roots[i];
+		for (File file : roots) {
 			TreeItem treeItem = new TreeItem(fileTree, SWT.NONE);
 			treeItem.setText(file.getAbsolutePath());
 			treeItem.setData(file);
@@ -201,8 +200,7 @@ public class Snippet135 {
 			File root = (File)item.getData();
 			File[] files = root.listFiles();
 			if (files == null) return;
-			for (int i = 0; i < files.length; i++) {
-				File file = files[i];
+			for (File file : files) {
 				if (file.isDirectory()) {
 					TreeItem treeItem = new TreeItem(item, SWT.NONE);
 					treeItem.setText(file.getName());
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet152.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet152.java
index 8f4dac46cb..3e07caa832 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet152.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet152.java
@@ -70,9 +70,9 @@ public static void main(String[] args) {
 	fileMenu.addListener(SWT.Show, showListener);
 	fileItem.setMenu(fileMenu);
 	String[] fileStrings = { "New", "Close", "Exit" };
-	for (int i = 0; i < fileStrings.length; i++) {
+	for (String fileString : fileStrings) {
 		MenuItem item = new MenuItem(fileMenu, SWT.PUSH);
-		item.setText(fileStrings[i]);
+		item.setText(fileString);
 		item.addListener(SWT.Arm, armListener);
 	}
 	Menu editMenu = new Menu(shell, SWT.DROP_DOWN);
@@ -80,9 +80,9 @@ public static void main(String[] args) {
 	editMenu.addListener(SWT.Show, showListener);
 	String[] editStrings = { "Cut", "Copy", "Paste" };
 	editItem.setMenu(editMenu);
-	for (int i = 0; i < editStrings.length; i++) {
+	for (String editString : editStrings) {
 		MenuItem item = new MenuItem(editMenu, SWT.PUSH);
-		item.setText(editStrings[i]);
+		item.setText(editString);
 		item.addListener(SWT.Arm, armListener);
 	}
 	shell.open();
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet168.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet168.java
index 4ec04deb7f..e4f7f5298a 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet168.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet168.java
@@ -38,14 +38,14 @@ public static void main(String[] args) {
 		gc.setForeground(display.getSystemColor(SWT.COLOR_BLUE));
 		gc.setLineWidth(10);
 		int[] caps = {SWT.CAP_FLAT, SWT.CAP_ROUND, SWT.CAP_SQUARE};
-		for (int i1 = 0; i1 < caps.length; i1++) {
-			gc.setLineCap(caps[i1]);
+		for (int cap : caps) {
+			gc.setLineCap(cap);
 			gc.drawLine(x, y, x + w, y);
 			y += 20;
 		}
 		int[] joins = {SWT.JOIN_BEVEL, SWT.JOIN_MITER, SWT.JOIN_ROUND};
-		for (int i2 = 0; i2 < joins.length; i2++) {
-			gc.setLineJoin(joins[i2]);
+		for (int join : joins) {
+			gc.setLineJoin(join);
 			gc.drawPolygon(new int[] {x, y, x + w/2, y + h, x + w, y});
 			y += h + 20;
 		}
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet169.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet169.java
index f5edcc312f..342f800f33 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet169.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet169.java
@@ -32,8 +32,7 @@ public static void main (String [] args) {
 	shell.setLayout (new FillLayout ());
 	Listener listener = e -> {
 		Control [] children = shell.getChildren ();
-		for (int i=0; i<children.length; i++) {
-			Control child = children [i];
+		for (Control child : children) {
 			if (e.widget != child && child instanceof Button && (child.getStyle () & SWT.TOGGLE) != 0) {
 				((Button) child).setSelection (false);
 			}
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet179.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet179.java
index 67f7226f1f..0133402530 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet179.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet179.java
@@ -80,17 +80,17 @@ public static void main(String[] args) {
 			int start = e.start;
 			if (start > 9) return;
 			int index = 0;
-			for (int i = 0; i < chars.length; i++) {
+			for (char c : chars) {
 				if (start + index == 4 || start + index == 7) {
-					if (chars[i] == '/') {
+					if (c == '/') {
 						index++;
 						continue;
 					}
 					buffer.insert(index++, '/');
 				}
-				if (chars[i] < '0' || '9' < chars[i]) return;
-				if (start + index == 5 &&  '1' < chars[i]) return; /* [M]M */
-				if (start + index == 8 &&  '3' < chars[i]) return; /* [D]D */
+				if (c < '0' || '9' < c) return;
+				if (start + index == 5 &&  '1' < c) return; /* [M]M */
+				if (start + index == 8 &&  '3' < c) return; /* [D]D */
 				index++;
 			}
 			String newText = buffer.toString();
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet181.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet181.java
index daa78a0867..314ff3573a 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet181.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet181.java
@@ -51,11 +51,10 @@ public class Snippet181 {
 			item.setText(text);
 		}
 		Listener listener = e -> System.out.println("Move "+e.widget);
-		TableColumn[] columns = table.getColumns();
-		for (int i = 0; i < columns.length; i++) {
-			columns[i].pack();
-			columns[i].setMoveable(true);
-			columns[i].addListener(SWT.Move, listener);
+		for (TableColumn col : table.getColumns()) {
+			col.pack();
+			col.setMoveable(true);
+			col.addListener(SWT.Move, listener);
 		}
 		Button b = new Button(shell, SWT.PUSH);
 		b.setText("invert column order");
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet193.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet193.java
index c5aadffdb5..021835c0bf 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet193.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet193.java
@@ -61,11 +61,10 @@ public class Snippet193 {
 			}
 		}
 		Listener listener = e -> System.out.println("Move "+e.widget);
-		TreeColumn[] columns = tree.getColumns();
-		for (int i = 0; i < columns.length; i++) {
-			columns[i].setWidth(100);
-			columns[i].setMoveable(true);
-			columns[i].addListener(SWT.Move, listener);
+		for (TreeColumn col : tree.getColumns()) {
+			col.setWidth(100);
+			col.setMoveable(true);
+			col.addListener(SWT.Move, listener);
 		}
 		Button b = new Button(shell, SWT.PUSH);
 		b.setText("invert column order");
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet199.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet199.java
index bd8c61fb5c..a4ecb51b80 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet199.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet199.java
@@ -79,8 +79,8 @@ public class Snippet199 {
 		public void handleEvent (OleEvent e) {
 			System.out.println("selection has changed");
 			Variant[] args = e.arguments;
-			for (int i = 0; i < args.length; i++) {
-				System.out.println(args[i]);
+			for (Variant arg : args) {
+				System.out.println(arg);
 			}
 		}
 	};
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet203.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet203.java
index a66ccb2706..3b25114153 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet203.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet203.java
@@ -49,8 +49,7 @@ public static void main(String[] args) {
 	shell.addListener(SWT.Paint, event -> {
 		Point point = new Point(10, 10);
 		int width = shell.getClientArea().width - 2 * point.x;
-		for (int i = 0; i < layouts.length; i++) {
-			TextLayout layout = layouts[i];
+		for (TextLayout layout : layouts) {
 			layout.setWidth(width);
 			layout.draw(event.gc, point.x, point.y);
 			point.y += layout.getBounds().height + 10;
@@ -60,8 +59,8 @@ public static void main(String[] args) {
 	while (!shell.isDisposed()) {
 		if (!display.readAndDispatch()) display.sleep();
 	}
-	for (int i = 0; i < layouts.length; i++) {
-		layouts[i].dispose();
+	for (TextLayout layout : layouts) {
+		layout.dispose();
 	}
 	display.dispose();
 }
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet205.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet205.java
index 3eaf526251..ea9cfcbf56 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet205.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet205.java
@@ -86,8 +86,8 @@ public static void main(String[] args) {
 		if (!display.readAndDispatch()) display.sleep();
 	}
 	layout.dispose();
-	for (int i = 0; i < images.length; i++) {
-		images[i].dispose();
+	for (Image image : images) {
+		image.dispose();
 	}
 	display.dispose();
 }
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet212.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet212.java
index 6cae8116b1..3f9aca58a2 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet212.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet212.java
@@ -84,8 +84,7 @@ public class Snippet212 {
 		});
 		styledText.addListener(SWT.Dispose, event -> {
 			StyleRange[] styles = styledText.getStyleRanges();
-			for (int i = 0; i < styles.length; i++) {
-				StyleRange style = styles[i];
+			for (StyleRange style : styles) {
 				if (style.data != null) {
 					Image image = (Image)style.data;
 					if (image != null) image.dispose();
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet224.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet224.java
index 770f7ab064..0cf65d7b30 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet224.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet224.java
@@ -42,8 +42,7 @@ public static void main (String [] args) {
 	button.addListener (SWT.Selection, event -> {
 		Control [] children = shell.getChildren ();
 		Button newButton = (Button) children [4];
-		for (int i=0; i<children.length; i++) {
-			Control child = children [i];
+		for (Control child : children) {
 			if (child instanceof Button && (child.getStyle () & SWT.RADIO) != 0) {
 				((Button) child).setSelection (false);
 			}
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet228.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet228.java
index afa9d91ffa..446663d55e 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet228.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet228.java
@@ -47,9 +47,9 @@ public static void main(String [] args) {
 	column2.setText("Percent");
 	column2.setWidth(200);
 	String[] labels = new String[]{"Resolved", "New", "Won't Fix", "Invalid"};
-	for (int i=0; i<labels.length; i++) {
+	for (String label : labels) {
 		TableItem item = new TableItem(table, SWT.NONE);
-		item.setText(labels[i]);
+		item.setText(label);
 	}
 
 	/*
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet232.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet232.java
index 657cc6d015..ecae89802f 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet232.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet232.java
@@ -48,12 +48,12 @@ public static void main(String [] args) {
 	column2.setWidth(200);
 	String[] states = new String[]{"Resolved", "New", "Won't Fix", "Invalid"};
 	String[] teams = new String[] {"UI", "SWT", "OSGI"};
-	for (int i=0; i<teams.length; i++) {
+	for (String team : teams) {
 		TreeItem item = new TreeItem(tree, SWT.NONE);
-		item.setText(teams[i]);
-		for (int j = 0; j < states.length; j++) {
+		item.setText(team);
+		for (String state : states) {
 			TreeItem subItem = new TreeItem(item, SWT.NONE);
-			subItem.setText(states[j]);
+			subItem.setText(state);
 		}
 	}
 
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet274.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet274.java
index 3287361d27..d312ead3b0 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet274.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet274.java
@@ -51,9 +51,8 @@ public class Snippet274 {
 	static void checkItems(TreeItem item, boolean checked) {
 		item.setGrayed(false);
 		item.setChecked(checked);
-		TreeItem[] items = item.getItems();
-		for (int i = 0; i < items.length; i++) {
-			checkItems(items[i], checked);
+		for (TreeItem child : item.getItems()) {
+			checkItems(child, checked);
 		}
 	}
 
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet285.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet285.java
index d24c74aaae..cbd0562731 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet285.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet285.java
@@ -26,8 +26,8 @@ import org.eclipse.swt.widgets.*;
 public class Snippet285 {
 	static void loadPath(Region region, float[] points, byte[] types) {
 		int start = 0, end = 0;
-		for (int i = 0; i < types.length; i++) {
-			switch (types[i]) {
+		for (byte type : types) {
+			switch (type) {
 				case SWT.PATH_MOVE_TO: {
 					if (start != end) {
 						int n = 0;
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet298.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet298.java
index 3f1e583196..2143bd6ed2 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet298.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet298.java
@@ -32,8 +32,8 @@ public static void main (String [] args) {
 	shell.addListener(SWT.Paint, event -> {
 		int[] icons = new int[]{SWT.ICON_ERROR, SWT.ICON_WARNING, SWT.ICON_INFORMATION, SWT.ICON_QUESTION, SWT.ICON_WORKING};
 		int x = 10;
-		for (int i = 0; i < icons.length; i++) {
-			Image image = display.getSystemImage(icons[i]);
+		for (int icon : icons) {
+			Image image = display.getSystemImage(icon);
 			if (image != null) {
 				Transform t = new Transform(display);
 				t.translate(x, 10);
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet307.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet307.java
index c2e83ef353..5e6ffc1466 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet307.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet307.java
@@ -72,8 +72,7 @@ static class CustomFunction extends BrowserFunction {
 	@Override
 	public Object function (Object[] arguments) {
 		System.out.println ("theJavaFunction() called from javascript with args:");
-		for (int i = 0; i < arguments.length; i++) {
-			Object arg = arguments[i];
+		for (Object arg : arguments) {
 			if (arg == null) {
 				System.out.println ("\t-->null");
 			} else {
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet311.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet311.java
index 1670dffb97..16f06037a3 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet311.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet311.java
@@ -85,9 +85,9 @@ public static void main (String[] args) {
 	columnOwner.setResizable(false);
 	createMenuItem(headerMenu, columnOwner);
 
-	for (int i = 0; i < files.length; i++) {
+	for (String[] file : files) {
 		TableItem item = new TableItem(table, SWT.NONE);
-		item.setText(files[i]);
+		item.setText(file);
 	}
 
 	final Menu tableMenu = new Menu(shell, SWT.POP_UP);
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet312.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet312.java
index 496b5ef5e6..c6d2b30330 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet312.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet312.java
@@ -85,9 +85,9 @@ public static void main (String[] args) {
 	columnOwner.setResizable(false);
 	createMenuItem(headerMenu, columnOwner);
 
-	for (int i = 0; i < files.length; i++) {
+	for (String[] file : files) {
 		TreeItem item = new TreeItem(tree, SWT.NONE);
-		item.setText(files[i]);
+		item.setText(file);
 		TreeItem subItem = new TreeItem(item, SWT.NONE);
 		subItem.setText("node");
 	}
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet336.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet336.java
index 0797b0acaa..19a483bc61 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet336.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet336.java
@@ -142,9 +142,9 @@ public static void main(String[] args) {
 	button.addListener(SWT.Selection, listener3);
 	button.setSelection(true);
 	String[] images = {"eclipse.png", "pause.gif", "run.gif", "warning.gif"};
-	for (int i = 0; i < images.length; i++) {
+	for (String image : images) {
 		button = new Button(group, SWT.RADIO);
-		button.setText(images[i]);
+		button.setText(image);
 		button.addListener(SWT.Selection, listener3);
 	}
 	shell.pack();
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet337.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet337.java
index f0b502898e..669bef4745 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet337.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet337.java
@@ -70,8 +70,8 @@ public static void main(String args[]) {
 	});
 	display.addListener(SWT.Close, event -> EventQueue.invokeLater(() -> {
 		Frame[] frames = Frame.getFrames();
-		for (int i = 0; i < frames.length; i++) {
-			frames[i].dispose();
+		for (Frame frame : frames) {
+			frame.dispose();
 		}
 	}));
 	while (!display.isDisposed()) {
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet349.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet349.java
index ecc1c07772..2073b17e82 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet349.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet349.java
@@ -137,9 +137,9 @@ public static void main(String [] args) {
 	while (!shell.isDisposed()) {
 		if (!display.readAndDispatch()) display.sleep();
 	}
-	for (int i = 0; i < images.length; i++) {
-		if (images[i] != null) {
-			images[i].dispose();
+	for (Image image : images) {
+		if (image != null) {
+			image.dispose();
 		}
 	}
 	display.dispose();
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet352.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet352.java
index 2d58eb080e..970d09afec 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet352.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet352.java
@@ -59,9 +59,7 @@ public class Snippet352 {
 
 			Touch touches[] = e.touches;
 
-			for (int i = 0; i < touches.length; i++) {
-				Touch currTouch = touches[i];
-
+			for (Touch currTouch : touches) {
 				if ((currTouch.state & (SWT.TOUCHSTATE_UP)) != 0) {
 					touchLocations.remove(currTouch.id);
 				} else {
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet354.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet354.java
index 8cb6f8ca48..e37c4fa9f2 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet354.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet354.java
@@ -32,8 +32,8 @@ public class Snippet354 {
 
 	static MenuItem getItem(Menu menu, int id) {
 		MenuItem[] items = menu.getItems();
-		for (int i = 0; i < items.length; i++) {
-			if (items[i].getID() == id) return items[i];
+		for (MenuItem item : items) {
+			if (item.getID() == id) return item;
 		}
 		return null;
 	}
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet358.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet358.java
index 0cd4a11fb0..dea7668cd3 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet358.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet358.java
@@ -47,12 +47,10 @@ public static void main(String [] args) {
 		treeBounds.width = treeSize.x;
 		treeBounds.height = treeSize.y;
 		TreeItem[] rootItems = tree.getItems();
-		for (int i = 0; i < rootItems.length; i++) {
-			TreeItem rootItem = rootItems[i];
+		for (TreeItem rootItem : rootItems) {
 			System.out.println(rootItem.getText() + " is at least partially visible? " + treeBounds.intersects(rootItem.getBounds()));
 			TreeItem[] childItems = rootItem.getItems();
-			for (int j = 0; j < childItems.length; j++) {
-				TreeItem childItem = childItems[j];
+			for (TreeItem childItem : childItems) {
 				System.out.println(childItem.getText() + " is at least partially visible? " + treeBounds.intersects(childItem.getBounds()));
 			}
 		}
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet373.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet373.java
index d9cf55021b..62c42c332d 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet373.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet373.java
@@ -221,9 +221,9 @@ public class Snippet373 {
 		table.setLinesVisible(true);
 		table.setHeaderVisible(true);
 		String titles[] = { "Title 1" };
-		for (int i = 0; i < titles.length; i++) {
+		for (String title : titles) {
 			TableColumn column = new TableColumn(table, SWT.NONE);
-			column.setText(titles[i]);
+			column.setText(title);
 			column.setImage(eclipseTableHeader);
 		}
 		for (int i = 0; i < 1; i++) {
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet38.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet38.java
index 5aa9e0fee2..945740f0ea 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet38.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet38.java
@@ -37,9 +37,9 @@ public static void main (String [] args) {
 	data.heightHint = 200;
 	table.setLayoutData(data);
 	String[] titles = {" ", "C", "!", "Description", "Resource", "In Folder", "Location"};
-	for (int i=0; i<titles.length; i++) {
+	for (String title : titles) {
 		TableColumn column = new TableColumn (table, SWT.NONE);
-		column.setText (titles [i]);
+		column.setText (title);
 	}
 	int count = 128;
 	for (int i=0; i<count; i++) {
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet59.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet59.java
index b4d077b86e..bfdf8dc80d 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet59.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet59.java
@@ -36,13 +36,15 @@ public static void main (String [] args) {
 	list.addListener (SWT.Selection, e -> {
 		String string = "";
 		int [] selection = list.getSelectionIndices ();
-		for (int i=0; i<selection.length; i++) string += selection [i] + " ";
+		for (int element : selection)
+			string += element + " ";
 		System.out.println ("Selection={" + string + "}");
 	});
 	list.addListener (SWT.DefaultSelection, e -> {
 		String string = "";
 		int [] selection = list.getSelectionIndices ();
-		for (int i=0; i<selection.length; i++) string += selection [i] + " ";
+		for (int element : selection)
+			string += element + " ";
 		System.out.println ("DefaultSelection={" + string + "}");
 	});
 	shell.pack ();
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet61.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet61.java
index 1b86aac469..4157725e11 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet61.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet61.java
@@ -45,14 +45,14 @@ public static void main (String [] args) {
 	}
 	tree.addListener (SWT.Selection, e -> {
 		String string = "";
-		TreeItem [] selection = tree.getSelection ();
-		for (int i=0; i<selection.length; i++) string += selection [i] + " ";
+		for (TreeItem item : tree.getSelection ())
+			string += item + " ";
 		System.out.println ("Selection={" + string + "}");
 	});
 	tree.addListener (SWT.DefaultSelection, e -> {
 		String string = "";
-		TreeItem [] selection = tree.getSelection ();
-		for (int i=0; i<selection.length; i++) string += selection [i] + " ";
+		for (TreeItem item : tree.getSelection ())
+			string += item + " ";
 		System.out.println ("DefaultSelection={" + string + "}");
 	});
 	tree.addListener (SWT.Expand, e -> System.out.println ("Expand={" + e.item + "}"));
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet64.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet64.java
index ab3e09cf9a..ae8c640624 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet64.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet64.java
@@ -38,14 +38,14 @@ public static void main (String [] args) {
 	table.setBounds (clientArea.x, clientArea.y, 100, 100);
 	table.addListener (SWT.Selection, e -> {
 		String string = "";
-		TableItem [] selection = table.getSelection ();
-		for (int i=0; i<selection.length; i++) string += selection [i] + " ";
+		for (TableItem item : table.getSelection ())
+			string += item + " ";
 		System.out.println ("Selection={" + string + "}");
 	});
 	table.addListener (SWT.DefaultSelection, e -> {
 		String string = "";
-		TableItem [] selection = table.getSelection ();
-		for (int i=0; i<selection.length; i++) string += selection [i] + " ";
+		for (TableItem item : table.getSelection ())
+			string += item + " ";
 		System.out.println ("DefaultSelection={" + string + "}");
 	});
 	shell.pack ();
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet73.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet73.java
index c76c7909db..290bf1c9b5 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet73.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet73.java
@@ -41,14 +41,14 @@ public static void main (String [] args) {
 	menu.addListener (SWT.Show, event -> {
 		MenuItem [] menuItems = menu.getItems ();
 		TreeItem [] treeItems = tree.getSelection ();
-		for (int i=0; i<menuItems.length; i++) {
-			String text = menuItems [i].getText ();
+		for (MenuItem menuItem : menuItems) {
+			String text = menuItem.getText ();
 			int index = 0;
 			while (index<treeItems.length) {
 				if (treeItems [index].getText ().equals (text)) break;
 				index++;
 			}
-			menuItems [i].setEnabled (index != treeItems.length);
+			menuItem.setEnabled (index != treeItems.length);
 		}
 	});
 	Rectangle clientArea = shell.getClientArea ();
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet79.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet79.java
index 571cbd0838..f53e08e6ec 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet79.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet79.java
@@ -56,12 +56,12 @@ public void javaToNative (Object object, TransferData transferData) {
 	try (ByteArrayOutputStream out = new ByteArrayOutputStream ();
 		DataOutputStream writeOut = new DataOutputStream (out)) {
 		// write data to a byte array and then ask super to convert to pMedium
-		for (int i = 0, length = myTypes.length; i < length; i++) {
-			byte [] buffer = myTypes [i].fileName.getBytes ();
+		for (MyType myType : myTypes) {
+			byte [] buffer = myType.fileName.getBytes ();
 			writeOut.writeInt (buffer.length);
 			writeOut.write (buffer);
-			writeOut.writeLong (myTypes [i].fileLength);
-			writeOut.writeLong (myTypes [i].lastModified);
+			writeOut.writeLong (myType.fileLength);
+			writeOut.writeLong (myType.lastModified);
 		}
 		byte [] buffer = out.toByteArray ();
 		writeOut.close ();
@@ -119,10 +119,10 @@ boolean checkMyType(Object object) {
 		return false;
 	}
 	MyType[] myTypes = (MyType[])object;
-	for (int i = 0; i < myTypes.length; i++) {
-		if (myTypes[i] == null ||
-			myTypes[i].fileName == null ||
-			myTypes[i].fileName.length() == 0) {
+	for (MyType myType : myTypes) {
+		if (myType == null ||
+			myType.fileName == null ||
+			myType.fileName.length() == 0) {
 			return false;
 		}
 	}
@@ -184,8 +184,8 @@ public static void main (String [] args) {
 				MyType [] myTypes = (MyType []) event.data;
 				if (myTypes != null) {
 					String string = "";
-					for (int i = 0; i < myTypes.length; i++) {
-						string += myTypes [i].fileName + " ";
+					for (MyType myType : myTypes) {
+						string += myType.fileName + " ";
 					}
 					label2.setText (string);
 				}
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet8.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet8.java
index 3012725fbb..8d3c56a5b9 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet8.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet8.java
@@ -34,28 +34,27 @@ public static void main (String [] args) {
 	shell.setText ("Lazy Tree");
 	shell.setLayout (new FillLayout ());
 	final Tree tree = new Tree (shell, SWT.BORDER);
-	File [] roots = File.listRoots ();
-	for (int i=0; i<roots.length; i++) {
+	for (File rootFile : File.listRoots ()) {
 		TreeItem root = new TreeItem (tree, 0);
-		root.setText (roots [i].toString ());
-		root.setData (roots [i]);
+		root.setText (rootFile.toString ());
+		root.setData (rootFile);
 		new TreeItem (root, 0);
 	}
 	tree.addListener (SWT.Expand, event -> {
 		final TreeItem root = (TreeItem) event.item;
 		TreeItem [] items = root.getItems ();
-		for (int i1= 0; i1<items.length; i1++) {
-			if (items [i1].getData () != null) return;
-			items [i1].dispose ();
+		for (TreeItem item : items) {
+			if (item.getData () != null) return;
+			item.dispose ();
 		}
 		File file = (File) root.getData ();
 		File [] files = file.listFiles ();
 		if (files == null) return;
-		for (int i2= 0; i2<files.length; i2++) {
+		for (File rootFile : files) {
 			TreeItem item = new TreeItem (root, 0);
-			item.setText (files [i2].getName ());
-			item.setData (files [i2]);
-			if (files [i2].isDirectory()) {
+			item.setText (rootFile.getName ());
+			item.setData (rootFile);
+			if (rootFile.isDirectory()) {
 				new TreeItem (item, 0);
 			}
 		}
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet80.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet80.java
index 6f14f3ecba..c83f7abf06 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet80.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet80.java
@@ -50,14 +50,13 @@ public static void main(String[] args) {
 	}
 
 	tree.addSelectionListener(widgetSelectedAdapter(e -> {
-			TreeItem[] selection = tree.getSelection();
 			TreeItem[] revisedSelection = new TreeItem[0];
-			for (int i = 0; i < selection.length; i++) {
-				String text = selection[i].getText();
+			for (TreeItem item : tree.getSelection()) {
+				String text = item.getText();
 				if (text.indexOf('1') > 0) {
 					TreeItem[] newSelection = new TreeItem[revisedSelection.length + 1];
 					System.arraycopy(revisedSelection, 0, newSelection, 0, revisedSelection.length);
-					newSelection[revisedSelection.length] = selection[i];
+					newSelection[revisedSelection.length] = item;
 					revisedSelection = newSelection;
 				}
 			}
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet83.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet83.java
index b6a2e2518f..314decc536 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet83.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet83.java
@@ -64,9 +64,8 @@ public static void main(String[] args) {
 				}
 			}
 
-			TransferData[] data = event.dataTypes;
-			for (int i = 0; i < data.length; i++) {
-				int id = data[i].type;
+			for (TransferData transfer : event.dataTypes) {
+				int id = transfer.type;
 				String name = getNameFromId(id);
 				TableItem item2 = new TableItem(control,SWT.NONE);
 				item2.setText("Data type is "+id+" "+name);
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet97.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet97.java
index 86a4de44c7..6af8b97a05 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet97.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet97.java
@@ -38,13 +38,13 @@ public static void main (String [] args) {
 	}
 	menu.addListener (SWT.Show, event -> {
 		MenuItem [] menuItems = menu.getItems ();
-		for (int i1=0; i1<menuItems.length; i1++) {
-			menuItems [i1].dispose ();
+		for (MenuItem menuItem : menuItems) {
+			menuItem.dispose ();
 		}
 		TreeItem [] treeItems = tree.getSelection ();
-		for (int i2=0; i2<treeItems.length; i2++) {
+		for (TreeItem treeItem : treeItems) {
 			MenuItem menuItem = new MenuItem (menu, SWT.PUSH);
-			menuItem.setText (treeItems [i2].getText ());
+			menuItem.setText (treeItem.getText ());
 		}
 	});
 	Rectangle clientArea = shell.getClientArea ();
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/SnippetExplorer.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/SnippetExplorer.java
index f977a74674..602df68940 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/SnippetExplorer.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/SnippetExplorer.java
@@ -442,8 +442,8 @@ public class SnippetExplorer {
 	 *         available with given name)
 	 */
 	private Font tryCreateFont(String fontName, FontData[] existingData) {
-		for (int i = 0; i < existingData.length; i++) {
-			existingData[i].setName(fontName);
+		for (FontData element : existingData) {
+			element.setName(fontName);
 		}
 		try {
 			return new Font(display, existingData);
diff --git a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/SnippetLauncher.java b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/SnippetLauncher.java
index 365e26dbd1..07675ac235 100644
--- a/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/SnippetLauncher.java
+++ b/examples/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/SnippetLauncher.java
@@ -69,9 +69,9 @@ public class SnippetLauncher {
 							skip = true;
 						} else {
 							String [] platforms = {"win32", "gtk"};
-							for (int p = 0; p < platforms.length; p++) {
-								if (!platforms[p].equals(platform) && source.contains("." + platforms[p])) {
-									platform = platforms[p];
+							for (String platformId : platforms) {
+								if (!platformId.equals(platform) && source.contains("." + platformId)) {
+									platform = platformId;
 									skip = true;
 									break;
 								}