diff options
author | Lars Vogel | 2016-05-10 09:29:35 +0000 |
---|---|---|
committer | Mickael Istria | 2017-02-02 18:23:49 +0000 |
commit | 987947306302e3c4960fc6f7d57b82e2a5a2435a (patch) | |
tree | 7bafdb64047edf0dea950efefefe8ff9a903c1aa /org.eclipse.search/new search | |
parent | fab00d8dab78d07b1caddd2a2c481c6c8e28510c (diff) | |
download | eclipse.platform.text-987947306302e3c4960fc6f7d57b82e2a5a2435a.tar.gz eclipse.platform.text-987947306302e3c4960fc6f7d57b82e2a5a2435a.tar.xz eclipse.platform.text-987947306302e3c4960fc6f7d57b82e2a5a2435a.zip |
Bug 493306 - Inefficient use of keySet iterator instead of entrySet
iterator in eclipse.text
Change-Id: I5f43ac955ca602846b2f3680b2e63023e1c23368
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
Diffstat (limited to 'org.eclipse.search/new search')
2 files changed, 7 insertions, 8 deletions
diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/AnnotationHighlighter.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/AnnotationHighlighter.java index 954c1abc7c5..76fbd83d51c 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/AnnotationHighlighter.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/AnnotationHighlighter.java @@ -16,6 +16,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import org.eclipse.core.runtime.IStatus; @@ -117,10 +118,9 @@ public class AnnotationHighlighter extends Highlighter { IAnnotationModelExtension ame= (IAnnotationModelExtension) fModel; ame.replaceAnnotations(new Annotation[0], annotationToPositionMap); } else { - for (Iterator<Annotation> elements= annotationToPositionMap.keySet().iterator(); elements.hasNext();) { - Annotation element= elements.next(); - Position p= annotationToPositionMap.get(element); - fModel.addAnnotation(element, p); + Set<Entry<Annotation, Position>> entrySet = annotationToPositionMap.entrySet(); + for (Entry<Annotation, Position> entry : entrySet) { + fModel.addAnnotation(entry.getKey(), entry.getValue()); } } } diff --git a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/EditorAccessHighlighter.java b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/EditorAccessHighlighter.java index a2c665c87e9..b18f9dacc4a 100644 --- a/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/EditorAccessHighlighter.java +++ b/org.eclipse.search/new search/org/eclipse/search2/internal/ui/text/EditorAccessHighlighter.java @@ -15,6 +15,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import org.eclipse.core.runtime.IStatus; @@ -71,10 +72,8 @@ public class EditorAccessHighlighter extends Highlighter { } } } - for (Iterator<IAnnotationModel> maps= mapsByAnnotationModel.keySet().iterator(); maps.hasNext();) { - IAnnotationModel model= maps.next(); - Map<Annotation, Position> positionMap= mapsByAnnotationModel.get(model); - addAnnotations(model, positionMap); + for (Entry<IAnnotationModel, HashMap<Annotation, Position>> entry : mapsByAnnotationModel.entrySet()) { + addAnnotations(entry.getKey(), entry.getValue()); } } |