diff options
Diffstat (limited to 'bundles/org.eclipse.team.core/src/org')
3 files changed, 5 insertions, 11 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoTree.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoTree.java index 37ee0c489..4e7161004 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoTree.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoTree.java @@ -17,7 +17,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -311,8 +310,7 @@ public class SyncInfoTree extends SyncInfoSet { private synchronized IResource[] internalMembers(IWorkspaceRoot root) { Set possibleChildren = parents.keySet(); Set<IResource> children = new HashSet<>(); - for (Iterator it = possibleChildren.iterator(); it.hasNext();) { - Object next = it.next(); + for (Object next : possibleChildren) { IResource element = root.findMember((IPath)next); if (element != null) { children.add(element.getProject()); @@ -339,8 +337,7 @@ public class SyncInfoTree extends SyncInfoSet { IPath path = parent.getFullPath(); Set possibleChildren = parents.get(path); if(possibleChildren != null) { - for (Iterator it = possibleChildren.iterator(); it.hasNext();) { - Object next = it.next(); + for (Object next : possibleChildren) { IResource element = (IResource)next; IPath childPath = element.getFullPath(); IResource modelObject = null; diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileContentManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileContentManager.java index 4c7dd374f..6063fd593 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileContentManager.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileContentManager.java @@ -21,7 +21,6 @@ import java.io.FileInputStream; import java.io.IOException; import java.util.Collections; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import java.util.TreeMap; @@ -258,8 +257,8 @@ public class FileContentManager implements IFileContentManager { private static IStringMapping [] getStringMappings(Map map) { final IStringMapping [] result= new IStringMapping [map.size()]; int index= 0; - for (final Iterator iter = map.entrySet().iterator(); iter.hasNext();) { - final Map.Entry entry= (Map.Entry)iter.next(); + for (Object element : map.entrySet()) { + final Map.Entry entry= (Map.Entry)element; result[index++]= new StringMapping((String)entry.getKey(), ((Integer)entry.getValue()).intValue()); } return result; diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/PathTree.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/PathTree.java index 67ff59302..e119fd3be 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/PathTree.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/PathTree.java @@ -17,7 +17,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -153,8 +152,7 @@ public class PathTree { if (node != null) { Set possibleChildren = node.descendantsWithPayload; if(possibleChildren != null) { - for (Iterator it = possibleChildren.iterator(); it.hasNext();) { - Object next = it.next(); + for (Object next : possibleChildren) { IPath descendantPath = (IPath)next; IPath childPath = null; if(descendantPath.segmentCount() == (path.segmentCount() + 1)) { |