Bug 509091 - Use enhanced for loop in org.eclipse.swt.examples

* cleans up variable names that got auto-generated


Change-Id: Id7850b83ad494202e4951b7bc704f4bdfcdf17df
Signed-off-by: Fabian Pfaff <fabian.pfaff@vogella.com>

9 files changed, 84 insertions, 67 deletions

diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/accessibility/CTable.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/accessibility/CTable.java
index 0432bb0d41..0b454abb06 100644
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/accessibility/CTable.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/accessibility/CTable.java
@@ -418,12 +418,12 @@ public void clear (int [] indices) {
 		}
 	}
 
-	for (int indice : indices) {
-		items [indice].clear ();
+	for (int index : indices) {
+		items [index].clear ();
 	}
 	updateHorizontalBar ();
-	for (int indice : indices) {
-		redrawItem (indice, false);
+	for (int index : indices) {
+		redrawItem (index, false);
 	}
 }
 /**
@@ -668,8 +668,8 @@ public void deselect (int [] indices) {
 	checkWidget ();
 	if (indices == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
 	if (indices.length == 0) return;
-	for (int indice : indices) {
-		deselect (indice);
+	for (int index : indices) {
+		deselect (index);
 	}
 }
 /**
@@ -3635,16 +3635,15 @@ public void select (int [] indices) {
 	checkWidget ();
 	if (indices == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
 	if (indices.length == 0 || ((getStyle () & SWT.SINGLE) != 0 && indices.length > 1)) return;
-
-	for (int indice : indices) {
-		if (0 <= indice && indice < itemsCount) {
-			selectItem (items [indice], (getStyle () & SWT.MULTI) != 0);
+	for (int index : indices) {
+		if (0 <= index && index < itemsCount) {
+			selectItem (items [index], (getStyle () & SWT.MULTI) != 0);
 		}
 	}
 	if (isFocusControl () || (getStyle () & SWT.HIDE_SELECTION) == 0) {
-		for (int indice : indices) {
-			if (0 <= indice && indice < itemsCount) {
-				redrawItem (indice, false);
+		for (int index : indices) {
+			if (0 <= index && index < itemsCount) {
+				redrawItem (index, false);
 			}
 		}
 	}
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/DialogTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/DialogTab.java
index db5d66f562..40b564b884 100644
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/DialogTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/DialogTab.java
@@ -11,12 +11,26 @@
 package org.eclipse.swt.examples.controlexample;
 
 
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.printing.*;
-import org.eclipse.swt.events.*;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.printing.PrintDialog;
+import org.eclipse.swt.printing.PrinterData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.ColorDialog;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.DirectoryDialog;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.FontDialog;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.MessageBox;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.widgets.Widget;
 
 class DialogTab extends Tab {
 	/* Example widgets and groups that contain them */
@@ -142,8 +156,8 @@ class DialogTab extends Tab {
 			textWidget.append ("getRGBs() =" + Text.DELIMITER);
 			RGB[] rgbs = dialog.getRGBs();
 			if (rgbs != null) {
-				for (RGB rgb : rgbs) {
-					textWidget.append ("\t" + rgb + Text.DELIMITER);
+				for (RGB rgbColor : rgbs) {
+					textWidget.append ("\t" + rgbColor + Text.DELIMITER);
 				}
 			}
 			textWidget.append (Text.DELIMITER);
@@ -206,8 +220,8 @@ class DialogTab extends Tab {
 			textWidget.append ("getFontList() =" + Text.DELIMITER);
 			FontData [] fonts = dialog.getFontList ();
 			if (fonts != null) {
-				for (FontData font2 : fonts) {
-					textWidget.append ("\t" + font2 + Text.DELIMITER);
+				for (FontData font : fonts) {
+					textWidget.append ("\t" + font + Text.DELIMITER);
 				}
 			}
 			textWidget.append ("getEffectsVisible() = " + dialog.getEffectsVisible() + Text.DELIMITER);
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/Tab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/Tab.java
index 17a854f52b..9e105b667b 100644
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/Tab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/Tab.java
@@ -456,8 +456,8 @@ abstract class Tab {
 			font = null;
 			if (colorAndFontTable != null && !colorAndFontTable.isDisposed()) {
 				TableItem [] items = colorAndFontTable.getItems();
-				for (TableItem item2 : items) {
-					Image image = item2.getImage();
+				for (TableItem currentItem : items) {
+					Image image = currentItem.getImage();
 					if (image != null) image.dispose();
 				}
 			}
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/FileViewer.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/FileViewer.java
index 8478d54f2b..28e8369abb 100644
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/FileViewer.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/FileViewer.java
@@ -944,8 +944,8 @@ public class FileViewer {
 			// No guarantee that the items are sorted in any recognizable fashion, so we'll
 			// just sequential scan.  There shouldn't be more than a few thousand entries.
 			TreeItem item = null;
-			for (TreeItem item2 : items) {
-				item = item2;
+			for (TreeItem currentItem : items) {
+				item = currentItem;
 				if (item.isDisposed()) continue;
 				final File itemFile = (File) item.getData(TREEITEMDATA_FILE);
 				if (itemFile != null && itemFile.equals(pathElement)) break;
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/BallTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/BallTab.java
index 7f4ad24725..d169ae81a6 100644
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/BallTab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/BallTab.java
@@ -144,19 +144,19 @@ public class BallTab extends AnimatedGraphicsTab {
 					new Color[] { device.getSystemColor(SWT.COLOR_MAGENTA) });
 		}
 
-		for (BallCollection element : bc) {
-			for (int i = 0; i < element.prevx.size(); i++) {
+		for (BallCollection ballCollection : bc) {
+			for (int i = 0; i < ballCollection.prevx.size(); i++) {
 				Transform transform = new Transform(device);
-				transform.translate(element.prevx.get(element.prevx.size()
-						- (i + 1)).floatValue(), element.prevy
-						.get(element.prevy.size() - (i + 1)).floatValue());
+				transform.translate(ballCollection.prevx.get(ballCollection.prevx.size()
+						- (i + 1)).floatValue(), ballCollection.prevy
+						.get(ballCollection.prevy.size() - (i + 1)).floatValue());
 				gc.setTransform(transform);
 				transform.dispose();
 
 				Path path = new Path(device);
-				path.addArc(0, 0, element.ball_size, element.ball_size, 0, 360);
-				gc.setAlpha(255 - i * (255 / element.capacity));
-				gc.setBackground(element.colors[0]);
+				path.addArc(0, 0, ballCollection.ball_size, ballCollection.ball_size, 0, 360);
+				gc.setAlpha(255 - i * (255 / ballCollection.capacity));
+				gc.setBackground(ballCollection.colors[0]);
 				gc.fillPath(path);
 				gc.drawPath(path);
 				path.dispose();
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/layoutexample/LayoutExample.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/layoutexample/LayoutExample.java
index ffd3b4e028..f9395dadca 100644
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/layoutexample/LayoutExample.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/layoutexample/LayoutExample.java
@@ -11,13 +11,19 @@
 package org.eclipse.swt.examples.layoutexample;
 
 
-import org.eclipse.swt.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.events.*;
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
 
-import java.text.*;
-import java.util.*;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ShellAdapter;
+import org.eclipse.swt.events.ShellEvent;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.TabFolder;
+import org.eclipse.swt.widgets.TabItem;
 
 public class LayoutExample {
 	private static ResourceBundle resourceBundle = ResourceBundle.getBundle("examples_layout");
@@ -73,8 +79,8 @@ public class LayoutExample {
 			@Override
 			public void shellClosed(ShellEvent e) {
 				Shell [] shells = display.getShells();
-				for (Shell shell2 : shells) {
-					if (shell2 != shell) shell2.close ();
+				for (Shell currentShell : shells) {
+					if (currentShell != shell) currentShell.close ();
 				}
 			}
 		});
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/layoutexample/Tab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/layoutexample/Tab.java
index e43f15975d..1bae1e76b4 100644
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/layoutexample/Tab.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/layoutexample/Tab.java
@@ -220,8 +220,8 @@ abstract class Tab {
 			public void widgetSelected (SelectionEvent e) {
 				resetEditors ();
 				children = layoutComposite.getChildren ();
-				for (Control element : children) {
-					element.dispose ();
+				for (Control child : children) {
+					child.dispose ();
 				}
 				table.removeAll ();
 				data.clear ();
@@ -649,8 +649,8 @@ abstract class Tab {
 	void refreshLayoutComposite () {
 		/* Remove children that are already laid out */
 		children = layoutComposite.getChildren ();
-		for (Control element : children) {
-			element.dispose ();
+		for (Control child : children) {
+			child.dispose ();
 		}
 		/* Add all children listed in the table */
 		TableItem [] items = table.getItems ();
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/paint/PaintExample.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/paint/PaintExample.java
index e9e493e1b9..1ee6b41b4b 100644
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/paint/PaintExample.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/paint/PaintExample.java
@@ -368,8 +368,7 @@ public class PaintExample {
 	 * Frees the resource bundle resources.
 	 */
 	public void freeResources() {
-		for (Tool tool2 : tools) {
-			Tool tool = tool2;
+		for (Tool tool : tools) {
 			final Image image = tool.image;
 			if (image != null) image.dispose();
 			tool.image = null;
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/texteditor/TextEditor.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/texteditor/TextEditor.java
index 6dbd080820..6086d6ab82 100644
--- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/texteditor/TextEditor.java
+++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/texteditor/TextEditor.java
@@ -1039,25 +1039,24 @@ public class TextEditor {
 
 	void disposeRanges(StyleRange[] ranges) {
 		StyleRange[] allRanges = styledText.getStyleRanges(0, styledText.getCharCount(), false);
-		for (StyleRange style : ranges) {
+		for (StyleRange rangeToDispose : ranges) {
 			boolean disposeFg = true, disposeBg = true, disposeStrike= true, disposeUnder= true, disposeBorder = true, disposeFont = true;
-
-			for (StyleRange s : allRanges) {
-				if (disposeFont && style.font == s.font) disposeFont = false;
-				if (disposeFg && style.foreground == s.foreground) disposeFg = false;
-				if (disposeBg && style.background == s.background) disposeBg = false;
-				if (disposeStrike && style.strikeoutColor == s.strikeoutColor) disposeStrike = false;
-				if (disposeUnder && style.underlineColor == s.underlineColor) disposeUnder = false;
-				if (disposeBorder && style.borderColor == s.borderColor) disposeBorder =  false;
-			}
-			if (disposeFont && style.font != textFont && style.font != null)  style.font.dispose();
-			if (disposeFg && style.foreground != textForeground && style.foreground != null) style.foreground.dispose();
-			if (disposeBg && style.background != textBackground && style.background != null) style.background.dispose();
-			if (disposeStrike && style.strikeoutColor != strikeoutColor && style.strikeoutColor != null) style.strikeoutColor.dispose();
-			if (disposeUnder && style.underlineColor != underlineColor && style.underlineColor != null) style.underlineColor.dispose();
-			if (disposeBorder && style.borderColor != borderColor && style.borderColor != null) style.borderColor.dispose();
-
-			Object data = style.data;
+			for (StyleRange range : allRanges) {
+				if (disposeFont && rangeToDispose.font == range.font) disposeFont = false;
+				if (disposeFg && rangeToDispose.foreground == range.foreground) disposeFg = false;
+				if (disposeBg && rangeToDispose.background == range.background) disposeBg = false;
+				if (disposeStrike && rangeToDispose.strikeoutColor == range.strikeoutColor) disposeStrike = false;
+				if (disposeUnder && rangeToDispose.underlineColor == range.underlineColor) disposeUnder = false;
+				if (disposeBorder && rangeToDispose.borderColor == range.borderColor) disposeBorder =  false;
+			}
+			if (disposeFont && rangeToDispose.font != textFont && rangeToDispose.font != null)  rangeToDispose.font.dispose();
+			if (disposeFg && rangeToDispose.foreground != textForeground && rangeToDispose.foreground != null) rangeToDispose.foreground.dispose();
+			if (disposeBg && rangeToDispose.background != textBackground && rangeToDispose.background != null) rangeToDispose.background.dispose();
+			if (disposeStrike && rangeToDispose.strikeoutColor != strikeoutColor && rangeToDispose.strikeoutColor != null) rangeToDispose.strikeoutColor.dispose();
+			if (disposeUnder && rangeToDispose.underlineColor != underlineColor && rangeToDispose.underlineColor != null) rangeToDispose.underlineColor.dispose();
+			if (disposeBorder && rangeToDispose.borderColor != borderColor && rangeToDispose.borderColor != null) rangeToDispose.borderColor.dispose();
+
+			Object data = rangeToDispose.data;
 			if (data != null) {
 				if (data instanceof Image) ((Image)data).dispose();
 				if (data instanceof Control) ((Control)data).dispose();