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

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

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

5 files changed, 10 insertions, 16 deletions

diff --git a/org.eclipse.jdt.jeview/META-INF/MANIFEST.MF b/org.eclipse.jdt.jeview/META-INF/MANIFEST.MF
index b1c1ed3e75..c5011322a2 100644
--- a/org.eclipse.jdt.jeview/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.jeview/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.jdt.jeview
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.jeview; singleton:=true
-Bundle-Version: 1.3.200.qualifier
+Bundle-Version: 1.3.300.qualifier
 Eclipse-SourceReferences: scm:git:git://git.eclipse.org/gitroot/jdt/eclipse.jdt.ui.git;path="org.eclipse.jdt.jeview";tag=R4_4
 Bundle-Activator: org.eclipse.jdt.jeview.JEViewPlugin
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.jdt.jeview/pom.xml b/org.eclipse.jdt.jeview/pom.xml
index 2a505a9a33..af55f2c6f8 100644
--- a/org.eclipse.jdt.jeview/pom.xml
+++ b/org.eclipse.jdt.jeview/pom.xml
@@ -18,6 +18,6 @@
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.jeview</artifactId>
-  <version>1.3.200-SNAPSHOT</version>
+  <version>1.3.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/properties/MarkerProperties.java b/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/properties/MarkerProperties.java
index 8b712966cd..0f11a9c0e7 100644
--- a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/properties/MarkerProperties.java
+++ b/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/properties/MarkerProperties.java
@@ -109,8 +109,7 @@ public class MarkerProperties implements IPropertySource {
 	@Override
 	public Object getPropertyValue(Object id) {
 		AttributeDescriptor[] propertyDescriptors= getPropertyDescriptors();
-		for (int i= 0; i < propertyDescriptors.length; i++) {
-			AttributeDescriptor descriptor= propertyDescriptors[i];
+		for (AttributeDescriptor descriptor : propertyDescriptors) {
 			if (descriptor.getId().equals(id))
 				return descriptor.getValue();
 		}
@@ -203,8 +202,7 @@ public class MarkerProperties implements IPropertySource {
 		
 		private static String getConstantName(int id) {
 			Field[] fields= IProblem.class.getFields();
-			for (int i= 0; i < fields.length; i++) {
-				Field f= fields[i];
+			for (Field f : fields) {
 				try {
 					if (f.getType() == int.class && f.getInt(f) == id) {
 						return "IProblem." + f.getName();
diff --git a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/properties/MemberValuePairProperties.java b/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/properties/MemberValuePairProperties.java
index 59f0287e8c..1b0f2d920b 100644
--- a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/properties/MemberValuePairProperties.java
+++ b/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/properties/MemberValuePairProperties.java
@@ -89,8 +89,7 @@ public class MemberValuePairProperties implements IPropertySource {
 	static String getValueKindName(int valueKind) {
 		String name= "UNKNOWN";
 		Field[] fields= IMemberValuePair.class.getFields();
-		for (int i= 0; i < fields.length; i++) {
-			Field f= fields[i];
+		for (Field f : fields) {
 			try {
 				if (f.getType() == int.class && f.getInt(f) == valueKind) {
 					name= "IMemberValuePair." + f.getName();
diff --git a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/TreeCopyAction.java b/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/TreeCopyAction.java
index 8287864176..cc3f3f0e7e 100644
--- a/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/TreeCopyAction.java
+++ b/org.eclipse.jdt.jeview/src/org/eclipse/jdt/jeview/views/TreeCopyAction.java
@@ -15,7 +15,6 @@ package org.eclipse.jdt.jeview.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 fTree : fTrees) {
+			if (fTree.isFocusControl()) {
+				tree= fTree;
 				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++)