Use addAll, deleteAll instead of looping through a collection

Simplifies reading the code.

Change-Id: Ic0eed1281a8472f4706283ebf599ea71119c39b1
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

19 files changed, 25 insertions, 74 deletions

diff --git a/bundles/org.eclipse.e4.ui.services/src/org/eclipse/e4/ui/internal/services/ContextContextService.java b/bundles/org.eclipse.e4.ui.services/src/org/eclipse/e4/ui/internal/services/ContextContextService.java
index 6174f0cfacd..b6fa1e8ab11 100644
--- a/bundles/org.eclipse.e4.ui.services/src/org/eclipse/e4/ui/internal/services/ContextContextService.java
+++ b/bundles/org.eclipse.e4.ui.services/src/org/eclipse/e4/ui/internal/services/ContextContextService.java
@@ -116,16 +116,12 @@ public class ContextContextService implements EContextService {
 		LinkedList<String> activates = (LinkedList<String>) eclipseContext.getLocal(DEFERED_ACTIVATES);
 		if (activates != null) {
 			eclipseContext.remove(DEFERED_ACTIVATES);
-			for (String id : activates) {
-				locals.add(id);
-			}
+			locals.addAll(activates);
 		}
 		LinkedList<?> deactivates = (LinkedList<?>) eclipseContext.getLocal(DEFERED_DEACTIVATES);
 		if (deactivates != null) {
 			eclipseContext.remove(DEFERED_DEACTIVATES);
-			for (Object id : deactivates) {
-				locals.remove(id);
-			}
+			locals.removeAll(deactivates);
 		}
 		eclipseContext.set(LOCAL_CONTEXTS, locals.clone());
 	}
diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/MinMaxAddonUtil.java b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/MinMaxAddonUtil.java
index 372ba2e7d52..acdcd55ecbd 100644
--- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/MinMaxAddonUtil.java
+++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/MinMaxAddonUtil.java
@@ -162,9 +162,7 @@ public class MinMaxAddonUtil {
 			if (partStacks.contains(element)) {
 				continue;
 			}
-			for (MPartStack partStack : partStacks) {
-				elementsToRestore.remove(partStack);
-			}
+			elementsToRestore.removeAll(partStacks);
 		}
 	}
 
diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ContributionRecord.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ContributionRecord.java
index 11e35cbcb75..9391e7559a3 100644
--- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ContributionRecord.java
+++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ContributionRecord.java
@@ -315,9 +315,7 @@ public class ContributionRecord {
 	}
 
 	public void dispose() {
-		for (MMenuElement copy : generatedElements) {
-			menuModel.getChildren().remove(copy);
-		}
+		menuModel.getChildren().removeAll(generatedElements);
 		for (MMenuElement shared : sharedElements) {
 			renderer.removeRecord(shared, this);
 			ArrayList<ContributionRecord> array = renderer.getList(shared);
diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarContributionRecord.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarContributionRecord.java
index 94249fcc761..df3c65b753a 100644
--- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarContributionRecord.java
+++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarContributionRecord.java
@@ -291,9 +291,7 @@ public class ToolBarContributionRecord {
 	}
 
 	public void dispose() {
-		for (MToolBarElement copy : generatedElements) {
-			toolbarModel.getChildren().remove(copy);
-		}
+		toolbarModel.getChildren().removeAll(generatedElements);
 		for (MToolBarElement shared : sharedElements) {
 			ArrayList<ToolBarContributionRecord> array = renderer
 					.getList(shared);
diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ModelAssembler.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ModelAssembler.java
index 97c958e6963..0914bc57416 100644
--- a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ModelAssembler.java
+++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ModelAssembler.java
@@ -202,9 +202,7 @@ public class ModelAssembler {
 
 	private void addAllBucketFragmentWrapper(Bucket bucket, List<ModelFragmentWrapper> fragmentList,
 			Set<String> checkedElementIds) {
-		for (ModelFragmentWrapper wrapper : bucket.wrapper) {
-			fragmentList.add(wrapper);
-		}
+		fragmentList.addAll(bucket.wrapper);
 		checkedElementIds.addAll(bucket.containedElementIds);
 		for (Bucket child : bucket.dependencies) {
 			addAllBucketFragmentWrapper(child, fragmentList, checkedElementIds);
diff --git a/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/fieldassist/ControlDecorationSupport.java b/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/fieldassist/ControlDecorationSupport.java
index 7943a0fe528..eea99c7932d 100644
--- a/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/fieldassist/ControlDecorationSupport.java
+++ b/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/fieldassist/ControlDecorationSupport.java
@@ -453,9 +453,7 @@ public class ControlDecorationSupport {
 
 	private static IObservableList<IObservable> getObservableList(IObservable[] observables) {
 		IObservableList<IObservable> observableList = new WritableList<>();
-		for (IObservable observable : observables) {
-			observableList.add(observable);
-		}
+		java.util.Collections.addAll(observableList, observables);
 
 		return observableList;
 	}
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/dialogs/ResourceTreeAndListGroup.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/dialogs/ResourceTreeAndListGroup.java
index 1681e8c388b..50f2df6927b 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/dialogs/ResourceTreeAndListGroup.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/dialogs/ResourceTreeAndListGroup.java
@@ -903,10 +903,7 @@ public class ResourceTreeAndListGroup extends EventManager {
 	 * @param treeElement the element being updated
 	 */
 	private void setListForWhiteSelection(Object treeElement) {
-		List listItemsChecked = new ArrayList();
-		for (Object listItem : listContentProvider.getElements(treeElement)) {
-			listItemsChecked.add(listItem);
-		}
+		List listItemsChecked = new ArrayList(Arrays.asList(listContentProvider.getElements(treeElement)));
 		checkedStateStore.put(treeElement, listItemsChecked);
 	}
 
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/misc/CheckboxTreeAndListGroup.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/misc/CheckboxTreeAndListGroup.java
index 875ae5b154a..bb9f74c372f 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/misc/CheckboxTreeAndListGroup.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/misc/CheckboxTreeAndListGroup.java
@@ -14,6 +14,7 @@
 package org.eclipse.ui.internal.ide.misc;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -657,11 +658,7 @@ public class CheckboxTreeAndListGroup extends EventManager implements
 		}
 
 		if (state) {
-			List listItemsChecked = new ArrayList();
-			for (Object listItem : listContentProvider.getElements(treeElement)) {
-				listItemsChecked.add(listItem);
-			}
-
+			List listItemsChecked = new ArrayList(Arrays.asList(listContentProvider.getElements(treeElement)));
 			checkedStateStore.put(treeElement, listItemsChecked);
 		} else {
 			checkedStateStore.remove(treeElement);
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/model/WorkingSetResourceMapping.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/model/WorkingSetResourceMapping.java
index bdbe79303d2..c480eaa8c22 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/model/WorkingSetResourceMapping.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/model/WorkingSetResourceMapping.java
@@ -60,9 +60,7 @@ public class WorkingSetResourceMapping extends ResourceMapping {
 	public IProject[] getProjects() {
 		Set<IProject> result = new HashSet<>();
 		for (ResourceMapping mapping : getMappings()) {
-			for (IProject project : mapping.getProjects()) {
-				result.add(project);
-			}
+			java.util.Collections.addAll(result, mapping.getProjects());
 		}
 		return result.toArray(new IProject[result.size()]);
 	}
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerResourceUtil.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerResourceUtil.java
index a1d16e25082..7d571e70e01 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerResourceUtil.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerResourceUtil.java
@@ -252,9 +252,7 @@ class MarkerResourceUtil {
 			break;
 		}
 		case MarkerFieldFilterGroup.ON_ANY_IN_SAME_CONTAINER: {
-			for (IResource resource : getProjects(selectedResources)) {
-				resourceSet.add(resource);
-			}
+			java.util.Collections.addAll(resourceSet, getProjects(selectedResources));
 			break;
 		}
 		case MarkerFieldFilterGroup.ON_WORKING_SET: {
@@ -295,9 +293,7 @@ class MarkerResourceUtil {
 			if (element instanceof IResource) {
 				projects.add(((IResource) element).getProject());
 			} else {
-				for (IProject mappingProject : ((ResourceMapping) element).getProjects()) {
-					projects.add(mappingProject);
-				}
+				java.util.Collections.addAll(projects, ((ResourceMapping) element).getProjects());
 			}
 		}
 		return projects;
@@ -315,9 +311,7 @@ class MarkerResourceUtil {
 					ResourceMappingContext.LOCAL_CONTEXT,
 					new NullProgressMonitor());
 			for (ResourceTraversal traversal : traversals) {
-				for (IResource resource : traversal.getResources()) {
-					resourceCollection.add(resource);
-				}
+				java.util.Collections.addAll(resourceCollection, traversal.getResources());
 			}
 		} catch (CoreException e) {
 			Policy.handle(e);
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/SmartImportRootWizardPage.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/SmartImportRootWizardPage.java
index 9dccfde84d3..e376f9f7255 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/SmartImportRootWizardPage.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/SmartImportRootWizardPage.java
@@ -775,10 +775,8 @@ public class SmartImportRootWizardPage extends WizardPage {
 		this.workingSets = new HashSet<>();
 		// workingSetsGroup doesn't support listeners...
 		Runnable workingSetsRetriever = () -> {
-			for (IWorkingSet workingSet : SmartImportRootWizardPage.this.workingSetsGroup
-					.getSelectedWorkingSets()) {
-				SmartImportRootWizardPage.this.workingSets.add(workingSet);
-			}
+			java.util.Collections.addAll(SmartImportRootWizardPage.this.workingSets, SmartImportRootWizardPage.this.workingSetsGroup
+					.getSelectedWorkingSets());
 		};
 		if (Display.getCurrent() == null) {
 			getContainer().getShell().getDisplay().syncExec(workingSetsRetriever);
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/MarkerFilter.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/MarkerFilter.java
index 6b41671c6ff..450cdf4c4af 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/MarkerFilter.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/MarkerFilter.java
@@ -573,9 +573,7 @@ public class MarkerFilter implements Cloneable {
 			// any types we know about that weren't either true or
 			// false in the selection attribute are new. By default,
 			// new marker types will be selected=true
-			for (int i = 0; i < newTypes.size(); ++i) {
-				selectedTypes.add(newTypes.get(i));
-			}
+			selectedTypes.addAll(newTypes);
 		} else {
 			// the settings didn't contain the new selection attribute
 			// so check for the old selection attribute.
@@ -672,9 +670,7 @@ public class MarkerFilter implements Cloneable {
 			// any types we know about that weren't either true or
 			// false in the selection attribute are new. By default,
 			// new marker types will be selected=true
-			for (int i = 0; i < newTypes.size(); ++i) {
-				selectedTypes.add(newTypes.get(i));
-			}
+			selectedTypes.addAll(newTypes);
 		} else {
 			// the settings didn't contain the new selection attribute
 			// so check for the old selection attribute.
diff --git a/bundles/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabbedPropertyRegistry.java b/bundles/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabbedPropertyRegistry.java
index fa6686e9f10..32456350ee1 100755
--- a/bundles/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabbedPropertyRegistry.java
+++ b/bundles/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabbedPropertyRegistry.java
@@ -454,9 +454,7 @@ public class TabbedPropertyRegistry {
 					return 0;
 				}
 			});
-			for (int j = 0; j < categoryList.size(); j++) {
-				sorted.add(categoryList.get(j));
-			}
+			sorted.addAll(categoryList);
 			categoryIndex = endOfCategory;
 		}
 		return sorted;
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java
index 673313e993e..28c427f3879 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java
@@ -99,7 +99,6 @@ import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
 import org.eclipse.e4.ui.model.application.ui.MElementContainer;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
-import org.eclipse.e4.ui.model.application.ui.basic.MTrimElement;
 import org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow;
 import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
 import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicFactoryImpl;
@@ -1326,9 +1325,7 @@ public final class Workbench extends EventManager implements IWorkbench, org.ecl
 	}
 
 	private static void cleanUpTrimBar(MTrimBar element) {
-		for (MTrimElement child : element.getPendingCleanup()) {
-			element.getChildren().remove(child);
-		}
+		element.getChildren().removeAll(element.getPendingCleanup());
 		element.getPendingCleanup().clear();
 	}
 
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPage.java
index 7d21c3ac709..d8b270ed16c 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPage.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPage.java
@@ -3805,9 +3805,7 @@ public class WorkbenchPage implements IWorkbenchPage {
 				}
 			}
 		}
-		for (IWorkbenchPart part : closingPartsWithSameModel) {
-			pagePartsWithSameModels.remove(part);
-		}
+		pagePartsWithSameModels.removeAll(closingPartsWithSameModel);
 		return pagePartsWithSameModels.isEmpty();
 	}
 
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java
index 0ea5e079ae5..fcee8eb6b74 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java
@@ -2034,9 +2034,7 @@ public class WorkbenchWindow implements IWorkbenchWindow {
 
 		// Remove the actual shared Parts for any placeholder that was removed
 		List<MUIElement> seList = model.getSharedElements();
-		for (MPart partToRemove : sharedPartsToRemove) {
-			seList.remove(partToRemove);
-		}
+		seList.removeAll(sharedPartsToRemove);
 	}
 
 	private boolean isLastEditorStack(MUIElement element) {
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WizardCollectionElement.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WizardCollectionElement.java
index ea2e129dd0e..4baaaa0f419 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WizardCollectionElement.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WizardCollectionElement.java
@@ -86,9 +86,7 @@ public class WizardCollectionElement extends AdaptableList implements IPluginCon
 		this.configElement = input.configElement;
 		this.wizards = wizards;
 
-		for (Object child : input.children) {
-			children.add(child);
-		}
+		children.addAll(input.children);
 	}
 
 	/**
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/PreferencesAdapter.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/PreferencesAdapter.java
index 79cb8a2f4e3..29ea12c8a25 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/PreferencesAdapter.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/preferences/PreferencesAdapter.java
@@ -43,9 +43,7 @@ public final class PreferencesAdapter extends PropertyMapAdapter {
 	public Set keySet() {
 		Set result = new HashSet();
 
-		for (String name : store.propertyNames()) {
-			result.add(name);
-		}
+		java.util.Collections.addAll(result, store.propertyNames());
 
 		return result;
 	}
diff --git a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/UserElement.java b/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/UserElement.java
index 4b4d346d9a5..29e8a0dac7e 100644
--- a/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/UserElement.java
+++ b/examples/org.eclipse.ui.examples.propertysheet/Eclipse UI Examples PropertySheet/org/eclipse/ui/examples/propertysheet/UserElement.java
@@ -242,9 +242,7 @@ public class UserElement extends OrganizationElement {
 
 		//gets descriptors from parent, warning name-space collision may occur
 		ArrayList<PropertyDescriptor> parentDescriptors = OrganizationElement.getDescriptors();
-		for (int i = 0; i < parentDescriptors.size(); i++) {
-			descriptors.add(parentDescriptors.get(i));
-		}
+		descriptors.addAll(parentDescriptors);
 	}
 
 	/**