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>

37 files changed, 195 insertions, 257 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextManager.java
index c8669a24c..3a78e8d1e 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextManager.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextManager.java
@@ -53,8 +53,7 @@ public class ViewContextManager implements IWindowListener {
 	private ViewContextManager() {
 		IWorkbench workbench = PlatformUI.getWorkbench();
 		IWorkbenchWindow[] workbenchWindows = workbench.getWorkbenchWindows();
-		for (int i = 0; i < workbenchWindows.length; i++) {
-			IWorkbenchWindow window = workbenchWindows[i];
+		for (IWorkbenchWindow window : workbenchWindows) {
 			windowOpened(window);
 		}
 		workbench.addWindowListener(this);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointOrganizerExtension.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointOrganizerExtension.java
index 9c7bf8d82..7f04f4a83 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointOrganizerExtension.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointOrganizerExtension.java
@@ -160,8 +160,8 @@ public class BreakpointOrganizerExtension implements IBreakpointOrganizer, IBrea
 		if (organizer instanceof IBreakpointOrganizerDelegateExtension) {
 			((IBreakpointOrganizerDelegateExtension)organizer).addBreakpoints(breakpoints, category);
 		} else {
-			for (int i = 0; i < breakpoints.length; i++) {
-				addBreakpoint(breakpoints[i], category);
+			for (IBreakpoint breakpoint : breakpoints) {
+				addBreakpoint(breakpoint, category);
 			}
 		}
 	}
@@ -172,8 +172,8 @@ public class BreakpointOrganizerExtension implements IBreakpointOrganizer, IBrea
 		if (organizer instanceof IBreakpointOrganizerDelegateExtension) {
 			((IBreakpointOrganizerDelegateExtension)organizer).removeBreakpoints(breakpoints, category);
 		} else {
-			for (int i = 0; i < breakpoints.length; i++) {
-				removeBreakpoint(breakpoints[i], category);
+			for (IBreakpoint breakpoint : breakpoints) {
+				removeBreakpoint(breakpoint, category);
 			}
 		}
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointSetOrganizer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointSetOrganizer.java
index 9d8d08d08..a8129c311 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointSetOrganizer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointSetOrganizer.java
@@ -82,12 +82,10 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate
 	public IAdaptable[] getCategories(IBreakpoint breakpoint) {
 		List<IAdaptable> result = new ArrayList<>();
 		IWorkingSet[] workingSets = fWorkingSetManager.getWorkingSets();
-		for (int i = 0; i < workingSets.length; i++) {
-			IWorkingSet set = workingSets[i];
+		for (IWorkingSet set : workingSets) {
 			if (IDebugUIConstants.BREAKPOINT_WORKINGSET_ID.equals(set.getId())) {
 				IAdaptable[] elements = set.getElements();
-				for (int j = 0; j < elements.length; j++) {
-					IAdaptable adaptable = elements[j];
+				for (IAdaptable adaptable : elements) {
 					if (adaptable.equals(breakpoint)) {
 						result.add(new WorkingSetCategory(set));
 						break;
@@ -143,9 +141,9 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate
 		}
 		if(property.equals(IWorkingSetManager.CHANGE_WORKING_SET_ADD)) {
 			IAdaptable[] breakpoints = set.getElements();
-			for (int i = 0; i < breakpoints.length; i++) {
-				if (breakpoints[i] instanceof IBreakpoint) {
-					IMarker marker = ((IBreakpoint)breakpoints[i]).getMarker();
+			for (IAdaptable breakpoint : breakpoints) {
+				if (breakpoint instanceof IBreakpoint) {
+					IMarker marker = ((IBreakpoint) breakpoint).getMarker();
 					fCache.addEntry(marker, set.getName());
 					fCache.flushMarkerCache(marker);
 				}
@@ -159,12 +157,12 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate
 	@Override
 	public void breakpointsAdded(IBreakpoint[] breakpoints) {
 		Map<IWorkingSet, List<IBreakpoint>> setToBreakpoints = new HashMap<>();
-		for (int i = 0; i < breakpoints.length; i++) {
-			IMarker marker = breakpoints[i].getMarker();
+		for (IBreakpoint breakpoint : breakpoints) {
+			IMarker marker = breakpoint.getMarker();
 			String[] names = getWorkingsetAttributeFromMarker(marker, IInternalDebugUIConstants.WORKING_SET_NAME);
 			//add it to the default set if the listing is empty
 			if (names.length == 0) {
-				queueToSet(breakpoints[i], getDefaultWorkingSet(), setToBreakpoints);
+				queueToSet(breakpoint, getDefaultWorkingSet(), setToBreakpoints);
 			} else {
 				for (int j = 1; j < names.length; j++) {
 					IWorkingSet set = PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSet(names[j]);
@@ -172,7 +170,7 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate
 					if (set == null) {
 						set = getDefaultWorkingSet();
 					}
-					queueToSet(breakpoints[i], set, setToBreakpoints);
+					queueToSet(breakpoint, set, setToBreakpoints);
 				}
 			}
 		}
@@ -204,12 +202,11 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate
 			IAdaptable[] elements = set.getElements();
 			Set<IAdaptable> collection = new HashSet<>(elements.length);
 			List<IAdaptable> list = new ArrayList<>(elements.length + breakpoints.length);
-			for(int i = 0; i < elements.length; i++) {
-				collection.add(elements[i]);
-				list.add(elements[i]);
+			for (IAdaptable element : elements) {
+				collection.add(element);
+				list.add(element);
 			}
-			for (int i = 0; i < breakpoints.length; i++) {
-				IBreakpoint breakpoint = breakpoints[i];
+			for (IBreakpoint breakpoint : breakpoints) {
 				if (!collection.contains(breakpoint)) {
 					list.add(breakpoint);
 					fCache.addEntry(breakpoint.getMarker(), set.getName()); //fix for bug 103731
@@ -225,8 +222,8 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate
 			IMarkerDelta[] deltas) {
 		IWorkingSet[] workingSets = fWorkingSetManager.getWorkingSets();
 		IWorkingSet set = null;
-		for (int i = 0; i < workingSets.length; i++) {
-			set = workingSets[i];
+		for (IWorkingSet workingSet : workingSets) {
+			set = workingSet;
 			if (IDebugUIConstants.BREAKPOINT_WORKINGSET_ID.equals(set.getId())) {
 				clean(set);
 			}
@@ -255,8 +252,7 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate
 		}
 		if (update) {
 			List<IAdaptable> newElements = new ArrayList<>(elements.length);
-			for (int i = 0; i < elements.length; i++) {
-				IAdaptable adaptable = elements[i];
+			for (IAdaptable adaptable : elements) {
 				if (adaptable != null) {
 					newElements.add(adaptable);
 				}
@@ -360,8 +356,7 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate
 			IWorkingSet set = ((WorkingSetCategory) category).getWorkingSet();
 			IAdaptable[] elements = set.getElements();
 			List<IAdaptable> list = new ArrayList<>();
-			for (int i = 0; i < elements.length; i++) {
-				IAdaptable adaptable = elements[i];
+			for (IAdaptable adaptable : elements) {
 				if (!adaptable.equals(breakpoint)) {
 					list.add(adaptable);
 				}
@@ -376,8 +371,7 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate
 	public IAdaptable[] getCategories() {
 		IWorkingSet[] workingSets = fWorkingSetManager.getWorkingSets();
 		List<IAdaptable> all = new ArrayList<>();
-		for (int i = 0; i < workingSets.length; i++) {
-			IWorkingSet set = workingSets[i];
+		for (IWorkingSet set : workingSets) {
 			if (IDebugUIConstants.BREAKPOINT_WORKINGSET_ID.equals(set
 					.getId())) {
 				all.add(new WorkingSetCategory(set));
@@ -401,8 +395,7 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate
 			IAdaptable[] elements = set.getElements();
 			List<IAdaptable> list = new ArrayList<>(elements.length);
 			Collections.addAll(list, elements);
-			for (int i = 0; i < breakpoints.length; i++) {
-				IBreakpoint breakpoint = breakpoints[i];
+			for (IBreakpoint breakpoint : breakpoints) {
 				fCache.removeMappedEntry(breakpoint.getMarker(), set.getName());
 				fCache.flushMarkerCache(breakpoint.getMarker());
 				list.remove(breakpoint);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveAllTerminatedAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveAllTerminatedAction.java
index c0226dcf8..053ac17e4 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveAllTerminatedAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveAllTerminatedAction.java
@@ -37,8 +37,7 @@ public class ConsoleRemoveAllTerminatedAction extends Action implements IUpdate,
 	@Override
 	public synchronized void update() {
 		ILaunch[] launches = DebugPlugin.getDefault().getLaunchManager().getLaunches();
-		for (int i = 0; i < launches.length; i++) {
-			ILaunch launch = launches[i];
+		for (ILaunch launch : launches) {
 			if (launch.isTerminated()) {
 				setEnabled(true);
 				return;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AbstractMemoryViewPane.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AbstractMemoryViewPane.java
index 37a6b44db..37033eabb 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AbstractMemoryViewPane.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AbstractMemoryViewPane.java
@@ -261,9 +261,9 @@ public abstract class AbstractMemoryViewPane implements IMemoryBlockListener, IS
 
 	@Override
 	public void handleDebugEvents(DebugEvent[] events) {
-		for (int i = 0; i < events.length; i++) {
-			Object source = events[i].getSource();
-			if (events[i].getKind() == DebugEvent.TERMINATE && source instanceof IMemoryBlockRetrieval) {
+		for (DebugEvent event : events) {
+			Object source = event.getSource();
+			if (event.getKind() == DebugEvent.TERMINATE && source instanceof IMemoryBlockRetrieval) {
 				if (isDisposed()) {
 					return;
 				}
@@ -333,8 +333,8 @@ public abstract class AbstractMemoryViewPane implements IMemoryBlockListener, IS
 			// if tab folder is not empty, dipose view tabs
 			CTabItem[] tabs = tabFolder.getItems();
 
-			for (int i = 0; i < tabs.length; i++) {
-				disposeTab(tabs[i]);
+			for (CTabItem tab : tabs) {
+				disposeTab(tab);
 			}
 
 			tabFolder.dispose();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryBlockAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryBlockAction.java
index 61f3c5c54..844f628e3 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryBlockAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryBlockAction.java
@@ -184,8 +184,8 @@ public class AddMemoryBlockAction extends Action implements IDebugContextListene
 	 * @return if we should exit
 	 */
 	private boolean addMemoryBlocks(boolean exit, Object elem, IMemoryBlockRetrieval standardMemRetrieval, MonitorMemoryBlockDialog dialog, final String[] expressionsArray) {
-		for (int i = 0; i < expressionsArray.length; i++) {
-			String expression = expressionsArray[i].trim();
+		for (String e : expressionsArray) {
+			String expression = e.trim();
 			try {
 				if (standardMemRetrieval instanceof IMemoryBlockRetrievalExtension) {
 					// if the debug session supports
@@ -276,8 +276,8 @@ public class AddMemoryBlockAction extends Action implements IDebugContextListene
 
 	@Override
 	public void handleDebugEvents(DebugEvent[] events) {
-		for (int i = 0; i < events.length; i++) {
-			handleDebugEvent(events[i]);
+		for (DebugEvent event : events) {
+			handleDebugEvent(event);
 		}
 	}
 
@@ -344,18 +344,18 @@ public class AddMemoryBlockAction extends Action implements IDebugContextListene
 			DebugUIPlugin.log(e1);
 		}
 
-		for (int i = 0; i < renderingTypes.length; i++) {
+		for (IMemoryRenderingType renderingType : renderingTypes) {
 			try {
 				boolean create = true;
 				if (primaryType != null) {
-					if (primaryType.getId().equals(renderingTypes[i].getId())) {
+					if (primaryType.getId().equals(renderingType.getId())) {
 						create = false;
 					}
 				}
 				if (create) {
-					createRenderingInContainer(memoryBlock, renderingTypes[i], IDebugUIConstants.ID_RENDERING_VIEW_PANE_2);
+					createRenderingInContainer(memoryBlock, renderingType, IDebugUIConstants.ID_RENDERING_VIEW_PANE_2);
 				}
-			} catch (CoreException e) {
+			}catch (CoreException e) {
 				DebugUIPlugin.log(e);
 			}
 		}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingContextAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingContextAction.java
index d517e68a9..83d398f54 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingContextAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingContextAction.java
@@ -56,9 +56,9 @@ public class AddMemoryRenderingContextAction implements IViewActionDelegate {
 		String actionId = action.getId();
 		IMemoryRenderingContainer selectedPane = null;
 
-		for (int i = 0; i < viewPanes.length; i++) {
-			if (actionId.contains(viewPanes[i].getId())) {
-				selectedPane = viewPanes[i];
+		for (IMemoryRenderingContainer viewPane : viewPanes) {
+			if (actionId.contains(viewPane.getId())) {
+				selectedPane = viewPane;
 				break;
 			}
 		}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java
index add3e0eb9..c54bc43c3 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java
@@ -367,8 +367,8 @@ public class AddMemoryRenderingDialog extends SelectionDialog {
 		// clean up
 		combo.removeAll();
 
-		for (int i = 0; i < labels.length; i++) {
-			combo.add(labels[i]);
+		for (String label : labels) {
+			combo.add(label);
 		}
 
 		combo.select(selectionIdx);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlocksTreeViewPane.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlocksTreeViewPane.java
index e5478da29..2ca3ac384 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlocksTreeViewPane.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlocksTreeViewPane.java
@@ -110,9 +110,9 @@ public class MemoryBlocksTreeViewPane implements ISelectionListener, ISelectionC
 			if (selected != null && selected instanceof IStructuredSelection) {
 				Object[] selectedMemBlks = ((IStructuredSelection) selected).toArray();
 				ArrayList<Object> memoryBlocks = new ArrayList<>();
-				for (int i = 0; i < selectedMemBlks.length; i++) {
-					if (selectedMemBlks[i] instanceof IMemoryBlock) {
-						memoryBlocks.add(selectedMemBlks[i]);
+				for (Object selectedMemBlk : selectedMemBlks) {
+					if (selectedMemBlk instanceof IMemoryBlock) {
+						memoryBlocks.add(selectedMemBlk);
 					}
 				}
 
@@ -224,8 +224,8 @@ public class MemoryBlocksTreeViewPane implements ISelectionListener, ISelectionC
 
 		@Override
 		public void handleDebugEvents(DebugEvent[] events) {
-			for (int i = 0; i < events.length; i++) {
-				doHandleDebugEvent(events[i]);
+			for (DebugEvent event : events) {
+				doHandleDebugEvent(event);
 			}
 		}
 	}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryView.java
index 71b707408..53347de57 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryView.java
@@ -262,9 +262,9 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 			// also try to find other views and register
 			if (DebugUIPlugin.getActiveWorkbenchWindow() != null && DebugUIPlugin.getActiveWorkbenchWindow().getActivePage() != null) {
 				IViewReference references[] = DebugUIPlugin.getActiveWorkbenchWindow().getActivePage().getViewReferences();
-				for (int i = 0; i < references.length; i++) {
-					if (references[i].getSecondaryId() != null) {
-						MemoryViewIdRegistry.registerView(references[i].getSecondaryId());
+				for (IViewReference reference : references) {
+					if (reference.getSecondaryId() != null) {
+						MemoryViewIdRegistry.registerView(reference.getSecondaryId());
 					}
 				}
 			}
@@ -422,8 +422,8 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 
 		ToolBarManager viewerToolBarMgr = new ToolBarManager(SWT.FLAT);
 		IAction[] actions = fMemBlkViewer.getActions();
-		for (int i = 0; i < actions.length; i++) {
-			viewerToolBarMgr.add(actions[i]);
+		for (IAction action : actions) {
+			viewerToolBarMgr.add(action);
 		}
 		ToolBar viewerToolbar = viewerToolBarMgr.createControl(viewerViewForm);
 		viewerViewForm.setTopRight(viewerToolbar);
@@ -547,15 +547,15 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 	private void setVisible(boolean visible) {
 		IMemoryViewPane[] viewPanes = getViewPanes();
 
-		for (int i = 0; i < viewPanes.length; i++) {
+		for (IMemoryViewPane viewPane : viewPanes) {
 			// if currently visible, take view pane's visibility into account
 			// else force view pane to be visible if it is listed in
 			// "visible view panes" array list.
 			if (fVisible) {
-				viewPanes[i].setVisible(visible && viewPanes[i].isVisible());
+				viewPane.setVisible(visible && viewPane.isVisible());
 			} else {
-				if (isViewPaneVisible(viewPanes[i].getId())) {
-					viewPanes[i].setVisible(visible);
+				if (isViewPaneVisible(viewPane.getId())) {
+					viewPane.setVisible(visible);
 				}
 			}
 		}
@@ -596,8 +596,8 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 	 */
 	private void restoreView() {
 		IMemoryViewPane[] viewPanes = getViewPanes();
-		for (int i = 0; i < viewPanes.length; i++) {
-			viewPanes[i].restoreViewPane();
+		for (IMemoryViewPane viewPane : viewPanes) {
+			viewPane.restoreViewPane();
 		}
 	}
 
@@ -613,9 +613,9 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 		if (viewPaneControl != null) {
 			Control children[] = fSashForm.getChildren();
 
-			for (int i = 0; i < children.length; i++) {
-				if (children[i] == viewPaneControl) {
-					children[i].setVisible(show);
+			for (Control child : children) {
+				if (child == viewPaneControl) {
+					child.setVisible(show);
 					IMemoryViewPane viewPane = fViewPanes.get(paneId);
 					if (viewPane != null) {
 						viewPane.setVisible(show);
@@ -673,8 +673,8 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 				fVisibleViewPanes.add(paneId);
 			}
 		} else {
-			for (int i = 0; i < defaultVisiblePaneIds.length; i++) {
-				fVisibleViewPanes.add(defaultVisiblePaneIds[i]);
+			for (String defaultVisiblePaneId : defaultVisiblePaneIds) {
+				fVisibleViewPanes.add(defaultVisiblePaneId);
 			}
 		}
 
@@ -699,9 +699,9 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 	private void loadOrientation() {
 		fViewOrientation = Platform.getPreferencesService().getInt(DebugUIPlugin.getUniqueIdentifier(), getOrientationPrefId(), HORIZONTAL_VIEW_ORIENTATION, null);
 
-		for (int i = 0; i < fOrientationActions.length; i++) {
-			if (fOrientationActions[i].getOrientation() == fViewOrientation) {
-				fOrientationActions[i].run();
+		for (ViewPaneOrientationAction fOrientationAction : fOrientationActions) {
+			if (fOrientationAction.getOrientation() == fViewOrientation) {
+				fOrientationAction.run();
 			}
 		}
 		updateOrientationActions();
@@ -720,13 +720,12 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 	}
 
 	private void updateOrientationActions() {
-		for (int i = 0; i < fOrientationActions.length; i++) {
-			if (fOrientationActions[i].getOrientation() == fViewOrientation) {
-				fOrientationActions[i].setChecked(true);
+		for (ViewPaneOrientationAction fOrientationAction : fOrientationActions) {
+			if (fOrientationAction.getOrientation() == fViewOrientation) {
+				fOrientationAction.setChecked(true);
 			} else {
-				fOrientationActions[i].setChecked(false);
+				fOrientationAction.setChecked(false);
 			}
-
 		}
 	}
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewSynchronizationService.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewSynchronizationService.java
index a14fcf7d6..9a5002d31 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewSynchronizationService.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewSynchronizationService.java
@@ -81,8 +81,8 @@ public class MemoryViewSynchronizationService implements IMemoryRenderingSynchro
 			if (fFilters == null) {
 				return true;
 			}
-			for (int i = 0; i < fFilters.length; i++) {
-				if (fFilters[i].equals(property)) {
+			for (String filter : fFilters) {
+				if (filter.equals(property)) {
 					return true;
 				}
 			}
@@ -134,9 +134,7 @@ public class MemoryViewSynchronizationService implements IMemoryRenderingSynchro
 			return;
 		}
 
-		for (int i = 0; i < memoryBlocks.length; i++) {
-			IMemoryBlock memory = memoryBlocks[i];
-
+		for (IMemoryBlock memory : memoryBlocks) {
 			if (fLastChangedRendering != null && fLastChangedRendering.getMemoryBlock() == memory) {
 				fLastChangedRendering = null;
 			}
@@ -343,9 +341,8 @@ public class MemoryViewSynchronizationService implements IMemoryRenderingSynchro
 					// synchronization service is being enabled
 					// this is to get around problem when the last changed
 					// rendering is not currently the sync info provider
-
-					for (int i = 0; i < ids.length; i++) {
-						PropertyChangeEvent evt = new PropertyChangeEvent(fLastChangedRendering, ids[i], null, info.getProperty(ids[i]));
+					for (String id : ids) {
+						PropertyChangeEvent evt = new PropertyChangeEvent(fLastChangedRendering, id, null, info.getProperty(id));
 						firePropertyChanged(evt);
 					}
 				}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTreeModelContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTreeModelContentProvider.java
index 810e8b39e..14a3f0273 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTreeModelContentProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTreeModelContentProvider.java
@@ -28,8 +28,7 @@ public class MemoryViewTreeModelContentProvider extends TreeModelContentProvider
 	protected void updateNodes(IModelDelta[] nodes, int mask) {
 
 		if (getViewer() instanceof TreeModelViewer) {
-			for (int i = 0; i < nodes.length; i++) {
-				IModelDelta node = nodes[i];
+			for (IModelDelta node : nodes) {
 				int flags = node.getFlags();
 
 				if ((mask & ITreeModelContentProvider.CONTROL_MODEL_DELTA_FLAGS) != 0 && (flags & IModelDelta.ADDED) != 0 && (flags & IModelDelta.SELECT) != 0 && node.getElement() instanceof IMemoryBlock) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/NewMemoryViewAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/NewMemoryViewAction.java
index dd09175bc..aec3672ed 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/NewMemoryViewAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/NewMemoryViewAction.java
@@ -88,9 +88,9 @@ public class NewMemoryViewAction implements IViewActionDelegate {
 			MemoryView newMView = (MemoryView) newView;
 			IMemoryViewPane[] viewPanes = fView.getViewPanes();
 			int orientation = fView.getViewPanesOrientation();
-			for (int i = 0; i < viewPanes.length; i++) {
+			for (IMemoryViewPane viewPane : viewPanes) {
 				// copy view pane visibility
-				newMView.showViewPane(fView.isViewPaneVisible(viewPanes[i].getId()), viewPanes[i].getId());
+				newMView.showViewPane(fView.isViewPaneVisible(viewPane.getId()), viewPane.getId());
 			}
 
 			// do not want to copy renderings as it could be very expensive
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RemoveRenderingContextAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RemoveRenderingContextAction.java
index d671dc806..2ccb57445 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RemoveRenderingContextAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RemoveRenderingContextAction.java
@@ -69,9 +69,9 @@ public class RemoveRenderingContextAction implements IViewActionDelegate {
 		String actionId = action.getId();
 		IMemoryRenderingContainer selectedPane = null;
 
-		for (int i = 0; i < viewPanes.length; i++) {
-			if (actionId.contains(viewPanes[i].getId())) {
-				selectedPane = viewPanes[i];
+		for (IMemoryRenderingContainer viewPane : viewPanes) {
+			if (actionId.contains(viewPane.getId())) {
+				selectedPane = viewPane;
 				break;
 			}
 		}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RenderingViewPane.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RenderingViewPane.java
index 90ef9daaf..9509fde4d 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RenderingViewPane.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RenderingViewPane.java
@@ -128,9 +128,7 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory
 				return;
 			}
 
-			for (int i = 0; i < memoryBlocks.length; i++) {
-				IMemoryBlock memory = memoryBlocks[i];
-
+			for (IMemoryBlock memory : memoryBlocks) {
 				if (!fTabFolderForMemoryBlock.containsKey(memory)) {
 					createFolderForMemoryBlock(memory);
 				}
@@ -143,27 +141,21 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory
 	@Override
 	public void memoryBlocksRemoved(final IMemoryBlock[] memoryBlocks) {
 		Display.getDefault().asyncExec(() -> {
-			for (int j = 0; j < memoryBlocks.length; j++) {
-				IMemoryBlock mbRemoved = memoryBlocks[j];
+			for (IMemoryBlock mbRemoved : memoryBlocks) {
 				if (fTabFolderForMemoryBlock == null) {
 					return;
 				}
-
 				// get all renderings from this memory block and remove them
 				// from the view
 				IMemoryRendering[] renderings = fRenderingMgr.getRenderingsFromMemoryBlock(mbRemoved);
-
-				for (int k = 0; k < renderings.length; k++) {
-					removeMemoryRendering(renderings[k]);
+				for (IMemoryRendering rendering : renderings) {
+					removeMemoryRendering(rendering);
 				}
-
 				// remove a the tab folder if the memory block is removed
 				CTabFolder tabFolder = fTabFolderForMemoryBlock.get(mbRemoved);
-
 				if (tabFolder == null) {
 					continue;
 				}
-
 				fTabFolderForMemoryBlock.remove(mbRemoved);
 				fMemoryBlockFromTabFolder.remove(tabFolder);
 				IMemoryBlockRetrieval retrieve = MemoryViewUtil.getMemoryBlockRetrieval(mbRemoved);
@@ -172,18 +164,14 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory
 						fTabFolderForDebugView.remove(MemoryViewUtil.getHashCode(retrieve));
 					}
 				}
-
 				if (!tabFolder.isDisposed()) {
 					// dispose all view tabs belonging to the tab folder
 					CTabItem[] items = tabFolder.getItems();
-
-					for (int i = 0; i < items.length; i++) {
-						disposeTab(items[i]);
+					for (CTabItem item : items) {
+						disposeTab(item);
 					}
-
 					// dispose the tab folder
 					tabFolder.dispose();
-
 					// if this is the top control
 					if (tabFolder == fStackLayout.topControl) {
 
@@ -222,7 +210,6 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory
 					// if not the top control
 					// no need to do anything
 				}
-
 				fAddedMemoryBlocks.remove(mbRemoved);
 				updateToolBarActionsEnablement();
 			}
@@ -502,20 +489,17 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory
 
 			CTabItem[] tabs = tabFolder.getItems();
 			boolean foundTab = false;
-			for (int i1 = 0; i1 < tabs.length; i1++) {
-				IMemoryViewTab viewTab1 = (IMemoryViewTab) tabs[i1].getData();
-
-				if (tabs[i1].isDisposed()) {
+			for (CTabItem tab : tabs) {
+				IMemoryViewTab viewTab1 = (IMemoryViewTab) tab.getData();
+				if (tab.isDisposed()) {
 					continue;
 				}
-
 				if (viewTab1.getRendering().getMemoryBlock() == memory) {
 					if (viewTab1.getRendering() == rendering) {
 						foundTab = true;
-						disposeTab(tabs[i1]);
+						disposeTab(tab);
 						break;
 					}
-
 				}
 			}
 
@@ -528,12 +512,12 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory
 					CTabFolder otherTabFolder = enumeration.nextElement();
 					tabs = otherTabFolder.getItems();
 					IMemoryViewTab viewTab2 = null;
-					for (int i2 = 0; i2 < tabs.length; i2++) {
-						viewTab2 = (IMemoryViewTab) tabs[i2].getData();
+					for (CTabItem tab : tabs) {
+						viewTab2 = (IMemoryViewTab) tab.getData();
 						if (viewTab2.getRendering().getMemoryBlock() == memory) {
 							if (viewTab2.getRendering() == rendering) {
 								foundTab = true;
-								disposeTab(tabs[i2]);
+								disposeTab(tab);
 								break;
 							}
 						}
@@ -563,8 +547,8 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory
 	}
 
 	private void restoreViewTabs(IMemoryRendering[] renderings) {
-		for (int i = 0; i < renderings.length; i++) {
-			memoryBlockRenderingAdded(renderings[i]);
+		for (IMemoryRendering rendering : renderings) {
+			memoryBlockRenderingAdded(rendering);
 		}
 	}
 
@@ -1050,10 +1034,9 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory
 				originalProvider = service.getSynchronizationProvider();
 			}
 
-			for (int i = 0; i < renderings.length; i++) {
-				if (renderings[i] instanceof IResettableMemoryRendering) {
+			for (IMemoryRendering rendering : renderings) {
+				if (rendering instanceof IResettableMemoryRendering) {
 					try {
-
 						// This is done to allow user to select multiple memory
 						// monitors and
 						// reset their renderings.
@@ -1075,10 +1058,10 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory
 						// though the rendering
 						// is currently hidden.
 						if (service != null) {
-							service.setSynchronizationProvider(renderings[i]);
+							service.setSynchronizationProvider(rendering);
 						}
-						((IResettableMemoryRendering) renderings[i]).resetRendering();
-					} catch (DebugException e) {
+						((IResettableMemoryRendering) rendering).resetRendering();
+					}catch (DebugException e) {
 						// do not pop up error message
 						// error message is annoying where there are multiple
 						// rendering
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ResetMemoryBlockAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ResetMemoryBlockAction.java
index a1c8b76ad..1860641da 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ResetMemoryBlockAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ResetMemoryBlockAction.java
@@ -61,9 +61,9 @@ public class ResetMemoryBlockAction implements IViewActionDelegate {
 				MemoryView memView = (MemoryView) fView;
 				IMemoryRenderingContainer[] containers = memView.getMemoryRenderingContainers();
 
-				for (int i = 0; i < containers.length; i++) {
-					if (containers[i] instanceof RenderingViewPane) {
-						((RenderingViewPane) containers[i]).resetRenderings(mb, resetVisible);
+				for (IMemoryRenderingContainer container : containers) {
+					if (container instanceof RenderingViewPane) {
+						((RenderingViewPane) container).resetRenderings(mb, resetVisible);
 					}
 				}
 			}
@@ -77,12 +77,12 @@ public class ResetMemoryBlockAction implements IViewActionDelegate {
 			IStructuredSelection strucSel = (IStructuredSelection) selection;
 			Object[] objs = strucSel.toArray();
 			fSelectedMB.clear();
-			for (int i = 0; i < objs.length; i++) {
-				if (objs[i] instanceof IMemoryBlock) {
-					fSelectedMB.add(objs[i]);
+			for (Object obj : objs) {
+				if (obj instanceof IMemoryBlock) {
+					fSelectedMB.add(obj);
 				}
-				if (objs[i] instanceof IMemoryRendering) {
-					fSelectedMB.add(((IMemoryRendering) objs[i]).getMemoryBlock());
+				if (obj instanceof IMemoryRendering) {
+					fSelectedMB.add(((IMemoryRendering) obj).getMemoryBlock());
 				}
 			}
 		}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SwitchMemoryBlockAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SwitchMemoryBlockAction.java
index 6292c9be2..1d99b6bfe 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SwitchMemoryBlockAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SwitchMemoryBlockAction.java
@@ -237,9 +237,9 @@ public class SwitchMemoryBlockAction extends Action implements IViewActionDelega
 					allMemoryBlocks = DebugPlugin.getDefault().getMemoryBlockManager().getMemoryBlocks(retrieval);
 				}
 				if (allMemoryBlocks != null) {
-					for (int i = 0; i < allMemoryBlocks.length; i++) {
-						SwitchToAction action = new SwitchToAction(allMemoryBlocks[i], true);
-						if (allMemoryBlocks[i] == memoryBlock) {
+					for (IMemoryBlock block : allMemoryBlocks) {
+						SwitchToAction action = new SwitchToAction(block, true);
+						if (block == memoryBlock) {
 							action.setChecked(true);
 						}
 						ActionContributionItem item = new ActionContributionItem(action);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneRenderingMgr.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneRenderingMgr.java
index ff8ec2667..ff4e4277a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneRenderingMgr.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneRenderingMgr.java
@@ -78,9 +78,8 @@ public class ViewPaneRenderingMgr implements IDebugEventSetListener {
 
 		IMemoryRendering[] toRemove = getRenderings(mem, renderingId);
 
-		for (int i = 0; i < toRemove.length; i++) {
-			fRenderings.remove(toRemove[i]);
-
+		for (IMemoryRendering rendering : toRemove) {
+			fRenderings.remove(rendering);
 			// remove listener after the last memory block has been removed
 			if (fRenderings.isEmpty()) {
 				DebugPlugin.getDefault().removeDebugEventListener(this);
@@ -179,8 +178,8 @@ public class ViewPaneRenderingMgr implements IDebugEventSetListener {
 	@Override
 	public void handleDebugEvents(DebugEvent[] events) {
 
-		for (int i = 0; i < events.length; i++) {
-			handleDebugEvent(events[i]);
+		for (DebugEvent event : events) {
+			handleDebugEvent(event);
 		}
 
 	}
@@ -198,9 +197,9 @@ public class ViewPaneRenderingMgr implements IDebugEventSetListener {
 				// returns empty array if dt == null
 				IMemoryRendering[] deletedrendering = getRenderingsFromDebugTarget(dt);
 
-				for (int i = 0; i < deletedrendering.length; i++) {
-					removeMemoryBlockRendering(deletedrendering[i].getMemoryBlock(), deletedrendering[i].getRenderingId());
-					fViewPane.removeMemoryRendering(deletedrendering[i]);
+				for (IMemoryRendering rendering : deletedrendering) {
+					removeMemoryBlockRendering(rendering.getMemoryBlock(), rendering.getRenderingId());
+					fViewPane.removeMemoryRendering(rendering);
 				}
 			}
 		}
@@ -302,8 +301,7 @@ public class ViewPaneRenderingMgr implements IDebugEventSetListener {
 		Document document = LaunchManager.getDocument();
 		Element rootElement = document.createElement(RENDERINGS_TAG);
 		document.appendChild(rootElement);
-		for (int i = 0; i < renderings.length; i++) {
-			IMemoryRendering rendering = renderings[i];
+		for (IMemoryRendering rendering : renderings) {
 			Element element = document.createElement(MEMORY_RENDERING_TAG);
 			element.setAttribute(MEMORY_BLOCK, Integer.toString(rendering.getMemoryBlock().hashCode()));
 			element.setAttribute(RENDERING_ID, rendering.getRenderingId());
@@ -347,18 +345,18 @@ public class ViewPaneRenderingMgr implements IDebugEventSetListener {
 
 				IMemoryBlock[] memoryBlocks = DebugPlugin.getDefault().getMemoryBlockManager().getMemoryBlocks();
 				IMemoryBlock memoryBlock = null;
-				for (int j = 0; j < memoryBlocks.length; j++) {
-					if (Integer.toString(memoryBlocks[j].hashCode()).equals(memoryBlockHashCode)) {
-						memoryBlock = memoryBlocks[j];
+				for (IMemoryBlock m : memoryBlocks) {
+					if (Integer.toString(m.hashCode()).equals(memoryBlockHashCode)) {
+						memoryBlock = m;
 					}
 				}
 
 				if (memoryBlock != null) {
 					IMemoryRenderingType[] types = DebugUITools.getMemoryRenderingManager().getRenderingTypes(memoryBlock);
 					IMemoryRenderingType type = null;
-					for (int k = 0; k < types.length; k++) {
-						if (types[k].getId().equals(renderingId)) {
-							type = types[k];
+					for (IMemoryRenderingType t : types) {
+						if (t.getId().equals(renderingId)) {
+							type = t;
 						}
 					}
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewTabEnablementManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewTabEnablementManager.java
index 168e44d65..676c53a59 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewTabEnablementManager.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewTabEnablementManager.java
@@ -62,10 +62,9 @@ public class ViewTabEnablementManager implements SelectionListener {
 		CTabItem[] allTabs = folder.getItems();
 
 		// check all tabs to make sure they are enabled/disabled properly
-		for (int i = 0; i < allTabs.length; i++) {
+		for (CTabItem tab : allTabs) {
 			IMemoryViewTab viewTab;
-			Object obj = allTabs[i].getData();
-
+			Object obj = tab.getData();
 			if (obj instanceof IMemoryViewTab) {
 				viewTab = (IMemoryViewTab) obj;
 
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;
 			}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java
index b06a47bc3..8b83c4d4f 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java
@@ -500,8 +500,8 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis
 		createOrientationActions(variablesViewer);
 		IPreferenceStore prefStore = DebugUIPlugin.getDefault().getPreferenceStore();
 		String orientation = prefStore.getString(getDetailPanePreferenceKey());
-		for (int i = 0; i < fToggleDetailPaneActions.length; i++) {
-			fToggleDetailPaneActions[i].setChecked(fToggleDetailPaneActions[i].getOrientation().equals(orientation));
+		for (ToggleDetailPaneAction action : fToggleDetailPaneActions) {
+			action.setChecked(action.getOrientation().equals(orientation));
 		}
 
 		fDetailPane = new DetailPaneProxy(this);
@@ -1440,9 +1440,9 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis
 
 	protected ToggleDetailPaneAction getToggleDetailPaneAction(String orientation)
 	{
-		for (int i=0; i<fToggleDetailPaneActions.length; i++) {
-			if (fToggleDetailPaneActions[i].getOrientation().equals(orientation)) {
-				return fToggleDetailPaneActions[i];
+		for (ToggleDetailPaneAction action : fToggleDetailPaneActions) {
+			if (action.getOrientation().equals(orientation)) {
+				return action;
 			}
 		}
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DetailPaneManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DetailPaneManager.java
index 5c41204b1..9eea45848 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DetailPaneManager.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DetailPaneManager.java
@@ -445,8 +445,8 @@ public class DetailPaneManager {
 			IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(DebugUIPlugin.getUniqueIdentifier(), IDebugUIConstants.EXTENSION_POINT_DETAIL_FACTORIES);
 			IConfigurationElement[] infos = extensionPoint.getConfigurationElements();
 			DetailPaneFactoryExtension delegate = null;
-			for(int i = 0; i < infos.length; i++) {
-				delegate = new DetailPaneFactoryExtension(infos[i]);
+			for (IConfigurationElement info : infos) {
+				delegate = new DetailPaneFactoryExtension(info);
 				fKnownFactories.add(delegate);
 			}
 		}