diff options
author | Carsten Hammer | 2019-11-16 13:28:42 +0000 |
---|---|---|
committer | Karsten Thoms | 2019-12-10 20:55:41 +0000 |
commit | 2ce17be15cf3c1e867c0f38123149b85e3d00a8d (patch) | |
tree | 2102142f22610bc101e10f4164e4a0c04a7acbdf | |
parent | 6bf9205c322ad3c5948b57f199ee33fa01cd877e (diff) | |
download | eclipse.platform.team-2ce17be15cf3c1e867c0f38123149b85e3d00a8d.tar.gz eclipse.platform.team-2ce17be15cf3c1e867c0f38123149b85e3d00a8d.tar.xz eclipse.platform.team-2ce17be15cf3c1e867c0f38123149b85e3d00a8d.zip |
Use jdk 5 for-each loop
Replace simple uses of Iterator with a corresponding for-loop. Also add
missing braces on loops as necessary.
Remove unnecessary type specifications
Since Java 7 the diamond operator can be used instead of explicit type
parameters.
Change-Id: Idcec62cdf7b2c67a004e5b27c8d79fe102568597
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
9 files changed, 26 insertions, 54 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/FastDiffFilter.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/FastDiffFilter.java index c527898ff..eb971879e 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/FastDiffFilter.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/FastDiffFilter.java @@ -33,8 +33,7 @@ public abstract class FastDiffFilter extends DiffFilter { @Override public boolean select(IDiff node) { int status = ((Diff)node).getStatus(); - for (int i = 0; i < states.length; i++) { - int state = states[i]; + for (int state : states) { if ((status & mask) == state) { return true; } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberScopeManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberScopeManager.java index e04482f88..c51497698 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberScopeManager.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberScopeManager.java @@ -16,7 +16,6 @@ package org.eclipse.team.core.subscribers; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -83,9 +82,8 @@ public class SubscriberScopeManager extends SynchronizationScopeManager implemen @Override public void dispose() { - for (Iterator iter = participants.values().iterator(); iter.hasNext();) { - ISynchronizationScopeParticipant p = (ISynchronizationScopeParticipant) iter.next(); - p.dispose(); + for (ISynchronizationScopeParticipant participant : participants.values()) { + participant.dispose(); } super.dispose(); } @@ -118,9 +116,7 @@ public class SubscriberScopeManager extends SynchronizationScopeManager implemen * appropriately */ /* private */ void hookupParticipants() { - ModelProvider[] providers = getScope().getModelProviders(); - for (int i = 0; i < providers.length; i++) { - ModelProvider provider = providers[i]; + for (ModelProvider provider : getScope().getModelProviders()) { if (!participants.containsKey(provider)) { ISynchronizationScopeParticipant p = createParticipant(provider); if (p != null) { @@ -146,8 +142,7 @@ public class SubscriberScopeManager extends SynchronizationScopeManager implemen public void subscriberResourceChanged(ISubscriberChangeEvent[] deltas) { List<IResource> changedResources = new ArrayList<>(); List<IProject> changedProjects = new ArrayList<>(); - for (int i = 0; i < deltas.length; i++) { - ISubscriberChangeEvent event = deltas[i]; + for (ISubscriberChangeEvent event : deltas) { if ((event.getFlags() & (ISubscriberChangeEvent.ROOT_ADDED | ISubscriberChangeEvent.ROOT_REMOVED)) != 0) { changedProjects.add(event.getResource().getProject()); } @@ -160,15 +155,12 @@ public class SubscriberScopeManager extends SynchronizationScopeManager implemen private void fireChange(final IResource[] resources, final IProject[] projects) { final Set<ResourceMapping> result = new HashSet<>(); - ISynchronizationScopeParticipant[] handlers = participants.values().toArray(new ISynchronizationScopeParticipant[participants.size()]); - for (int i = 0; i < handlers.length; i++) { - final ISynchronizationScopeParticipant participant = handlers[i]; + for (final ISynchronizationScopeParticipant participant : participants.values()) { SafeRunner.run(new ISafeRunnable() { @Override public void run() throws Exception { - ResourceMapping[] mappings = participant.handleContextChange(SubscriberScopeManager.this.getScope(), resources, projects); - for (int j = 0; j < mappings.length; j++) { - ResourceMapping mapping = mappings[j]; + for (ResourceMapping mapping : participant + .handleContextChange(SubscriberScopeManager.this.getScope(), resources, projects)) { result.add(mapping); } } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/FastSyncInfoFilter.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/FastSyncInfoFilter.java index aed94334d..59ee87acf 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/FastSyncInfoFilter.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/FastSyncInfoFilter.java @@ -150,8 +150,7 @@ public class FastSyncInfoFilter extends SyncInfoFilter { @Override public boolean select(SyncInfo info) { int syncKind = info.getKind(); - for (int i = 0; i < changeFilters.length; i++) { - int filter = changeFilters[i]; + for (int filter : changeFilters) { if ((syncKind & SyncInfo.CHANGE_MASK) == filter) return true; } @@ -185,8 +184,7 @@ public class FastSyncInfoFilter extends SyncInfoFilter { @Override public boolean select(SyncInfo info) { int syncKind = info.getKind(); - for (int i = 0; i < directionFilters.length; i++) { - int filter = directionFilters[i]; + for (int filter : directionFilters) { if ((syncKind & SyncInfo.DIRECTION_MASK) == filter) return true; } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/AbstractResourceVariantTree.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/AbstractResourceVariantTree.java index a74000d3c..396edd27f 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/AbstractResourceVariantTree.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/AbstractResourceVariantTree.java @@ -18,7 +18,6 @@ import java.util.Arrays; 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; @@ -187,8 +186,7 @@ public abstract class AbstractResourceVariantTree implements IResourceVariantTre } if (depth == IResource.DEPTH_ZERO) return; Map<IResource, IResourceVariant> children = mergedMembers(local, remote, monitor); - for (Iterator<IResource> it = children.keySet().iterator(); it.hasNext();) { - IResource localChild = it.next(); + for (IResource localChild : children.keySet()) { IResourceVariant remoteChild = children.get(localChild); collectChanges(localChild, remoteChild, changedResources, depth == IResource.DEPTH_INFINITE ? IResource.DEPTH_INFINITE : IResource.DEPTH_ZERO, diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/CompoundResourceTraversal.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/CompoundResourceTraversal.java index d8e0ccf2f..5eaf39707 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/CompoundResourceTraversal.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/CompoundResourceTraversal.java @@ -76,8 +76,7 @@ public class CompoundResourceTraversal { public synchronized boolean isCovered(IResource resource, int depth) { IPath fullPath = resource.getFullPath(); // Regardless of the depth, look for a deep folder that covers the resource - for (Iterator iter = deepFolders.iterator(); iter.hasNext();) { - IResource deepFolder = (IResource) iter.next(); + for (IResource deepFolder : deepFolders) { if (deepFolder.getFullPath().isPrefixOf(fullPath)) { return true; } @@ -195,26 +194,22 @@ public class CompoundResourceTraversal { */ private IResource[] getUncoveredResources(CompoundResourceTraversal otherTraversal) { Set<IResource> result = new HashSet<>(); - for (Iterator iter = otherTraversal.files.iterator(); iter.hasNext();) { - IResource resource = (IResource) iter.next(); + for (IResource resource : otherTraversal.files) { if (!isCovered(resource, IResource.DEPTH_ZERO)) { result.add(resource); } } - for (Iterator iter = otherTraversal.zeroFolders.iterator(); iter.hasNext();) { - IResource resource = (IResource) iter.next(); + for (IResource resource : otherTraversal.zeroFolders) { if (!isCovered(resource, IResource.DEPTH_ZERO)) { result.add(resource); } } - for (Iterator iter = otherTraversal.shallowFolders.iterator(); iter.hasNext();) { - IResource resource = (IResource) iter.next(); + for (IResource resource : otherTraversal.shallowFolders) { if (!isCovered(resource, IResource.DEPTH_ONE)) { result.add(resource); } } - for (Iterator iter = otherTraversal.deepFolders.iterator(); iter.hasNext();) { - IResource resource = (IResource) iter.next(); + for (IResource resource : otherTraversal.deepFolders) { if (!isCovered(resource, IResource.DEPTH_INFINITE)) { result.add(resource); } @@ -257,26 +252,22 @@ public class CompoundResourceTraversal { public ResourceTraversal[] getUncoveredTraversals(CompoundResourceTraversal otherTraversal) { synchronized (otherTraversal) { CompoundResourceTraversal uncovered = new CompoundResourceTraversal(); - for (Iterator iter = otherTraversal.files.iterator(); iter.hasNext();) { - IResource resource = (IResource) iter.next(); + for (IResource resource : otherTraversal.files) { if (!isCovered(resource, IResource.DEPTH_ZERO)) { uncovered.addResource(resource, IResource.DEPTH_ZERO); } } - for (Iterator iter = otherTraversal.zeroFolders.iterator(); iter.hasNext();) { - IResource resource = (IResource) iter.next(); + for (IResource resource : otherTraversal.zeroFolders) { if (!isCovered(resource, IResource.DEPTH_ZERO)) { uncovered.addResource(resource, IResource.DEPTH_ZERO); } } - for (Iterator iter = otherTraversal.shallowFolders.iterator(); iter.hasNext();) { - IResource resource = (IResource) iter.next(); + for (IResource resource : otherTraversal.shallowFolders) { if (!isCovered(resource, IResource.DEPTH_ONE)) { uncovered.addResource(resource, IResource.DEPTH_ONE); } } - for (Iterator iter = otherTraversal.deepFolders.iterator(); iter.hasNext();) { - IResource resource = (IResource) iter.next(); + for (IResource resource : otherTraversal.deepFolders) { if (!isCovered(resource, IResource.DEPTH_INFINITE)) { uncovered.addResource(resource, IResource.DEPTH_INFINITE); } 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 fa13cd431..67ff59302 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 @@ -56,8 +56,7 @@ public class PathTree { } public boolean descendantHasFlag(int property) { if (hasDescendants()) { - for (Iterator<IPath> iter = descendantsWithPayload.iterator(); iter.hasNext();) { - IPath path = iter.next(); + for (IPath path : descendantsWithPayload) { Node child = getNode(path); if (child.hasFlag(property)) { return true; @@ -250,8 +249,7 @@ public class PathTree { */ public synchronized IPath[] getPaths() { List<IPath> result = new ArrayList<>(); - for (Iterator iter = objects.keySet().iterator(); iter.hasNext();) { - IPath path = (IPath) iter.next(); + for (IPath path : objects.keySet()) { Node node = getNode(path); if (node.getPayload() != null) result.add(path); @@ -265,8 +263,7 @@ public class PathTree { */ public synchronized Collection<Object> values() { List<Object> result = new ArrayList<>(); - for (Iterator iter = objects.keySet().iterator(); iter.hasNext();) { - IPath path = (IPath) iter.next(); + for (IPath path : objects.keySet()) { Node node = getNode(path); if (node.getPayload() != null) result.add(node.getPayload()); diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/BatchingLock.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/BatchingLock.java index 426710046..0c4939d91 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/BatchingLock.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/BatchingLock.java @@ -16,7 +16,6 @@ package org.eclipse.team.internal.core.subscribers; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -224,8 +223,7 @@ public class BatchingLock { return rules.remove(rules.size() - 1); } public boolean ruleContains(IResource resource) { - for (Iterator iter = rules.iterator(); iter.hasNext();) { - ISchedulingRule rule = (ISchedulingRule) iter.next(); + for (ISchedulingRule rule : rules) { if (rule != NULL_SCHEDULING_RULE && rule.contains(resource)) { return true; } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ChangeSetManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ChangeSetManager.java index 1cf0e10ac..850b4153f 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ChangeSetManager.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ChangeSetManager.java @@ -27,7 +27,7 @@ import org.eclipse.core.runtime.SafeRunner; */ public abstract class ChangeSetManager { - private ListenerList<IChangeSetChangeListener> listeners = new ListenerList<IChangeSetChangeListener>(ListenerList.IDENTITY); + private ListenerList<IChangeSetChangeListener> listeners = new ListenerList<>(ListenerList.IDENTITY); private Set<ChangeSet> sets; private boolean initializing; diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoTreeChangeEvent.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoTreeChangeEvent.java index ea2c485dc..178816a57 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoTreeChangeEvent.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoTreeChangeEvent.java @@ -77,8 +77,7 @@ public class SyncInfoTreeChangeEvent extends SyncInfoSetChangeEvent implements I } private boolean isDescendantOfAddedRoot(IResource resource) { - for (Iterator iter = addedSubtrees.iterator(); iter.hasNext();) { - IResource root = (IResource) iter.next(); + for (IResource root : addedSubtrees) { if (isParent(root, resource)) { // There is a higher added root already in the list return true; |