Merge "Fix Findbugs WMI_WRONG_MAP_ITERATOR"

4 files changed, 17 insertions, 13 deletions

diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/MergeToolActionHandler.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/MergeToolActionHandler.java
index 79d2b0aede..bdbfb1ced0 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/MergeToolActionHandler.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/MergeToolActionHandler.java
@@ -16,6 +16,7 @@ package org.eclipse.egit.ui.internal.actions;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 
 import org.eclipse.compare.CompareEditorInput;
@@ -64,13 +65,13 @@ public class MergeToolActionHandler extends RepositoryActionHandler {
 		Map<Repository, Collection<String>> pathsByRepository = ResourceUtil
 				.splitPathsByRepository(Arrays.asList(paths));
 
-		Set<Repository> repos = pathsByRepository.keySet();
-
-		if (repos.size() != 1)
+		if (pathsByRepository.size() != 1)
 			return false;
 
-		Repository repo = repos.iterator().next();
-		Collection<String> selectedRepoPaths = pathsByRepository.get(repo);
+		Entry<Repository, Collection<String>> pathsEntry = pathsByRepository
+				.entrySet().iterator().next();
+		Repository repo = pathsEntry.getKey();
+		Collection<String> selectedRepoPaths = pathsEntry.getValue();
 		if (selectedRepoPaths.isEmpty())
 			return false;
 
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ReplaceWithOursTheirsMenu.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ReplaceWithOursTheirsMenu.java
index e0dd1c4332..453f052354 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ReplaceWithOursTheirsMenu.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ReplaceWithOursTheirsMenu.java
@@ -18,6 +18,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import org.eclipse.core.resources.WorkspaceJob;
 import org.eclipse.core.runtime.CoreException;
@@ -80,9 +81,10 @@ public class ReplaceWithOursTheirsMenu extends CompoundContributionItem
 				.splitPathsByRepository(Arrays.asList(locations));
 		if (pathsByRepository.size() == 1) {
 
-			Repository repository = pathsByRepository.keySet().iterator()
-					.next();
-			Collection<String> paths = pathsByRepository.get(repository);
+			Entry<Repository, Collection<String>> entry = pathsByRepository
+					.entrySet().iterator().next();
+			Repository repository = entry.getKey();
+			Collection<String> paths = entry.getValue();
 			if (paths.size() == 1) {
 				String path = paths.iterator().next();
 				items.addAll(createSpecificOursTheirsItems(repository, path));
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/GitTraceConfigurationDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/GitTraceConfigurationDialog.java
index 386e3abf88..8e03ff1f55 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/GitTraceConfigurationDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/GitTraceConfigurationDialog.java
@@ -452,8 +452,7 @@ public class GitTraceConfigurationDialog extends TitleAreaDialog {
 						checkedKeys.add(((OptionNode) checked).getOption());
 				}
 
-				for (PluginNode plugin : optionsMap.keySet()) {
-					Properties props = optionsMap.get(plugin);
+				for (Properties props : optionsMap.values()) {
 					for (Object keyObject : props.keySet()) {
 						String key = (String) keyObject;
 						boolean isOn = options.getBooleanOption(key, false);
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/GitMergeEditorInput.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/GitMergeEditorInput.java
index b8ab6874db..260acf8ec8 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/GitMergeEditorInput.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/GitMergeEditorInput.java
@@ -18,6 +18,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import org.eclipse.compare.CompareConfiguration;
 import org.eclipse.compare.CompareEditorInput;
@@ -145,9 +146,10 @@ public class GitMergeEditorInput extends CompareEditorInput {
 						new IllegalStateException(
 								UIText.RepositoryAction_multiRepoSelection));
 			}
-			Repository repo = pathsByRepository.keySet().iterator().next();
-			List<String> filterPaths = new ArrayList<>(
-					pathsByRepository.get(repo));
+			Entry<Repository, Collection<String>> entry = pathsByRepository
+					.entrySet().iterator().next();
+			Repository repo = entry.getKey();
+			List<String> filterPaths = new ArrayList<>(entry.getValue());
 
 			if (monitor.isCanceled())
 				throw new InterruptedException();