Use addAll, deleteAll instead of looping through a collectionI20190620-1800I20190620-0130I20190619-1820I20190619-1800

Update to trigger build

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

15 files changed, 34 insertions, 58 deletions

diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteExtensionProvider.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteExtensionProvider.java
index 22ead73e5..5029bc73a 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteExtensionProvider.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteExtensionProvider.java
@@ -17,6 +17,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.help.AbstractContentExtensionProvider;
@@ -63,9 +64,7 @@ public class RemoteExtensionProvider extends AbstractContentExtensionProvider {
 						}
 						UAElement element = reader.read(in);
 						IContentExtension[] children = element.getChildren(IContentExtension.class);
-						for (int contrib = 0; contrib < children.length; contrib++) {
-							contributions.add(children[contrib]);
-						}
+						Collections.addAll(contributions, children);
 					} catch (IOException e) {
 						String msg = "I/O error while trying to contact the remote help server"; //$NON-NLS-1$
 						HelpBasePlugin.logError(msg, e);
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteIndexProvider.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteIndexProvider.java
index 876b257a7..039fa5327 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteIndexProvider.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/RemoteIndexProvider.java
@@ -17,6 +17,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.help.AbstractIndexProvider;
@@ -71,9 +72,7 @@ public class RemoteIndexProvider extends AbstractIndexProvider {
 
 						RemoteIndexParser parser = new RemoteIndexParser();
 						IIndexContribution[] result = parser.parse(in);
-						for (int contrib = 0; contrib < result.length; contrib++) {
-							contributions.add(result[contrib]);
-						}
+						Collections.addAll(contributions, result);
 					} catch (IOException e) {
 						String msg = "I/O error while trying to contact the remote help server"; //$NON-NLS-1$
 						HelpBasePlugin.logError(msg, e);
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeRegistry.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeRegistry.java
index 3414a407e..a8c22a005 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeRegistry.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeRegistry.java
@@ -15,6 +15,7 @@
 package org.eclipse.help.internal.base.scope;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Stack;
@@ -94,8 +95,7 @@ public class ScopeRegistry {
 			else if (obj instanceof IHelpScopeProducer)
 			{
 				IScopeHandle dynamicScopes[] = ((IHelpScopeProducer)obj).getScopeHandles();
-				for (int d=0;d<dynamicScopes.length;d++)
-					scopes.add(dynamicScopes[d]);
+				Collections.addAll(scopes, dynamicScopes);
 			}
 		}
 		initialized = true;
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/ProxyUtil.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/ProxyUtil.java
index dfad67405..a83c7fe8a 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/ProxyUtil.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/ProxyUtil.java
@@ -25,6 +25,7 @@ import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.core.internal.net.ProxyManager;
@@ -98,11 +99,9 @@ public class ProxyUtil {
 		if (service instanceof ProxyManager)
 			natives = ((ProxyManager)service).getNativeNonProxiedHosts();
 
-		for (int m=0;m<manuals.length;m++)
-			hosts.add(manuals[m]);
+		Collections.addAll(hosts, manuals);
 		if (natives!=null)
-			for (int n=0;n<natives.length;n++)
-				hosts.add(natives[n]);
+			Collections.addAll(hosts, natives);
 		return hosts;
 	}
 
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchResults.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchResults.java
index 7c430442e..8e96555ef 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchResults.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchResults.java
@@ -15,6 +15,7 @@
 package org.eclipse.help.internal.search;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
@@ -277,8 +278,7 @@ public class SearchResults implements ISearchHitCollector {
 		scopes = new ArrayList<>(wSets.length);
 		for (int w = 0; w < wSets.length; w++) {
 			AdaptableHelpResource[] elements = wSets[w].getElements();
-			for (int i = 0; i < elements.length; i++)
-				scopes.add(elements[i]);
+			Collections.addAll(scopes, elements);
 		}
 		return scopes;
 	}
@@ -290,8 +290,7 @@ public class SearchResults implements ISearchHitCollector {
 		ArrayList<CriterionResource> criteriaScopes = new ArrayList<>(wSets.length);
 		for (int w = 0; w < wSets.length; w++) {
 			CriterionResource[] elements = wSets[w].getCriteria();
-			for (int i = 0; i < elements.length; i++)
-				criteriaScopes.add(elements[i]);
+			Collections.addAll(criteriaScopes, elements);
 		}
 		return criteriaScopes;
 	}
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Options.java b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Options.java
index 14d821662..ef30a3236 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Options.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/Options.java
@@ -15,6 +15,7 @@ package org.eclipse.help.internal.standalone;
 
 import java.io.*;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -101,9 +102,7 @@ public class Options {
 	public static void init(String appId, String[] args) {
 		// convert array of arguments to a list
 		List<String> list = new ArrayList<>();
-		for (int i = 0; i < args.length; i++) {
-			list.add(args[i]);
-		}
+		Collections.addAll(list, args);
 
 		init(appId, list);
 	}
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSet.java b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSet.java
index 05dd28cef..28f2c9662 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSet.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/workingset/WorkingSet.java
@@ -14,6 +14,7 @@
 package org.eclipse.help.internal.workingset;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
@@ -59,17 +60,13 @@ public class WorkingSet {
 			elements = new AdaptableHelpResource[0];
 
 		this.elements = new ArrayList<>(elements.length);
-		for (int i = 0; i < elements.length; i++) {
-			this.elements.add(elements[i]);
-		}
+		Collections.addAll(this.elements, elements);
 
 		if (criteria == null)
 			criteria = new CriterionResource[0];
 
 		this.criteria = new ArrayList<>(criteria.length);
-		for (int j = 0; j < criteria.length; j++) {
-			this.criteria.add(criteria[j]);
-		}
+		Collections.addAll(this.criteria, criteria);
 	}
 
 	public void removeElement(AdaptableHelpResource element) {
@@ -97,16 +94,13 @@ public class WorkingSet {
 
 	public void setElements(AdaptableHelpResource[] elements) {
 		this.elements = new ArrayList<>(elements.length);
-		for (int i = 0; i < elements.length; i++)
-			this.elements.add(elements[i]);
+		Collections.addAll(this.elements, elements);
 	}
 
 
 	public void setCriteria(CriterionResource[] criteria) {
 		this.criteria = new ArrayList<>(criteria.length);
-		for(int i = 0; i < criteria.length; i++) {
-			this.criteria.add(criteria[i]);
-		}
+		Collections.addAll(this.criteria, criteria);
 	}
 
 	public CriterionResource[] getCriteria(){
diff --git a/org.eclipse.help.base/src/org/eclipse/help/search/HelpIndexBuilder.java b/org.eclipse.help.base/src/org/eclipse/help/search/HelpIndexBuilder.java
index 7ba966a90..07b1c4f40 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/search/HelpIndexBuilder.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/search/HelpIndexBuilder.java
@@ -22,6 +22,7 @@ import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Locale;
@@ -448,9 +449,7 @@ public class HelpIndexBuilder {
 		if (legalLanguages==null) {
 			legalLanguages = new HashSet<>();
 			String [] choices = Locale.getISOLanguages();
-			for (int i=0; i<choices.length; i++) {
-				legalLanguages.add(choices[i]);
-			}
+			Collections.addAll(legalLanguages, choices);
 		}
 		return legalLanguages.contains(language);
 	}
@@ -459,9 +458,7 @@ public class HelpIndexBuilder {
 		if (legalCountries==null) {
 			legalCountries = new HashSet<>();
 			String [] choices = Locale.getISOCountries();
-			for (int i=0; i<choices.length; i++) {
-				legalCountries.add(choices[i]);
-			}
+			Collections.addAll(legalCountries, choices);
 		}
 		return legalCountries.contains(country);
 	}
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/ICTable.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/ICTable.java
index 1a548fb8d..a34cd3df3 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/ICTable.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/ICTable.java
@@ -16,6 +16,7 @@ package org.eclipse.help.ui.internal.preferences;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.help.ui.internal.Messages;
@@ -224,8 +225,7 @@ public class ICTable {
 		ICContentProvider p = (ICContentProvider)viewer.getContentProvider();
 		IC objs[] = p.getElements(null);
 		List<IC> content = new ArrayList<>();
-		for (int o=0;o<objs.length;o++)
-			content.add(objs[o]);
+		Collections.addAll(content, objs);
 		return content;
 	}
 
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/EngineResultSection.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/EngineResultSection.java
index 44eee0d83..0886cd534 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/EngineResultSection.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/EngineResultSection.java
@@ -15,7 +15,7 @@ package org.eclipse.help.ui.internal.views;
 
 import java.net.URL;
 import java.util.ArrayList;
-
+import java.util.Collections;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.help.IHelpResource;
@@ -234,8 +234,7 @@ public class EngineResultSection {
 	 * @see org.eclipse.help.internal.search.federated.ISearchEngineResultCollector#add(org.eclipse.help.internal.search.federated.ISearchEngineResult[])
 	 */
 	public synchronized void add(ISearchEngineResult[] matches) {
-		for (int i = 0; i < matches.length; i++)
-			hits.add(matches[i]);
+		Collections.addAll(hits, matches);
 		asyncUpdateResults(false, false);
 	}
 
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ScopeSetDialog.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ScopeSetDialog.java
index eca3a4c05..96564822b 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ScopeSetDialog.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ScopeSetDialog.java
@@ -14,6 +14,7 @@
 package org.eclipse.help.ui.internal.views;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -227,9 +228,7 @@ public class ScopeSetDialog extends TrayDialog  {
 
 	private ArrayList<ScopeSet> extractSets(ScopeSet[] array) {
 		ArrayList<ScopeSet> list = new ArrayList<>();
-		for (int i=0; i<array.length; i++) {
-			list.add(array[i]);
-		}
+		Collections.addAll(list, array);
 		return list;
 	}
 
diff --git a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/ButtonData.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/ButtonData.java
index 813583069..8691ea02d 100644
--- a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/ButtonData.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/ButtonData.java
@@ -61,11 +61,7 @@ public class ButtonData extends RequestData {
 		}
 
 		List<AbstractButton> buttonList = new ArrayList<>();
-		for (AbstractButton button : allButtons) {
-			//if (button.isVisible() && button.getLocation() == location) {
-				buttonList.add(button);
-			//}
-		}
+		buttonList.addAll(allButtons);
 		AbstractButton[] buttons = buttonList.toArray(new AbstractButton[buttonList.size()]);
 		return buttons;
 	}
diff --git a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/CssUtil.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/CssUtil.java
index 866c1c201..58ee0dc10 100644
--- a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/CssUtil.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/CssUtil.java
@@ -13,6 +13,7 @@
  *******************************************************************************/
 package org.eclipse.help.internal.webapp.data;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.StringTokenizer;
 
@@ -57,9 +58,7 @@ public class CssUtil {
 	public static void addCssFiles(final String preference, List<String> list) {
 		String topicCssPath = Platform.getPreferencesService().getString(HelpBasePlugin.PLUGIN_ID, preference, "", null);  //$NON-NLS-1$
 		String[] cssFiles = CssUtil.getCssFilenames(topicCssPath);
-		for (String cssFile : cssFiles) {
-			list.add(cssFile);
-		}
+		Collections.addAll(list, cssFiles);
 	}
 
 	public static String createCssIncludes(List<String> cssFiles, String backPath) {
diff --git a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/ExtraFilters.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/ExtraFilters.java
index 2b186f832..ce150b5c3 100644
--- a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/ExtraFilters.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/ExtraFilters.java
@@ -81,9 +81,7 @@ public class ExtraFilters implements IFilter {
 	 */
 	public static void setFilters(PrioritizedFilter[] newFilters) {
 		filters = new ArrayList<>();
-		for (PrioritizedFilter newFilter : newFilters) {
-			filters.add(newFilter);
-		}
+		Collections.addAll(filters, newFilters);
 		sortFilters();
 	}
 
diff --git a/org.eclipse.help/src/org/eclipse/help/internal/dynamic/ExtensionResolver.java b/org.eclipse.help/src/org/eclipse/help/internal/dynamic/ExtensionResolver.java
index 5cc750e88..2b5f45023 100644
--- a/org.eclipse.help/src/org/eclipse/help/internal/dynamic/ExtensionResolver.java
+++ b/org.eclipse.help/src/org/eclipse/help/internal/dynamic/ExtensionResolver.java
@@ -16,6 +16,7 @@ package org.eclipse.help.internal.dynamic;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import javax.xml.parsers.ParserConfigurationException;
@@ -67,9 +68,7 @@ public class ExtensionResolver {
 			String content = extensions[i].getContent();
 			try {
 				Node[] nodes = getContent(content);
-				for (int j=0;j<nodes.length;++j) {
-					list.add(nodes[j]);
-				}
+				Collections.addAll(list, nodes);
 			}
 			catch (Throwable t) {
 				// ignore invalid extensions