Iterate over Map.entrySet instead of Map.keySet and value search
Faster than first getting the keys and afterwards reading the value.
Done with Autorefactor https://github.com/JnRouvignac/AutoRefactor/
batch conversion using the iterate over
Map.entrySet instead of Map.keySet and value search
Change-Id: Ide5d9b8fbdd0d209a7ec35584a3d0eb9d20e749d
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/UnusedCodeFixCore.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/UnusedCodeFixCore.java
index 5281a7a..1d9af7c 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/UnusedCodeFixCore.java
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/UnusedCodeFixCore.java
@@ -782,8 +782,8 @@
}
}
}
- for (ASTNode node : variableDeclarations.keySet()) {
- List<SimpleName> names= variableDeclarations.get(node);
+ for (Map.Entry<ASTNode, List<SimpleName>> entry : variableDeclarations.entrySet()) {
+ List<SimpleName> names= entry.getValue();
result.add(new RemoveUnusedMemberOperation(names.toArray(new SimpleName[0]), false));
}
if (unnecessaryCasts.size() > 0)
diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/contentassist/ContentAssistHistoryTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/contentassist/ContentAssistHistoryTest.java
index 52c2575..ad724eb 100644
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/contentassist/ContentAssistHistoryTest.java
+++ b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/contentassist/ContentAssistHistoryTest.java
@@ -248,8 +248,9 @@
private static void assertEqualMap(String message, Map<String, List<String>> expected, Map<String, RHSHistory> actual) {
assertEquals(message, expected.size(), actual.size());
- for (String type : expected.keySet()) {
- assertEquals(message, expected.get(type), actual.get(type).getTypes());
+ for (Map.Entry<String, List<String>> entry : expected.entrySet()) {
+ String type = entry.getKey();
+ assertEquals(message, entry.getValue(), actual.get(type).getTypes());
}
}
diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/InvocationCountPerformanceMeter.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/InvocationCountPerformanceMeter.java
index 54e413c..6cd1738 100644
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/InvocationCountPerformanceMeter.java
+++ b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/InvocationCountPerformanceMeter.java
@@ -268,8 +268,9 @@
public void print(Object key1) {
System.out.println(key1.toString() + ":"); //$NON-NLS-1$
Map<Object, Integer> results= fResultsMap.get(key1);
- for (Object key : results.keySet()) {
- System.out.println("\t" + key + ": " + results.get(key).intValue()); //$NON-NLS-1$ //$NON-NLS-2$
+ for (Map.Entry<Object, Integer> entry : results.entrySet()) {
+ Object key = entry.getKey();
+ System.out.println("\t" + key + ": " + entry.getValue().intValue()); //$NON-NLS-1$ //$NON-NLS-2$
}
}
}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/IntroduceFactoryTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/IntroduceFactoryTests.java
index 5df89ba..1d4443d 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/IntroduceFactoryTests.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/IntroduceFactoryTests.java
@@ -487,14 +487,15 @@
}
private void createProjectPackageStructure(Map<String, Set<String>> projName2PkgNames, Map<String, IJavaProject> projName2Project, Map<IJavaProject, IPackageFragmentRoot> proj2PkgRoot) throws CoreException, JavaModelException {
- for (String projName : projName2PkgNames.keySet()) {
+ for (Map.Entry<String, Set<String>> entry : projName2PkgNames.entrySet()) {
+ String projName = entry.getKey();
IJavaProject project= JavaProjectHelper.createJavaProject(projName, "bin");
IPackageFragmentRoot root= JavaProjectHelper.addSourceContainer(project, CONTAINER);
JavaProjectHelper.addRTJar(project);
Set<IPackageFragment> pkgs= new HashSet<>();
projName2Project.put(projName, project);
proj2PkgRoot.put(project, root);
- for (String pkgName : projName2PkgNames.get(projName)) {
+ for (String pkgName : entry.getValue()) {
pkgs.add(root.createPackageFragment(pkgName, true, null));
}
}
diff --git a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/CleanUpPostSaveListener.java b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/CleanUpPostSaveListener.java
index 2f01750..47470bb 100644
--- a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/CleanUpPostSaveListener.java
+++ b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/CleanUpPostSaveListener.java
@@ -606,9 +606,10 @@
Map<String, String> projectOptions= project.getOptions(true);
- for (String key : cleanUpOptions.keySet()) {
+ for (Map.Entry<String, String> entry : cleanUpOptions.entrySet()) {
+ String key = entry.getKey();
String projectOption= projectOptions.get(key);
- String cleanUpOption= cleanUpOptions.get(key);
+ String cleanUpOption= entry.getValue();
if (!strongerEquals(projectOption, cleanUpOption))
return false;
}
diff --git a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/CleanUpPreferenceUtil.java b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/CleanUpPreferenceUtil.java
index d265092..79baa3e 100644
--- a/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/CleanUpPreferenceUtil.java
+++ b/org.eclipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/fix/CleanUpPreferenceUtil.java
@@ -152,8 +152,9 @@
public static void saveSaveParticipantOptions(IScopeContext context, Map<String, String> settings) {
IEclipsePreferences node= context.getNode(JavaUI.ID_PLUGIN);
- for (String key : settings.keySet()) {
- node.put(SAVE_PARTICIPANT_KEY_PREFIX + key, settings.get(key));
+ for (Map.Entry<String, String> entry : settings.entrySet()) {
+ String key = entry.getKey();
+ node.put(SAVE_PARTICIPANT_KEY_PREFIX + key, entry.getValue());
}
}
diff --git a/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/DeleteChangeCreator.java b/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/DeleteChangeCreator.java
index 6b6b9fc..294ab76 100644
--- a/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/DeleteChangeCreator.java
+++ b/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/DeleteChangeCreator.java
@@ -104,8 +104,9 @@
Map<ICompilationUnit, List<IJavaElement>> grouped= ReorgUtils.groupByCompilationUnit(getElementsSmallerThanCu(javaElements));
if (grouped.size() != 0 ){
Assert.isNotNull(manager);
- for (ICompilationUnit cu : grouped.keySet()) {
- result.add(createDeleteChange(cu, grouped.get(cu), manager));
+ for (Map.Entry<ICompilationUnit, List<IJavaElement>> entry : grouped.entrySet()) {
+ ICompilationUnit cu = entry.getKey();
+ result.add(createDeleteChange(cu, entry.getValue(), manager));
}
}
diff --git a/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/MoveCuUpdateCreator.java b/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/MoveCuUpdateCreator.java
index 9f01681..cae9cd5 100644
--- a/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/MoveCuUpdateCreator.java
+++ b/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/MoveCuUpdateCreator.java
@@ -111,8 +111,9 @@
}
private void addImportRewriteUpdates(TextChangeManager changeManager) throws CoreException {
- for (ICompilationUnit cu : fImportRewrites.keySet()) {
- ImportRewrite importRewrite= fImportRewrites.get(cu);
+ for (Map.Entry<ICompilationUnit, ImportRewrite> entry : fImportRewrites.entrySet()) {
+ ICompilationUnit cu = entry.getKey();
+ ImportRewrite importRewrite= entry.getValue();
if (importRewrite != null && importRewrite.hasRecordedChanges()) {
TextChangeCompatibility.addTextEdit(changeManager.get(cu), RefactoringCoreMessages.MoveCuUpdateCreator_update_imports, importRewrite.rewriteImports(null));
}
diff --git a/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/ChangeTypeRefactoring.java b/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/ChangeTypeRefactoring.java
index 243eda5..25271b1 100644
--- a/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/ChangeTypeRefactoring.java
+++ b/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/ChangeTypeRefactoring.java
@@ -513,8 +513,9 @@
arguments.put(JavaRefactoringDescriptorUtil.ATTRIBUTE_SELECTION, Integer.valueOf(fSelectionStart).toString() + " " + Integer.valueOf(fSelectionLength).toString()); //$NON-NLS-1$
arguments.put(ATTRIBUTE_TYPE, fSelectedType.getQualifiedName());
final DynamicValidationRefactoringChange result= new DynamicValidationRefactoringChange(descriptor, RefactoringCoreMessages.ChangeTypeRefactoring_allChanges);
- for (ICompilationUnit icu : relevantVarsByUnit.keySet()) {
- Set<ConstraintVariable> cVars= relevantVarsByUnit.get(icu);
+ for (Map.Entry<ICompilationUnit, Set<ConstraintVariable>> entry : relevantVarsByUnit.entrySet()) {
+ ICompilationUnit icu = entry.getKey();
+ Set<ConstraintVariable> cVars= entry.getValue();
CompilationUnitChange cuChange= new CompilationUnitChange(getName(), icu);
addAllChangesFor(icu, cVars, cuChange);
result.add(cuChange);
diff --git a/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/constraints/SuperTypeRefactoringProcessor.java b/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/constraints/SuperTypeRefactoringProcessor.java
index d041fe7..2429049 100644
--- a/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/constraints/SuperTypeRefactoringProcessor.java
+++ b/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/constraints/SuperTypeRefactoringProcessor.java
@@ -1132,10 +1132,11 @@
final ASTParser parser= ASTParser.newParser(IASTSharedValues.SHARED_AST_LEVEL);
ICompilationUnit current= null;
final Map<ICompilationUnit, SearchResultGroup> groups= new HashMap<>();
- for (IJavaProject project : firstPass.keySet()) {
+ for (Map.Entry<IJavaProject, Set<SearchResultGroup>> entry : firstPass.entrySet()) {
+ IJavaProject project = entry.getKey();
if (level == 3 && !JavaModelUtil.is50OrHigher(project))
level= 2;
- collection= firstPass.get(project);
+ collection= entry.getValue();
if (collection != null) {
for (SearchResultGroup group : collection) {
for (SearchMatch match : group.getSearchResults()) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackagerfat/FatJarAntExporter.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackagerfat/FatJarAntExporter.java
index 3f051c3..99ae407 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackagerfat/FatJarAntExporter.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackagerfat/FatJarAntExporter.java
@@ -97,17 +97,18 @@
public String substitute(String path) {
int len= 0;
String result= path;
- for (String basePath : pathSubstitutions.keySet()) {
+ for (Map.Entry<String, String> entry : pathSubstitutions.entrySet()) {
+ String basePath = entry.getKey();
if (basePath.length() < len) {
continue;
}
if (path.equals(basePath)) {
- result= pathSubstitutions.get(basePath);
+ result= entry.getValue();
break;
}
if (path.startsWith(basePath + File.separator)) {
len= basePath.length();
- result= pathSubstitutions.get(basePath) + path.substring(len);
+ result= entry.getValue() + path.substring(len);
}
}
return result;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackagerfat/FatJarManifestProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackagerfat/FatJarManifestProvider.java
index b9313c6..f35c579 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackagerfat/FatJarManifestProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackagerfat/FatJarManifestProvider.java
@@ -116,11 +116,12 @@
Map<String, Attributes> mergedEntries= mergedManifest.getEntries();
for (Manifest otherManifest : otherManifests) {
Map<String, Attributes> otherEntries= otherManifest.getEntries();
- for (String attributeName : otherEntries.keySet()) {
+ for (Map.Entry<String, Attributes> entry : otherEntries.entrySet()) {
+ String attributeName = entry.getKey();
if (mergedEntries.containsKey(attributeName)) {
// TODO: WARNING
} else {
- mergedEntries.put(attributeName, otherEntries.get(attributeName));
+ mergedEntries.put(attributeName, entry.getValue());
}
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/CleanUpConfigurationBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/CleanUpConfigurationBlock.java
index 724d47f..36eb6c3 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/CleanUpConfigurationBlock.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/CleanUpConfigurationBlock.java
@@ -162,8 +162,9 @@
private void fill(Map<String, String> settings, Map<String, String> sharedSettings) {
sharedSettings.clear();
- for (String key : settings.keySet()) {
- sharedSettings.put(key, settings.get(key));
+ for (Map.Entry<String, String> entry : settings.entrySet()) {
+ String key = entry.getKey();
+ sharedSettings.put(key, entry.getValue());
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/LevelTreeContentProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/LevelTreeContentProvider.java
index 394dc4e..1ba3330 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/LevelTreeContentProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/LevelTreeContentProvider.java
@@ -259,8 +259,9 @@
}
viewer.remove(toRemove.toArray());
- for (Object parent : toAdd.keySet()) {
- HashSet<Object> children= (HashSet<Object>) toAdd.get(parent);
+ for (Map.Entry<Object, Set<Object>> entry : toAdd.entrySet()) {
+ Object parent = entry.getKey();
+ HashSet<Object> children= (HashSet<Object>) entry.getValue();
viewer.add(parent, children.toArray());
}
for (Iterator<Object> elementsToUpdate= toUpdate.iterator(); elementsToUpdate.hasNext();) {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/ContentAssistHistory.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/ContentAssistHistory.java
index 455d11b..0292e97 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/ContentAssistHistory.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/ContentAssistHistory.java
@@ -94,11 +94,12 @@
rootElement.setAttribute(ATTRIBUTE_MAX_RHS, Integer.toString(history.fMaxRHS));
document.appendChild(rootElement);
- for (String lhs : history.fLHSCache.keySet()) {
+ for (Entry<String, MRUSet<String>> entry : history.fLHSCache.entrySet()) {
+ String lhs = entry.getKey();
Element lhsElement= document.createElement(NODE_LHS);
lhsElement.setAttribute(ATTRIBUTE_NAME, lhs);
rootElement.appendChild(lhsElement);
- for (String rhs : history.fLHSCache.get(lhs)) {
+ for (String rhs : entry.getValue()) {
Element rhsElement= document.createElement(NODE_RHS);
rhsElement.setAttribute(ATTRIBUTE_NAME, rhs);
lhsElement.appendChild(rhsElement);
diff --git a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringPluginImages.java b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringPluginImages.java
index dcf850a..4af2f43 100644
--- a/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringPluginImages.java
+++ b/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringPluginImages.java
@@ -134,8 +134,9 @@
/* package */ static ImageRegistry getImageRegistry() {
if (fgImageRegistry == null) {
fgImageRegistry= new ImageRegistry();
- for (String key : fgAvoidSWTErrorMap.keySet()) {
- fgImageRegistry.put(key, fgAvoidSWTErrorMap.get(key));
+ for (java.util.Map.Entry<String, ImageDescriptor> entry : fgAvoidSWTErrorMap.entrySet()) {
+ String key = entry.getKey();
+ fgImageRegistry.put(key, entry.getValue());
}
fgAvoidSWTErrorMap= null;
}
