2 files changed, 9 insertions, 8 deletions
diff --git a/org.eclipse.text/src/org/eclipse/jface/text/AbstractDocument.java b/org.eclipse.text/src/org/eclipse/jface/text/AbstractDocument.java
index 45e6e9cccb5..f0f24411a5f 100644
--- a/org.eclipse.text/src/org/eclipse/jface/text/AbstractDocument.java
+++ b/org.eclipse.text/src/org/eclipse/jface/text/AbstractDocument.java
@@ -18,6 +18,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.regex.PatternSyntaxException;
 
 import org.eclipse.core.runtime.Assert;
@@ -655,10 +656,10 @@ public abstract class AbstractDocument implements IDocument, IDocumentExtension,
 
 		if (fDocumentPartitioners != null) {
 			fDocumentPartitioningChangedEvent= new DocumentPartitioningChangedEvent(this);
-			Iterator<String> e= fDocumentPartitioners.keySet().iterator();
-			while (e.hasNext()) {
-				String partitioning= e.next();
-				IDocumentPartitioner partitioner= fDocumentPartitioners.get(partitioning);
+			for (Entry<String, IDocumentPartitioner> entry : fDocumentPartitioners.entrySet()) {
+
+				String partitioning= entry.getKey();
+				IDocumentPartitioner partitioner= entry.getValue();
 
 				if (partitioner instanceof IDocumentPartitionerExtension3) {
 					IDocumentPartitionerExtension3 extension= (IDocumentPartitionerExtension3) partitioner;
diff --git a/org.eclipse.text/src/org/eclipse/text/edits/MoveSourceEdit.java b/org.eclipse.text/src/org/eclipse/text/edits/MoveSourceEdit.java
index f297f2c0fd7..b0230703216 100644
--- a/org.eclipse.text/src/org/eclipse/text/edits/MoveSourceEdit.java
+++ b/org.eclipse.text/src/org/eclipse/text/edits/MoveSourceEdit.java
@@ -13,9 +13,9 @@ package org.eclipse.text.edits;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import org.eclipse.core.runtime.Assert;
 
@@ -420,9 +420,9 @@ public final class MoveSourceEdit extends TextEdit {
 	}
 
 	private static void restorePositions(Map<TextEdit, TextEdit> editMap) {
-		for (Iterator<TextEdit> iter= editMap.keySet().iterator(); iter.hasNext();) {
-			TextEdit marker= iter.next();
-			TextEdit edit= editMap.get(marker);
+		for (Entry<TextEdit, TextEdit> entry: editMap.entrySet()) {
+			TextEdit marker = entry.getKey();
+			TextEdit edit= entry.getValue();
 			if (marker.isDeleted()) {
 				edit.markAsDeleted();
 			} else {