Bug 568322 - Fix: fix inefficient use of keySet iterator in
ProfileVersionerCore.java
Signed-off-by: Shi Chen <chenshi@microsoft.com>
Change-Id: I82e784837563b2e6e715d1f43976a6cdd73e0798
diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/preferences/formatter/ProfileVersionerCore.java b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/preferences/formatter/ProfileVersionerCore.java
index 054d7f0..66a7e37 100644
--- a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/preferences/formatter/ProfileVersionerCore.java
+++ b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/preferences/formatter/ProfileVersionerCore.java
@@ -117,18 +117,19 @@
version20to21(oldSettings);
//$FALL-THROUGH$
default:
- for (String key : oldSettings.keySet()) {
- if (!newSettings.containsKey(key))
- continue;
+ for (Map.Entry<String, String> entry : oldSettings.entrySet()) {
+ final String key= entry.getKey();
+ if (!newSettings.containsKey(key))
+ continue;
- final String value= oldSettings.get(key);
- if (value != null) {
- newSettings.put(key, value);
- }
+ final String value= entry.getValue();
+ if (value != null) {
+ newSettings.put(key, value);
}
+ }
// copy over profile options (not formatter settings)
if (oldSettings.containsKey(JavaCore.JAVA_FORMATTER)) {
- newSettings.put(JavaCore.JAVA_FORMATTER, oldSettings.get(JavaCore.JAVA_FORMATTER));
+ newSettings.put(JavaCore.JAVA_FORMATTER, oldSettings.get(JavaCore.JAVA_FORMATTER));
}
}
return newSettings;
