Bug 548309 - Use jdk 5 for-each loop (org.eclipse.jdt.astview)

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

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

4 files changed, 23 insertions, 34 deletions

diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTView.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTView.java
index 97c386db7c..099f8bb9fd 100644
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTView.java
+++ b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTView.java
@@ -741,8 +741,8 @@ public class ASTView extends ViewPart implements IShowInSource, IShowInTargetLis
 		fStatementsRecoveryAction.setEnabled(enabled);
 		fBindingsRecoveryAction.setEnabled(enabled);
 		fIgnoreMethodBodiesAction.setEnabled(enabled);
-		for (int i= 0; i < fASTVersionToggleActions.length; i++) {
-			fASTVersionToggleActions[i].setEnabled(enabled);
+		for (ASTView.ASTLevelToggle action : fASTVersionToggleActions) {
+			action.setEnabled(enabled);
 		}
 	}
 
@@ -935,8 +935,8 @@ public class ASTView extends ViewPart implements IShowInSource, IShowInTargetLis
 	}
 
 	private void fillLocalPullDown(IMenuManager manager) {
-		for (int i= 0; i < fASTVersionToggleActions.length; i++) {
-			manager.add(fASTVersionToggleActions[i]);
+		for (ASTView.ASTLevelToggle action : fASTVersionToggleActions) {
+			manager.add(action);
 		}
 		manager.add(new Separator());
 		manager.add(fCreateBindingsAction);
@@ -944,8 +944,8 @@ public class ASTView extends ViewPart implements IShowInSource, IShowInTargetLis
 		manager.add(fBindingsRecoveryAction);
 		manager.add(fIgnoreMethodBodiesAction);
 		manager.add(new Separator());
-		for (int i= 0; i < fASTInputKindActions.length; i++) {
-			manager.add(fASTInputKindActions[i]);
+		for (ASTView.ASTInputKindAction action : fASTInputKindActions) {
+			manager.add(action);
 		}
 		manager.add(new Separator());
 		manager.add(fFindDeclaringNodeAction);
@@ -1236,9 +1236,8 @@ public class ASTView extends ViewPart implements IShowInSource, IShowInTargetLis
 			}
 		}
 		// update action state
-		for (int i= 0; i < fASTVersionToggleActions.length; i++) {
-			ASTLevelToggle curr= fASTVersionToggleActions[i];
-			curr.setChecked(curr.getLevel() == fCurrentASTLevel);
+		for (ASTView.ASTLevelToggle action : fASTVersionToggleActions) {
+			action.setChecked(action.getLevel() == fCurrentASTLevel);
 		}
 	}
 	
@@ -1246,9 +1245,8 @@ public class ASTView extends ViewPart implements IShowInSource, IShowInTargetLis
 		if (inputKind != fCurrentInputKind) {
 			fCurrentInputKind= inputKind;
 			fDialogSettings.put(SETTINGS_INPUT_KIND, inputKind);
-			for (int i= 0; i < fASTInputKindActions.length; i++) {
-				ASTInputKindAction curr= fASTInputKindActions[i];
-				curr.setChecked(curr.getInputKind() == inputKind);
+			for (ASTView.ASTInputKindAction action : fASTInputKindActions) {
+				action.setChecked(action.getInputKind() == inputKind);
 			}
 			refreshASTSettingsActions();
 			performRefresh();
@@ -1364,10 +1362,9 @@ public class ASTView extends ViewPart implements IShowInSource, IShowInTargetLis
 		if (selection.isEmpty()) {
 			fViewer.collapseAll();
 		} else {
-			Object[] selected= selection.toArray();
 			fViewer.getTree().setRedraw(false);
-			for (int i= 0; i < selected.length; i++) {
-				fViewer.collapseToLevel(selected[i], AbstractTreeViewer.ALL_LEVELS);
+			for (Object s : selection.toArray()) {
+				fViewer.collapseToLevel(s, AbstractTreeViewer.ALL_LEVELS);
 			}
 			fViewer.getTree().setRedraw(true);
 		}
@@ -1378,10 +1375,9 @@ public class ASTView extends ViewPart implements IShowInSource, IShowInTargetLis
 		if (selection.isEmpty()) {
 			fViewer.expandToLevel(3);
 		} else {
-			Object[] selected= selection.toArray();
 			fViewer.getTree().setRedraw(false);
-			for (int i= 0; i < selected.length; i++) {
-				fViewer.expandToLevel(selected[i], 3);
+			for (Object s : selection.toArray()) {
+				fViewer.expandToLevel(s, 3);
 			}
 			fViewer.getTree().setRedraw(true);
 		}
diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTViewLabelProvider.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTViewLabelProvider.java
index 4608996751..1041a761bc 100644
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTViewLabelProvider.java
+++ b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ASTViewLabelProvider.java
@@ -14,7 +14,6 @@
 
 package org.eclipse.jdt.astview.views;
 
-import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.swt.SWT;
@@ -77,8 +76,8 @@ public class ASTViewLabelProvider extends LabelProvider implements IColorProvide
 		
 		fBold= PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getFontRegistry().getBold(JFaceResources.DEFAULT_FONT);
 		FontData[] fontData= fBold.getFontData();
-		for (int i= 0; i < fontData.length; i++) {
-			fontData[i].setStyle(fontData[i].getStyle() | SWT.ITALIC);
+		for (FontData fd : fontData) {
+			fd.setStyle(fd.getStyle() | SWT.ITALIC);
 		}
 		fAllocatedBoldItalic= new Font(display, fontData);
 	}
@@ -216,8 +215,7 @@ public class ASTViewLabelProvider extends LabelProvider implements IColorProvide
 			if (object instanceof ASTNode) {
 				return isInsideNode((ASTNode) object);
 			} else if (object instanceof List) {
-				for (Iterator<?> iter= ((List<?>) object).iterator(); iter.hasNext(); ) {
-					Object child= iter.next();
+				for (Object child : (List<?>) object) {
 					if (isInside(child)) {
 						return true;
 					}
diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ProblemNode.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ProblemNode.java
index fd7db5daa4..3732ce72ce 100644
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ProblemNode.java
+++ b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/ProblemNode.java
@@ -113,9 +113,7 @@ public class ProblemNode extends ASTAttribute {
 	
 	private String getConstantName() {
 		int id= fProblem.getID();
-		Field[] fields= IProblem.class.getFields();
-		for (int i= 0; i < fields.length; i++) {
-			Field f= fields[i];
+		for (Field f : IProblem.class.getFields()) {
 			try {
 				if (f.getType() == int.class && f.getInt(f) == id) {
 					return "IProblem." + f.getName();
diff --git a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/TreeCopyAction.java b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/TreeCopyAction.java
index 99b6b59e5f..6c5e179920 100644
--- a/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/TreeCopyAction.java
+++ b/org.eclipse.jdt.astview/src/org/eclipse/jdt/astview/views/TreeCopyAction.java
@@ -15,7 +15,6 @@ package org.eclipse.jdt.astview.views;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.swt.dnd.Clipboard;
@@ -95,9 +94,9 @@ public class TreeCopyAction extends Action {
 	@Override
 	public void run() {
 		Tree tree= null;
-		for (int i= 0; i < fTrees.length; i++) {
-			if (fTrees[i].isFocusControl()) {
-				tree= fTrees[i];
+		for (Tree t : fTrees) {
+			if (t.isFocusControl()) {
+				tree= t;
 				break;
 			}
 		}
@@ -127,8 +126,7 @@ public class TreeCopyAction extends Action {
 		List<TreeObject> roots= new ArrayList<>();
 		int indent= Integer.MIN_VALUE;
 		
-		for (int i= 0; i < selection.length; i++) {
-			TreeItem item= selection[i];
+		for (TreeItem item : selection) {
 			TreeObject treeObj= elementToTreeObj.get(item);
 			if (treeObj == null) {
 				treeObj= new TreeObject(item, true);
@@ -168,8 +166,7 @@ public class TreeCopyAction extends Action {
 	}
 
 	private void appendSelectionObjects(StringBuffer buffer, int indent, List<TreeObject> selObjs) {
-		for (Iterator<TreeObject> iter= selObjs.iterator(); iter.hasNext();) {
-			TreeObject selObj= iter.next();
+		for (TreeObject selObj : selObjs) {
 			if (selObj.isSelected()) {
 				buffer.append('\n');
 				for (int d= 0; d < indent; d++)