Use jdk 5 for-each loop (Part 2)I20191024-1800I20191023-1810

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

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

16 files changed, 59 insertions, 87 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractVirtualContentTableModel.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractVirtualContentTableModel.java
index 4c6633eeb..58a9b18ee 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractVirtualContentTableModel.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractVirtualContentTableModel.java
@@ -29,11 +29,11 @@ abstract public class AbstractVirtualContentTableModel extends AsynchronousTable
 		ModelNode[] nodes = getNodes(getRootNode().getElement());
 		ArrayList<Object> result = new ArrayList<>();
 		if (nodes != null) {
-			for (int i = 0; i < nodes.length; i++) {
-				ModelNode[] children = nodes[i].getChildrenNodes();
+			for (ModelNode node : nodes) {
+				ModelNode[] children = node.getChildrenNodes();
 				if (children != null) {
-					for (int j = 0; j < children.length; j++) {
-						result.add(children[j].getElement());
+					for (ModelNode child : children) {
+						result.add(child.getElement());
 					}
 				}
 			}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingViewer.java
index c57c7bf8e..d9a9a927c 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingViewer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingViewer.java
@@ -614,9 +614,7 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer {
 		int colNum = -1;
 		int numCol = getColumnProperties().length;
 
-		for (int j=0; j<tableItems.length; j++)
-		{
-			TableItem item = tableItems[j];
+		for (TableItem item : tableItems) {
 			if (item.getData() != null)
 			{
 				for (int i=0; i<numCol; i++)
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncVirtualContentTableViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncVirtualContentTableViewer.java
index 8a94cf217..0ec26b16b 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncVirtualContentTableViewer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncVirtualContentTableViewer.java
@@ -87,8 +87,8 @@ abstract public class AsyncVirtualContentTableViewer extends AsynchronousTableVi
 		// clean up old columns
 		TableColumn[] oldColumns = getTable().getColumns();
 
-		for (int i = 0; i < oldColumns.length; i++) {
-			oldColumns[i].dispose();
+		for (TableColumn oldColumn : oldColumns) {
+			oldColumn.dispose();
 		}
 	}
 
@@ -97,8 +97,8 @@ abstract public class AsyncVirtualContentTableViewer extends AsynchronousTableVi
 		CellEditor[] oldCellEditors = getCellEditors();
 
 		if (oldCellEditors != null) {
-			for (int i = 0; i < oldCellEditors.length; i++) {
-				oldCellEditors[i].dispose();
+			for (CellEditor oldCellEditor : oldCellEditors) {
+				oldCellEditor.dispose();
 			}
 		}
 	}
@@ -424,9 +424,9 @@ abstract public class AsyncVirtualContentTableViewer extends AsynchronousTableVi
 			// check each of the items and find the minimum
 			TableItem[] items = table.getItems();
 			int minHeight = table.getItemHeight();
-			for (int i = 0; i < items.length; i++) {
-				if (items[i].getData() != null) {
-					minHeight = Math.min(items[i].getBounds(0).height, minHeight);
+			for (TableItem item : items) {
+				if (item.getData() != null) {
+					minHeight = Math.min(item.getBounds(0).height, minHeight);
 				}
 			}
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/BasicDebugViewContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/BasicDebugViewContentProvider.java
index 08fb101ff..48f93c40a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/BasicDebugViewContentProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/BasicDebugViewContentProvider.java
@@ -109,8 +109,8 @@ public abstract class BasicDebugViewContentProvider implements IStructuredConten
 
 	@Override
 	public void handleDebugEvents(DebugEvent[] events) {
-		for (int i=0; i < events.length; i++) {
-			handleDebugEvent(events[i]);
+		for (DebugEvent event : events) {
+			handleDebugEvent(event);
 		}
 	}
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CopyTableRenderingToClipboardAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CopyTableRenderingToClipboardAction.java
index 3decf470e..2ec3f8297 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CopyTableRenderingToClipboardAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CopyTableRenderingToClipboardAction.java
@@ -139,11 +139,11 @@ public class CopyTableRenderingToClipboardAction extends Action
 		StringBuilder temp;
 
 		//get the column contents from all the rows
-		for (int i=0; i < itemList.length; i++) {
-			for (int j=0; j < numColumns; j++) {
+		for (TableItem item : itemList) {
+			for (int j = 0; j < numColumns; j++) {
 				tableContents.append(COLUMN_SEPERATOR);
 
-				temp = new StringBuilder(labelProvider.getColumnText(itemList[i].getData(), j));
+				temp = new StringBuilder(labelProvider.getColumnText(item.getData(), j));
 
 				if (j>0)
 				{
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CreateRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CreateRendering.java
index 4db332fb7..c09a32c98 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CreateRendering.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CreateRendering.java
@@ -257,12 +257,10 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR
 		// make a copy of the container, may be diposed when a rendering is added
 		IMemoryRenderingContainer container = fContainer;
 		// add memory renderings to Memory Rendering Manager
-		for (int i=0; i<renderings.length; i++)
-		{
-			if (renderings[i] instanceof IMemoryRenderingType)
-			{
+		for (Object r : renderings) {
+			if (r instanceof IMemoryRenderingType) {
 				try {
-					IMemoryRendering rendering = ((IMemoryRenderingType)renderings[i]).createRendering();
+					IMemoryRendering rendering = ((IMemoryRenderingType) r).createRendering();
 					if (rendering != null)
 					{
 						rendering.init(container, getMemoryBlock());
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/FormatTableRenderingDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/FormatTableRenderingDialog.java
index 7ddfd7f26..06c3bfbb1 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/FormatTableRenderingDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/FormatTableRenderingDialog.java
@@ -353,9 +353,8 @@ public class FormatTableRenderingDialog extends TrayDialog
 			}
 
 			addressCol.pack();
-			for (int i=0; i<columns.length; i++)
-			{
-				columns[i].pack();
+			for (TableColumn column : columns) {
+				column.pack();
 			}
 
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressDialog.java
index 0982ff7a1..c82588500 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressDialog.java
@@ -80,8 +80,8 @@ public class GoToAddressDialog extends TrayDialog implements ModifyListener {
 
 		// add history
 		String[] historyExpression = history.toArray(new String[history.size()]);
-		for (int i = 0; i < historyExpression.length; i++) {
-			expressionInput.add(historyExpression[i]);
+		for (String h : historyExpression) {
+			expressionInput.add(h);
 		}
 
 		expressionInput.addModifyListener(this);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexIntegerRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexIntegerRendering.java
index 53280662e..4e05c2207 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexIntegerRendering.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexIntegerRendering.java
@@ -46,14 +46,10 @@ public class HexIntegerRendering extends AbstractIntegerRendering {
 			data = swapped;
 		}
 
-		for (int i=0; i<data.length; i++)
-		{
-			if (data[i].isReadable())
-			{
-				strBuffer.append(new String(RenderingsUtil.convertByteToCharArray(data[i].getValue())));
-			}
-			else
-			{
+		for (MemoryByte memByte : data) {
+			if (memByte.isReadable()) {
+				strBuffer.append(new String(RenderingsUtil.convertByteToCharArray(memByte.getValue())));
+			} else {
 				// pad with padded string
 				strBuffer.append(paddedStr);
 			}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexRendering.java
index 5561c180f..f3544e302 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexRendering.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexRendering.java
@@ -38,14 +38,10 @@ public class HexRendering extends AbstractAsyncTableRendering {
 
 		String paddedStr = DebugUIPlugin.getDefault().getPreferenceStore().getString(IDebugUIConstants.PREF_PADDED_STR);
 
-		for (int i=0; i<data.length; i++)
-		{
-			if (data[i].isReadable())
-			{
-				strBuffer.append(new String(RenderingsUtil.convertByteToCharArray(data[i].getValue())));
-			}
-			else
-			{
+		for (MemoryByte memByte : data) {
+			if (memByte.isReadable()) {
+				strBuffer.append(new String(RenderingsUtil.convertByteToCharArray(memByte.getValue())));
+			} else {
 				// pad with padded string
 				strBuffer.append(paddedStr);
 			}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/PrintTableRenderingAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/PrintTableRenderingAction.java
index 6068deb0c..9b405f8e9 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/PrintTableRenderingAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/PrintTableRenderingAction.java
@@ -80,22 +80,20 @@ public class PrintTableRenderingAction extends Action
 		lineNum = printColumnLabels(printGC, lineNum);
 
 		//for all items in the table
-		for (int i=0; i < itemList.length; i++) {
+		for (TableItem item : itemList) {
 			StringBuilder tableContents = new StringBuilder();
 			//print all columns for this row
-			for (int j=0; j < numColumns; j++) {
-				String columnText = labelProvider.getColumnText(itemList[i].getData(), j);
-
+			for (int j = 0; j < numColumns; j++) {
+				String columnText = labelProvider.getColumnText(item.getData(), j);
 				while (columnText.length() < fRendering.getBytesPerColumn() * charsPerByte)
 				{
-					 columnText += " "; //$NON-NLS-1$
+					columnText += " "; //$NON-NLS-1$
 				}
 				tableContents.append(COLUMN_SEPERATOR);
 				tableContents.append(columnText);
 			}
 			printGC.drawString(tableContents.toString(), 10, 10+(lineNum*printGC.getFontMetrics().getHeight()));
 			lineNum++;
-
 			// if we've run over the end of a page, start a new one
 			if (20+lineNum*printGC.getFontMetrics().getHeight() > printer.getClientArea().height) {
 				lineNum=1;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/SignedIntegerRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/SignedIntegerRendering.java
index b808a2c50..ac774e814 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/SignedIntegerRendering.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/SignedIntegerRendering.java
@@ -144,10 +144,8 @@ public class SignedIntegerRendering extends AbstractIntegerRendering {
 
 		boolean invalid = false;
 		String paddedStr = DebugUIPlugin.getDefault().getPreferenceStore().getString(IDebugUIConstants.PREF_PADDED_STR);
-		for (int i=0; i<data.length; i++)
-		{
-			if (!data[i].isReadable())
-			{
+		for (MemoryByte memByte : data) {
+			if (!memByte.isReadable()) {
 				invalid = true;
 				break;
 			}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingContentProvider.java
index f8c20fd79..58df27051 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingContentProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingContentProvider.java
@@ -726,10 +726,9 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider
 		// content.
 		if (!getTableRendering(fInput).isDisplayingError())
 		{
-			for (int i=0; i<lines.length; i++)
-			{
-				contentCache.put(lines[i].getAddress(), lines[i]);
-				lines[i].isMonitored = true;
+			for (TableRenderingLine line : lines) {
+				contentCache.put(line.getAddress(), line);
+				line.isMonitored = true;
 			}
 		}
 
@@ -933,9 +932,8 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider
 		TableRenderingLine[] convertedLines = convertBytesToLines(bytes, bytesPerLine, new BigInteger(fContentCacheStartAddress, 16));
 
 		contentCache.clear();
-		for (int i=0; i<convertedLines.length; i++)
-		{
-			contentCache.put(convertedLines[i].getAddress(), convertedLines[i]);
+		for (TableRenderingLine convertedLine : convertedLines) {
+			contentCache.put(convertedLine.getAddress(), convertedLine);
 		}
 	}
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLine.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLine.java
index 677bf2714..b1165f9cf 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLine.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLine.java
@@ -93,11 +93,9 @@ public class TableRenderingLine extends PlatformObject {
 			// pad unavailable bytes with padded string from memory block
 			String paddedString = null;
 			int bufferCounter = 0;
-			for (int i=0; i<fBytes.length; i++)
-			{
+			for (MemoryByte mb : fBytes) {
 				// if byte is invalid
-				if (!fBytes[i].isReadable())
-				{
+				if (!mb.isReadable()) {
 					if (paddedString == null)
 					{
 						paddedString = fPaddedString;
@@ -177,10 +175,9 @@ public class TableRenderingLine extends PlatformObject {
 		// if the string representation is the same, no need to compare
 		if (oldData.getRawMemoryString().equals(getRawMemoryString()))
 		{
-			for (int i=0; i<fBytes.length; i++)
-			{
+			for (MemoryByte mb : fBytes) {
 				// set history as known if we have old data for this line
-				fBytes[i].setHistoryKnown(true);
+				mb.setHistoryKnown(true);
 			}
 			return;
 		}
@@ -283,11 +280,10 @@ public class TableRenderingLine extends PlatformObject {
 
 	public void unmarkDeltas()
 	{
-		for (int i=0; i<fBytes.length; i++)
-		{
+		for (MemoryByte mb : fBytes) {
 			// unset the change bit
-			if (fBytes[i].isChanged()) {
-				fBytes[i].setChanged(false);
+			if (mb.isChanged()) {
+				mb.setChanged(false);
 			}
 		}
 	}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingModel.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingModel.java
index 859bc9f3f..7937f4576 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingModel.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingModel.java
@@ -166,8 +166,7 @@ public class TableRenderingModel extends AbstractVirtualContentTableModel implem
 
 	@Override
 	public void cache(Object[] elements) {
-		for (int i = 0; i < elements.length; i++) {
-			Object obj = elements[i];
+		for (Object obj : elements) {
 			if (obj instanceof MemorySegment) {
 				cache(((MemorySegment) obj).getAddress(), obj);
 			}
@@ -187,8 +186,7 @@ public class TableRenderingModel extends AbstractVirtualContentTableModel implem
 			return newElements;
 		}
 
-		for (int j = 0; j < newElements.length; j++) {
-			Object obj = newElements[j];
+		for (Object obj : newElements) {
 			if (obj instanceof MemorySegment) {
 				MemorySegment newSegment = (MemorySegment) obj;
 				MemorySegment oldSegment = (MemorySegment) fCache.get(newSegment.getAddress());
@@ -275,8 +273,8 @@ public class TableRenderingModel extends AbstractVirtualContentTableModel implem
 		}
 
 		MemorySegment[] newSegments = convertMemoryBytesToSegments(address, bytes, bytesPerLine, numAddressableUnitPerLine, addressableSize, alignAddress);
-		for (int i = 0; i < newSegments.length; i++) {
-			cache(newSegments[i].getAddress(), newSegments[i]);
+		for (MemorySegment newSegment : newSegments) {
+			cache(newSegment.getAddress(), newSegment);
 		}
 	}
 
@@ -290,8 +288,7 @@ public class TableRenderingModel extends AbstractVirtualContentTableModel implem
 
 		ArrayList<Object> segments = new ArrayList<>();
 		Object[] elements = getElements();
-		for (int i = 0; i < elements.length; i++) {
-			Object element = elements[i];
+		for (Object element : elements) {
 			if (element instanceof MemorySegment) {
 				segments.add(element);
 			}
@@ -322,8 +319,8 @@ public class TableRenderingModel extends AbstractVirtualContentTableModel implem
 
 	private MemoryByte[] convertSegmentsToBytes(MemorySegment[] segments) {
 		ArrayList<MemoryByte> toReturn = new ArrayList<>();
-		for (int i = 0; i < segments.length; i++) {
-			MemoryByte[] temp = segments[i].getBytes();
+		for (MemorySegment segment : segments) {
+			MemoryByte[] temp = segment.getBytes();
 			Collections.addAll(toReturn, temp);
 		}
 		return toReturn.toArray(new MemoryByte[0]);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/UnsignedIntegerRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/UnsignedIntegerRendering.java
index 25b8a8197..572bbf293 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/UnsignedIntegerRendering.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/UnsignedIntegerRendering.java
@@ -130,10 +130,8 @@ public class UnsignedIntegerRendering extends AbstractIntegerRendering {
 
 		String paddedStr = DebugUIPlugin.getDefault().getPreferenceStore().getString(IDebugUIConstants.PREF_PADDED_STR);
 		boolean invalid = false;
-		for (int i=0; i<data.length; i++)
-		{
-			if (!data[i].isReadable())
-			{
+		for (MemoryByte memByte : data) {
+			if (!memByte.isReadable()) {
 				invalid = true;
 				break;
 			}