Bug 567365 - dogfooding use addAll()/removeAll() and other quickfixesI20200927-1800I20200926-1800I20200925-1800

Bug 567335 - [AutoRefactor immigration #25/136] [cleanup & saveaction]
Use Collection.addAll(), Collection.removeAll(), Collections.addAll() or
Collections.removeAll() instead of loop

Bug 567262 - [AutoRefactor immigration #22/136] [cleanup & saveaction]
Initialize map at creation

Bug 567264 - [AutoRefactor immigration #23/136] [cleanup & saveaction]
Use Arrays.fill()

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

5 files changed, 7 insertions, 16 deletions

diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/GenerateHashCodeEqualsOperation.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/GenerateHashCodeEqualsOperation.java
index 970e24c652..f4495d1b16 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/GenerateHashCodeEqualsOperation.java
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/codemanipulation/GenerateHashCodeEqualsOperation.java
@@ -475,9 +475,7 @@ public final class GenerateHashCodeEqualsOperation implements IWorkspaceRunnable
 					j7Invoc.arguments().add(fAst.newSimpleName(field.getName()));
 				} else if (field.getType().isPrimitive()) {
 					Statement[] sts= createAddSimpleHashCode(field.getType(), this::getThisAccessForHashCode, field.getName(), false);
-					for (Statement st : sts) {
-						body.statements().add(st);
-					}
+					body.statements().addAll(Arrays.asList(sts));
 				} else {
 					body.statements().add(createAddQualifiedHashCode(field));
 				}
@@ -730,9 +728,7 @@ public final class GenerateHashCodeEqualsOperation implements IWorkspaceRunnable
 			a.setIndex(fAst.newSimpleName(name));
 			return a;
 		}, VARIABLE_NAME_INDEX, true);
-		for (Statement statement : statements) {
-			forBody.statements().add(statement);
-		}
+		forBody.statements().addAll(Arrays.asList(statements));
 		forStatement.setBody(forBody);
 
 		// END RETURN
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/code/flow/FlowInfo.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/code/flow/FlowInfo.java
index e3bf7683ed..5d6a793f3d 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/code/flow/FlowInfo.java
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/code/flow/FlowInfo.java
@@ -16,6 +16,7 @@
 package org.eclipse.jdt.internal.corext.refactoring.code.flow;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -386,9 +387,7 @@ public abstract class FlowInfo {
 
 	protected void createAccessModeArray(FlowContext context) {
 		fAccessModes= new int[context.getArrayLength()];
-		for (int i= 0; i < fAccessModes.length; i++) {
-			fAccessModes[i]= UNUSED;
-		}
+		Arrays.fill(fAccessModes, UNUSED);
 	}
 
 	protected void mergeAccessModeConditional(FlowInfo otherInfo, FlowContext context) {
diff --git a/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/ReorgPolicyFactory.java b/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/ReorgPolicyFactory.java
index 009c3af3c5..f8dce9c406 100644
--- a/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/ReorgPolicyFactory.java
+++ b/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/ReorgPolicyFactory.java
@@ -1590,8 +1590,7 @@ public final class ReorgPolicyFactory {
 
 		@Override
 		protected Map<String, String> getRefactoringArguments(String project) {
-			final Map<String, String> arguments= new HashMap<>();
-			arguments.putAll(super.getRefactoringArguments(project));
+			final Map<String, String> arguments= new HashMap<>(super.getRefactoringArguments(project));
 			if (fFilePatterns != null && !"".equals(fFilePatterns)) //$NON-NLS-1$
 				arguments.put(ATTRIBUTE_PATTERNS, fFilePatterns);
 			arguments.put(JavaRefactoringDescriptorUtil.ATTRIBUTE_REFERENCES, Boolean.toString(fUpdateReferences));
diff --git a/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/PullUpRefactoringProcessor.java b/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/PullUpRefactoringProcessor.java
index a75f19ea23..87afa93158 100644
--- a/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/PullUpRefactoringProcessor.java
+++ b/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/PullUpRefactoringProcessor.java
@@ -1610,8 +1610,7 @@ public class PullUpRefactoringProcessor extends HierarchyProcessor {
 	}
 
 	private Map<IMember, Set<IMember>> getMatchingMembers(final ITypeHierarchy hierarchy, final IType type, final boolean includeAbstract) throws JavaModelException {
-		final Map<IMember, Set<IMember>> result= new HashMap<>();
-		result.putAll(getMatchingMembersMapping(type));
+		final Map<IMember, Set<IMember>> result= new HashMap<>(getMatchingMembersMapping(type));
 		for (IType subType : hierarchy.getAllSubtypes(type)) {
 			final Map<IMember, Set<IMember>> map= getMatchingMembersMapping(subType);
 			mergeMaps(result, map);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/AdvancedQuickAssistProcessor.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/AdvancedQuickAssistProcessor.java
index 2a2f74d2f5..53345276f7 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/AdvancedQuickAssistProcessor.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/AdvancedQuickAssistProcessor.java
@@ -2771,9 +2771,7 @@ public class AdvancedQuickAssistProcessor implements IQuickAssistProcessor {
 				thenStatement= currentIf.getThenStatement();
 			}
 
-			for (SwitchCase switchCaseStatement : createSwitchCaseStatements(ast, rewrite, caseExpressions)) {
-				switchStatement.statements().add(switchCaseStatement);
-			}
+			switchStatement.statements().addAll(Arrays.asList(createSwitchCaseStatements(ast, rewrite, caseExpressions)));
 			boolean isBreakRequired= true;
 			if (thenStatement instanceof Block) {
 				Statement statement= null;