diff options
Diffstat (limited to 'bundles/org.eclipse.team.core/src/org/eclipse/team/internal')
39 files changed, 160 insertions, 251 deletions
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 { |