Use jdk 5 for-each loop

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

Remove unnecessary type specifications

Since Java 7 the diamond operator can be used instead of explicit type
parameters.

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

23 files changed, 57 insertions, 76 deletions

diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ProjectSetImporter.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ProjectSetImporter.java
index 445898e6d..fca3acd32 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ProjectSetImporter.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ProjectSetImporter.java
@@ -110,7 +110,7 @@ public class ProjectSetImporter {
 				}
 			} else {
 				UIProjectSetSerializationContext context = new UIProjectSetSerializationContext(shell, filename);
-				List<TeamException> errors = new ArrayList<TeamException>();
+				List<TeamException> errors = new ArrayList<>();
 				IMemento[] providers = xmlMemento.getChildren("provider"); //$NON-NLS-1$
 				for (IMemento provider : providers) {
 					ArrayList<String> referenceStrings= new ArrayList<>();
@@ -277,7 +277,7 @@ public class ProjectSetImporter {
 		IAdaptable[] oldElements = oldWs.getElements();
 		IAdaptable[] newElements = newWs.getElements();
 
-		Set<IAdaptable> combinedElements = new HashSet<IAdaptable>();
+		Set<IAdaptable> combinedElements = new HashSet<>();
 		combinedElements.addAll(Arrays.asList(oldElements));
 		combinedElements.addAll(Arrays.asList(newElements));
 
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/PropertyChangeHandler.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/PropertyChangeHandler.java
index 1237e8395..10735b43b 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/PropertyChangeHandler.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/PropertyChangeHandler.java
@@ -24,7 +24,7 @@ import org.eclipse.jface.util.PropertyChangeEvent;
  * Helper class for implementing property change handling
  */
 public class PropertyChangeHandler {
-	private ListenerList<IPropertyChangeListener> fListeners = new ListenerList<IPropertyChangeListener>(ListenerList.IDENTITY);
+	private ListenerList<IPropertyChangeListener> fListeners = new ListenerList<>(ListenerList.IDENTITY);
 
 	/**
 	 * Notifies listeners of property changes, handling any exceptions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamCapabilityHelper.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamCapabilityHelper.java
index c4aea1529..ced6d3bec 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamCapabilityHelper.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamCapabilityHelper.java
@@ -69,7 +69,7 @@ public class TeamCapabilityHelper {
 	 * for workspace changes and promote activities accordingly.
 	 */
 	private TeamCapabilityHelper() {
-		providerIdToPluginId = new HashMap<String, IPluginContribution>();
+		providerIdToPluginId = new HashMap<>();
 		loadRepositoryProviderIds();
 
 		// crawl the initial projects
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java
index 511bffdea..f783ad069 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java
@@ -19,7 +19,6 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Hashtable;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -82,9 +81,9 @@ public class TeamUIPlugin extends AbstractUIPlugin {
 
 	public static final String TRIGGER_POINT_ID = "org.eclipse.team.ui.activityTriggerPoint"; //$NON-NLS-1$
 
-	private static List<IPropertyChangeListener> propertyChangeListeners = new ArrayList<IPropertyChangeListener>(5);
+	private static List<IPropertyChangeListener> propertyChangeListeners = new ArrayList<>(5);
 
-	private Hashtable<String, ImageDescriptor> imageDescriptors = new Hashtable<String, ImageDescriptor>(20);
+	private Hashtable<String, ImageDescriptor> imageDescriptors = new Hashtable<>(20);
 
 	private WorkspaceTeamStateProvider provider;
 
@@ -258,8 +257,8 @@ public class TeamUIPlugin extends AbstractUIPlugin {
 		if (provider != null) {
 			provider.dispose();
 		}
-		for (Iterator<TeamStateProvider> iter = decoratedStateProviders.values().iterator(); iter.hasNext();) {
-			SubscriberTeamStateProvider sdsp = (SubscriberTeamStateProvider) iter.next();
+		for (TeamStateProvider teamStateProvider : decoratedStateProviders.values()) {
+			SubscriberTeamStateProvider sdsp = (SubscriberTeamStateProvider) teamStateProvider;
 			sdsp.dispose();
 		}
 	}
@@ -285,8 +284,7 @@ public class TeamUIPlugin extends AbstractUIPlugin {
 	 * @param event the property change event object
 	 */
 	public static void broadcastPropertyChange(PropertyChangeEvent event) {
-		for (Iterator<IPropertyChangeListener> it = propertyChangeListeners.iterator(); it.hasNext();) {
-			IPropertyChangeListener listener = it.next();
+		for (IPropertyChangeListener listener : propertyChangeListeners) {
 			listener.propertyChange(event);
 		}
 	}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DialogArea.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DialogArea.java
index 24ec1f7fe..d4d619581 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DialogArea.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DialogArea.java
@@ -14,7 +14,6 @@
 package org.eclipse.team.internal.ui.dialogs;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.jface.dialogs.Dialog;
@@ -44,7 +43,7 @@ public abstract class DialogArea {
 	 * Create a dialog area
 	 */
 	protected DialogArea() {
-		this.listeners = new ArrayList<IPropertyChangeListener>();
+		this.listeners = new ArrayList<>();
 	}
 
 	/**
@@ -69,8 +68,7 @@ public abstract class DialogArea {
 
 	protected void firePropertyChangeChange(String property, Object oldValue, Object newValue) {
 		PropertyChangeEvent event = new PropertyChangeEvent(this, property, oldValue, newValue);
-		for (Iterator<IPropertyChangeListener> iter = listeners.iterator(); iter.hasNext();) {
-			IPropertyChangeListener listener = iter.next();
+		for (IPropertyChangeListener listener : listeners) {
 			listener.propertyChange(event);
 		}
 	}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PreferencePageContainerDialog.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PreferencePageContainerDialog.java
index 1303f383e..842213897 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PreferencePageContainerDialog.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PreferencePageContainerDialog.java
@@ -75,7 +75,7 @@ public class PreferencePageContainerDialog extends TrayDialog
 
 	private Button fOkButton;
 
-	private ListenerList<IPageChangedListener> pageChangedListeners = new ListenerList<IPageChangedListener>();
+	private ListenerList<IPageChangedListener> pageChangedListeners = new ListenerList<>();
 
 	/**
 	 * The Composite in which a page is shown.
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/EditionHistoryPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/EditionHistoryPage.java
index 56722d06f..60dd19d61 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/EditionHistoryPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/EditionHistoryPage.java
@@ -16,7 +16,6 @@ package org.eclipse.team.internal.ui.history;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -63,7 +62,7 @@ public class EditionHistoryPage extends LocalHistoryPage {
 
 	private LocalResourceTypedElement localFileElement;
 	private IStructureCreator structureCreator;
-	private Map<IFileRevision, ITypedElement> editions = new HashMap<IFileRevision, ITypedElement>();
+	private Map<IFileRevision, ITypedElement> editions = new HashMap<>();
 	private ITypedElement localEdition;
 	private String name;
 
@@ -241,7 +240,7 @@ public class EditionHistoryPage extends LocalHistoryPage {
 	private IFileRevision[] filterRevisions(ITypedElement localEdition, IFileRevision[] revisions,
 			IProgressMonitor monitor) {
 		ITypedElement previousEdition = localEdition;
-		List<IFileRevision> result = new ArrayList<IFileRevision>();
+		List<IFileRevision> result = new ArrayList<>();
 		sortDescending(revisions);
 		editions.clear();
 		for (IFileRevision revision : revisions) {
@@ -379,8 +378,7 @@ public class EditionHistoryPage extends LocalHistoryPage {
 	private Object getRevisionFor(Object object) {
 		if (object == localEdition)
 			return localFileElement;
-		for (Iterator<IFileRevision> iterator = editions.keySet().iterator(); iterator.hasNext();) {
-			IFileRevision revision = iterator.next();
+		for (IFileRevision revision : editions.keySet()) {
 			if (editions.get(revision) == object) {
 				return revision;
 			}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryTableProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryTableProvider.java
index 29874301a..0401a7802 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryTableProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryTableProvider.java
@@ -167,9 +167,8 @@ public class GenericHistoryTableProvider {
 			if (e1 == null || e2 == null) {
 				result = super.compare(viewer, o1, o2);
 			} else {
-				int[] columnSortOrder = SORT_ORDERS_BY_COLUMN[columnNumber];
-				for (int i = 0; i < columnSortOrder.length; ++i) {
-					result = compareColumnValue(columnSortOrder[i], e1, e2);
+				for (int columnSortOrder : SORT_ORDERS_BY_COLUMN[columnNumber]) {
+					result = compareColumnValue(columnSortOrder, e1, e2);
 					if (result != 0)
 						break;
 				}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryTableProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryTableProvider.java
index 04931882e..1ce8a992d 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryTableProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryTableProvider.java
@@ -208,9 +208,8 @@ public class LocalHistoryTableProvider {
 			if (date1 == -1 || date2 == -1) {
 				result = super.compare(compareViewer, o1, o2);
 			} else {
-				int[] columnSortOrder = SORT_ORDERS_BY_COLUMN[columnNumber];
-				for (int i = 0; i < columnSortOrder.length; ++i) {
-					result = compareColumnValue(columnSortOrder[i], date1, date2);
+				for (int columnSortOrder : SORT_ORDERS_BY_COLUMN[columnNumber]) {
+					result = compareColumnValue(columnSortOrder, date1, date2);
 					if (result != 0)
 						break;
 				}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelEnablementPreferencePage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelEnablementPreferencePage.java
index 99697694f..29cf1f7c0 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelEnablementPreferencePage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelEnablementPreferencePage.java
@@ -17,7 +17,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
@@ -134,8 +133,8 @@ public class ModelEnablementPreferencePage extends PreferencePage implements IWo
 			}
 			@Override
 			public void dispose() {
-				for (Iterator iter = images.values().iterator(); iter.hasNext();) {
-					Image image = (Image) iter.next();
+				for (Object element : images.values()) {
+					Image image = (Image) element;
 					image.dispose();
 				}
 				super.dispose();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelContentProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelContentProvider.java
index a64b04009..f7fd2ad60 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelContentProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelContentProvider.java
@@ -451,8 +451,7 @@ public class ResourceModelContentProvider extends SynchronizationContentProvider
 				if (!removals.isEmpty())
 					viewer.remove(viewer.getInput(), removals.toArray());
 				if (!refreshes.isEmpty()) {
-					for (Iterator iter = refreshes.iterator(); iter.hasNext();) {
-						Object element = iter.next();
+					for (Object element : refreshes) {
 						viewer.refresh(element);
 					}
 				}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelLabelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelLabelProvider.java
index ab8a0989c..7dddda2a0 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelLabelProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelLabelProvider.java
@@ -94,6 +94,7 @@ public class ResourceModelLabelProvider extends
 		return provider ;
 	}
 
+	@Override
 	protected IDiff getDiff(Object elementOrPath) {
 		IResource resource = getResource(elementOrPath);
 		IResourceDiffTree tree = getDiffTree(elementOrPath);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/TextPreferencePage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/TextPreferencePage.java
index 40bab1aa1..1cb44fa18 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/TextPreferencePage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/TextPreferencePage.java
@@ -240,8 +240,8 @@ public class TextPreferencePage extends PreferencePage implements IWorkbenchPref
 		final ArrayList<String> namesList= new ArrayList<>();
 		final ArrayList<Integer> namesModesList= new ArrayList<>();
 
-		for (final Iterator iter = fItems.iterator(); iter.hasNext();) {
-			final FileTypeTable.Item item= (FileTypeTable.Item) iter.next();
+		for (Object element : fItems) {
+			final FileTypeTable.Item item= (FileTypeTable.Item) element;
 
 			if (item instanceof FileTypeTable.Extension) {
 				extensionsList.add(item.name);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/registry/TeamContentProviderManager.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/registry/TeamContentProviderManager.java
index 690f330a1..a5c262b74 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/registry/TeamContentProviderManager.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/registry/TeamContentProviderManager.java
@@ -15,7 +15,6 @@ package org.eclipse.team.internal.ui.registry;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -81,10 +80,10 @@ public class TeamContentProviderManager implements ITeamContentProviderManager {
 		IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(TeamUIPlugin.ID, PT_TEAM_CONTENT_PROVIDERS);
 		IExtension[] extensions = point.getExtensions();
 		descriptors = new HashMap<>(extensions.length * 2);
-		for (int i = 0, imax = extensions.length; i < imax; i++) {
+		for (IExtension extension : extensions) {
 			ITeamContentProviderDescriptor desc = null;
 			try {
-				desc = new TeamContentProviderDescriptor(extensions[i]);
+				desc = new TeamContentProviderDescriptor(extension);
 			} catch (CoreException e) {
 				TeamUIPlugin.log(e);
 			}
@@ -127,8 +126,8 @@ public class TeamContentProviderManager implements ITeamContentProviderManager {
 	@Override
 	public void setEnabledDescriptors(ITeamContentProviderDescriptor[] descriptors) {
 		List<ITeamContentProviderDescriptor> previouslyEnabled = new ArrayList<>();
-		for (Iterator iter = this.descriptors.values().iterator(); iter.hasNext();) {
-			TeamContentProviderDescriptor descriptor = (TeamContentProviderDescriptor) iter.next();
+		for (Object element : this.descriptors.values()) {
+			TeamContentProviderDescriptor descriptor = (TeamContentProviderDescriptor) element;
 			if (descriptor.isEnabled()) {
 				previouslyEnabled.add(descriptor);
 				descriptor.setEnabled(false);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/registry/TeamDecoratorManager.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/registry/TeamDecoratorManager.java
index cf123a754..2cf9b30f0 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/registry/TeamDecoratorManager.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/registry/TeamDecoratorManager.java
@@ -53,10 +53,10 @@ public class TeamDecoratorManager {
 		IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(TeamUIPlugin.ID, PT_TEAM_DECORATORS);
 		IExtension[] extensions = point.getExtensions();
 		descriptors = new HashMap<>(extensions.length * 2 + 1);
-		for (int i = 0, imax = extensions.length; i < imax; i++) {
+		for (IExtension extension : extensions) {
 			TeamDecoratorDescription desc = null;
 			try {
-				desc = new TeamDecoratorDescription(extensions[i]);
+				desc = new TeamDecoratorDescription(extension);
 			} catch (CoreException e) {
 				TeamUIPlugin.log(e);
 			}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActiveChangeSetCollector.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActiveChangeSetCollector.java
index aed41a072..7b77db39a 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActiveChangeSetCollector.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActiveChangeSetCollector.java
@@ -16,7 +16,6 @@ package org.eclipse.team.internal.ui.synchronize;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -234,8 +233,8 @@ public class ActiveChangeSetCollector implements IDiffChangeListener {
 	 * @param resources the resources to be removed
 	 */
 	protected void remove(IResource[] resources) {
-		for (Iterator iter = activeSets.values().iterator(); iter.hasNext();) {
-			SyncInfoSet set = (SyncInfoSet) iter.next();
+		for (Object element : activeSets.values()) {
+			SyncInfoSet set = (SyncInfoSet) element;
 			set.removeAll(resources);
 		}
 		rootSet.removeAll(resources);
@@ -412,8 +411,8 @@ public class ActiveChangeSetCollector implements IDiffChangeListener {
 	}
 
 	private ChangeSet getChangeSet(IDiffTree tree) {
-		for (Iterator iter = activeSets.keySet().iterator(); iter.hasNext();) {
-			ChangeSet changeSet = (ChangeSet) iter.next();
+		for (Object element : activeSets.keySet()) {
+			ChangeSet changeSet = (ChangeSet) element;
 			if (((DiffChangeSet)changeSet).getDiffTree() == tree) {
 				return changeSet;
 			}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompressedFoldersModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompressedFoldersModelProvider.java
index 768f6df1e..c926c6058 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompressedFoldersModelProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompressedFoldersModelProvider.java
@@ -17,7 +17,6 @@ package org.eclipse.team.internal.ui.synchronize;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
@@ -173,8 +172,8 @@ public class CompressedFoldersModelProvider extends HierarchicalModelProvider {
 				}
 			}
 		}
-		for (Iterator iter = resourcesToShow.iterator(); iter.hasNext();) {
-			IResource resource = (IResource) iter.next();
+		for (Object element : resourcesToShow) {
+			IResource resource = (IResource) element;
 			result.add(createModelObject(parent, resource));
 		}
 
@@ -260,7 +259,7 @@ public class CompressedFoldersModelProvider extends HierarchicalModelProvider {
 		}
 
 		IResource[] resources = event.getRemovedResources();
-		List<IResource> resourcesToRemove = new ArrayList<IResource>();
+		List<IResource> resourcesToRemove = new ArrayList<>();
 		List<SyncInfo> resourcesToAdd = new ArrayList<>();
 		for (IResource resource : resources) {
 			if (!removedProjects.contains(resource.getProject())) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelProvider.java
index cf3d4c1d8..8846b315d 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelProvider.java
@@ -15,7 +15,6 @@
 package org.eclipse.team.internal.ui.synchronize;
 
 import java.util.HashSet;
-import java.util.Iterator;
 
 import org.eclipse.compare.structuremergeviewer.IDiffElement;
 import org.eclipse.core.resources.IProject;
@@ -195,8 +194,8 @@ public class HierarchicalModelProvider extends SynchronizeModelProvider {
 		for (SyncInfo info : infos) {
 			set.add(info.getLocal().getProject());
 		}
-		for (Iterator it = set.iterator(); it.hasNext(); ) {
-			addResource((IResource)it.next());
+		for (Object element : set) {
+			addResource((IResource)element);
 		}
 	}
 
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java
index bbc3e5fc8..519332f66 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java
@@ -25,7 +25,6 @@ import java.io.Writer;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -582,8 +581,8 @@ public class SynchronizeManager implements ISynchronizeManager {
 	public void dispose() {
 		// save state and settings for existing participants.
 		saveState();
-		for (Iterator it = participantReferences.values().iterator(); it.hasNext();) {
-			ParticipantInstance ref = (ParticipantInstance) it.next();
+		for (Object element : participantReferences.values()) {
+			ParticipantInstance ref = (ParticipantInstance) element;
 			if((ref).isInstantiated()) {
 				try {
 					ref.getParticipant().dispose();
@@ -631,8 +630,8 @@ public class SynchronizeManager implements ISynchronizeManager {
 	 */
 	private void saveState() {
 		XMLMemento xmlMemento = XMLMemento.createWriteRoot(CTX_PARTICIPANTS);
-		for (Iterator it = participantReferences.values().iterator(); it.hasNext(); ) {
-			ParticipantInstance ref = (ParticipantInstance) it.next();
+		for (Object element : participantReferences.values()) {
+			ParticipantInstance ref = (ParticipantInstance) element;
 			// Participants can opt out of being saved between sessions
 			if(! ref.getDescriptor().isPersistent()) continue;
 			// Create the state placeholder for a participant
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java
index 08935bb8a..5222e9c3d 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java
@@ -17,7 +17,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.ResourceBundle;
@@ -569,9 +568,9 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
 		ISynchronizeManager manager = TeamUI.getSynchronizeManager();
 		List participants = Arrays.asList(getParticipants());
 		boolean errorOccurred = false;
-		for (int i = 0; i < participants.size(); i++) {
+		for (Object participant : participants) {
 			try {
-				ISynchronizeParticipantReference ref = (ISynchronizeParticipantReference)participants.get(i);
+				ISynchronizeParticipantReference ref = (ISynchronizeParticipantReference)participant;
 				participantsAdded(new ISynchronizeParticipant[] {ref.getParticipant()});
 			} catch (TeamException e) {
 				errorOccurred = true;
@@ -682,8 +681,8 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
 	@Override
 	public Saveable[] getSaveables() {
 		Set<Saveable> result = new HashSet<>();
-		for (Iterator iter = fPartToParticipant.keySet().iterator(); iter.hasNext();) {
-			SynchronizeViewWorkbenchPart part = (SynchronizeViewWorkbenchPart) iter.next();
+		for (Object element : fPartToParticipant.keySet()) {
+			SynchronizeViewWorkbenchPart part = (SynchronizeViewWorkbenchPart) element;
 			Saveable saveable = getSaveable(part.getParticipant());
 			if (saveable != null) {
 				result.add(saveable);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetMainPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetMainPage.java
index 0ce623310..e894e4483 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetMainPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetMainPage.java
@@ -256,8 +256,8 @@ public class ExportProjectSetMainPage extends TeamWizardPage {
 
 		// filter out unexportable projects
 		List passedInExportableProjects = new ArrayList();
-		for (Iterator iterator = passedInSelectedProjects.iterator(); iterator.hasNext();) {
-			IProject project = (IProject) iterator.next();
+		for (Object element : passedInSelectedProjects) {
+			IProject project = (IProject) element;
 			if (isProjectExportable(project))
 				passedInExportableProjects.add(project);
 		}
@@ -679,9 +679,8 @@ public class ExportProjectSetMainPage extends TeamWizardPage {
 			// check if there is at least one exportable project selected
 			if (complete || !pageShown) {
 				complete = false;
-				for (Iterator iterator = selectedProjects.iterator(); iterator
-						.hasNext();) {
-					IProject selectedProject = (IProject) iterator.next();
+				for (Object element : selectedProjects) {
+					IProject selectedProject = (IProject) element;
 					if (isProjectExportable(selectedProject)) {
 						complete = true;
 					} else {
@@ -745,8 +744,7 @@ public class ExportProjectSetMainPage extends TeamWizardPage {
 
 			if (!tempSet.isEmpty()) {
 				selectedProjects.removeAll(tempSet);
-				for (Iterator iterator = tempSet.iterator(); iterator.hasNext();) {
-					Object element = iterator.next();
+				for (Object element : tempSet) {
 					referenceCountProjects.remove(element);
 				}
 				selectedProjects.addAll(referenceCountProjects);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/GlobalRefreshWizardSelectionPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/GlobalRefreshWizardSelectionPage.java
index 67c5a6ba1..b0a9a7bf0 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/GlobalRefreshWizardSelectionPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/GlobalRefreshWizardSelectionPage.java
@@ -14,7 +14,6 @@
 package org.eclipse.team.internal.ui.wizards;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.core.runtime.CoreException;
@@ -111,8 +110,8 @@ public class GlobalRefreshWizardSelectionPage extends WizardPage implements IDou
 	@Override
 	public void dispose() {
 		if (createdImages != null) {
-			for (Iterator it = createdImages.iterator(); it.hasNext();) {
-				Image image = (Image) it.next();
+			for (Object element : createdImages) {
+				Image image = (Image) element;
 				image.dispose();
 			}
 		}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationActionProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationActionProvider.java
index 700eb483b..15bc91b37 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationActionProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationActionProvider.java
@@ -14,7 +14,6 @@
 package org.eclipse.team.ui.mapping;
 
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 
 import org.eclipse.core.commands.IHandler;
@@ -193,8 +192,8 @@ public class SynchronizationActionProvider extends CommonActionProvider {
 	public void dispose() {
 		super.dispose();
 		if (openWithActions != null) openWithActions.dispose();
-		for (Iterator iter = handlers.values().iterator(); iter.hasNext();) {
-			IHandler handler = (IHandler) iter.next();
+		for (Object element : handlers.values()) {
+			IHandler handler = (IHandler) element;
 			if (handler instanceof MergeActionHandler) {
 				MergeActionHandler mah = (MergeActionHandler) handler;
 				mah.dispose();