diff options
Diffstat (limited to 'bundles/org.eclipse.team.core')
61 files changed, 316 insertions, 485 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/ProjectSetCapability.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/ProjectSetCapability.java index 63c86bd0c..1c3bbcc46 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/ProjectSetCapability.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/ProjectSetCapability.java @@ -240,8 +240,7 @@ public abstract class ProjectSetCapability { // Build a collection of existing projects final Collection<IProject> existingProjects = new ArrayList<>(); - for (int i = 0; i < projects.length; i++) { - IProject eachProj = projects[i]; + for (IProject eachProj : projects) { if (eachProj.exists()) { existingProjects.add(eachProj); } else if (new File(eachProj.getParent().getLocation().toFile(), eachProj.getName()).exists()) { @@ -267,8 +266,7 @@ public abstract class ProjectSetCapability { Collection<IProject> result = new ArrayList<>(projects.length); result.addAll(Arrays.asList(projects)); result.removeAll(existingProjects); - for (int i = 0; i < confirmed.length; i++) { - IProject eachProj = confirmed[i]; + for (IProject eachProj : confirmed) { if (existingProjects.contains(eachProj)) result.add(eachProj); } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/RepositoryProvider.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/RepositoryProvider.java index 8e4ba1259..9ce34692a 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/RepositoryProvider.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/RepositoryProvider.java @@ -222,8 +222,7 @@ public abstract class RepositoryProvider implements IProjectNature, IAdaptable { if (!provider.canHandleLinkedResources()) { try { IResource[] members = project.members(); - for (int i = 0; i < members.length; i++) { - IResource resource = members[i]; + for (IResource resource : members) { if (resource.isLinked()) { throw new TeamException(new Status(IStatus.ERROR, TeamPlugin.ID, IResourceStatus.LINKING_NOT_ALLOWED, NLS.bind(Messages.RepositoryProvider_linkedResourcesExist, new String[] { project.getName(), id }), null)); } @@ -502,13 +501,12 @@ public abstract class RepositoryProvider implements IProjectNature, IAdaptable { Set<String> teamSet = new HashSet<>(); teamSet.addAll(AllProviderTypeIds); // add in all the ones we know via extension point - //fall back to old method of nature ID to find any for backwards compatibility - for (int i = 0; i < desc.length; i++) { - String[] setIds = desc[i].getNatureSetIds(); - for (int j = 0; j < setIds.length; j++) { - if(setIds[j].equals(TEAM_SETID)) { - teamSet.add(desc[i].getNatureId()); + for (IProjectNatureDescriptor d : desc) { + String[] setIds = d.getNatureSetIds(); + for (String setId : setIds) { + if (setId.equals(TEAM_SETID)) { + teamSet.add(d.getNatureId()); } } } @@ -550,14 +548,14 @@ public abstract class RepositoryProvider implements IProjectNature, IAdaptable { IWorkspace workspace = ResourcesPlugin.getWorkspace(); // for every nature id on this project, find it's natures sets and check if it is // in the team set. - for (int i = 0; i < natureIds.length; i++) { - IProjectNatureDescriptor desc = workspace.getNatureDescriptor(natureIds[i]); + for (String natureId : natureIds) { + IProjectNatureDescriptor desc = workspace.getNatureDescriptor(natureId); // The descriptor can be null if the nature doesn't exist if (desc != null) { String[] setIds = desc.getNatureSetIds(); - for (int j = 0; j < setIds.length; j++) { - if(setIds[j].equals(TEAM_SETID)) { - return getProvider(project, natureIds[i]); + for (String setId : setIds) { + if (setId.equals(TEAM_SETID)) { + return getProvider(project, natureId); } } } @@ -631,8 +629,8 @@ public abstract class RepositoryProvider implements IProjectNature, IAdaptable { return null; String[] setIds = desc.getNatureSetIds(); - for (int i = 0; i < setIds.length; i++) { - if(setIds[i].equals(TEAM_SETID)) { + for (String setId : setIds) { + if (setId.equals(TEAM_SETID)) { return (RepositoryProvider)project.getNature(id); } } @@ -714,10 +712,10 @@ public abstract class RepositoryProvider implements IProjectNature, IAdaptable { IExtensionPoint extension = Platform.getExtensionRegistry().getExtensionPoint(TeamPlugin.ID, TeamPlugin.REPOSITORY_EXTENSION); if (extension != null) { IExtension[] extensions = extension.getExtensions(); - for (int i = 0; i < extensions.length; i++) { - IConfigurationElement [] configElements = extensions[i].getConfigurationElements(); - for (int j = 0; j < configElements.length; j++) { - String extensionId = configElements[j].getAttribute("id"); //$NON-NLS-1$ + for (IExtension e : extensions) { + IConfigurationElement[] configElements = e.getConfigurationElements(); + for (IConfigurationElement configElement : configElements) { + String extensionId = configElement.getAttribute("id"); //$NON-NLS-1$ allIDs.add(extensionId); } } @@ -732,17 +730,17 @@ public abstract class RepositoryProvider implements IProjectNature, IAdaptable { IExtensionPoint extension = Platform.getExtensionRegistry().getExtensionPoint(TeamPlugin.ID, TeamPlugin.REPOSITORY_EXTENSION); if (extension != null) { IExtension[] extensions = extension.getExtensions(); - for (int i = 0; i < extensions.length; i++) { - IConfigurationElement [] configElements = extensions[i].getConfigurationElements(); - for (int j = 0; j < configElements.length; j++) { - String extensionId = configElements[j].getAttribute("id"); //$NON-NLS-1$ + for (IExtension ext : extensions) { + IConfigurationElement[] configElements = ext.getConfigurationElements(); + for (IConfigurationElement configElement : configElements) { + String extensionId = configElement.getAttribute("id"); //$NON-NLS-1$ if (extensionId != null && extensionId.equals(id)) { try { - return (RepositoryProvider) configElements[j].createExecutableExtension("class"); //$NON-NLS-1$ + return (RepositoryProvider) configElement.createExecutableExtension("class"); //$NON-NLS-1$ } catch (CoreException e) { TeamPlugin.log(e); } catch (ClassCastException e) { - String className = configElements[j].getAttribute("class"); //$NON-NLS-1$ + String className = configElement.getAttribute("class"); //$NON-NLS-1$ TeamPlugin.log(IStatus.ERROR, NLS.bind(Messages.RepositoryProvider_invalidClass, new String[] { id, className }), e); } return null; diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/RepositoryProviderType.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/RepositoryProviderType.java index 62ca83791..ac06da4d5 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/RepositoryProviderType.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/RepositoryProviderType.java @@ -14,7 +14,6 @@ package org.eclipse.team.core; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import org.eclipse.core.resources.IContainer; @@ -107,8 +106,7 @@ public abstract class RepositoryProviderType extends PlatformObject { * @since 3.2 */ public static RepositoryProviderType getTypeForScheme(String scheme) { - for (Iterator iter = allProviderTypes.values().iterator(); iter.hasNext();) { - RepositoryProviderType type = (RepositoryProviderType) iter.next(); + for (RepositoryProviderType type : allProviderTypes.values()) { if (type.getFileSystemScheme() != null && type.getFileSystemScheme().equals(scheme)) return type; } @@ -119,11 +117,11 @@ public abstract class RepositoryProviderType extends PlatformObject { IExtensionPoint extension = Platform.getExtensionRegistry().getExtensionPoint(TeamPlugin.ID, TeamPlugin.REPOSITORY_EXTENSION); if (extension != null) { IExtension[] extensions = extension.getExtensions(); - for (int i = 0; i < extensions.length; i++) { - IConfigurationElement [] configElements = extensions[i].getConfigurationElements(); - for (int j = 0; j < configElements.length; j++) { - String extensionId = configElements[j].getAttribute("id"); //$NON-NLS-1$ - String typeScheme = configElements[j].getAttribute("fileSystemScheme"); //$NON-NLS-1$ + for (IExtension ext : extensions) { + IConfigurationElement[] configElements = ext.getConfigurationElements(); + for (IConfigurationElement configElement : configElements) { + String extensionId = configElement.getAttribute("id"); //$NON-NLS-1$ + String typeScheme = configElement.getAttribute("fileSystemScheme"); //$NON-NLS-1$ if (typeScheme != null && typeScheme.equals(scheme) && extensionId != null) { return newProviderType(extensionId); } @@ -141,30 +139,28 @@ public abstract class RepositoryProviderType extends PlatformObject { IExtensionPoint extension = Platform.getExtensionRegistry().getExtensionPoint(TeamPlugin.ID, TeamPlugin.REPOSITORY_EXTENSION); if (extension != null) { IExtension[] extensions = extension.getExtensions(); - for (int i = 0; i < extensions.length; i++) { - IConfigurationElement [] configElements = extensions[i].getConfigurationElements(); - for (int j = 0; j < configElements.length; j++) { - String extensionId = configElements[j].getAttribute("id"); //$NON-NLS-1$ - + for (IExtension ext : extensions) { + IConfigurationElement[] configElements = ext.getConfigurationElements(); + for (IConfigurationElement configElement : configElements) { + String extensionId = configElement.getAttribute("id"); //$NON-NLS-1$ if (extensionId != null && extensionId.equals(id)) { try { RepositoryProviderType providerType; //Its ok not to have a typeClass extension. In this case, a default instance will be created. - if(configElements[j].getAttribute("typeClass") == null) { //$NON-NLS-1$ + if (configElement.getAttribute("typeClass") == null) { //$NON-NLS-1$ providerType = new DefaultRepositoryProviderType(); } else { - providerType = (RepositoryProviderType) configElements[j].createExecutableExtension("typeClass"); //$NON-NLS-1$ + providerType = (RepositoryProviderType) configElement.createExecutableExtension("typeClass"); //$NON-NLS-1$ } - providerType.setID(id); allProviderTypes.put(id, providerType); - String scheme = configElements[j].getAttribute("fileSystemScheme"); //$NON-NLS-1$ + String scheme = configElement.getAttribute("fileSystemScheme"); //$NON-NLS-1$ providerType.setFileSystemScheme(scheme); return providerType; } catch (CoreException e) { TeamPlugin.log(e); } catch (ClassCastException e) { - String className = configElements[j].getAttribute("typeClass"); //$NON-NLS-1$ + String className = configElement.getAttribute("typeClass"); //$NON-NLS-1$ TeamPlugin.log(IStatus.ERROR, "Class " + className + " registered for repository provider type id " + id + " is not a subclass of RepositoryProviderType", e); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } return null; diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/Team.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/Team.java index d65e49f24..d25103c29 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/Team.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/Team.java @@ -156,12 +156,14 @@ public final class Team { private static boolean matchesEnabledIgnore(IResource resource) { StringMatcher[] matchers = getStringMatchers(); - for (int i = 0; i < matchers.length; i++) { + for (StringMatcher matcher : matchers) { String resourceName = resource.getName(); - if(matchers[i].isPathPattern()) { + if (matcher.isPathPattern()) { resourceName = resource.getFullPath().toString(); } - if (matchers[i].match(resourceName)) return true; + if (matcher.match(resourceName)) { + return true; + } } return false; } @@ -249,9 +251,9 @@ public final class Team { if (ignoreMatchers==null) { IIgnoreInfo[] ignorePatterns = getAllIgnores(); ArrayList<StringMatcher> matchers = new ArrayList<>(ignorePatterns.length); - for (int i = 0; i < ignorePatterns.length; i++) { - if (ignorePatterns[i].getEnabled()) { - matchers.add(new StringMatcher(ignorePatterns[i].getPattern(), true, false)); + for (IIgnoreInfo ignorePattern : ignorePatterns) { + if (ignorePattern.getEnabled()) { + matchers.add(new StringMatcher(ignorePattern.getPattern(), true, false)); } } ignoreMatchers = new StringMatcher[matchers.size()]; @@ -295,13 +297,11 @@ public final class Team { } // Now set into preferences StringBuilder buf = new StringBuilder(); - Iterator e = globalIgnore.entrySet().iterator(); - while (e.hasNext()) { - Map.Entry entry = (Entry) e.next(); + for (Map.Entry entry : globalIgnore.entrySet()) { String pattern = (String) entry.getKey(); Boolean value = (Boolean) entry.getValue(); boolean isCustom = (!pluginIgnore.containsKey(pattern)) || - !pluginIgnore.get(pattern).equals(value); + !pluginIgnore.get(pattern).equals(value); if (isCustom) { buf.append(pattern); buf.append(PREF_TEAM_SEPARATOR); @@ -309,7 +309,6 @@ public final class Team { buf.append(en); buf.append(PREF_TEAM_SEPARATOR); } - } TeamPlugin.getPlugin().getPluginPreferences().setValue(PREF_TEAM_IGNORES, buf.toString()); } @@ -328,15 +327,15 @@ public final class Team { IExtensionPoint extension = Platform.getExtensionRegistry().getExtensionPoint(TeamPlugin.ID, TeamPlugin.IGNORE_EXTENSION); if (extension != null) { IExtension[] extensions = extension.getExtensions(); - for (int i = 0; i < extensions.length; i++) { - IConfigurationElement [] configElements = extensions[i].getConfigurationElements(); - for (int j = 0; j < configElements.length; j++) { - String pattern = configElements[j].getAttribute("pattern"); //$NON-NLS-1$ + for (IExtension ext : extensions) { + IConfigurationElement[] configElements = ext.getConfigurationElements(); + for (IConfigurationElement configElement : configElements) { + String pattern = configElement.getAttribute("pattern"); //$NON-NLS-1$ if (pattern != null) { - String selected = configElements[j].getAttribute("enabled"); //$NON-NLS-1$ + String selected = configElement.getAttribute("enabled"); //$NON-NLS-1$ if (selected == null) { // Check for selected because this used to be the field name - selected = configElements[j].getAttribute("selected"); //$NON-NLS-1$ + selected = configElement.getAttribute("selected"); //$NON-NLS-1$ } boolean enabled = selected != null && selected.equalsIgnoreCase("true"); //$NON-NLS-1$ @@ -382,17 +381,15 @@ public final class Team { String patternToFind, IExtension[] extensions) { StringBuilder sb = new StringBuilder(); boolean isFirst = true; - for (int i = 0; i < extensions.length; i++) { - IConfigurationElement[] configElements = extensions[i] - .getConfigurationElements(); - for (int j = 0; j < configElements.length; j++) { - if (patternToFind.equals(configElements[j] - .getAttribute("pattern"))) { //$NON-NLS-1$ + for (IExtension extension : extensions) { + IConfigurationElement[] configElements = extension.getConfigurationElements(); + for (IConfigurationElement configElement : configElements) { + if (patternToFind.equals(configElement.getAttribute("pattern"))) { //$NON-NLS-1$ if (!isFirst) { sb.append(", "); //$NON-NLS-1$ } isFirst = false; - sb.append(extensions[i].getContributor().getName()); + sb.append(extension.getContributor().getName()); } } } @@ -494,13 +491,13 @@ public final class Team { IExtensionPoint extension = RegistryFactory.getRegistry().getExtensionPoint(TeamPlugin.ID, TeamPlugin.PROJECT_SET_EXTENSION); if (extension != null) { IExtension[] extensions = extension.getExtensions(); - for (int i = 0; i < extensions.length; i++) { - IConfigurationElement [] configElements = extensions[i].getConfigurationElements(); - for (int j = 0; j < configElements.length; j++) { - String extensionId = configElements[j].getAttribute("id"); //$NON-NLS-1$ + for (IExtension ext : extensions) { + IConfigurationElement[] configElements = ext.getConfigurationElements(); + for (IConfigurationElement configElement : configElements) { + String extensionId = configElement.getAttribute("id"); //$NON-NLS-1$ if (extensionId != null && extensionId.equals(id)) { try { - return (IProjectSetSerializer)configElements[j].createExecutableExtension("class"); //$NON-NLS-1$ + return (IProjectSetSerializer) configElement.createExecutableExtension("class"); //$NON-NLS-1$ } catch (CoreException e) { TeamPlugin.log(e); return null; @@ -642,8 +639,8 @@ public final class Team { IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(TeamPlugin.EXTENSION_POINT_BUNDLE_IMPORTERS); if (point != null) { IConfigurationElement[] infos = point.getConfigurationElements(); - for (int i = 0; i < infos.length; i++) { - fBundleImporters.add(new BundleImporterExtension(infos[i])); + for (IConfigurationElement info : infos) { + fBundleImporters.add(new BundleImporterExtension(info)); } } } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/DiffTree.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/DiffTree.java index 6163c84ba..5cb113a49 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/DiffTree.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/diff/provider/DiffTree.java @@ -15,7 +15,6 @@ package org.eclipse.team.core.diff.provider; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.Map; import java.util.Set; @@ -93,8 +92,7 @@ public class DiffTree implements IDiffTree { if (depth == IResource.DEPTH_ZERO) return; IPath[] children = getChildren(path); - for (int i = 0; i < children.length; i++) { - IPath child = children[i]; + for (IPath child : children) { accept(child, visitor, depth == IResource.DEPTH_ONE ? IResource.DEPTH_ZERO : IResource.DEPTH_INFINITE); } } @@ -244,8 +242,8 @@ public class DiffTree implements IDiffTree { if(event.isEmpty() && ! event.isReset() && propertyChanges.isEmpty()) return; Object[] listeners = this.listeners.getListeners(); - for (int i = 0; i < listeners.length; i++) { - final IDiffChangeListener listener = (IDiffChangeListener)listeners[i]; + for (Object l : listeners) { + final IDiffChangeListener listener = (IDiffChangeListener) l; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { @@ -257,8 +255,7 @@ public class DiffTree implements IDiffTree { lockedForModification = true; if (!event.isEmpty() || event.isReset()) listener.diffsChanged(event, Policy.subMonitorFor(monitor, 100)); - for (Iterator<Integer> iter = propertyChanges.keySet().iterator(); iter.hasNext();) { - Integer key = iter.next(); + for (Integer key : propertyChanges.keySet()) { Set<IPath> paths = propertyChanges.get(key); listener.propertyChanged(DiffTree.this, key.intValue(), paths.toArray(new IPath[paths .size()])); @@ -371,8 +368,7 @@ public class DiffTree implements IDiffTree { changes = new HashSet<>(); propertyChanges.put(key, changes); } - for (int i = 0; i < paths.length; i++) { - IPath path = paths[i]; + for (IPath path : paths) { changes.add(path); } } @@ -386,8 +382,7 @@ public class DiffTree implements IDiffTree { public void setBusy(IDiff[] diffs, IProgressMonitor monitor) { try { beginInput(); - for (int i = 0; i < diffs.length; i++) { - IDiff node = diffs[i]; + for (IDiff node : diffs) { setPropertyToRoot(node, P_BUSY_HINT, true); } } finally { @@ -400,8 +395,7 @@ public class DiffTree implements IDiffTree { try { beginInput(); IPath[] paths = pathTree.getPaths(); - for (int i = 0; i < paths.length; i++) { - IPath path = paths[i]; + for (IPath path : paths) { IPath[] changed = pathTree.setPropogatedProperty(path, P_BUSY_HINT, false); accumulatePropertyChanges(P_BUSY_HINT, changed); } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/importing/provisional/BundleImporterDelegate.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/importing/provisional/BundleImporterDelegate.java index 1915ad01a..e5e43281e 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/importing/provisional/BundleImporterDelegate.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/importing/provisional/BundleImporterDelegate.java @@ -67,8 +67,7 @@ public abstract class BundleImporterDelegate implements IBundleImporterDelegate if (getSupportedValues().contains(prefix)) { try { ManifestElement[] elements = ManifestElement.parseHeader(ECLIPSE_SOURCE_REFERENCES, value); - for (int j = 0; j < elements.length; j++) { - ManifestElement element = elements[j]; + for (ManifestElement element : elements) { String url = element.toString(); String project = element.getAttribute(ATTR_PROJECT); if (project == null) { @@ -97,8 +96,7 @@ public abstract class BundleImporterDelegate implements IBundleImporterDelegate IProject[] result = null; if (psfCapability != null) { // collect and validate all header values - for (int i = 0; i < descriptions.length; i++) { - ScmUrlImportDescription description = descriptions[i]; + for (ScmUrlImportDescription description : descriptions) { references.add(psfCapability.asReference(description.getUri(), description.getProject())); } // create projects diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ChangeTracker.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ChangeTracker.java index c3d6cd6a1..dbf9c7b75 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ChangeTracker.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ChangeTracker.java @@ -59,8 +59,7 @@ public abstract class ChangeTracker { if (disposed) return; IResourceDelta delta = event.getDelta(); IResourceDelta[] projectDeltas = delta.getAffectedChildren(IResourceDelta.ADDED | IResourceDelta.CHANGED | IResourceDelta.REMOVED); - for (int i = 0; i < projectDeltas.length; i++) { - IResourceDelta projectDelta = projectDeltas[i]; + for (IResourceDelta projectDelta : projectDeltas) { IResource resource = projectDelta.getResource(); if (resource.getType() == IResource.PROJECT) { IProject project = (IProject)resource; @@ -117,8 +116,7 @@ public abstract class ChangeTracker { ResourcesPlugin.getWorkspace().addResourceChangeListener(changeListener, IResourceChangeEvent.POST_CHANGE); RepositoryProviderManager.getInstance().addListener(changeListener); IProject[] allProjects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); - for (int i = 0; i < allProjects.length; i++) { - IProject project = allProjects[i]; + for (IProject project : allProjects) { if (isProjectOfInterest(project)) trackProject(project); } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ResourceMappingMerger.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ResourceMappingMerger.java index b3c994661..702087800 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ResourceMappingMerger.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ResourceMappingMerger.java @@ -71,11 +71,9 @@ public abstract class ResourceMappingMerger implements IResourceMappingMerger { public ISchedulingRule getMergeRule(IMergeContext context) { ResourceMapping[] mappings = context.getScope().getMappings(getModelProvider().getId()); ISchedulingRule rule = null; - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { IProject[] mappingProjects = mapping.getProjects(); - for (int j = 0; j < mappingProjects.length; j++) { - IProject project = mappingProjects[j]; + for (IProject project : mappingProjects) { if (rule == null) { rule = project; } else { @@ -105,12 +103,10 @@ public abstract class ResourceMappingMerger implements IResourceMappingMerger { private IDiff[] getSetToMerge(IMergeContext mergeContext) { ResourceMapping[] mappings = mergeContext.getScope().getMappings(getModelProvider().getDescriptor().getId()); Set<IDiff> result = new HashSet<>(); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { ResourceTraversal[] traversals = mergeContext.getScope().getTraversals(mapping); IDiff[] deltas = mergeContext.getDiffTree().getDiffs(traversals); - for (int j = 0; j < deltas.length; j++) { - IDiff delta = deltas[j]; + for (IDiff delta : deltas) { result.add(delta); } } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/MergeContext.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/MergeContext.java index 5a29fe4ea..41ff492e5 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/MergeContext.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/MergeContext.java @@ -86,8 +86,7 @@ public abstract class MergeContext extends SynchronizationContext implements IMe @Override public void reject(final IDiff[] diffs, IProgressMonitor monitor) throws CoreException { run(monitor1 -> { - for (int i = 0; i < diffs.length; i++) { - IDiff node = diffs[i]; + for (IDiff node : diffs) { reject(node, monitor1); } }, getMergeRule(diffs), IResource.NONE, monitor); @@ -96,8 +95,7 @@ public abstract class MergeContext extends SynchronizationContext implements IMe @Override public void markAsMerged(final IDiff[] nodes, final boolean inSyncHint, IProgressMonitor monitor) throws CoreException { run(monitor1 -> { - for (int i = 0; i < nodes.length; i++) { - IDiff node = nodes[i]; + for (IDiff node : nodes) { markAsMerged(node, inSyncHint, monitor1); } }, getMergeRule(nodes), IResource.NONE, monitor); @@ -109,8 +107,7 @@ public abstract class MergeContext extends SynchronizationContext implements IMe run(monitor1 -> { try { monitor1.beginTask(null, deltas.length * 100); - for (int i = 0; i < deltas.length; i++) { - IDiff delta = deltas[i]; + for (IDiff delta : deltas) { IStatus s = merge(delta, force, Policy.subMonitorFor(monitor1, 100)); if (!s.isOK()) { if (s.getCode() == IMergeStatus.CONFLICTS) { @@ -459,8 +456,7 @@ public abstract class MergeContext extends SynchronizationContext implements IMe @Override public ISchedulingRule getMergeRule(IDiff[] deltas) { ISchedulingRule result = null; - for (int i = 0; i < deltas.length; i++) { - IDiff node = deltas[i]; + for (IDiff node : deltas) { ISchedulingRule rule = getMergeRule(node); if (result == null) { result = rule; diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/ResourceDiffTree.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/ResourceDiffTree.java index 5926d6dcd..0f7bf3ebb 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/ResourceDiffTree.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/ResourceDiffTree.java @@ -83,11 +83,9 @@ public class ResourceDiffTree extends DiffTree implements IResourceDiffTree { @Override public void accept(ResourceTraversal[] traversals, IDiffVisitor visitor) { - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; + for (ResourceTraversal traversal : traversals) { IResource[] resources = traversal.getResources(); - for (int j = 0; j < resources.length; j++) { - IResource resource = resources[j]; + for (IResource resource : resources) { accept(resource.getFullPath(), visitor, traversal.getDepth()); } } @@ -96,11 +94,9 @@ public class ResourceDiffTree extends DiffTree implements IResourceDiffTree { @Override public IDiff[] getDiffs(final ResourceTraversal[] traversals) { final Set<IDiff> result = new HashSet<>(); - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; + for (ResourceTraversal traversal : traversals) { IResource[] resources = traversal.getResources(); - for (int j = 0; j < resources.length; j++) { - IResource resource = resources[j]; + for (IResource resource : resources) { internalGetDiffs(resource, traversal.getDepth(), result); } } @@ -131,8 +127,7 @@ public class ResourceDiffTree extends DiffTree implements IResourceDiffTree { public IResource[] members(IResource resource) { List<IResource> result = new ArrayList<>(); IPath[] paths = getChildren(resource.getFullPath()); - for (int i = 0; i < paths.length; i++) { - IPath path = paths[i]; + for (IPath path : paths) { IDiff node = getDiff(path); if (node == null) { result.add(internalGetResource(path, true)); @@ -147,8 +142,7 @@ public class ResourceDiffTree extends DiffTree implements IResourceDiffTree { public IResource[] getAffectedResources() { List<IResource> result = new ArrayList<>(); IDiff[] nodes = getDiffs(); - for (int i = 0; i < nodes.length; i++) { - IDiff node = nodes[i]; + for (IDiff node : nodes) { result.add(getResource(node)); } return result.toArray(new IResource[result.size()]); diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/SynchronizationScopeManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/SynchronizationScopeManager.java index b66e9021d..b6c694a8e 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/SynchronizationScopeManager.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/SynchronizationScopeManager.java @@ -99,8 +99,7 @@ public class SynchronizationScopeManager extends PlatformObject implements ISync Set<ResourceMapping> result = new HashSet<>(); IModelProviderDescriptor[] descriptors = ModelProvider .getModelProviderDescriptors(); - for (int i = 0; i < descriptors.length; i++) { - IModelProviderDescriptor descriptor = descriptors[i]; + for (IModelProviderDescriptor descriptor : descriptors) { ResourceMapping[] mappings = getMappings(descriptor, traversals, context, monitor); result.addAll(Arrays.asList(mappings)); @@ -153,8 +152,7 @@ public class SynchronizationScopeManager extends PlatformObject implements ISync public ISchedulingRule getSchedulingRule() { Set<IProject> projects = new HashSet<>(); ResourceMapping[] mappings = scope.getInputMappings(); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { Object modelObject = mapping.getModelObject(); if (modelObject instanceof IResource) { IResource resource = (IResource) modelObject; @@ -229,8 +227,7 @@ public class SynchronizationScopeManager extends PlatformObject implements ISync ScopeChangeEvent change = new ScopeChangeEvent(scope); CompoundResourceTraversal refreshTraversals = new CompoundResourceTraversal(); CompoundResourceTraversal removedTraversals = new CompoundResourceTraversal(); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { ResourceTraversal[] previousTraversals = scope.getTraversals(mapping); ResourceTraversal[] mappingTraversals = mapping.getTraversals( context, Policy.subMonitorFor(monitor, 100)); @@ -289,8 +286,7 @@ public class SynchronizationScopeManager extends PlatformObject implements ISync private ResourceMapping findAncestor(ResourceMapping mapping) { ResourceMapping[] mappings = scope.getMappings(mapping.getModelProviderId()); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping m = mappings[i]; + for (ResourceMapping m : mappings) { if (m.contains(mapping)) { return m; } @@ -389,8 +385,7 @@ public class SynchronizationScopeManager extends PlatformObject implements ISync IProgressMonitor monitor) throws CoreException { CompoundResourceTraversal result = new CompoundResourceTraversal(); ResourceMappingContext context = this.context; - for (int i = 0; i < targetMappings.length; i++) { - ResourceMapping mapping = targetMappings[i]; + for (ResourceMapping mapping : targetMappings) { if (scope.getTraversals(mapping) == null) { ResourceTraversal[] traversals = mapping.getTraversals(context, Policy.subMonitorFor(monitor, 100)); @@ -421,12 +416,10 @@ public class SynchronizationScopeManager extends PlatformObject implements ISync ResourceMapping[] mappings = scope.getMappings(); if (inputMappings.length == mappings.length) { Set<ResourceMapping> testSet = new HashSet<>(); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { testSet.add(mapping); } - for (int i = 0; i < inputMappings.length; i++) { - ResourceMapping mapping = inputMappings[i]; + for (ResourceMapping mapping : inputMappings) { if (!testSet.contains(mapping)) { return true; } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/Subscriber.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/Subscriber.java index 4896b3421..3a3271f22 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/Subscriber.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/Subscriber.java @@ -265,8 +265,7 @@ abstract public class Subscriber { public void collectOutOfSync(IResource[] resources, int depth, SyncInfoSet set, IProgressMonitor monitor) { try { monitor.beginTask(null, 100 * resources.length); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { IProgressMonitor subMonitor = Policy.subMonitorFor(monitor, 100); subMonitor.beginTask(null, IProgressMonitor.UNKNOWN); collect(resource, depth, set, subMonitor); @@ -290,8 +289,7 @@ abstract public class Subscriber { allListeners = listeners.toArray(new ISubscriberChangeListener[listeners.size()]); } // Notify the listeners safely so all will receive notification - for (int i = 0; i < allListeners.length; i++) { - final ISubscriberChangeListener listener = allListeners[i]; + for (ISubscriberChangeListener listener : allListeners) { SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { @@ -322,14 +320,10 @@ abstract public class Subscriber { && depth != IResource.DEPTH_ZERO) { try { IResource[] members = members(resource); - for (int i = 0; i < members.length; i++) { - collect( - members[i], - depth == IResource.DEPTH_INFINITE + for (IResource member : members) { + collect(member, depth == IResource.DEPTH_INFINITE ? IResource.DEPTH_INFINITE - : IResource.DEPTH_ZERO, - set, - monitor); + : IResource.DEPTH_ZERO, set, monitor); } } catch (TeamException e) { set.addError(new TeamStatus(IStatus.ERROR, TeamPlugin.ID, ITeamStatus.SYNC_INFO_SET_ERROR, NLS.bind(Messages.SubscriberEventHandler_8, new String[] { resource.getFullPath().toString(), e.getMessage() }), e, resource)); @@ -406,8 +400,7 @@ abstract public class Subscriber { * @since 3.2 */ public void accept(ResourceTraversal[] traversals, IDiffVisitor visitor) throws CoreException { - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; + for (ResourceTraversal traversal : traversals) { accept(traversal.getResources(), traversal.getDepth(), visitor); } } @@ -434,8 +427,7 @@ abstract public class Subscriber { * @since 3.2 */ public void accept(IResource[] resources, int depth, IDiffVisitor visitor) throws CoreException { - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { accept(resource, depth, visitor); } } @@ -449,8 +441,7 @@ abstract public class Subscriber { if (depth != IResource.DEPTH_ZERO) { IResource[] members = members(resource); int newDepth = depth == IResource.DEPTH_INFINITE ? IResource.DEPTH_INFINITE : IResource.DEPTH_ZERO; - for (int i = 0; i < members.length; i++) { - IResource member = members[i]; + for (IResource member : members) { accept(member, newDepth, visitor); } } @@ -476,8 +467,7 @@ abstract public class Subscriber { */ public void refresh(ResourceTraversal[] traversals, IProgressMonitor monitor) throws TeamException { monitor.beginTask(null, 100 * traversals.length); - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; + for (ResourceTraversal traversal : traversals) { refresh(traversal.getResources(), traversal.getDepth(), Policy.subMonitorFor(monitor, 100)); } monitor.done(); diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberResourceMappingContext.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberResourceMappingContext.java index b1f3d8817..695368f5a 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberResourceMappingContext.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberResourceMappingContext.java @@ -148,8 +148,7 @@ public class SubscriberResourceMappingContext extends RemoteResourceMappingConte @Override public final void refresh(ResourceTraversal[] traversals, int flags, IProgressMonitor monitor) throws CoreException { subscriber.refresh(traversals, monitor); - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; + for (ResourceTraversal traversal : traversals) { refreshed(traversal.getResources(), traversal.getDepth()); } } @@ -178,8 +177,7 @@ public class SubscriberResourceMappingContext extends RemoteResourceMappingConte * @param depth the depth to which the resources were refreshed */ protected final void refreshed(IResource[] resources, int depth) { - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { // Include files and depth-one folders as shallow if (depth == IResource.DEPTH_ONE || resource.getType() == IResource.FILE) { shallowRefresh.add(resource); @@ -293,8 +291,7 @@ public class SubscriberResourceMappingContext extends RemoteResourceMappingConte public IProject[] getProjects() { Set<IProject> projects = new HashSet<>(); IResource[] roots = subscriber.roots(); - for (int i = 0; i < roots.length; i++) { - IResource resource = roots[i]; + for (IResource resource : roots) { projects.add(resource.getProject()); } return projects.toArray(new IProject[projects.size()]); 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 87342d7a5..aed94334d 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 @@ -73,8 +73,7 @@ public class FastSyncInfoFilter extends SyncInfoFilter { } @Override public boolean select(SyncInfo info) { - for (int i = 0; i < filters.length; i++) { - FastSyncInfoFilter filter = filters[i]; + for (FastSyncInfoFilter filter : filters) { if (!filter.select(info)) { return false; } @@ -116,8 +115,7 @@ public class FastSyncInfoFilter extends SyncInfoFilter { } @Override public boolean select(SyncInfo info) { - for (int i = 0; i < filters.length; i++) { - FastSyncInfoFilter filter = filters[i]; + for (FastSyncInfoFilter filter : filters) { if (filter.select(info)) { return true; } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoSet.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoSet.java index beb723704..6e3a12b3d 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoSet.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoSet.java @@ -78,8 +78,8 @@ public class SyncInfoSet { public SyncInfoSet(SyncInfo[] infos) { this(); // use the internal add since we can't have listeners at this point anyway - for (int i = 0; i < infos.length; i++) { - internalAdd(infos[i]); + for (SyncInfo info : infos) { + internalAdd(info); } } @@ -102,8 +102,7 @@ public class SyncInfoSet { public IResource[] getResources() { SyncInfo[] infos = getSyncInfos(); List<IResource> resources = new ArrayList<>(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { resources.add(info.getLocal()); } return resources.toArray(new IResource[resources.size()]); @@ -346,8 +345,8 @@ public class SyncInfoSet { try { beginInput(); SyncInfo[] infos = set.getSyncInfos(); - for (int i = 0; i < infos.length; i++) { - add(infos[i]); + for (SyncInfo info : infos) { + add(info); } } finally { endInput(null); @@ -377,8 +376,8 @@ public class SyncInfoSet { public void removeAll(IResource[] resources) { try { beginInput(); - for (int i = 0; i < resources.length; i++) { - remove(resources[i]); + for (IResource resource : resources) { + remove(resource); } } finally { endInput(null); @@ -414,8 +413,7 @@ public class SyncInfoSet { */ public boolean hasNodes(FastSyncInfoFilter filter) { SyncInfo[] infos = getSyncInfos(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { if (info != null && filter.select(info)) { return true; } @@ -433,8 +431,7 @@ public class SyncInfoSet { try { beginInput(); SyncInfo[] infos = getSyncInfos(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { if (info == null || !filter.select(info)) { remove(info.getLocal()); } @@ -454,8 +451,7 @@ public class SyncInfoSet { try { beginInput(); SyncInfo[] infos = getSyncInfos(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { if (info != null && filter.select(info)) { remove(info.getLocal()); } @@ -474,8 +470,7 @@ public class SyncInfoSet { public SyncInfo[] getNodes(FastSyncInfoFilter filter) { List<SyncInfo> result = new ArrayList<>(); SyncInfo[] infos = getSyncInfos(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { if (info != null && filter.select(info)) { result.add(info); } @@ -580,8 +575,7 @@ public class SyncInfoSet { // Fire the events using an ISafeRunnable final ITeamStatus[] newErrors = event.getErrors(); monitor.beginTask(null, 100 + (newErrors.length > 0 ? 50 : 0) * allListeners.length); - for (int i = 0; i < allListeners.length; i++) { - final ISyncInfoSetChangeListener listener = allListeners[i]; + for (ISyncInfoSetChangeListener listener : allListeners) { SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { 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 0a55b352a..1d73e387e 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 @@ -59,8 +59,7 @@ public class SyncInfoTree extends SyncInfoSet { */ public SyncInfoTree(SyncInfo[] infos) { super(infos); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { IResource local = info.getLocal(); addToParents(local, local); } @@ -119,8 +118,7 @@ public class SyncInfoTree extends SyncInfoSet { result.add(info); } IResource[] members = members(resource); - for (int i = 0; i < members.length; i++) { - IResource member = members[i]; + for (IResource member : members) { info = getSyncInfo(member); if (info != null) { result.add(info); @@ -145,8 +143,7 @@ public class SyncInfoTree extends SyncInfoSet { private synchronized SyncInfo[] internalGetDeepSyncInfo(IContainer resource) { List<SyncInfo> infos = new ArrayList<>(); IResource[] children = internalGetOutOfSyncDescendants(resource); - for (int i = 0; i < children.length; i++) { - IResource child = children[i]; + for (IResource child : children) { SyncInfo info = getSyncInfo(child); if(info != null) { infos.add(info); @@ -284,16 +281,15 @@ public class SyncInfoTree extends SyncInfoSet { if (depth == IResource.DEPTH_ZERO || resource.getType() == IResource.FILE) return; if (depth == IResource.DEPTH_ONE) { IResource[] members = members(resource); - for (int i = 0; i < members.length; i++) { - IResource member = members[i]; + for (IResource member : members) { if (getSyncInfo(member) != null) { remove(member); } } } else if (depth == IResource.DEPTH_INFINITE) { IResource [] toRemove = internalGetOutOfSyncDescendants((IContainer)resource); - for (int i = 0; i < toRemove.length; i++) { - remove(toRemove[i]); + for (IResource t : toRemove) { + remove(t); } } } finally { 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 fe817cc17..a74000d3c 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 @@ -66,8 +66,7 @@ public abstract class AbstractResourceVariantTree implements IResourceVariantTre public IResource[] refresh(IResource[] resources, int depth, IProgressMonitor monitor) throws TeamException { List<IResource> changedResources = new ArrayList<>(); monitor.beginTask(null, 100 * resources.length); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { IResource[] changed = refresh(resource, depth, Policy.subMonitorFor(monitor, 100)); changedResources.addAll(Arrays.asList(changed)); } @@ -223,8 +222,7 @@ public abstract class AbstractResourceVariantTree implements IResourceVariantTre if (localChildren.length > 0) { localSet = new HashMap<>(10); - for (int i = 0; i < localChildren.length; i++) { - IResource localChild = localChildren[i]; + for (IResource localChild : localChildren) { String name = localChild.getName(); localSet.put(name, localChild); allSet.add(name); @@ -233,38 +231,34 @@ public abstract class AbstractResourceVariantTree implements IResourceVariantTre if (remoteChildren.length > 0) { remoteSet = new HashMap<>(10); - for (int i = 0; i < remoteChildren.length; i++) { - IResourceVariant remoteChild = remoteChildren[i]; + for (IResourceVariant remoteChild : remoteChildren) { String name = remoteChild.getName(); remoteSet.put(name, remoteChild); allSet.add(name); } } - Iterator e = allSet.iterator(); - while (e.hasNext()) { - String keyChildName = (String) e.next(); - + for (String keyChildName : allSet) { Policy.checkCanceled(progress); IResource localChild = - localSet != null ? (IResource) localSet.get(keyChildName) : null; - - IResourceVariant remoteChild = + localSet != null ? (IResource) localSet.get(keyChildName) : null; + + IResourceVariant remoteChild = remoteSet != null ? (IResourceVariant) remoteSet.get(keyChildName) : null; - - if (localChild == null) { - // there has to be a remote resource available if we got this far - Assert.isTrue(remoteChild != null); - boolean isContainer = remoteChild.isContainer(); - localChild = getResourceChild(local /* parent */, keyChildName, isContainer); - } - if (localChild == null) { - TeamPlugin.log(IStatus.ERROR, NLS.bind("File {0} cannot be the parent of remote resource {1}", //$NON-NLS-1$ - new Object[] { local.getFullPath(), keyChildName }), null); - } else { - mergedResources.put(localChild, remoteChild); - } + + if (localChild == null) { + // there has to be a remote resource available if we got this far + Assert.isTrue(remoteChild != null); + boolean isContainer = remoteChild.isContainer(); + localChild = getResourceChild(local /* parent */, keyChildName, isContainer); + } + if (localChild == null) { + TeamPlugin.log(IStatus.ERROR, NLS.bind("File {0} cannot be the parent of remote resource {1}", //$NON-NLS-1$ + new Object[] { local.getFullPath(), keyChildName }), null); + } else { + mergedResources.put(localChild, remoteChild); + } } } return mergedResources; diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/PersistantResourceVariantByteStore.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/PersistantResourceVariantByteStore.java index dea3b6181..3080d9609 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/PersistantResourceVariantByteStore.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/PersistantResourceVariantByteStore.java @@ -138,8 +138,7 @@ public class PersistantResourceVariantByteStore extends ResourceVariantByteStore // Filter and return only resources that have sync bytes in the cache. IResource[] members = ((IContainer)resource).members(true /* include phantoms */); List<IResource> filteredMembers = new ArrayList<>(members.length); - for (int i = 0; i < members.length; i++) { - IResource member = members[i]; + for (IResource member : members) { if(getBytes(member) != null) { filteredMembers.add(member); } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantTreeSubscriber.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantTreeSubscriber.java index 9d4420a3a..ea88f25f4 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantTreeSubscriber.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantTreeSubscriber.java @@ -119,8 +119,7 @@ public abstract class ResourceVariantTreeSubscriber extends Subscriber { List<IStatus> cancels = new ArrayList<>(); try { monitor.beginTask(null, 1000 * resources.length); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { if (resource.getProject().isAccessible()) { IStatus status = refresh(resource, depth, Policy.subMonitorFor(monitor, 1000)); if (status.getSeverity() == IStatus.CANCEL) { diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/SessionResourceVariantByteStore.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/SessionResourceVariantByteStore.java index 2c7fb888b..5f4b61764 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/SessionResourceVariantByteStore.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/SessionResourceVariantByteStore.java @@ -53,8 +53,7 @@ public class SessionResourceVariantByteStore extends ResourceVariantByteStore { if (getSyncBytesCache().containsKey(resource)) { if (depth != IResource.DEPTH_ZERO) { IResource[] members = members(resource); - for (int i = 0; i < members.length; i++) { - IResource child = members[i]; + for (IResource child : members) { flushBytes(child, (depth == IResource.DEPTH_INFINITE) ? IResource.DEPTH_INFINITE: IResource.DEPTH_ZERO); } } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySubscriber.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySubscriber.java index 0aeb221f8..297a045d4 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySubscriber.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySubscriber.java @@ -159,8 +159,7 @@ public abstract class ThreeWaySubscriber extends ResourceVariantTreeSubscriber i private boolean isChildOfRoot(IResource resource) { IResource[] roots = roots(); IPath fullPath = resource.getFullPath(); - for (int i = 0; i < roots.length; i++) { - IResource root = roots[i]; + for (IResource root : roots) { if (root.getFullPath().isPrefixOf(fullPath)) { return true; } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySynchronizer.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySynchronizer.java index 5ce6d8b81..94b4572ae 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySynchronizer.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySynchronizer.java @@ -418,8 +418,7 @@ public class ThreeWaySynchronizer { allListeners = listeners.toArray(new ISynchronizerChangeListener[listeners.size()]); } // Notify the listeners safely so all will receive notification - for (int i = 0; i < allListeners.length; i++) { - final ISynchronizerChangeListener listener = allListeners[i]; + for (ISynchronizerChangeListener listener : allListeners) { SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/DefaultFileModificationValidator.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/DefaultFileModificationValidator.java index a01b75680..200035bfa 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/DefaultFileModificationValidator.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/DefaultFileModificationValidator.java @@ -87,8 +87,7 @@ public class DefaultFileModificationValidator extends FileModificationValidator private IFile[] getReadOnly(IFile[] files) { List<IFile> result = new ArrayList<>(files.length); - for (int i = 0; i < files.length; i++) { - IFile file = files[i]; + for (IFile file : files) { if (file.isReadOnly()) { result.add(file); } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ExceptionCollector.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ExceptionCollector.java index 8c956d1a9..bc784a0d3 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ExceptionCollector.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ExceptionCollector.java @@ -104,8 +104,7 @@ public class ExceptionCollector { IStatus status = new Status(exceptionStatus.getSeverity(), exceptionStatus.getPlugin(), exceptionStatus.getCode(), exceptionStatus.getMessage(), exception); recordStatus(status); IStatus[] children = status.getChildren(); - for (int i = 0; i < children.length; i++) { - IStatus status2 = children[i]; + for (IStatus status2 : children) { recordStatus(status2); } } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileModificationValidatorManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileModificationValidatorManager.java index c8dc7055e..3426ac6e3 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileModificationValidatorManager.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileModificationValidatorManager.java @@ -44,8 +44,7 @@ public class FileModificationValidatorManager extends FileModificationValidator Map<RepositoryProvider, List<IFile>> providersToFiles = new HashMap<>(files.length); //for each file, determine which provider, map providers to files - for (int i = 0; i < files.length; i++) { - IFile file = files[i]; + for (IFile file : files) { RepositoryProvider provider = RepositoryProvider.getProvider(file.getProject()); if (!providersToFiles.containsKey(provider)) { diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/PluginStringMappings.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/PluginStringMappings.java index 8193e6ae4..85ae03f65 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/PluginStringMappings.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/PluginStringMappings.java @@ -57,16 +57,13 @@ public class PluginStringMappings { final IExtension[] extensions = extension.getExtensions(); - for (int i = 0; i < extensions.length; i++) { - IConfigurationElement[] configElements = extensions[i].getConfigurationElements(); - - for (int j = 0; j < configElements.length; j++) { - - final String ext = configElements[j].getAttribute(fAttributeName);//"extension"); - final String type = configElements[j].getAttribute("type"); //$NON-NLS-1$ + for (IExtension e : extensions) { + IConfigurationElement[] configElements = e.getConfigurationElements(); + for (IConfigurationElement configElement : configElements) { + final String ext = configElement.getAttribute(fAttributeName); //"extension"); + final String type = configElement.getAttribute("type"); //$NON-NLS-1$ if (ext == null || type == null) continue; - if (type.equals("text")) { //$NON-NLS-1$ result.put(ext, Integer.valueOf(Team.TEXT)); } else if (type.equals("binary")) { //$NON-NLS-1$ diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/RepositoryProviderManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/RepositoryProviderManager.java index 48744eb2f..351a961e1 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/RepositoryProviderManager.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/RepositoryProviderManager.java @@ -32,8 +32,8 @@ public class RepositoryProviderManager implements IRepositoryProviderListener { @Override public void providerMapped(RepositoryProvider provider) { Object[] allListeners = listeners.getListeners(); - for (int i = 0; i < allListeners.length; i++) { - IRepositoryProviderListener listener = (IRepositoryProviderListener)allListeners[i]; + for (Object l : allListeners) { + IRepositoryProviderListener listener = (IRepositoryProviderListener) l; listener.providerMapped(provider); } } @@ -41,8 +41,8 @@ public class RepositoryProviderManager implements IRepositoryProviderListener { @Override public void providerUnmapped(IProject project) { Object[] allListeners = listeners.getListeners(); - for (int i = 0; i < allListeners.length; i++) { - IRepositoryProviderListener listener = (IRepositoryProviderListener)allListeners[i]; + for (Object l : allListeners) { + IRepositoryProviderListener listener = (IRepositoryProviderListener) l; listener.providerUnmapped(project); } } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ResourceVariantCache.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ResourceVariantCache.java index ba1bf5be1..22d753890 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ResourceVariantCache.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ResourceVariantCache.java @@ -17,7 +17,6 @@ import java.io.File; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; @@ -100,8 +99,7 @@ public class ResourceVariantCache { public static synchronized void shutdown() { String[] keys = caches.keySet().toArray(new String[caches.size()]); - for (int i = 0; i < keys.length; i++) { - String id = keys[i]; + for (String id : keys) { disableCache(id); } } @@ -131,8 +129,7 @@ public class ResourceVariantCache { long current = new Date().getTime(); if ((lastCacheCleanup!=-1) && (current - lastCacheCleanup < CACHE_FILE_LIFESPAN)) return; List<ResourceVariantCacheEntry> stale = new ArrayList<>(); - for (Iterator iter = cacheEntries.values().iterator(); iter.hasNext();) { - ResourceVariantCacheEntry entry = (ResourceVariantCacheEntry) iter.next(); + for (ResourceVariantCacheEntry entry : cacheEntries.values()) { long lastHit = entry.getLastAccessTimeStamp(); if ((current - lastHit) > CACHE_FILE_LIFESPAN){ stale.add(entry); @@ -199,8 +196,8 @@ public class ResourceVariantCache { if(children == null) { throw new TeamException(NLS.bind(Messages.RemoteContentsCache_fileError, new String[] { file.getAbsolutePath() })); } - for (int i = 0; i < children.length; i++) { - deleteFile(children[i]); + for (File f : children) { + deleteFile(f); } } if (! file.delete()) { diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/StorageMergerRegistry.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/StorageMergerRegistry.java index 4c6095879..943b554cb 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/StorageMergerRegistry.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/StorageMergerRegistry.java @@ -96,12 +96,11 @@ public class StorageMergerRegistry { // collect all IStreamMergers IConfigurationElement[] elements= registry.getConfigurationElementsFor(TeamPlugin.ID, STORAGE_MERGER_EXTENSION_POINT); - for (int i= 0; i < elements.length; i++) { - IConfigurationElement element= elements[i]; - if (STORAGE_MERGER.equals(element.getName())) - register(element, new StorageMergerDescriptor(element)); - else if (CONTENT_TYPE_BINDING.equals(element.getName())) - createBinding(element, STORAGE_MERGER_ID_ATTRIBUTE); + for (IConfigurationElement element : elements) { + if (STORAGE_MERGER.equals(element.getName())) + register(element, new StorageMergerDescriptor(element)); + else if (CONTENT_TYPE_BINDING.equals(element.getName())) + createBinding(element, STORAGE_MERGER_ID_ATTRIBUTE); } } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/TeamPlugin.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/TeamPlugin.java index b2b22a7e7..1a9cc76de 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/TeamPlugin.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/TeamPlugin.java @@ -184,12 +184,12 @@ final public class TeamPlugin extends Plugin { IExtensionPoint extension = Platform.getExtensionRegistry().getExtensionPoint(TeamPlugin.ID, TeamPlugin.REPOSITORY_EXTENSION); if (extension != null) { IExtension[] extensions = extension.getExtensions(); - for (int i = 0; i < extensions.length; i++) { - IConfigurationElement [] configElements = extensions[i].getConfigurationElements(); - for (int j = 0; j < configElements.length; j++) { - String aliasId = configElements[j].getAttribute("canImportId"); //$NON-NLS-1$ + for (IExtension ext : extensions) { + IConfigurationElement[] configElements = ext.getConfigurationElements(); + for (IConfigurationElement configElement : configElements) { + String aliasId = configElement.getAttribute("canImportId"); //$NON-NLS-1$ if (aliasId != null && aliasId.equals(id)) { - String extensionId = configElements[j].getAttribute("id"); //$NON-NLS-1$ + String extensionId = configElement.getAttribute("id"); //$NON-NLS-1$ if (extensionId != null) { return RepositoryProviderType.getProviderType(extensionId); } @@ -204,11 +204,11 @@ final public class TeamPlugin extends Plugin { IExtensionPoint extension = Platform.getExtensionRegistry().getExtensionPoint(TeamPlugin.ID, TeamPlugin.REPOSITORY_EXTENSION); if (extension != null) { IExtension[] extensions = extension.getExtensions(); - for (int i = 0; i < extensions.length; i++) { - IConfigurationElement [] configElements = extensions[i].getConfigurationElements(); - for (int j = 0; j < configElements.length; j++) { - String extensionId = configElements[j].getAttribute("id"); //$NON-NLS-1$ - String metaFilePaths = configElements[j].getAttribute("metaFilePaths"); //$NON-NLS-1$ + for (IExtension ext : extensions) { + IConfigurationElement[] configElements = ext.getConfigurationElements(); + for (IConfigurationElement configElement : configElements) { + String extensionId = configElement.getAttribute("id"); //$NON-NLS-1$ + String metaFilePaths = configElement.getAttribute("metaFilePaths"); //$NON-NLS-1$ if (extensionId != null && extensionId.equals(id) && metaFilePaths != null) { return getPaths(metaFilePaths); diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/TeamResourceChangeListener.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/TeamResourceChangeListener.java index 6465386ba..39ce85a7a 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/TeamResourceChangeListener.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/TeamResourceChangeListener.java @@ -16,7 +16,6 @@ package org.eclipse.team.internal.core; 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; @@ -45,8 +44,7 @@ public final class TeamResourceChangeListener implements IResourceChangeListener static { metaFilePaths = new HashMap<>(); String[] ids = RepositoryProvider.getAllProviderTypeIds(); - for (int i = 0; i < ids.length; i++) { - String id = ids[i]; + for (String id : ids) { IPath[] paths = TeamPlugin.getMetaFilePaths(id); if (paths != null) { metaFilePaths.put(id, paths); @@ -57,8 +55,7 @@ public final class TeamResourceChangeListener implements IResourceChangeListener @Override public void resourceChanged(IResourceChangeEvent event) { IResourceDelta[] projectDeltas = event.getDelta().getAffectedChildren(); - for (int i = 0; i < projectDeltas.length; i++) { - IResourceDelta delta = projectDeltas[i]; + for (IResourceDelta delta : projectDeltas) { IResource resource = delta.getResource(); IProject project = resource.getProject(); if (!RepositoryProvider.isShared(project)) { @@ -85,8 +82,7 @@ public final class TeamResourceChangeListener implements IResourceChangeListener Set<IContainer> metaFileContainers = new HashSet<>(); Set<String> badIds = new HashSet<>(); IFile[] files = getAddedFiles(delta); - for (int i = 0; i < files.length; i++) { - IFile file = files[i]; + for (IFile file : files) { String typeId = getMetaFileType(file); if (typeId != null) { // The file path matches the path for the given type id @@ -112,8 +108,7 @@ public final class TeamResourceChangeListener implements IResourceChangeListener IPath[] paths = metaFilePaths.get(typeId); IPath foundPath = null; IPath projectRelativePath = file.getProjectRelativePath(); - for (int i = 0; i < paths.length; i++) { - IPath path = paths[i]; + for (IPath path : paths) { if (isSuffix(projectRelativePath, path)) { foundPath = path; } @@ -131,11 +126,9 @@ public final class TeamResourceChangeListener implements IResourceChangeListener } private String getMetaFileType(IFile file) { - for (Iterator<String> iter = metaFilePaths.keySet().iterator(); iter.hasNext();) { - String id = iter.next(); + for (String id : metaFilePaths.keySet()) { IPath[] paths = metaFilePaths.get(id); - for (int i = 0; i < paths.length; i++) { - IPath path = paths[i]; + for (IPath path : paths) { if (isSuffix(file.getProjectRelativePath(), path)) { return id; } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/history/LocalFileHistory.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/history/LocalFileHistory.java index d363481cc..3e90f2eb1 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/history/LocalFileHistory.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/history/LocalFileHistory.java @@ -47,15 +47,16 @@ public class LocalFileHistory extends FileHistory { //the predecessor is the file with a timestamp that is the largest timestamp //from the set of all timestamps smaller than the root file's timestamp IFileRevision fileRevision = null; - for (int i = 0; i < revisions.length; i++) { - if (((LocalFileRevision) revisions[i]).isPredecessorOf(revision)) { + for (IFileRevision r : revisions) { + if (((LocalFileRevision) r).isPredecessorOf(revision)) { //no revision has been set as of yet - if (fileRevision == null) - fileRevision = revisions[i]; + if (fileRevision == null) { + fileRevision = r; + } //this revision is a predecessor - now check to see if it comes //after the current predecessor, if it does make it the current predecessor - if (fileRevision != null && revisions[i].getTimestamp() > fileRevision.getTimestamp()) { - fileRevision = revisions[i]; + if (fileRevision != null && r.getTimestamp() > fileRevision.getTimestamp()) { + fileRevision = r; } } } @@ -67,8 +68,7 @@ public class LocalFileHistory extends FileHistory { @Override public IFileRevision getFileRevision(String id) { if (revisions != null) { - for (int i = 0; i < revisions.length; i++) { - IFileRevision revision = revisions[i]; + for (IFileRevision revision : revisions) { if (revision.getContentIdentifier().equals(id)) { return revision; } @@ -89,9 +89,9 @@ public class LocalFileHistory extends FileHistory { IFileRevision[] revisions = getFileRevisions(); ArrayList<IFileRevision> directDescendents = new ArrayList<>(); - for (int i = 0; i < revisions.length; i++) { - if (((LocalFileRevision) revisions[i]).isDescendentOf(revision)) { - directDescendents.add(revisions[i]); + for (IFileRevision r : revisions) { + if (((LocalFileRevision) r).isDescendentOf(revision)) { + directDescendents.add(r); } } return directDescendents.toArray(new IFileRevision[directDescendents.size()]); diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/importing/BundleImporterExtension.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/importing/BundleImporterExtension.java index 1937f93f8..7a0de8202 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/importing/BundleImporterExtension.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/importing/BundleImporterExtension.java @@ -73,8 +73,8 @@ public class BundleImporterExtension implements IBundleImporter { if (supportedValues == null) { IConfigurationElement[] supported = element.getChildren("supports"); //$NON-NLS-1$ supportedValues = new HashSet<>(supported.length); - for (int i = 0; i < supported.length; i++) { - supportedValues.add(supported[i].getAttribute("prefix")); //$NON-NLS-1$ + for (IConfigurationElement s : supported) { + supportedValues.add(s.getAttribute("prefix")); //$NON-NLS-1$ } } return supportedValues; diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/AbstractResourceMappingScope.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/AbstractResourceMappingScope.java index a5a584907..3784d1e8f 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/AbstractResourceMappingScope.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/AbstractResourceMappingScope.java @@ -29,8 +29,7 @@ public abstract class AbstractResourceMappingScope extends AbstractSynchronizati @Override public ResourceMapping getMapping(Object modelObject) { ResourceMapping[] mappings = getMappings(); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { if (mapping.getModelObject().equals(modelObject)) return mapping; } @@ -41,8 +40,7 @@ public abstract class AbstractResourceMappingScope extends AbstractSynchronizati public ResourceMapping[] getMappings(String id) { Set<ResourceMapping> result = new HashSet<>(); ResourceMapping[] mappings = getMappings(); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { if (mapping.getModelProviderId().equals(id)) { result.add(mapping); } @@ -55,8 +53,7 @@ public abstract class AbstractResourceMappingScope extends AbstractSynchronizati public ResourceTraversal[] getTraversals(String modelProviderId) { ResourceMapping[] mappings = getMappings(modelProviderId); CompoundResourceTraversal traversal = new CompoundResourceTraversal(); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { ResourceTraversal[] traversals = getTraversals(mapping); if (traversals != null) traversal.addTraversals(traversals); @@ -68,8 +65,7 @@ public abstract class AbstractResourceMappingScope extends AbstractSynchronizati public ModelProvider[] getModelProviders() { Set<ModelProvider> result = new HashSet<>(); ResourceMapping[] mappings = getMappings(); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { ModelProvider modelProvider = mapping.getModelProvider(); if (modelProvider != null) result.add(modelProvider); 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 2d68ae9dd..d8e0ccf2f 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 @@ -36,16 +36,14 @@ public class CompoundResourceTraversal { private Set<IResource> files = new HashSet<>(); public synchronized void addTraversals(ResourceTraversal[] traversals) { - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; + for (ResourceTraversal traversal : traversals) { addTraversal(traversal); } } public synchronized void addTraversal(ResourceTraversal traversal) { IResource[] resources = traversal.getResources(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { addResource(resource, traversal.getDepth()); } } @@ -175,8 +173,7 @@ public class CompoundResourceTraversal { } public synchronized void addResources(IResource[] resources, int depth) { - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { addResource(resource, depth); } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ModelProviderResourceMapping.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ModelProviderResourceMapping.java index 24af159f1..9132666a4 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ModelProviderResourceMapping.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ModelProviderResourceMapping.java @@ -55,8 +55,7 @@ public class ModelProviderResourceMapping extends ResourceMapping { try { IResource[] resources = provider.getDescriptor().getMatchingResources(projects); Set<IProject> result = new HashSet<>(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { if (resource.isAccessible()) result.add(resource.getProject()); } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ResourceMappingInputScope.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ResourceMappingInputScope.java index a9fcabc3f..549662686 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ResourceMappingInputScope.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ResourceMappingInputScope.java @@ -46,8 +46,7 @@ public class ResourceMappingInputScope extends AbstractResourceMappingScope { public ResourceTraversal[] getTraversals() { CompoundResourceTraversal result = new CompoundResourceTraversal(); ResourceMapping[] mappings = getMappings(); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping mapping = mappings[i]; + for (ResourceMapping mapping : mappings) { ResourceTraversal[] traversals = getTraversals(mapping); result.addTraversals(traversals); } @@ -64,8 +63,7 @@ public class ResourceMappingInputScope extends AbstractResourceMappingScope { private boolean contains(ResourceMapping mapping) { ResourceMapping[] mappings = getMappings(); - for (int i = 0; i < mappings.length; i++) { - ResourceMapping child = mappings[i]; + for (ResourceMapping child : mappings) { if (child.equals(mapping)) { return true; } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ScopeChangeEvent.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ScopeChangeEvent.java index 24073fc09..cd17a2c9b 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ScopeChangeEvent.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ScopeChangeEvent.java @@ -69,12 +69,10 @@ public class ScopeChangeEvent { // The number of mappings has increased so we should report the new mappings Set<ResourceMapping> originalSet = new HashSet<>(); List<ResourceMapping> result = new ArrayList<>(); - for (int i = 0; i < originalMappings.length; i++) { - ResourceMapping mapping = originalMappings[i]; + for (ResourceMapping mapping : originalMappings) { originalSet.add(mapping); } - for (int i = 0; i < currentMappings.length; i++) { - ResourceMapping mapping = currentMappings[i]; + for (ResourceMapping mapping : currentMappings) { if (!originalSet.contains(mapping)) { result.add(mapping); } @@ -84,12 +82,10 @@ public class ScopeChangeEvent { // The number of mappings may be smaller so report the removed mappings Set<ResourceMapping> finalSet = new HashSet<>(); List<ResourceMapping> result = new ArrayList<>(); - for (int i = 0; i < currentMappings.length; i++) { - ResourceMapping mapping = currentMappings[i]; + for (ResourceMapping mapping : currentMappings) { finalSet.add(mapping); } - for (int i = 0; i < originalMappings.length; i++) { - ResourceMapping mapping = originalMappings[i]; + for (ResourceMapping mapping : originalMappings) { if (!finalSet.contains(mapping)) { result.add(mapping); } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ScopeManagerEventHandler.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ScopeManagerEventHandler.java index d0c2bcf98..271a1f986 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ScopeManagerEventHandler.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/ScopeManagerEventHandler.java @@ -65,8 +65,7 @@ public class ScopeManagerEventHandler extends BackgroundEventHandler { throws CoreException { if (event instanceof ResourceMappingEvent) { ResourceMappingEvent rme = (ResourceMappingEvent) event; - for (int i = 0; i < rme.mappings.length; i++) { - ResourceMapping mapping = rme.mappings[i]; + for (ResourceMapping mapping : rme.mappings) { toRefresh.add(mapping); } } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/TextStorageMerger.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/TextStorageMerger.java index 18e63582f..3f7db7f07 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/TextStorageMerger.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/mapping/TextStorageMerger.java @@ -55,8 +55,7 @@ public class TextStorageMerger implements IStorageMerger { RangeDifference[] diffs= RangeDifferencer.findRanges(monitor, a, t, o); - for (int i= 0; i < diffs.length; i++) { - RangeDifference rd= diffs[i]; + for (RangeDifference rd : diffs) { switch (rd.kind()) { case RangeDifference.ANCESTOR: // pseudo conflict case RangeDifference.NOCHANGE: diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/AbstractSynchronizationScope.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/AbstractSynchronizationScope.java index 1aba78078..e1f36e6bb 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/AbstractSynchronizationScope.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/AbstractSynchronizationScope.java @@ -40,11 +40,9 @@ public abstract class AbstractSynchronizationScope implements ISynchronizationSc public IResource[] getRoots() { List<IResource> result = new ArrayList<>(); ResourceTraversal[] traversals = getTraversals(); - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; + for (ResourceTraversal traversal : traversals) { IResource[] resources = traversal.getResources(); - for (int j = 0; j < resources.length; j++) { - IResource resource = resources[j]; + for (IResource resource : resources) { accumulateRoots(result, resource); } } @@ -54,8 +52,7 @@ public abstract class AbstractSynchronizationScope implements ISynchronizationSc @Override public boolean contains(IResource resource) { ResourceTraversal[] traversals = getTraversals(); - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; + for (ResourceTraversal traversal : traversals) { if (traversal.contains(resource)) return true; } @@ -89,8 +86,7 @@ public abstract class AbstractSynchronizationScope implements ISynchronizationSc */ public void fireTraversalsChangedEvent(final ResourceTraversal[] newTraversals, final ResourceMapping[] newMappings) { Object[] allListeners = listeners.getListeners(); - for (int i = 0; i < allListeners.length; i++) { - final Object listener = allListeners[i]; + for (Object listener : allListeners) { SafeRunner.run(new ISafeRunnable() { @Override public void run() throws Exception { diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ActiveChangeSet.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ActiveChangeSet.java index 59608f687..dcd56d931 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ActiveChangeSet.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ActiveChangeSet.java @@ -138,8 +138,7 @@ public class ActiveChangeSet extends DiffChangeSet { if (!isEmpty()) { StringBuilder buffer = new StringBuilder(); IResource[] resources = getResources(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { buffer.append(resource.getFullPath().toString()); buffer.append('\n'); } @@ -207,8 +206,7 @@ public class ActiveChangeSet extends DiffChangeSet { */ public void add(IResource[] resources) throws CoreException { List<IDiff> toAdd = new ArrayList<>(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { IDiff diff = getManager().getDiff(resource); if (diff != null) { toAdd.add(diff); diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ActiveChangeSetManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ActiveChangeSetManager.java index a5b35c1ef..307c1978d 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ActiveChangeSetManager.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ActiveChangeSetManager.java @@ -60,8 +60,7 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements */ protected ChangeSet getChangeSet(IResourceDiffTree tree) { ChangeSet[] sets = getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet changeSet = sets[i]; + for (ChangeSet changeSet : sets) { if (((DiffChangeSet)changeSet).getDiffTree() == tree) { return changeSet; } @@ -143,8 +142,7 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements */ public ActiveChangeSet getSet(String name) { ChangeSet[] sets = getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { if (set.getName().equals(name) && set instanceof ActiveChangeSet) { return (ActiveChangeSet)set; } @@ -162,8 +160,7 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements */ public ActiveChangeSet createSet(String title, IFile[] files) throws CoreException { List<IDiff> infos = new ArrayList<>(); - for (int i = 0; i < files.length; i++) { - IFile file = files[i]; + for (IFile file : files) { IDiff diff = getDiff(file); if (diff != null) { infos.add(diff); @@ -214,18 +211,15 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements private IPath[] getAllResources(IDiffChangeEvent event) { Set<IPath> allResources = new HashSet<>(); IDiff[] addedResources = event.getAdditions(); - for (int i = 0; i < addedResources.length; i++) { - IDiff diff = addedResources[i]; + for (IDiff diff : addedResources) { allResources.add(diff.getPath()); } IDiff[] changedResources = event.getChanges(); - for (int i = 0; i < changedResources.length; i++) { - IDiff diff = changedResources[i]; + for (IDiff diff : changedResources) { allResources.add(diff.getPath()); } IPath[] removals = event.getRemovals(); - for (int i = 0; i < removals.length; i++) { - IPath path = removals[i]; + for (IPath path : removals) { allResources.add(path); } return allResources.toArray(new IPath[allResources.size()]); @@ -244,8 +238,7 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements } // Remove the added files from any other set that contains them ChangeSet[] sets = getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet otherSet = sets[i]; + for (ChangeSet otherSet : sets) { if (otherSet != set && ((ActiveChangeSet)otherSet).isUserCreated()) { otherSet.remove(resources); } @@ -309,8 +302,7 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements CompoundResourceTraversal traversal = new CompoundResourceTraversal(); traversal.addTraversals(traversals); ChangeSet[] sets = getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { handleIntersect(traversal, set); } return traversal.asTraversals(); @@ -318,8 +310,7 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements private void handleIntersect(CompoundResourceTraversal traversal, ChangeSet set) { IResource[] resources = set.getResources(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { if (traversal.isCovered(resource, IResource.DEPTH_ZERO)) { traversal.addResources(resources, IResource.DEPTH_ZERO); return; @@ -339,16 +330,14 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements // Clear the persisted state before saving the new state try { String[] oldSetNames = prefs.childrenNames(); - for (int i = 0; i < oldSetNames.length; i++) { - String string = oldSetNames[i]; + for (String string : oldSetNames) { prefs.node(string).removeNode(); } } catch (BackingStoreException e) { TeamPlugin.log(IStatus.ERROR, NLS.bind(Messages.SubscriberChangeSetCollector_5, new String[] { getName() }), e); } ChangeSet[] sets = getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { if (set instanceof ActiveChangeSet && !set.isEmpty()) { // Since the change set title is stored explicitly, the name of // the child preference node doesn't matter as long as it @@ -408,8 +397,7 @@ public abstract class ActiveChangeSetManager extends ChangeSetManager implements String defaultSetTitle = prefs.get(CTX_DEFAULT_SET, null); try { String[] childNames = prefs.childrenNames(); - for (int i = 0; i < childNames.length; i++) { - String string = childNames[i]; + for (String string : childNames) { Preferences childPrefs = prefs.node(string); ActiveChangeSet set = createSet(childPrefs); if (!set.isEmpty()) { diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/BatchingChangeSetManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/BatchingChangeSetManager.java index f94fd8972..cd4ad4d80 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/BatchingChangeSetManager.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/BatchingChangeSetManager.java @@ -64,12 +64,10 @@ public class BatchingChangeSetManager extends ChangeSetManager { changed.put(changeSet, allAffectedResources); } else { Set<IPath> allPaths = new HashSet<>(); - for (int i = 0; i < paths.length; i++) { - IPath path = paths[i]; + for (IPath path : paths) { allPaths.add(path); } - for (int i = 0; i < allAffectedResources.length; i++) { - IPath path = allAffectedResources[i]; + for (IPath path : allAffectedResources) { allPaths.add(path); } changed.put(changeSet, allPaths.toArray(new IPath[allPaths.size()])); @@ -130,8 +128,8 @@ public class BatchingChangeSetManager extends ChangeSetManager { final CollectorChangeEvent event = changes; changes = new CollectorChangeEvent(this); Object[] listeners = getListeners(); - for (int i = 0; i < listeners.length; i++) { - final IChangeSetChangeListener listener = (IChangeSetChangeListener)listeners[i]; + for (Object l : listeners) { + final IChangeSetChangeListener listener = (IChangeSetChangeListener) l; if (listener instanceof IChangeSetCollectorChangeListener) { final IChangeSetCollectorChangeListener csccl = (IChangeSetCollectorChangeListener) listener; SafeRunner.run(new ISafeRunnable() { 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 7c551b763..426710046 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 @@ -146,8 +146,7 @@ public class BatchingLock { // Create a MultiRule for all projects from the given rule ISchedulingRule[] rules = ((MultiRule)resourceRule).getChildren(); Set<ISchedulingRule> projects = new HashSet<>(); - for (int i = 0; i < rules.length; i++) { - ISchedulingRule childRule = rules[i]; + for (ISchedulingRule childRule : rules) { if (childRule instanceof IResource) { projects.add(((IResource)childRule).getProject()); } @@ -255,8 +254,7 @@ public class BatchingLock { private ThreadInfo getThreadInfo(IResource resource) { synchronized (infos) { - for (Iterator iter = infos.values().iterator(); iter.hasNext();) { - ThreadInfo info = (ThreadInfo) iter.next(); + for (ThreadInfo info : infos.values()) { if (info.ruleContains(resource)) { return info; } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ChangeSet.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ChangeSet.java index 03c9e2e3e..5eb583fab 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ChangeSet.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/ChangeSet.java @@ -69,8 +69,7 @@ public abstract class ChangeSet { * @param resources the resources to be removed */ public void remove(IResource[] resources) { - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { remove(resource); } } 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 ca446b0a3..1cf0e10ac 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 @@ -49,8 +49,8 @@ public abstract class ChangeSetManager { return; if (contains(set)) { Object[] listeners = getListeners(); - for (int i = 0; i < listeners.length; i++) { - final IChangeSetChangeListener listener = (IChangeSetChangeListener)listeners[i]; + for (Object l : listeners) { + final IChangeSetChangeListener listener = (IChangeSetChangeListener) l; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { @@ -75,8 +75,8 @@ public abstract class ChangeSetManager { if (initializing) return; Object[] listeners = getListeners(); - for (int i = 0; i < listeners.length; i++) { - final IChangeSetChangeListener listener = (IChangeSetChangeListener)listeners[i]; + for (Object l : listeners) { + final IChangeSetChangeListener listener = (IChangeSetChangeListener) l; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { @@ -109,8 +109,8 @@ public abstract class ChangeSetManager { if (initializing) return; Object[] listeners = getListeners(); - for (int i = 0; i < listeners.length; i++) { - final IChangeSetChangeListener listener = (IChangeSetChangeListener)listeners[i]; + for (Object l : listeners) { + final IChangeSetChangeListener listener = (IChangeSetChangeListener) l; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { @@ -143,8 +143,8 @@ public abstract class ChangeSetManager { if (initializing) return; Object[] listeners = getListeners(); - for (int i = 0; i < listeners.length; i++) { - final IChangeSetChangeListener listener = (IChangeSetChangeListener)listeners[i]; + for (Object l : listeners) { + final IChangeSetChangeListener listener = (IChangeSetChangeListener) l; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { @@ -208,8 +208,8 @@ public abstract class ChangeSetManager { if (initializing) return; Object[] listeners = getListeners(); - for (int i = 0; i < listeners.length; i++) { - final IChangeSetChangeListener listener = (IChangeSetChangeListener)listeners[i]; + for (Object l : listeners) { + final IChangeSetChangeListener listener = (IChangeSetChangeListener) l; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/CheckedInChangeSet.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/CheckedInChangeSet.java index 92a65d4a2..fa19cd488 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/CheckedInChangeSet.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/CheckedInChangeSet.java @@ -105,8 +105,7 @@ public abstract class CheckedInChangeSet extends ChangeSet { public void add(SyncInfo[] infos) { try { set.beginInput(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { add(info); } } finally { @@ -131,8 +130,7 @@ public abstract class CheckedInChangeSet extends ChangeSet { */ @Override public void remove(IResource[] resources) { - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { remove(resource); } } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DescendantResourceVariantByteStore.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DescendantResourceVariantByteStore.java index ee7fbca4c..49532b35b 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DescendantResourceVariantByteStore.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DescendantResourceVariantByteStore.java @@ -155,11 +155,10 @@ public abstract class DescendantResourceVariantByteStore extends ResourceVariant IResource[] remoteMembers = getRemoteStore().members(resource); IResource[] baseMembers = getBaseStore().members(resource); Set<IResource> members = new HashSet<>(); - for (int i = 0; i < remoteMembers.length; i++) { - members.add(remoteMembers[i]); + for (IResource remoteMember : remoteMembers) { + members.add(remoteMember); } - for (int i = 0; i < baseMembers.length; i++) { - IResource member = baseMembers[i]; + for (IResource member : baseMembers) { // Add the base only if the remote does not know about it // (i.e. hasn't marked it as deleted if (!isVariantKnown(member)) { diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffChangeSet.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffChangeSet.java index cfb3a92e1..12068ac78 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffChangeSet.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffChangeSet.java @@ -101,8 +101,7 @@ public class DiffChangeSet extends ChangeSet { public void add(IDiff[] diffs) { try { tree.beginInput(); - for (int i = 0; i < diffs.length; i++) { - IDiff diff = diffs[i]; + for (IDiff diff : diffs) { add(diff); } } finally { @@ -133,8 +132,7 @@ public class DiffChangeSet extends ChangeSet { if (diffs.length > 0) { try { tree.beginInput(); - for (int i = 0; i < diffs.length; i++) { - IDiff diff = diffs[i]; + for (IDiff diff : diffs) { IResource r = tree.getResource(diff); if (r != null) tree.remove(r); @@ -157,8 +155,7 @@ public class DiffChangeSet extends ChangeSet { public void remove(IPath[] paths) { try { tree.beginInput(); - for (int i = 0; i < paths.length; i++) { - IPath path = paths[i]; + for (IPath path : paths) { tree.remove(path); } } finally { @@ -170,8 +167,7 @@ public class DiffChangeSet extends ChangeSet { public void remove(IResource[] resources) { try { tree.beginInput(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { tree.remove(resource); } } finally { diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffTreeStatistics.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffTreeStatistics.java index 2fb946549..7cd58fbd0 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffTreeStatistics.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/DiffTreeStatistics.java @@ -107,9 +107,7 @@ public class DiffTreeStatistics { @Override public String toString() { StringBuilder out = new StringBuilder(); - Iterator it = stats.keySet().iterator(); - while (it.hasNext()) { - Integer kind = (Integer) it.next(); + for (Integer kind : stats.keySet()) { out.append(SyncInfo.kindToString(kind.intValue()) + ": " + stats.get(kind) + "\n"); //$NON-NLS-1$ //$NON-NLS-2$ } return out.toString(); diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/RootResourceSynchronizationScope.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/RootResourceSynchronizationScope.java index 5331a4b09..e2f49e9b5 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/RootResourceSynchronizationScope.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/RootResourceSynchronizationScope.java @@ -64,8 +64,7 @@ public class RootResourceSynchronizationScope extends AbstractResourceMappingSco @Override public ResourceMapping[] getMappings() { List<ResourceMapping> result = new ArrayList<>(); - for (int i = 0; i < roots.length; i++) { - IResource resource = roots[i]; + for (IResource resource : roots) { Object o = resource.getAdapter(ResourceMapping.class); if (o instanceof ResourceMapping) { result.add((ResourceMapping) o); diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberChangeSetManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberChangeSetManager.java index c34010237..2f6bf680d 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberChangeSetManager.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberChangeSetManager.java @@ -15,7 +15,6 @@ package org.eclipse.team.internal.core.subscribers; import java.util.ArrayList; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Set; @@ -79,8 +78,7 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { ResourceDiffTree[] locked = null; try { locked = beginDispath(); - for (Iterator iter = dispatchEvents.iterator(); iter.hasNext();) { - Event event = (Event) iter.next(); + for (Event event : dispatchEvents) { switch (event.getType()) { case RESOURCE_REMOVAL: handleRemove(event.getResource()); @@ -115,8 +113,8 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { ChangeSet[] sets = getSets(); List<ResourceDiffTree> lockedSets = new ArrayList<>(); try { - for (int i = 0; i < sets.length; i++) { - ActiveChangeSet set = (ActiveChangeSet)sets[i]; + for (ChangeSet s : sets) { + ActiveChangeSet set = (ActiveChangeSet) s; ResourceDiffTree tree = set.internalGetDiffTree(); lockedSets.add(tree); tree.beginInput(); @@ -124,8 +122,7 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { return lockedSets.toArray(new ResourceDiffTree[lockedSets.size()]); } catch (RuntimeException e) { try { - for (Iterator iter = lockedSets.iterator(); iter.hasNext();) { - ResourceDiffTree tree = (ResourceDiffTree) iter.next(); + for (ResourceDiffTree tree : lockedSets) { try { tree.endInput(null); } catch (Throwable e1) { @@ -145,8 +142,7 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { return; } monitor.beginTask(null, 100 * locked.length); - for (int i = 0; i < locked.length; i++) { - ResourceDiffTree tree = locked[i]; + for (ResourceDiffTree tree : locked) { try { tree.endInput(Policy.subMonitorFor(monitor, 100)); } catch (RuntimeException e) { @@ -170,8 +166,7 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { */ private void handleRemove(IResource resource) { ChangeSet[] sets = getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { // This will remove any descendants from the set and callback to // resourcesChanged which will batch changes if (!set.isEmpty()) { @@ -197,8 +192,7 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { getDefaultSet().add(diff); } } else { - for (int i = 0; i < containingSets.length; i++) { - ActiveChangeSet set = containingSets[i]; + for (ActiveChangeSet set : containingSets) { // Update the sync info in the set set.add(diff); } @@ -208,8 +202,7 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { } if (depth != IResource.DEPTH_ZERO) { IResource[] members = getSubscriber().members(resource); - for (int i = 0; i < members.length; i++) { - IResource member = members[i]; + for (IResource member : members) { handleChange(member, depth == IResource.DEPTH_ONE ? IResource.DEPTH_ZERO : IResource.DEPTH_INFINITE); } } @@ -218,8 +211,7 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { private void removeFromAllSets(IResource resource) { List<ChangeSet> toRemove = new ArrayList<>(); ChangeSet[] sets = getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { if (set.contains(resource)) { set.remove(resource); if (set.isEmpty()) { @@ -236,8 +228,7 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { private ActiveChangeSet[] getContainingSets(IResource resource) { Set<ActiveChangeSet> result = new HashSet<>(); ChangeSet[] sets = getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { if (set.contains(resource)) { result.add((ActiveChangeSet) set); } @@ -282,8 +273,8 @@ public class SubscriberChangeSetManager extends ActiveChangeSetManager { public boolean hasMembers(IResource resource) { ChangeSet[] sets = getSets(); - for (int i = 0; i < sets.length; i++) { - ActiveChangeSet set = (ActiveChangeSet)sets[i]; + for (ChangeSet s : sets) { + ActiveChangeSet set = (ActiveChangeSet) s; if (set.getDiffTree().getChildren(resource.getFullPath()).length > 0) return true; } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberDiffTreeEventHandler.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberDiffTreeEventHandler.java index 4fbe86525..576842e3c 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberDiffTreeEventHandler.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberDiffTreeEventHandler.java @@ -206,8 +206,7 @@ public class SubscriberDiffTreeEventHandler extends SubscriberEventHandler { IProgressMonitor monitor) { try { tree.beginInput(); - for (int i = 0; i < events.length; i++) { - SubscriberEvent event = events[i]; + for (SubscriberEvent event : events) { switch (event.getType()) { case SubscriberEvent.CHANGE : if (event instanceof SubscriberDiffChangedEvent) { @@ -220,10 +219,9 @@ public class SubscriberDiffTreeEventHandler extends SubscriberEventHandler { } } break; - case SubscriberEvent.REMOVAL : + case SubscriberEvent.REMOVAL: IDiff[] nodesToRemove = tree.getDiffs(new ResourceTraversal[] { event.asTraversal() }); - for (int j = 0; j < nodesToRemove.length; j++) { - IDiff node = nodesToRemove[j]; + for (IDiff node : nodesToRemove) { tree.remove(node.getPath()); } break; diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberEventHandler.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberEventHandler.java index 94e2495a4..050a0eae6 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberEventHandler.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberEventHandler.java @@ -199,13 +199,10 @@ public abstract class SubscriberEventHandler extends BackgroundEventHandler { try { IResource[] members = getSubscriber().members(resource); - for (int i = 0; i < members.length; i++) { - collect( - members[i], - depth == IResource.DEPTH_INFINITE + for (IResource member : members) { + collect(member, depth == IResource.DEPTH_INFINITE ? IResource.DEPTH_INFINITE - : IResource.DEPTH_ZERO, - monitor); + : IResource.DEPTH_ZERO, monitor); } } catch (TeamException e) { // We only handle the exception if the resource's project is accessible. @@ -286,11 +283,10 @@ public abstract class SubscriberEventHandler extends BackgroundEventHandler { * optimized recalculation if supported by the subscriber. */ protected void reset(ResourceTraversal[] traversals, int type) { - for (int i = 0; i < traversals.length; i++) { - ResourceTraversal traversal = traversals[i]; + for (ResourceTraversal traversal : traversals) { IResource[] resources = traversal.getResources(); - for (int j = 0; j < resources.length; j++) { - queueEvent(new SubscriberEvent(resources[j], type, traversal.getDepth()), false); + for (IResource resource : resources) { + queueEvent(new SubscriberEvent(resource, type, traversal.getDepth()), false); } } } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberResourceCollector.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberResourceCollector.java index 04b85e69f..78d9e4730 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberResourceCollector.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberResourceCollector.java @@ -68,19 +68,19 @@ public abstract class SubscriberResourceCollector implements IResourceChangeList try { beginInput(); IResource[] roots = getRoots(); - for (int i = 0; i < deltas.length; i++) { - switch (deltas[i].getFlags()) { - case ISubscriberChangeEvent.SYNC_CHANGED : - if (isAllRootsIncluded() || isDescendantOfRoot(deltas[i].getResource(), roots)) { - change(deltas[i].getResource(), IResource.DEPTH_ZERO); + for (ISubscriberChangeEvent delta : deltas) { + switch (delta.getFlags()) { + case ISubscriberChangeEvent.SYNC_CHANGED: + if (isAllRootsIncluded() || isDescendantOfRoot(delta.getResource(), roots)) { + change(delta.getResource(), IResource.DEPTH_ZERO); } break; - case ISubscriberChangeEvent.ROOT_REMOVED : - remove(deltas[i].getResource()); + case ISubscriberChangeEvent.ROOT_REMOVED: + remove(delta.getResource()); break; - case ISubscriberChangeEvent.ROOT_ADDED : - if (isAllRootsIncluded() || isDescendantOfRoot(deltas[i].getResource(), roots)) { - change(deltas[i].getResource(), IResource.DEPTH_INFINITE); + case ISubscriberChangeEvent.ROOT_ADDED: + if (isAllRootsIncluded() || isDescendantOfRoot(delta.getResource(), roots)) { + change(delta.getResource(), IResource.DEPTH_INFINITE); } break; } @@ -168,8 +168,8 @@ public abstract class SubscriberResourceCollector implements IResourceChangeList // Handle changed children if (visitChildren || isAncestorOfRoot(resource, roots)) { IResourceDelta[] affectedChildren = delta.getAffectedChildren(IResourceDelta.CHANGED | IResourceDelta.REMOVED | IResourceDelta.ADDED); - for (int i = 0; i < affectedChildren.length; i++) { - processDelta(affectedChildren[i], roots); + for (IResourceDelta c : affectedChildren) { + processDelta(c, roots); } } } @@ -222,8 +222,7 @@ public abstract class SubscriberResourceCollector implements IResourceChangeList private boolean isAncestorOfRoot(IResource parent, IResource[] roots) { // Always traverse into projects in case a root was removed if (parent.getType() == IResource.ROOT) return true; - for (int i = 0; i < roots.length; i++) { - IResource resource = roots[i]; + for (IResource resource : roots) { if (parent.getFullPath().isPrefixOf(resource.getFullPath())) { return true; } @@ -232,8 +231,7 @@ public abstract class SubscriberResourceCollector implements IResourceChangeList } private boolean isDescendantOfRoot(IResource resource, IResource[] roots) { - for (int i = 0; i < roots.length; i++) { - IResource root = roots[i]; + for (IResource root : roots) { if (root.getFullPath().isPrefixOf(resource.getFullPath())) { return true; } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberSyncInfoEventHandler.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberSyncInfoEventHandler.java index 72379bb7c..9bfb1d862 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberSyncInfoEventHandler.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberSyncInfoEventHandler.java @@ -181,8 +181,7 @@ public class SubscriberSyncInfoEventHandler extends SubscriberEventHandler { SubscriberSyncInfoSet syncSet = syncSetInput.getSyncSet(); try { syncSet.beginInput(); - for (int i = 0; i < events.length; i++) { - SubscriberEvent event = events[i]; + for (SubscriberEvent event : events) { switch (event.getType()) { case SubscriberEvent.CHANGE : if (event instanceof SubscriberSyncInfoEvent) { diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncByteConverter.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncByteConverter.java index a627e32b7..d6c585941 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncByteConverter.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncByteConverter.java @@ -123,8 +123,7 @@ public class SyncByteConverter { public static byte[] toBytes(String[] slots) { StringBuilder buffer = new StringBuilder(); - for (int i = 0; i < slots.length; i++) { - String string = slots[i]; + for (String string : slots) { buffer.append(string); buffer.append(new String(new byte[] {SyncByteConverter.SEPARATOR_BYTE })); } diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoStatistics.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoStatistics.java index 25e615197..5876de23d 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoStatistics.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoStatistics.java @@ -101,9 +101,7 @@ public class SyncInfoStatistics { @Override public String toString() { StringBuilder out = new StringBuilder(); - Iterator it = stats.keySet().iterator(); - while (it.hasNext()) { - Integer kind = (Integer) it.next(); + for (Integer kind : stats.keySet()) { out.append(SyncInfo.kindToString(kind.intValue()) + ": " + stats.get(kind) + "\n"); //$NON-NLS-1$ //$NON-NLS-2$ } return out.toString(); diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoWorkingSetFilter.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoWorkingSetFilter.java index ff232a323..18e8d22dc 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoWorkingSetFilter.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncInfoWorkingSetFilter.java @@ -46,8 +46,7 @@ public class SyncInfoWorkingSetFilter extends FastSyncInfoFilter { private boolean isIncluded(IResource resource) { // otherwise, if their is a parent of the resource in the set, // it is included - for (int i = 0; i < resources.length; i++) { - IResource setResource = resources[i]; + for (IResource setResource : resources) { if (isParent(setResource, resource)) { return true; } @@ -65,8 +64,7 @@ public class SyncInfoWorkingSetFilter extends FastSyncInfoFilter { // filter the roots by the selected working set Set<IResource> result = new HashSet<>(); - for (int i = 0; i < roots.length; i++) { - IResource resource = roots[i]; + for (IResource resource : roots) { result.addAll(Arrays.asList(getIntersectionWithSet(subscriber, resource))); } return result.toArray(new IResource[result.size()]); @@ -78,8 +76,7 @@ public class SyncInfoWorkingSetFilter extends FastSyncInfoFilter { */ private IResource[] getIntersectionWithSet(Subscriber subscriber, IResource resource) { List<IResource> result = new ArrayList<>(); - for (int i = 0; i < resources.length; i++) { - IResource setResource = resources[i]; + for (IResource setResource : resources) { if (setResource != null) { if (isParent(resource, setResource)) { try { diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncSetInputFromSyncSet.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncSetInputFromSyncSet.java index 1ec6e245a..9aa0adf79 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncSetInputFromSyncSet.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncSetInputFromSyncSet.java @@ -46,8 +46,8 @@ public class SyncSetInputFromSyncSet extends SyncSetInput implements ISyncInfoSe protected void fetchInput(IProgressMonitor monitor) { if (inputSyncSet == null) return; SyncInfo[] infos = inputSyncSet.getSyncInfos(); - for (int i = 0; i < infos.length; i++) { - collect(infos[i], monitor); + for (SyncInfo info : infos) { + collect(info, monitor); } } @@ -66,14 +66,14 @@ public class SyncSetInputFromSyncSet extends SyncSetInput implements ISyncInfoSe } private void syncSetChanged(SyncInfo[] infos, IProgressMonitor monitor) { - for (int i = 0; i < infos.length; i++) { - collect(infos[i], monitor); + for (SyncInfo info : infos) { + collect(info, monitor); } } private void remove(IResource[] resources) { - for (int i = 0; i < resources.length; i++) { - remove(resources[i]); + for (IResource resource : resources) { + remove(resource); } } @@ -104,8 +104,7 @@ public class SyncSetInputFromSyncSet extends SyncSetInput implements ISyncInfoSe SubscriberSyncInfoSet syncSet = getSyncSet(); try { syncSet.beginInput(); - for (int i = 0; i < errors.length; i++) { - ITeamStatus status = errors[i]; + for (ITeamStatus status : errors) { syncSet.addError(status); } } finally { |