diff options
| author | Shawn Pearce <spearce@spearce.org> | 2010-10-29 10:48:18 -0400 |
|---|---|---|
| committer | Code Review <codereview-daemon@eclipse.org> | 2010-10-29 10:48:18 -0400 |
| commit | 1572c9f4a79a71cb74d20d3066dc982a3033a1e8 (patch) | |
| tree | 45008899ff2745dd867076da504c2d03759e1861 /org.eclipse.jgit | |
| parent | 6bddae5775554a61d2d09740110a2ac206eda0d2 (diff) | |
| parent | 3b44b226098757d3bf0f4be10100493565cb9cc8 (diff) | |
| download | jgit-1572c9f4a79a71cb74d20d3066dc982a3033a1e8.tar.gz jgit-1572c9f4a79a71cb74d20d3066dc982a3033a1e8.zip | |
Merge "Use entrySet() instead of keySet()"
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java index 2099352f5f..045fecd219 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java @@ -169,8 +169,9 @@ public class MergeResult { this.mergeStrategy = mergeStrategy; this.description = description; if (lowLevelResults != null) - for (String path : lowLevelResults.keySet()) - addConflict(path, lowLevelResults.get(path)); + for (Map.Entry<String, org.eclipse.jgit.merge.MergeResult<?>> result : lowLevelResults + .entrySet()) + addConflict(result.getKey(), result.getValue()); } /** |