Iterate over Map.entrySet instead of Map.keySet and value searchI20200114-1805

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: I438796d7ce3abd35c5a8922559c582ef8685ed08
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

5 files changed, 24 insertions, 16 deletions

diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunchConfigurationDelegate.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunchConfigurationDelegate.java
index 6a8f651d9..de3c2f2b7 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunchConfigurationDelegate.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunchConfigurationDelegate.java
@@ -321,7 +321,8 @@ public class GroupLaunchConfigurationDelegate extends LaunchConfigurationDelegat
 		List<GroupLaunchElement> result = new ArrayList<>();
 		try {
 			Map<String, Object> attrs = configuration.getAttributes();
-			for (String attr : attrs.keySet()) {
+			for (Map.Entry<String, Object> entry : attrs.entrySet()) {
+				String attr = entry.getKey();
 				try {
 					if (attr.startsWith(MULTI_LAUNCH_CONSTANTS_PREFIX)) {
 						String prop = attr.substring(MULTI_LAUNCH_CONSTANTS_PREFIX.length() + 1);
@@ -332,7 +333,7 @@ public class GroupLaunchConfigurationDelegate extends LaunchConfigurationDelegat
 						if (name.equals(NAME_PROP)) {
 							GroupLaunchElement el = new GroupLaunchElement();
 							el.index = index;
-							el.name = (String) attrs.get(attr);
+							el.name = (String) entry.getValue();
 
 							Object actionParam = null;
 							String actionStr = (String) attrs.get(getProp(index, ACTION_PROP));
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugWindowContextService.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugWindowContextService.java
index 7b99a071b..780901061 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugWindowContextService.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugWindowContextService.java
@@ -250,7 +250,8 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis
 				}
 			}
 
-			outer: for (String listenerPartId : fListenersByPartId.keySet()) {
+			outer: for (Map.Entry<String, ListenerList<IDebugContextListener>> entry : fListenersByPartId.entrySet()) {
+				String listenerPartId = entry.getKey();
 				for (IDebugContextProvider provider : fProviders) {
 					String providerPartId = getCombinedPartId(provider.getPart());
 					if ((listenerPartId == null && providerPartId == null) ||
@@ -259,7 +260,7 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis
 						continue outer;
 					}
 				}
-				ListenerList<IDebugContextListener> listenersForPart = fListenersByPartId.get(listenerPartId);
+				ListenerList<IDebugContextListener> listenersForPart = entry.getValue();
 				if (listenersForPart != null) {
 					for (IDebugContextListener iDebugContextListener : listenersForPart) {
 						// no effect if listener already present
@@ -283,14 +284,15 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis
 				retVal = new ListenerList<>();
 			}
 
-			outer: for (String listenerPartId : fPostListenersByPartId.keySet()) {
+			outer: for (Map.Entry<String, ListenerList<IDebugContextListener>> entry : fPostListenersByPartId.entrySet()) {
+				String listenerPartId = entry.getKey();
 				for (IDebugContextProvider provider : fProviders) {
 					String providerPartId = getCombinedPartId(provider.getPart());
 					if ((listenerPartId == null && providerPartId == null) || (listenerPartId != null && listenerPartId.equals(providerPartId))) {
 						continue outer;
 					}
 				}
-				ListenerList<IDebugContextListener> listenersForPart = fPostListenersByPartId.get(listenerPartId);
+				ListenerList<IDebugContextListener> listenersForPart = entry.getValue();
 				if (listenersForPart != null) {
 					for (IDebugContextListener iDebugContextListener : listenersForPart) {
 						// no effect if listener already present
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/EmbeddedBreakpointsViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/EmbeddedBreakpointsViewer.java
index 3c277383d..4e21e8115 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/EmbeddedBreakpointsViewer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/importexport/breakpoints/EmbeddedBreakpointsViewer.java
@@ -122,8 +122,9 @@ public class EmbeddedBreakpointsViewer {
 			}
 			if(map != null) {
 				IDebugModelPresentation newpres = labelprovider.getPresentation();
-				for (String key : map.keySet()) {
-					newpres.setAttribute(key, map.get(key));
+				for (Map.Entry<String, Object> entry : map.entrySet()) {
+					String key = entry.getKey();
+					newpres.setAttribute(key, entry.getValue());
 				}
 			}
 		}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionContentProvider.java
index 51813e8b4..11e379da4 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionContentProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/elements/ExpressionContentProvider.java
@@ -94,8 +94,9 @@ public class ExpressionContentProvider extends VariableContentProvider {
 		findDelegates(delegateMap, notDelegated, updates);
 
 		// Batch the updates and send them to the delegates
-		for (IElementContentProvider delegate : delegateMap.keySet()) {
-			List<IViewerUpdate> updateList = delegateMap.get(delegate);
+		for (Map.Entry<IElementContentProvider, List<IViewerUpdate>> entry : delegateMap.entrySet()) {
+			IElementContentProvider delegate = entry.getKey();
+			List<IViewerUpdate> updateList = entry.getValue();
 			delegate.update(updateList.toArray(new IChildrenCountUpdate[updateList.size()]));
 		}
 		if (notDelegated.size() > 0){
@@ -111,8 +112,9 @@ public class ExpressionContentProvider extends VariableContentProvider {
 		findDelegates(delegateMap, notDelegated, updates);
 
 		// Batch the updates and send them to the delegates
-		for (IElementContentProvider delegate : delegateMap.keySet()) {
-			List<IViewerUpdate> updateList = delegateMap.get(delegate);
+		for (Map.Entry<IElementContentProvider, List<IViewerUpdate>> entry : delegateMap.entrySet()) {
+			IElementContentProvider delegate = entry.getKey();
+			List<IViewerUpdate> updateList = entry.getValue();
 			delegate.update(updateList.toArray(new IHasChildrenUpdate[updateList.size()]));
 		}
 		if (notDelegated.size() > 0){
@@ -128,8 +130,9 @@ public class ExpressionContentProvider extends VariableContentProvider {
 		findDelegates(delegateMap, notDelegated, updates);
 
 		// Batch the updates and send them to the delegates
-		for (IElementContentProvider delegate : delegateMap.keySet()) {
-			List<IViewerUpdate> updateList = delegateMap.get(delegate);
+		for (Map.Entry<IElementContentProvider, List<IViewerUpdate>> entry : delegateMap.entrySet()) {
+			IElementContentProvider delegate = entry.getKey();
+			List<IViewerUpdate> updateList = entry.getValue();
 			delegate.update(updateList.toArray(new IChildrenUpdate[updateList.size()]));
 		}
 		if (notDelegated.size() > 0){
diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java
index e3b96d32d..439b641f3 100644
--- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java
+++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java
@@ -1171,8 +1171,9 @@ public final class BuilderPropertyPage extends PropertyPage implements ICheckSta
 				if(oldArgs.size() != newArgs.size()) {
 					return true;
 				}
-				for (String key : oldArgs.keySet()) {
-					if (comparator.compare(oldArgs.get(key), newArgs.get(key)) != 0) {
+				for (Map.Entry<String, String> entry : oldArgs.entrySet()) {
+					String key = entry.getKey();
+					if (comparator.compare(entry.getValue(), newArgs.get(key)) != 0) {
 						return true;
 					}
 				}