diff options
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize')
44 files changed, 225 insertions, 329 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java index c570a8ba8..2756ed5c1 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java @@ -262,8 +262,7 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo if (resource != null && resource.exists()) { try { IMarker[] markers = resource.findMarkers(IMarker.PROBLEM, true, getLogicalModelDepth(resource)); - for (int i = 0; i < markers.length; i++) { - IMarker marker = markers[i]; + for (IMarker marker : markers) { try { Integer severity = (Integer) marker.getAttribute(IMarker.SEVERITY); if (severity != null) { @@ -300,8 +299,7 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo } else if (resource == null) { // For non-resource elements, show the same propogaqted marker as the children IDiffElement[] children = element.getChildren(); - for (int i = 0; i < children.length; i++) { - IDiffElement child = children[i]; + for (IDiffElement child : children) { if (child instanceof ISynchronizeModelElement) { ISynchronizeModelElement childElement = (ISynchronizeModelElement)child; if (childElement.getProperty(ISynchronizeModelElement.PROPAGATED_ERROR_MARKER_PROPERTY)) { @@ -416,15 +414,13 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo protected IResource[] getExpandedResources() { Set<IResource> expanded = new HashSet<>(); IResource[] savedExpansionState = getCachedResources(P_VIEWER_EXPANSION_STATE); - for (int i = 0; i < savedExpansionState.length; i++) { - IResource resource = savedExpansionState[i]; + for (IResource resource : savedExpansionState) { expanded.add(resource); } StructuredViewer viewer = getViewer(); Object[] objects = ((AbstractTreeViewer) viewer).getVisibleExpandedElements(); IResource[] currentExpansionState = getResources(objects); - for (int i = 0; i < currentExpansionState.length; i++) { - IResource resource = currentExpansionState[i]; + for (IResource resource : currentExpansionState) { expanded.add(resource); } return expanded.toArray(new IResource[expanded.size()]); @@ -462,13 +458,11 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo protected void expandResources(IResource[] resources) { Set<ISynchronizeModelElement> expandedElements = new HashSet<>(); StructuredViewer viewer = getViewer(); - for (int j = 0; j < resources.length; j++) { - IResource resource = resources[j]; + for (IResource resource : resources) { ISynchronizeModelElement[] elements = getModelObjects(resource); // Only expand when there is one element per resource if (elements.length == 1) { - for (int i = 0; i < elements.length; i++) { - ISynchronizeModelElement element = elements[i]; + for (ISynchronizeModelElement element : elements) { // Add all parents of the element to the expansion set while (element != null) { expandedElements.add(element); @@ -484,9 +478,9 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo protected IResource[] getResources(Object[] objects) { Set<IResource> result = new HashSet<>(); if (objects.length > 0) { - for (int i = 0; i < objects.length; i++) { - if (objects[i] instanceof ISynchronizeModelElement) { - IResource resource = ((ISynchronizeModelElement)objects[i]).getResource(); + for (Object object : objects) { + if (object instanceof ISynchronizeModelElement) { + IResource resource = ((ISynchronizeModelElement) object).getResource(); if(resource != null) result.add(resource); } @@ -503,8 +497,7 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo if (resources.length > 0) { ISynchronizePageConfiguration config = getConfiguration(); ArrayList<String> paths = new ArrayList<>(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { String path = resource.getFullPath().toString(); if (resource.getType() != IResource.FILE && path.charAt(path.length() - 1) != IPath.SEPARATOR) { // Include a trailing slash on folders and projects. @@ -591,8 +584,7 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo protected void selectResources(IResource[] resourcesToSelect) { StructuredViewer viewer = getViewer(); final ArrayList<ISynchronizeModelElement> selectedElements = new ArrayList<>(); - for (int i = 0; i < resourcesToSelect.length; i++) { - IResource resource = resourcesToSelect[i]; + for (IResource resource : resourcesToSelect) { ISynchronizeModelElement[] elements = getModelObjects(resource); // Only preserve the selection if there is one element for the resource if (elements.length == 1) { @@ -613,16 +605,13 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo if (!(viewer instanceof CheckboxTreeViewer)) return; - for (int j = 0; j < resourcesToCheck.length; j++) { - IResource resource = resourcesToCheck[j]; + for (IResource resource : resourcesToCheck) { if (resource.getType() != IResource.FILE) continue; - ISynchronizeModelElement[] elements = getModelObjects(resource); // Only expand when there is one element per resource if (elements.length == 1) { - for (int i = 0; i < elements.length; i++) { - ISynchronizeModelElement element = elements[i]; + for (ISynchronizeModelElement element : elements) { checkedElements.add(element); } } @@ -845,8 +834,7 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo */ protected void removeFromViewer(ISynchronizeModelElement[] nodes) { List<ISynchronizeModelElement> rootsToClear = new ArrayList<>(); - for (int i = 0; i < nodes.length; i++) { - ISynchronizeModelElement node = nodes[i]; + for (ISynchronizeModelElement node : nodes) { if (DEBUG) { System.out.println("Removing model element " + node.getName()); //$NON-NLS-1$ } @@ -864,8 +852,7 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo if (Utils.canUpdateViewer(getViewer())) { doRemove(roots); } - for (int i = 0; i < roots.length; i++) { - ISynchronizeModelElement element = roots[i]; + for (ISynchronizeModelElement element : roots) { updateHandler.nodeRemoved(element, this); } } @@ -886,8 +873,7 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo recursiveClearModelObjects(rootToClear); if (node == getModelRoot()) { IDiffElement[] children = node.getChildren(); - for (int i = 0; i < children.length; i++) { - IDiffElement element = children[i]; + for (IDiffElement element : children) { ((SynchronizeModelElement)node).remove(element); } } else { @@ -903,8 +889,7 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo protected void recursiveClearModelObjects(ISynchronizeModelElement node) { // Clear all the children of the node IDiffElement[] children = node.getChildren(); - for (int i = 0; i < children.length; i++) { - IDiffElement element = children[i]; + for (IDiffElement element : children) { if (element instanceof ISynchronizeModelElement) { ISynchronizeModelElement sme = (ISynchronizeModelElement) element; ISynchronizeModelProvider provider = getProvider(sme); @@ -979,8 +964,7 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo TeamUIPlugin.log(IStatus.ERROR, "An error occurred removing elements from the synchronize view", e); //$NON-NLS-1$ } if (DEBUG) { - for (int i = 0; i < elements.length; i++) { - ISynchronizeModelElement element = elements[i]; + for (ISynchronizeModelElement element : elements) { System.out.println("Removing view item " + element.getName()); //$NON-NLS-1$ } } @@ -1048,8 +1032,8 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo allListeners = listeners.getListeners(); } final PropertyChangeEvent event = new PropertyChangeEvent(this, key, oldValue, newValue); - for (int i = 0; i < allListeners.length; i++) { - final IPropertyChangeListener listener = (IPropertyChangeListener)allListeners[i]; + for (Object l : allListeners) { + final IPropertyChangeListener listener = (IPropertyChangeListener) l; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActiveChangeSetCollector.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActiveChangeSetCollector.java index 6d76eb831..aed41a072 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActiveChangeSetCollector.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActiveChangeSetCollector.java @@ -109,8 +109,7 @@ public class ActiveChangeSetCollector implements IDiffChangeListener { // Look for any resources that were removed from the set but are still out-of sync. // Re-add those resources final List<SyncInfo> outOfSync = new ArrayList<>(); - for (int i = 0; i < paths.length; i++) { - IPath path = paths[i]; + for (IPath path : paths) { if (!((DiffChangeSet)set).contains(path)) { SyncInfo info = getSyncInfo(path); if (info != null && info.getKind() != SyncInfo.IN_SYNC) { @@ -168,8 +167,7 @@ public class ActiveChangeSetCollector implements IDiffChangeListener { // First, clean up rootSet.clear(); ChangeSet[] sets = activeSets.keySet().toArray(new ChangeSet[activeSets.size()]); - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { remove(set); } activeSets.clear(); @@ -179,15 +177,13 @@ public class ActiveChangeSetCollector implements IDiffChangeListener { if (getConfiguration().getComparisonType() == ISynchronizePageConfiguration.THREE_WAY) { // Show all active change sets even if they are empty sets = getActiveChangeSetManager().getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { add(set); } // The above will add all sync info that are contained in sets. // We still need to add uncontained infos to the root set SyncInfo[] syncInfos = seedSet.getSyncInfos(); - for (int i = 0; i < syncInfos.length; i++) { - SyncInfo info = syncInfos[i]; + for (SyncInfo info : syncInfos) { if (isLocalChange(info)) { ChangeSet[] containingSets = findChangeSets(info); if (containingSets.length == 0) { @@ -221,8 +217,7 @@ public class ActiveChangeSetCollector implements IDiffChangeListener { removals.addAll(Arrays.asList(event.getRemovedResources())); additions.addAll(Arrays.asList(event.getAddedResources())); SyncInfo[] changed = event.getChangedResources(); - for (int i = 0; i < changed.length; i++) { - SyncInfo info = changed[i]; + for (SyncInfo info : changed) { additions.add(info); removals.add(info.getLocal()); } @@ -248,15 +243,13 @@ public class ActiveChangeSetCollector implements IDiffChangeListener { protected void add(SyncInfo[] infos) { rootSet.beginInput(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { if (isLocalChange(info) && select(info)) { ChangeSet[] sets = findChangeSets(info); if (sets.length == 0) { rootSet.add(info); } else { - for (int j = 0; j < sets.length; j++) { - ChangeSet set = sets[j]; + for (ChangeSet set : sets) { SyncInfoSet targetSet = getSyncInfoSet(set); if (targetSet == null) { // This will add all the appropriate sync info to the set @@ -275,8 +268,7 @@ public class ActiveChangeSetCollector implements IDiffChangeListener { ActiveChangeSetManager manager = getActiveChangeSetManager(); ChangeSet[] sets = manager.getSets(); List<ChangeSet> result = new ArrayList<>(); - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { if (set.contains(info.getLocal())) { result.add(set); } @@ -353,8 +345,7 @@ public class ActiveChangeSetCollector implements IDiffChangeListener { private SyncInfoSet asSyncInfoSet(IDiff[] diffs) { SyncInfoSet result = new SyncInfoSet(); - for (int i = 0; i < diffs.length; i++) { - IDiff diff = diffs[i]; + for (IDiff diff : diffs) { if (select(diff)) { SyncInfo info = asSyncInfo(diff); if (info != null) @@ -383,8 +374,7 @@ public class ActiveChangeSetCollector implements IDiffChangeListener { /* private */ IResource[] getResources(SyncInfoSet set, IPath[] paths) { List<IResource> result = new ArrayList<>(); - for (int i = 0; i < paths.length; i++) { - IPath path = paths[i]; + for (IPath path : paths) { SyncInfo info = getSyncInfo(set, path); if (info != null) { result.add(info.getLocal()); @@ -395,8 +385,7 @@ public class ActiveChangeSetCollector implements IDiffChangeListener { private SyncInfo getSyncInfo(SyncInfoSet set, IPath path) { SyncInfo[] infos = set.getSyncInfos(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { if (info.getLocal().getFullPath().equals(path)) return info; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetLabelDecorator.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetLabelDecorator.java index 60bf1dd88..80b416082 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetLabelDecorator.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetLabelDecorator.java @@ -72,8 +72,8 @@ public class ChangeSetLabelDecorator extends LabelProvider implements ILabelDeco if (boldFont == null) { Font defaultFont = JFaceResources.getDefaultFont(); FontData[] data = defaultFont.getFontData(); - for (int i = 0; i < data.length; i++) { - data[i].setStyle(SWT.BOLD); + for (FontData d : data) { + d.setStyle(SWT.BOLD); } boldFont = new Font(TeamUIPlugin.getStandardDisplay(), data); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelProvider.java index 09084d186..f1031a6d5 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelProvider.java @@ -149,13 +149,11 @@ public class ChangeSetModelProvider extends CompositeModelProvider { set.beginInput(); set.removeAll(event.getRemovedResources()); SyncInfo[] added = event.getAddedResources(); - for (int i = 0; i < added.length; i++) { - SyncInfo info = added[i]; + for (SyncInfo info : added) { set.add(info); } SyncInfo[] changed = event.getChangedResources(); - for (int i = 0; i < changed.length; i++) { - SyncInfo info = changed[i]; + for (SyncInfo info : changed) { set.add(info); } } finally { @@ -318,8 +316,7 @@ public class ChangeSetModelProvider extends CompositeModelProvider { */ protected ISynchronizeModelElement getModelElement(ChangeSet set) { IDiffElement[] children = getModelRoot().getChildren(); - for (int i = 0; i < children.length; i++) { - IDiffElement element = children[i]; + for (IDiffElement element : children) { if (element instanceof ChangeSetDiffNode && ((ChangeSetDiffNode)element).getSet() == set) { return (ISynchronizeModelElement)element; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompositeModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompositeModelProvider.java index e3a55a7f2..dc57dd375 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompositeModelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompositeModelProvider.java @@ -15,7 +15,6 @@ package org.eclipse.team.internal.ui.synchronize; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; @@ -76,12 +75,10 @@ public abstract class CompositeModelProvider extends AbstractSynchronizeModelPro return ((AbstractSynchronizeModelProvider)providers[0]).getClosestExistingParents(resource); } List<ISynchronizeModelElement> result = new ArrayList<>(); - for (int i = 0; i < providers.length; i++) { - ISynchronizeModelProvider provider = providers[i]; + for (ISynchronizeModelProvider provider : providers) { if (provider instanceof AbstractSynchronizeModelProvider) { ISynchronizeModelElement[] elements = ((AbstractSynchronizeModelProvider)provider).getClosestExistingParents(resource); - for (int j = 0; j < elements.length; j++) { - ISynchronizeModelElement element = elements[j]; + for (ISynchronizeModelElement element : elements) { result.add(element); } } @@ -108,8 +105,7 @@ public abstract class CompositeModelProvider extends AbstractSynchronizeModelPro return new ISynchronizeModelProvider[0]; } List<ISynchronizeModelProvider> result = new ArrayList<>(); - for (Iterator<ISynchronizeModelElement> iter = elements.iterator(); iter.hasNext();) { - ISynchronizeModelElement element = iter.next(); + for (ISynchronizeModelElement element : elements) { result.add(getProvider(element)); } return result.toArray(new ISynchronizeModelProvider[result.size()]); @@ -126,8 +122,7 @@ public abstract class CompositeModelProvider extends AbstractSynchronizeModelPro * @param resources */ protected void handleAdditions(SyncInfo[] resources) { - for (int i = 0; i < resources.length; i++) { - SyncInfo info = resources[i]; + for (SyncInfo info : resources) { handleAddition(info); } } @@ -141,8 +136,7 @@ public abstract class CompositeModelProvider extends AbstractSynchronizeModelPro @Override protected final void handleResourceChanges(ISyncInfoTreeChangeEvent event) { SyncInfo[] infos = event.getChangedResources(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { handleChange(info); } } @@ -160,8 +154,7 @@ public abstract class CompositeModelProvider extends AbstractSynchronizeModelPro @Override protected final void handleResourceRemovals(ISyncInfoTreeChangeEvent event) { IResource[] resources = event.getRemovedResources(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { handleRemoval(resource); } } @@ -172,8 +165,7 @@ public abstract class CompositeModelProvider extends AbstractSynchronizeModelPro */ protected void handleRemoval(IResource resource) { ISynchronizeModelProvider[] providers = getProvidersContaining(resource); - for (int i = 0; i < providers.length; i++) { - ISynchronizeModelProvider provider = providers[i]; + for (ISynchronizeModelProvider provider : providers) { removeFromProvider(resource, provider); } } @@ -232,8 +224,7 @@ public abstract class CompositeModelProvider extends AbstractSynchronizeModelPro } private void clearProviders() { - for (Iterator iter = providers.iterator(); iter.hasNext();) { - ISynchronizeModelProvider provider = (ISynchronizeModelProvider) iter.next(); + for (ISynchronizeModelProvider provider : providers) { provider.dispose(); } providers.clear(); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompressedFoldersModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompressedFoldersModelProvider.java index e2f967c15..768f6df1e 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompressedFoldersModelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompressedFoldersModelProvider.java @@ -147,8 +147,7 @@ public class CompressedFoldersModelProvider extends HierarchicalModelProvider { // Folders will only contain out-of-sync children IResource[] children = getSyncInfoTree().members(resource); List<IDiffElement> result = new ArrayList<>(); - for (int i = 0; i < children.length; i++) { - IResource child = children[i]; + for (IResource child : children) { if (child.getType() == IResource.FILE) { result.add(createModelObject(parent, child)); } @@ -162,8 +161,7 @@ public class CompressedFoldersModelProvider extends HierarchicalModelProvider { SyncInfo[] outOfSync = getSyncInfoTree().getSyncInfos(project, IResource.DEPTH_INFINITE); Set<IDiffElement> result = new HashSet<>(); Set<IResource> resourcesToShow = new HashSet<>(); - for (int i = 0; i < outOfSync.length; i++) { - SyncInfo info = outOfSync[i]; + for (SyncInfo info : outOfSync) { IResource local = info.getLocal(); if (local.getProjectRelativePath().segmentCount() == 1 && local.getType() == IResource.FILE) { resourcesToShow.add(local); @@ -208,8 +206,7 @@ public class CompressedFoldersModelProvider extends HierarchicalModelProvider { @Override protected void handleResourceAdditions(ISyncInfoTreeChangeEvent event) { SyncInfo[] infos = event.getAddedResources(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { addResource(info); } } @@ -255,8 +252,7 @@ public class CompressedFoldersModelProvider extends HierarchicalModelProvider { // First, deal with any projects that have been removed List<IResource> removedProjects = new ArrayList<>(); - for (int i = 0; i < roots.length; i++) { - IResource resource = roots[i]; + for (IResource resource : roots) { if (resource.getType() == IResource.PROJECT) { removeFromViewer(resource); removedProjects.add(resource); @@ -266,8 +262,7 @@ public class CompressedFoldersModelProvider extends HierarchicalModelProvider { IResource[] resources = event.getRemovedResources(); List<IResource> resourcesToRemove = new ArrayList<IResource>(); List<SyncInfo> resourcesToAdd = new ArrayList<>(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { if (!removedProjects.contains(resource.getProject())) { if (resource.getType() == IResource.FILE) { if (isCompressedParentEmpty(resource) && !isOutOfSync(resource.getParent())) { @@ -314,8 +309,7 @@ public class CompressedFoldersModelProvider extends HierarchicalModelProvider { private boolean hasFileMembers(IContainer parent) { // Check if the sync set has any file children of the parent IResource[] members = getSyncInfoTree().members(parent); - for (int i = 0; i < members.length; i++) { - IResource member = members[i]; + for (IResource member : members) { if (member.getType() == IResource.FILE) { return true; } @@ -328,13 +322,13 @@ public class CompressedFoldersModelProvider extends HierarchicalModelProvider { // Check if the sync set has any file children of the parent List<SyncInfo> result = new ArrayList<>(); IResource[] members = getSyncInfoTree().members(parent); - for (int i = 0; i < members.length; i++) { - SyncInfo info = getSyncInfoTree().getSyncInfo(members[i]); + for (IResource member : members) { + SyncInfo info = getSyncInfoTree().getSyncInfo(member); if (info != null) { result.add(info); } - if (members[i] instanceof IContainer) { - result.addAll(Arrays.asList(this.getSyncInfosForFileMembers((IContainer)members[i]))); + if (member instanceof IContainer) { + result.addAll(Arrays.asList(this.getSyncInfosForFileMembers((IContainer) member))); } } return result.toArray(new SyncInfo[result.size()]); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/FlatModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/FlatModelProvider.java index 1323b9662..01580ddd6 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/FlatModelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/FlatModelProvider.java @@ -246,8 +246,7 @@ public class FlatModelProvider extends SynchronizeModelProvider { if (node == getModelRoot()); SyncInfo[] infos = getSyncInfoSet().getSyncInfos(); List result = new ArrayList(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { result.add(createModelObject(node, info)); } return (IDiffElement[]) result.toArray(new IDiffElement[result.size()]); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshElementSelectionPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshElementSelectionPage.java index 64cca1c54..63719d1ab 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshElementSelectionPage.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshElementSelectionPage.java @@ -229,8 +229,7 @@ public abstract class GlobalRefreshElementSelectionPage extends WizardPage { */ private boolean areAnyElementsChecked() { TreeItem[] item = fViewer.getTree().getItems(); - for (int i = 0; i < item.length; i++) { - TreeItem child = item[i]; + for (TreeItem child : item) { if(child.getChecked() || child.getGrayed()) { return true; } @@ -247,8 +246,7 @@ public abstract class GlobalRefreshElementSelectionPage extends WizardPage { public Object[] getRootElement() { TreeItem[] item = fViewer.getTree().getItems(); List checked = new ArrayList(); - for (int i = 0; i < item.length; i++) { - TreeItem child = item[i]; + for (TreeItem child : item) { collectCheckedItems(child, checked); } return checked.toArray(new Object[checked.size()]); @@ -348,8 +346,7 @@ public abstract class GlobalRefreshElementSelectionPage extends WizardPage { checked.add(item.getData()); } else if(item.getGrayed()) { TreeItem[] children = item.getItems(); - for (int i = 0; i < children.length; i++) { - TreeItem child = children[i]; + for (TreeItem child : children) { collectCheckedItems(child, checked); } } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshResourceSelectionPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshResourceSelectionPage.java index 462054bb6..0750c74cb 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshResourceSelectionPage.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshResourceSelectionPage.java @@ -125,8 +125,7 @@ public class GlobalRefreshResourceSelectionPage extends GlobalRefreshElementSele protected boolean checkWorkingSetElements() { List allWorkingSetResources = new ArrayList(); IWorkingSet[] workingSets = getWorkingSets(); - for (int i = 0; i < workingSets.length; i++) { - IWorkingSet set = workingSets[i]; + for (IWorkingSet set : workingSets) { allWorkingSetResources.addAll(IDE.computeSelectedResources(new StructuredSelection(set.getElements()))); } getViewer().setCheckedElements(allWorkingSetResources.toArray(new IResource[allWorkingSetResources.size()])); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelProvider.java index bd5d3971f..cf3d4c1d8 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelProvider.java @@ -157,8 +157,7 @@ public class HierarchicalModelProvider extends SynchronizeModelProvider { } protected void addResources(IResource[] added) { - for (int i = 0; i < added.length; i++) { - IResource resource = added[i]; + for (IResource resource : added) { addResource(resource); } } @@ -181,8 +180,7 @@ public class HierarchicalModelProvider extends SynchronizeModelProvider { @Override protected IDiffElement[] buildModelObjects(ISynchronizeModelElement node) { IDiffElement[] children = createModelObjects(node); - for (int i = 0; i < children.length; i++) { - IDiffElement element = children[i]; + for (IDiffElement element : children) { if (element instanceof ISynchronizeModelElement) { buildModelObjects((ISynchronizeModelElement) element); } @@ -194,8 +192,7 @@ public class HierarchicalModelProvider extends SynchronizeModelProvider { protected void handleResourceAdditions(ISyncInfoTreeChangeEvent event) { SyncInfo[] infos = event.getAddedResources(); HashSet<IProject> set = new HashSet<>(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { set.add(info.getLocal().getProject()); } for (Iterator it = set.iterator(); it.hasNext(); ) { @@ -211,8 +208,7 @@ public class HierarchicalModelProvider extends SynchronizeModelProvider { // We have to look for folders that may no longer be in the set // (i.e. are in-sync) but still have descendants in the set IResource[] removedResources = event.getRemovedResources(); - for (int i = 0; i < removedResources.length; i++) { - IResource resource = removedResources[i]; + for (IResource resource : removedResources) { if (resource.getType() != IResource.FILE) { ISynchronizeModelElement node = getModelObject(resource); if (node != null) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/MultiLabelDecorator.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/MultiLabelDecorator.java index 51562f8f4..bebd0451d 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/MultiLabelDecorator.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/MultiLabelDecorator.java @@ -30,8 +30,7 @@ class MultiLabelDecorator extends LabelProvider implements ILabelDecorator, IFon @Override public Image decorateImage(Image image, Object element) { - for (int i = 0; i < decorators.length; i++) { - ILabelDecorator decorator = decorators[i]; + for (ILabelDecorator decorator : decorators) { Image newImage = decorator.decorateImage(image, element); if (newImage != null) { image = newImage; @@ -42,8 +41,7 @@ class MultiLabelDecorator extends LabelProvider implements ILabelDecorator, IFon @Override public String decorateText(String text, Object element) { - for (int i = 0; i < decorators.length; i++) { - ILabelDecorator decorator = decorators[i]; + for (ILabelDecorator decorator : decorators) { String newText = decorator.decorateText(text, element); if (newText != null) { text = newText; @@ -54,16 +52,14 @@ class MultiLabelDecorator extends LabelProvider implements ILabelDecorator, IFon @Override public void dispose() { - for (int i = 0; i < decorators.length; i++) { - ILabelDecorator d = decorators[i]; + for (ILabelDecorator d : decorators) { d.dispose(); } } @Override public Font decorateFont(Object element) { - for (int i = 0; i < decorators.length; i++) { - ILabelDecorator decorator = decorators[i]; + for (ILabelDecorator decorator : decorators) { if(decorator instanceof IFontDecorator) { return ((IFontDecorator)decorator).decorateFont(element); } @@ -73,8 +69,7 @@ class MultiLabelDecorator extends LabelProvider implements ILabelDecorator, IFon @Override public Color decorateForeground(Object element) { - for (int i = 0; i < decorators.length; i++) { - ILabelDecorator decorator = decorators[i]; + for (ILabelDecorator decorator : decorators) { if(decorator instanceof IColorDecorator) { return ((IColorDecorator)decorator).decorateForeground(element); } @@ -84,8 +79,7 @@ class MultiLabelDecorator extends LabelProvider implements ILabelDecorator, IFon @Override public Color decorateBackground(Object element) { - for (int i = 0; i < decorators.length; i++) { - ILabelDecorator decorator = decorators[i]; + for (ILabelDecorator decorator : decorators) { if(decorator instanceof IColorDecorator) { return ((IColorDecorator)decorator).decorateBackground(element); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshChangeListener.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshChangeListener.java index 7b2da501d..b48b1fe68 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshChangeListener.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshChangeListener.java @@ -36,8 +36,7 @@ public class RefreshChangeListener implements ISubscriberChangeListener, IChange } @Override public void subscriberResourceChanged(ISubscriberChangeEvent[] deltas) { - for (int i = 0; i < deltas.length; i++) { - ISubscriberChangeEvent delta = deltas[i]; + for (ISubscriberChangeEvent delta : deltas) { if (delta.getFlags() == ISubscriberChangeEvent.SYNC_CHANGED) { changes.add(delta); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshModelParticipantJob.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshModelParticipantJob.java index f5a42ae35..ac10c047b 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshModelParticipantJob.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshModelParticipantJob.java @@ -51,13 +51,11 @@ public class RefreshModelParticipantJob extends RefreshParticipantJob { @Override public void diffsChanged(IDiffChangeEvent event, IProgressMonitor monitor) { IDiff[] additions = event.getAdditions(); - for (int i = 0; i < additions.length; i++) { - IDiff node = additions[i]; + for (IDiff node : additions) { changes.put(node.getPath(), node); } IDiff[] changed = event.getChanges(); - for (int i = 0; i < changed.length; i++) { - IDiff node = changed[i]; + for (IDiff node : changed) { changes.put(node.getPath(), node); } } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshParticipantJob.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshParticipantJob.java index 23402f815..b2e9c8e63 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshParticipantJob.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshParticipantJob.java @@ -403,8 +403,7 @@ public abstract class RefreshParticipantJob extends Job { private boolean isJobInFamilyRunning(Object family) { Job[] jobs = Job.getJobManager().find(family); if (jobs != null && jobs.length > 0) { - for (int i = 0; i < jobs.length; i++) { - Job job = jobs[i]; + for (Job job : jobs) { if (job.getState() != Job.NONE) { return true; } @@ -583,8 +582,7 @@ public abstract class RefreshParticipantJob extends Job { listenerArray = listeners.toArray(new IRefreshSubscriberListener[listeners.size()]); } // Notify each listener in a safe manner (i.e. so their exceptions don't kill us) - for (int i = 0; i < listenerArray.length; i++) { - IRefreshSubscriberListener listener = listenerArray[i]; + for (IRefreshSubscriberListener listener : listenerArray) { Notification notification = new Notification() { @Override protected void notify(IRefreshSubscriberListener listener) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshSubscriberParticipantJob.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshSubscriberParticipantJob.java index 99d6c6474..3e6d34636 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshSubscriberParticipantJob.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshSubscriberParticipantJob.java @@ -46,8 +46,7 @@ public class RefreshSubscriberParticipantJob extends RefreshParticipantJob { SubscriberSyncInfoCollector collector = getCollector(); if (collector != null) { SyncInfoTree set = collector.getSyncInfoSet(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { SyncInfo[] infos = set.getSyncInfos(resource, IResource.DEPTH_INFINITE); if(infos != null && infos.length > 0) { numChanges += infos.length; @@ -72,12 +71,11 @@ public class RefreshSubscriberParticipantJob extends RefreshParticipantJob { SubscriberSyncInfoCollector collector = getCollector(); if (collector != null) { SyncInfoTree set = collector.getSyncInfoSet(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { SyncInfo[] infos = set.getSyncInfos(resource, IResource.DEPTH_INFINITE); - if(infos != null && infos.length > 0) { - for(int j = 0; j < infos.length; j++) { - if((infos[j].getKind() & kind)>0) { + if (infos != null && infos.length > 0) { + for (SyncInfo info : infos) { + if ((info.getKind() & kind) > 0) { numChanges++; } } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshUserNotificationPolicy.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshUserNotificationPolicy.java index 47bee12f5..97f26ac76 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshUserNotificationPolicy.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshUserNotificationPolicy.java @@ -112,8 +112,8 @@ public class RefreshUserNotificationPolicy implements IRefreshSubscriberListener SyncInfo[] infos = ((RefreshChangeListener)event.getChangeDescription()).getChanges(); List<IResource> selectedResources = new ArrayList<>(); selectedResources.addAll(Arrays.asList(((RefreshChangeListener)event.getChangeDescription()).getResources())); - for (int i = 0; i < infos.length; i++) { - selectedResources.add(infos[i].getLocal()); + for (SyncInfo info : infos) { + selectedResources.add(info.getLocal()); } IResource[] resources = selectedResources.toArray(new IResource[selectedResources.size()]); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RegexDiffComparator.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RegexDiffComparator.java index 9176a40c1..70047bc8c 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RegexDiffComparator.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RegexDiffComparator.java @@ -41,8 +41,7 @@ public class RegexDiffComparator extends RangeDifferenceComparator { protected boolean compareRangeDifferences(RangeDifference[] ranges, IDocument lDoc, IDocument rDoc) { try { - for (int i = 0; i < ranges.length; i++) { - RangeDifference diff = ranges[i]; + for (RangeDifference diff : ranges) { if (diff.kind() == RangeDifference.NOCHANGE) continue; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SaveablesCompareEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SaveablesCompareEditorInput.java index 2f7b2a21a..43542dfd9 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SaveablesCompareEditorInput.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SaveablesCompareEditorInput.java @@ -619,8 +619,8 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements if (!inputChangeListeners.isEmpty()) { Object[] allListeners = inputChangeListeners.getListeners(); final ICompareInput compareResult = (ICompareInput) getCompareResult(); - for (int i = 0; i < allListeners.length; i++) { - final ICompareInputChangeListener listener = (ICompareInputChangeListener) allListeners[i]; + for (Object l : allListeners) { + final ICompareInputChangeListener listener = (ICompareInputChangeListener) l; SafeRunner.run(new ISafeRunnable() { @Override public void run() throws Exception { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StructuredViewerAdvisor.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StructuredViewerAdvisor.java index aaf139b8d..946ae0f5c 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StructuredViewerAdvisor.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StructuredViewerAdvisor.java @@ -218,8 +218,7 @@ public abstract class StructuredViewerAdvisor extends AbstractViewerAdvisor { o = ISynchronizePageConfiguration.DEFAULT_TOOLBAR_MENU; } String[] groups = (String[])o; - for (int i = 0; i < groups.length; i++) { - String group = groups[i]; + for (String group : groups) { // The groupIds must be converted to be unique since the toolbar is shared manager.add(new Separator(getGroupId(group))); } @@ -234,8 +233,7 @@ public abstract class StructuredViewerAdvisor extends AbstractViewerAdvisor { } groups = (String[]) o; initializeStatusLine(actionBars); - for (int i = 0; i < groups.length; i++) { - String group = groups[i]; + for (String group : groups) { // The groupIds must be converted to be unique since the // view menu is shared menu.add(new Separator(getGroupId(group))); @@ -289,8 +287,7 @@ public abstract class StructuredViewerAdvisor extends AbstractViewerAdvisor { @Override public void menuShown(MenuEvent e) { IContributionItem[] items = menuMgr.getItems(); - for (int i = 0; i < items.length; i++) { - IContributionItem item = items[i]; + for (IContributionItem item : items) { if (item instanceof ActionContributionItem) { IAction actionItem = ((ActionContributionItem) item).getAction(); if (actionItem instanceof SynchronizeModelAction) { @@ -375,8 +372,7 @@ public abstract class StructuredViewerAdvisor extends AbstractViewerAdvisor { o = ISynchronizePageConfiguration.DEFAULT_CONTEXT_MENU; } String[] groups = (String[])o; - for (int i = 0; i < groups.length; i++) { - String group = groups[i]; + for (String group : groups) { // There is no need to adjust the group ids in a context menu (see setActionBars) manager.add(new Separator(group)); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangeSetCollector.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangeSetCollector.java index 327151fe5..98d626e51 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangeSetCollector.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangeSetCollector.java @@ -126,8 +126,7 @@ public abstract class SyncInfoSetChangeSetCollector extends ChangeSetManager { */ protected void remove(IResource[] resources) { ChangeSet[] sets = getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet set = sets[i]; + for (ChangeSet set : sets) { set.remove(resources); } } @@ -157,8 +156,7 @@ public abstract class SyncInfoSetChangeSetCollector extends ChangeSetManager { public void reset(SyncInfoSet seedSet) { // First, remove all the sets ChangeSet[] sets = getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet set2 = sets[i]; + for (ChangeSet set2 : sets) { remove(set2); } if (seedSet != null) { @@ -186,8 +184,7 @@ public abstract class SyncInfoSetChangeSetCollector extends ChangeSetManager { removals.addAll(Arrays.asList(event.getRemovedResources())); additions.addAll(Arrays.asList(event.getAddedResources())); SyncInfo[] changed = event.getChangedResources(); - for (int i = 0; i < changed.length; i++) { - SyncInfo info = changed[i]; + for (SyncInfo info : changed) { additions.add(info); removals.add(info.getLocal()); } @@ -267,8 +264,7 @@ public abstract class SyncInfoSetChangeSetCollector extends ChangeSetManager { */ protected ChangeSet getChangeSet(SyncInfoSet set) { ChangeSet[] sets = getSets(); - for (int i = 0; i < sets.length; i++) { - ChangeSet changeSet = sets[i]; + for (ChangeSet changeSet : sets) { if (((CheckedInChangeSet)changeSet).getSyncInfoSet() == set) { return changeSet; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java index 578915be5..7cd1eb76d 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java @@ -173,8 +173,8 @@ public class SynchronizeManager implements ISynchronizeManager { fChanged = participants; fType = update; Object[] copiedListeners = fListeners.getListeners(); - for (int i = 0; i < copiedListeners.length; i++) { - fListener = (ISynchronizeParticipantListener) copiedListeners[i]; + for (Object copiedListener : copiedListeners) { + fListener = (ISynchronizeParticipantListener) copiedListener; SafeRunner.run(this); } fChanged = null; @@ -364,8 +364,7 @@ public class SynchronizeManager implements ISynchronizeManager { public synchronized void addSynchronizeParticipants(ISynchronizeParticipant[] participants) { // renamed to createSynchronizeParticipant(id) List<ISynchronizeParticipant> added = new ArrayList<>(participants.length); - for (int i = 0; i < participants.length; i++) { - ISynchronizeParticipant participant = participants[i]; + for (ISynchronizeParticipant participant : participants) { String key = Utils.getKey(participant.getId(), participant.getSecondaryId()); if(! participantReferences.containsKey(key)) { try { @@ -390,8 +389,7 @@ public class SynchronizeManager implements ISynchronizeManager { ISynchronizeParticipantReference[] refs = get(id); if (refs.length > 0) { // Find an un-pinned participant and replace it - for (int i = 0; i < refs.length; i++) { - ISynchronizeParticipantReference reference = refs[i]; + for (ISynchronizeParticipantReference reference : refs) { ISynchronizeParticipant p; try { p = reference.getParticipant(); @@ -420,8 +418,7 @@ public class SynchronizeManager implements ISynchronizeManager { @Override public synchronized void removeSynchronizeParticipants(ISynchronizeParticipant[] participants) { List<ISynchronizeParticipant> removed = new ArrayList<>(participants.length); - for (int i = 0; i < participants.length; i++) { - ISynchronizeParticipant participant = participants[i]; + for (ISynchronizeParticipant participant : participants) { String key = Utils.getKey(participant.getId(), participant.getSecondaryId()); if(participantReferences.containsKey(key)) { ParticipantInstance ref = (ParticipantInstance)participantReferences.remove(key); @@ -447,8 +444,7 @@ public class SynchronizeManager implements ISynchronizeManager { public ISynchronizeParticipantReference[] get(String id) { ISynchronizeParticipantReference[] refs = getSynchronizeParticipants(); ArrayList<ISynchronizeParticipantReference> refsForId = new ArrayList<>(); - for (int i = 0; i < refs.length; i++) { - ISynchronizeParticipantReference reference = refs[i]; + for (ISynchronizeParticipantReference reference : refs) { if(reference.getId().equals(id)) { refsForId.add(reference); } @@ -606,8 +602,7 @@ public class SynchronizeManager implements ISynchronizeManager { } IMemento memento = XMLMemento.createReadRoot(reader); IMemento[] participantNodes = memento.getChildren(CTX_PARTICIPANT); - for (int i = 0; i < participantNodes.length; i++) { - IMemento memento2 = participantNodes[i]; + for (IMemento memento2 : participantNodes) { String id = memento2.getString(CTX_ID); String secondayId = memento2.getString(CTX_SECONDARY_ID); if (secondayId != null) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElement.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElement.java index 39d728aec..9b94b40d6 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElement.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElement.java @@ -159,8 +159,7 @@ public abstract class SynchronizeModelElement extends DiffNode implements IAdapt } boolean set = getProperty(propertyName); final PropertyChangeEvent event = new PropertyChangeEvent(this, propertyName, Boolean.valueOf(!set), Boolean.valueOf(set)); - for (int i = 0; i < allListeners.length; i++) { - Object object = allListeners[i]; + for (Object object : allListeners) { if (object instanceof IPropertyChangeListener) { final IPropertyChangeListener listener = (IPropertyChangeListener)object; SafeRunner.run(new ISafeRunnable() { @@ -196,8 +195,7 @@ public abstract class SynchronizeModelElement extends DiffNode implements IAdapt private boolean hasChildWithFlag(String flag) { IDiffElement[] childen = getChildren(); - for (int i = 0; i < childen.length; i++) { - IDiffElement element = childen[i]; + for (IDiffElement element : childen) { if (((SynchronizeModelElement)element).getProperty(flag)) { return true; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElementLabelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElementLabelProvider.java index 4fa15f001..b1062c531 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElementLabelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElementLabelProvider.java @@ -83,8 +83,8 @@ public class SynchronizeModelElementLabelProvider extends LabelProvider implemen if (busyFont == null) { Font defaultFont = JFaceResources.getDefaultFont(); FontData[] data = defaultFont.getFontData(); - for (int i = 0; i < data.length; i++) { - data[i].setStyle(SWT.ITALIC); + for (FontData d : data) { + d.setStyle(SWT.ITALIC); } busyFont = new Font(TeamUIPlugin.getStandardDisplay(), data); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelManager.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelManager.java index dc68ea5a1..25dfb6e70 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelManager.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelManager.java @@ -233,8 +233,7 @@ public abstract class SynchronizeModelManager extends SynchronizePageActionGroup // We only need switching of layouts if there is more than one model provider if (providers.length > 1) { toggleModelProviderActions = new ArrayList(); - for (int i = 0; i < providers.length; i++) { - final ISynchronizeModelProviderDescriptor provider = providers[i]; + for (ISynchronizeModelProviderDescriptor provider : providers) { toggleModelProviderActions.add(new ToggleModelProviderAction(provider)); } } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelProvider.java index 2520c08e3..2c6439d05 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelProvider.java @@ -131,8 +131,7 @@ public abstract class SynchronizeModelProvider extends AbstractSynchronizeModelP */ protected void removeFromViewer(IResource[] resources) { List<ISynchronizeModelElement> elements = new ArrayList<>(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { ISynchronizeModelElement element = getModelObject(resource); if(element != null) { elements.add(element); @@ -195,8 +194,7 @@ public abstract class SynchronizeModelProvider extends AbstractSynchronizeModelP protected void handleResourceChanges(ISyncInfoTreeChangeEvent event) { // Refresh the viewer for each changed resource SyncInfo[] infos = event.getChangedResources(); - for (int i = 0; i < infos.length; i++) { - SyncInfo info = infos[i]; + for (SyncInfo info : infos) { IResource local = info.getLocal(); ISynchronizeModelElement diffNode = getModelObject(local); if (diffNode != null) { @@ -233,8 +231,7 @@ public abstract class SynchronizeModelProvider extends AbstractSynchronizeModelP * @param added the added infos */ protected void addResources(SyncInfo[] added) { - for (int i = 0; i < added.length; i++) { - SyncInfo info = added[i]; + for (SyncInfo info : added) { addResource(info); } } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelUpdateHandler.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelUpdateHandler.java index e027dffc3..62c55d288 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelUpdateHandler.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelUpdateHandler.java @@ -17,7 +17,6 @@ import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.Map; import java.util.Set; @@ -175,23 +174,21 @@ public class SynchronizeModelUpdateHandler extends BackgroundEventHandler implem // Accumulate all distinct resources that have had problem marker // changes - for (int idx = 0; idx < markerTypes.length; idx++) { - IMarkerDelta[] markerDeltas = event.findMarkerDeltas(markerTypes[idx], true); - for (int i = 0; i < markerDeltas.length; i++) { - IMarkerDelta delta = markerDeltas[i]; - IResource resource = delta.getResource(); - if (!handledResources.contains(resource)) { - handledResources.add(resource); - ISynchronizeModelElement[] elements = provider.getClosestExistingParents(delta.getResource()); - if(elements != null && elements.length > 0) { - for (int j = 0; j < elements.length; j++) { - ISynchronizeModelElement element = elements[j]; - changes.add(element); - } - } + for (String markerType : markerTypes) { + IMarkerDelta[] markerDeltas = event.findMarkerDeltas(markerType, true); + for (IMarkerDelta delta : markerDeltas) { + IResource resource = delta.getResource(); + if (!handledResources.contains(resource)) { + handledResources.add(resource); + ISynchronizeModelElement[] elements = provider.getClosestExistingParents(delta.getResource()); + if (elements != null && elements.length > 0) { + for (ISynchronizeModelElement element : elements) { + changes.add(element); } } } + } + } if (!changes.isEmpty()) { updateMarkersFor(changes.toArray(new ISynchronizeModelElement[changes.size()])); @@ -216,8 +213,7 @@ public class SynchronizeModelUpdateHandler extends BackgroundEventHandler implem // Changes contains all elements that need their labels updated long start = System.currentTimeMillis(); ISynchronizeModelElement[] elements = getChangedElements(event); - for (int i = 0; i < elements.length; i++) { - ISynchronizeModelElement element = elements[i]; + for (ISynchronizeModelElement element : elements) { propagateProblemMarkers(element); updateParentLabels(element); } @@ -564,8 +560,7 @@ public class SynchronizeModelUpdateHandler extends BackgroundEventHandler implem if (Utils.canUpdateViewer(viewer)) { try { if (additionsMap != null && !additionsMap.isEmpty() && Utils.canUpdateViewer(viewer)) { - for (Iterator iter = additionsMap.keySet().iterator(); iter.hasNext();) { - ISynchronizeModelElement parent = (ISynchronizeModelElement) iter.next(); + for (ISynchronizeModelElement parent : additionsMap.keySet()) { if (Policy.DEBUG_SYNC_MODELS) { System.out.println("Adding child view items of " + parent.getName()); //$NON-NLS-1$ } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizePageConfiguration.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizePageConfiguration.java index 3380973b9..1013d8cbd 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizePageConfiguration.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizePageConfiguration.java @@ -226,8 +226,8 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp listeners = propertyChangeListeners.getListeners(); } final PropertyChangeEvent event = new PropertyChangeEvent(this, key, oldValue, newValue); - for (int i = 0; i < listeners.length; i++) { - final IPropertyChangeListener listener = (IPropertyChangeListener)listeners[i]; + for (Object l : listeners) { + final IPropertyChangeListener listener = (IPropertyChangeListener) l; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { @@ -254,8 +254,8 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp actionState = INITIALIZED; listeners = actionContributions.getListeners(); } - for (int i= 0; i < listeners.length; i++) { - final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup)listeners[i]; + for (Object listener : listeners) { + final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup) listener; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { @@ -276,8 +276,8 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp synchronized(actionContributions) { listeners = actionContributions.getListeners(); } - for (int i= 0; i < listeners.length; i++) { - final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup)listeners[i]; + for (Object listener : listeners) { + final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup) listener; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { @@ -302,8 +302,8 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp synchronized(actionContributions) { listeners = actionContributions.getListeners(); } - for (int i= 0; i < listeners.length; i++) { - final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup)listeners[i]; + for (Object listener : listeners) { + final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup) listener; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { @@ -330,8 +330,8 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp synchronized(actionContributions) { listeners = actionContributions.getListeners(); } - for (int i= 0; i < listeners.length; i++) { - final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup)listeners[i]; + for (Object listener : listeners) { + final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup) listener; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { @@ -351,8 +351,8 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp synchronized(actionContributions) { listeners = actionContributions.getListeners(); } - for (int i= 0; i < listeners.length; i++) { - final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup)listeners[i]; + for (Object listener : listeners) { + final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup) listener; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { @@ -372,8 +372,8 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp synchronized(actionContributions) { listeners = actionContributions.getListeners(); } - for (int i= 0; i < listeners.length; i++) { - final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup)listeners[i]; + for (Object listener : listeners) { + final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup) listener; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { @@ -395,8 +395,8 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp listeners = actionContributions.getListeners(); actionState = DISPOSED; } - for (int i= 0; i < listeners.length; i++) { - final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup)listeners[i]; + for (Object listener : listeners) { + final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup) listener; SafeRunner.run(new ISafeRunnable() { @Override public void handleException(Throwable exception) { @@ -433,8 +433,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp if (groups == null) { groups = getDefault(menuPropertyId); } - for (int i = 0; i < groups.length; i++) { - String string = groups[i]; + for (String string : groups) { if (string.equals(groupId)) return true; } return false; @@ -459,8 +458,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp decorators = new ILabelDecorator[0]; } // Ensure we don't have it registered already - for (int i = 0; i < decorators.length; i++) { - ILabelDecorator d = decorators[i]; + for (ILabelDecorator d : decorators) { if (d == decorator) { return; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java index bb2bffbd6..08935bb8a 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java @@ -357,8 +357,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I @Override public void participantsAdded(final ISynchronizeParticipant[] participants) { - for (int i = 0; i < participants.length; i++) { - ISynchronizeParticipant participant = participants[i]; + for (ISynchronizeParticipant participant : participants) { if (isAvailable() && select(TeamUI.getSynchronizeManager().get(participant.getId(), participant.getSecondaryId()))) { SynchronizeViewWorkbenchPart part = new SynchronizeViewWorkbenchPart(participant, getSite()); fParticipantToPart.put(participant, part); @@ -372,8 +371,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I public void participantsRemoved(final ISynchronizeParticipant[] participants) { if (isAvailable()) { Runnable r = () -> { - for (int i = 0; i < participants.length; i++) { - ISynchronizeParticipant participant = participants[i]; + for (ISynchronizeParticipant participant : participants) { if (isAvailable()) { SynchronizeViewWorkbenchPart part = (SynchronizeViewWorkbenchPart)fParticipantToPart.get(participant); if (part != null) { @@ -612,8 +610,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I // create pages List<ISynchronizeParticipantReference> participants = new ArrayList<>(); ISynchronizeParticipantReference[] refs = manager.getSynchronizeParticipants(); - for (int i = 0; i < refs.length; i++) { - ISynchronizeParticipantReference ref =refs[i]; + for (ISynchronizeParticipantReference ref : refs) { if(select(ref)) { participants.add(ref); } @@ -718,8 +715,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I if (saveables.length == 0) return; monitor.beginTask(null, 100* saveables.length); - for (int i = 0; i < saveables.length; i++) { - Saveable saveable = saveables[i]; + for (Saveable saveable : saveables) { try { saveable.doSave(Policy.subMonitorFor(monitor, 100)); } catch (CoreException e) { @@ -739,8 +735,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I @Override public boolean isDirty() { Saveable[] saveables = getSaveables(); - for (int i = 0; i < saveables.length; i++) { - Saveable saveable = saveables[i]; + for (Saveable saveable : saveables) { if (saveable.isDirty()) return true; } @@ -1014,10 +1009,11 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I IEditorPart editor = p.findEditor(input); if (editor == null) { IEditorReference[] er = p.getEditorReferences(); - for (int i = 0; i < er.length; i++) - if (er[i].getId().equals( - "org.eclipse.compare.CompareEditor") && matches(er[i], input)) //$NON-NLS-1$ - editor = er[i].getEditor(false); + for (IEditorReference e : er) { + if (e.getId().equals("org.eclipse.compare.CompareEditor") && matches(e, input)) { //$NON-NLS-1$ + editor = e.getEditor(false); + } + } } return editor; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java index 65839d020..6fe2c9cc6 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java @@ -228,8 +228,8 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup { set.add(diffArray); } else { ChangeSet[] sets = getActiveChangeSetManager().getSets(); - for (int i = 0; i < sets.length; i++) { - ActiveChangeSet activeSet = (ActiveChangeSet)sets[i]; + for (ChangeSet s : sets) { + ActiveChangeSet activeSet = (ActiveChangeSet) s; activeSet.remove(resources); } } @@ -391,8 +391,8 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup { createChangeSet.selectionChanged(selection); addToChangeSet.add(createChangeSet); addToChangeSet.add(new Separator()); - for (int i = 0; i < sets.length; i++) { - ActiveChangeSet set = (ActiveChangeSet)sets[i]; + for (ChangeSet s : sets) { + ActiveChangeSet set = (ActiveChangeSet) s; AddToChangeSetAction action = new AddToChangeSetAction(getConfiguration(), set, selection); manager.add(action); } @@ -472,8 +472,7 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup { private IDiff[] getDiffs(IResource[] resources) { List<IDiff> diffs = new ArrayList<>(); Subscriber s = ((SubscriberParticipant)getConfiguration().getParticipant()).getSubscriber(); - for (int i = 0; i < resources.length; i++) { - IResource resource = resources[i]; + for (IResource resource : resources) { try { IDiff diff = s.getDiff(resource); if (diff != null) diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/CopyToClipboardAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/CopyToClipboardAction.java index b3e010c0d..5efd85260 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/CopyToClipboardAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/CopyToClipboardAction.java @@ -89,8 +89,7 @@ class CopyToClipboardAction extends SelectionListenerAction { if (structuredSelection instanceof TreeSelection) { TreeSelection ts = (TreeSelection) structuredSelection; TreePath[] paths = ts.getPaths(); - for (int j = 0; j < paths.length; j++) { - TreePath path = paths[j]; + for (TreePath path : paths) { String text = getTextFor(path); if (text != null && text.length() > 0) { if (i > 0) diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenInCompareAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenInCompareAction.java index 4ac48f61d..366b2f6a3 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenInCompareAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenInCompareAction.java @@ -94,17 +94,17 @@ public class OpenInCompareAction extends Action { // model synchronize if (participant instanceof ModelSynchronizeParticipant) { ModelSynchronizeParticipant msp = (ModelSynchronizeParticipant) participant; - for (int i = 0; i < elements.length; i++) { + for (Object element : elements) { // TODO: This is inefficient - if (!msp.hasCompareInputFor(elements[i])) { + if (!msp.hasCompareInputFor(element)) { return false; } } } else { // all files IResource resources[] = Utils.getResources(elements); - for (int i = 0; i < resources.length; i++) { - if (resources[i].getType() != IResource.FILE) { + for (IResource resource : resources) { + if (resource.getType() != IResource.FILE) { // Only supported if all the items are files. return false; } @@ -248,8 +248,8 @@ public class OpenInCompareAction extends Action { public static IEditorPart findOpenCompareEditor(IWorkbenchPartSite site, IResource resource) { IWorkbenchPage page = site.getPage(); IEditorReference[] editorRefs = page.getEditorReferences(); - for (int i = 0; i < editorRefs.length; i++) { - final IEditorPart part = editorRefs[i].getEditor(false /* don't restore editor */); + for (IEditorReference editorRef : editorRefs) { + final IEditorPart part = editorRef.getEditor(false /* don't restore editor */); if(part != null) { IEditorInput input = part.getEditorInput(); if(part != null && input instanceof SyncInfoCompareInput) { @@ -279,8 +279,8 @@ public class OpenInCompareAction extends Action { } IWorkbenchPage page = site.getPage(); IEditorReference[] editorRefs = page.getEditorReferences(); - for (int i = 0; i < editorRefs.length; i++) { - final IEditorPart part = editorRefs[i].getEditor(false /* don't restore editor */); + for (IEditorReference editorRef : editorRefs) { + final IEditorPart part = editorRef.getEditor(false /* don't restore editor */); if(part != null) { IEditorInput input = part.getEditorInput(); if(input instanceof ModelCompareEditorInput) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenWithActionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenWithActionGroup.java index fba0cd937..c8eb249b2 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenWithActionGroup.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenWithActionGroup.java @@ -103,8 +103,8 @@ public class OpenWithActionGroup extends ActionGroup { if (participant instanceof ModelSynchronizeParticipant) { ModelSynchronizeParticipant msp = (ModelSynchronizeParticipant) participant; boolean allElementsHaveCompareInput = true; - for (int i = 0; i < elements.length; i++) { - if (!msp.hasCompareInputFor(elements[i])) { + for (Object element : elements) { + if (!msp.hasCompareInputFor(element)) { allElementsHaveCompareInput = false; break; } @@ -124,8 +124,8 @@ public class OpenWithActionGroup extends ActionGroup { } boolean allFiles = true; - for (int i = 0; i < resources.length; i++) { - if (resources[i].getType() != IResource.FILE) { + for (IResource resource : resources) { + if (resource.getType() != IResource.FILE) { // Open actions are only supported if all the items are files. allFiles = false; break; @@ -138,8 +138,8 @@ public class OpenWithActionGroup extends ActionGroup { } } - for (int i = 0; i < resources.length; i++) { - if (!resources[i].exists()) { + for (IResource resource : resources) { + if (!resource.exists()) { // Only support non-compare actions if all resources exist. return; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/PasteAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/PasteAction.java index 513b361ca..fc556c1a1 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/PasteAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/PasteAction.java @@ -151,9 +151,10 @@ public class PasteAction extends SelectionListenerAction { private static boolean isAvailable(Transfer transfer, TransferData[] availableDataTypes) { - for (int i = 0; i < availableDataTypes.length; i++) { - if (transfer.isSupportedType(availableDataTypes[i])) + for (TransferData availableDataType : availableDataTypes) { + if (transfer.isSupportedType(availableDataType)) { return true; + } } return false; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveSynchronizeParticipantAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveSynchronizeParticipantAction.java index cd7c571b0..1fff5e791 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveSynchronizeParticipantAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveSynchronizeParticipantAction.java @@ -108,8 +108,7 @@ public class RemoveSynchronizeParticipantAction extends Action { ISynchronizeManager manager = TeamUI.getSynchronizeManager(); ISynchronizeParticipantReference[] refs = manager.getSynchronizeParticipants(); ArrayList<ISynchronizeParticipant> removals = new ArrayList<>(); - for (int i = 0; i < refs.length; i++) { - ISynchronizeParticipantReference reference = refs[i]; + for (ISynchronizeParticipantReference reference : refs) { ISynchronizeParticipant p; try { p = reference.getParticipant(); @@ -211,8 +210,7 @@ public class RemoveSynchronizeParticipantAction extends Action { private List<Saveable> getDirtyModels(ISynchronizeParticipant[] participants) { List<Saveable> result = new ArrayList<>(); - for (int i = 0; i < participants.length; i++) { - ISynchronizeParticipant participant = participants[i]; + for (ISynchronizeParticipant participant : participants) { if (participant instanceof ModelSynchronizeParticipant) { ModelSynchronizeParticipant msp = (ModelSynchronizeParticipant) participant; Saveable s = msp.getActiveSaveable(); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizePageDropDownAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizePageDropDownAction.java index dea81fdc5..1fea90603 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizePageDropDownAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizePageDropDownAction.java @@ -99,8 +99,7 @@ public class SynchronizePageDropDownAction extends Action implements IMenuCreato protected void addParticipantsToMenu(ISynchronizeParticipantReference[] refs) { ISynchronizeParticipant current = fView.getParticipant(); - for (int i = 0; i < refs.length; i++) { - ISynchronizeParticipantReference page = refs[i]; + for (ISynchronizeParticipantReference page : refs) { Action action = new ShowSynchronizeParticipantAction(fView, page); try { boolean isCurrent = page.getParticipant().equals(current); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelSynchronizeParticipant.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelSynchronizeParticipant.java index e4a1968cb..862d2e375 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelSynchronizeParticipant.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelSynchronizeParticipant.java @@ -124,8 +124,7 @@ public class ApplyPatchModelSynchronizeParticipant extends public ModelProvider[] getEnabledModelProviders() { ModelProvider[] enabledProviders = super.getEnabledModelProviders(); // add Patch model provider if it's not there - for (int i = 0; i < enabledProviders.length; i++) { - ModelProvider provider = enabledProviders[i]; + for (ModelProvider provider : enabledProviders) { if (provider.getId().equals(PatchModelProvider.ID)) return enabledProviders; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriber.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriber.java index 4fe421e5d..93c523fac 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriber.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriber.java @@ -58,9 +58,10 @@ public class ApplyPatchSubscriber extends Subscriber { if (getRemote() != null) { FilePatch2 filePatch2 = ((PatchedFileVariant)getRemote()).getDiff(); IHunk[] hunks = filePatch2.getHunks(); - for (int i = 0; i < hunks.length; i++) { - if (patcher.isManuallyMerged((Hunk) hunks[i])) + for (IHunk hunk : hunks) { + if (patcher.isManuallyMerged((Hunk) hunk)) { return IN_SYNC; + } } } else { // deletions don't have the remote variant, but still can be manually merged @@ -68,9 +69,10 @@ public class ApplyPatchSubscriber extends Subscriber { if (patchObject instanceof FilePatch2) { FilePatch2 filePatch2 = (FilePatch2) patchObject; IHunk[] hunks = filePatch2.getHunks(); - for (int i = 0; i < hunks.length; i++) { - if (patcher.isManuallyMerged((Hunk) hunks[i])) + for (IHunk hunk : hunks) { + if (patcher.isManuallyMerged((Hunk) hunk)) { return IN_SYNC; + } } } } @@ -147,8 +149,8 @@ public class ApplyPatchSubscriber extends Subscriber { // patch members, subscriber location FilePatch2[] diffs = getPatcher().getDiffs(); - for (int i = 0; i < diffs.length; i++) { - IResource file = PatchModelProvider.getFile(diffs[i], getPatcher()); + for (FilePatch2 diff : diffs) { + IResource file = PatchModelProvider.getFile(diff, getPatcher()); if (container.getFullPath().isPrefixOf(file.getFullPath())) { // XXX: check segments if (!container.exists(file.getProjectRelativePath())) { @@ -166,9 +168,8 @@ public class ApplyPatchSubscriber extends Subscriber { public void refresh(IResource[] resources, int depth, IProgressMonitor monitor) throws TeamException { Set<FilePatch2> diffs = new HashSet<>(); - for (int i = 0; i < resources.length; i++) { - Object object = PatchModelProvider.getPatchObject(resources[i], - getPatcher()); + for (IResource resource : resources) { + Object object = PatchModelProvider.getPatchObject(resource, getPatcher()); if (object instanceof FilePatch2) { FilePatch2 filePatch = (FilePatch2) object; diffs.add(filePatch); @@ -182,9 +183,9 @@ public class ApplyPatchSubscriber extends Subscriber { Set<IResource> roots = new HashSet<>(); if (getPatcher().isWorkspacePatch()) { IDiffElement[] children = PatchModelProvider.getPatchWorkspace(this).getChildren(); - for (int i = 0; i < children.length; i++) { + for (IDiffElement child : children) { // return array of projects from the patch - DiffProject diffProject = ((PatchProjectDiffNode)children[i]).getDiffProject(); + DiffProject diffProject = ((PatchProjectDiffNode) child).getDiffProject(); IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(diffProject.getName()); if (project.isAccessible()) roots.add(project); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriberMergeContext.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriberMergeContext.java index f09ca4d79..bd1181f46 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriberMergeContext.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriberMergeContext.java @@ -56,14 +56,15 @@ public class ApplyPatchSubscriberMergeContext extends SubscriberMergeContext { Object object = PatchModelProvider.getPatchObject(resource, patcher); if (object instanceof FilePatch2) { HunkResult[] hunkResults = patcher.getDiffResult((FilePatch2) object).getHunkResults(); - for (int i = 0; i < hunkResults.length; i++) { + for (HunkResult hunkResult : hunkResults) { if (inSyncHint) { // clean Merge > disable hunks that have merged - if (hunkResults[i].isOK()) - patcher.setEnabled(hunkResults[i].getHunk(), false); + if (hunkResult.isOK()) { + patcher.setEnabled(hunkResult.getHunk(), false); + } } else { // Mark as Merged > mark *all* hunks from the file as manually merged - patcher.setManuallyMerged(hunkResults[i].getHunk(), true); + patcher.setManuallyMerged(hunkResult.getHunk(), true); } } } else { @@ -88,12 +89,12 @@ public class ApplyPatchSubscriberMergeContext extends SubscriberMergeContext { Object object = PatchModelProvider.getPatchObject(resource, patcher); if (object instanceof FilePatch2) { HunkResult[] hunkResults = patcher.getDiffResult((FilePatch2) object).getHunkResults(); - for (int i = 0; i < hunkResults.length; i++) { + for (HunkResult hunkResult : hunkResults) { // ... unmark them and exclude those properly merged - if (patcher.isManuallyMerged(hunkResults[i].getHunk())) { - patcher.setManuallyMerged(hunkResults[i].getHunk(), false); - if (hunkResults[i].isOK()) { - patcher.setEnabled(hunkResults[i].getHunk(), false); + if (patcher.isManuallyMerged(hunkResult.getHunk())) { + patcher.setManuallyMerged(hunkResult.getHunk(), false); + if (hunkResult.isOK()) { + patcher.setEnabled(hunkResult.getHunk(), false); } } } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationActionProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationActionProvider.java index 662c39263..6a3488197 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationActionProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationActionProvider.java @@ -39,8 +39,8 @@ public class ApplyPatchSynchronizationActionProvider extends super.updateEnablement(selection); // disable merge for hunks Object[] elements = getOperation().getElements(); - for (int i = 0; i < elements.length; i++) { - if (elements[i] instanceof HunkDiffNode) { + for (Object element : elements) { + if (element instanceof HunkDiffNode) { setEnabled(false); return; } @@ -54,8 +54,8 @@ public class ApplyPatchSynchronizationActionProvider extends super.updateEnablement(selection); // disable mark as merged for hunks Object[] elements = getOperation().getElements(); - for (int i = 0; i < elements.length; i++) { - if (elements[i] instanceof HunkDiffNode) { + for (Object element : elements) { + if (element instanceof HunkDiffNode) { setEnabled(false); return; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationWizard.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationWizard.java index c9e04734d..e142f601f 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationWizard.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationWizard.java @@ -132,9 +132,8 @@ public class ApplyPatchSynchronizationWizard extends PatchWizard implements private boolean isTargetingInaccessibleProjects() { DiffProject[] diffProjects = getPatcher().getDiffProjects(); if (diffProjects != null) { - for (int i = 0; i < diffProjects.length; i++) { - IProject project = ResourcesPlugin.getWorkspace().getRoot() - .getProject(diffProjects[i].getName()); + for (DiffProject diffProject : diffProjects) { + IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(diffProject.getName()); if (!project.isAccessible()) return true; } @@ -175,8 +174,7 @@ public class ApplyPatchSynchronizationWizard extends PatchWizard implements IStatus.ERROR, TeamUIMessages.PatchInaccessibleProjectsPage_openingProjects, null); - for (int i = 0; i < projects.length; i++) { - IProject project = projects[i]; + for (IProject project : projects) { try { project.open(SubMonitor.convert(monitor, 1)); } catch (CoreException e) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/DiffProjectResourceMapping.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/DiffProjectResourceMapping.java index ef6b8e8d2..49fbcc858 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/DiffProjectResourceMapping.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/DiffProjectResourceMapping.java @@ -72,10 +72,10 @@ public class DiffProjectResourceMapping extends ResourceMapping { FileDiffResult filePatch = (FileDiffResult) mapping .getModelObject(); FilePatch2[] filePatches = object.getFileDiffs(); - for (int i = 0; i < filePatches.length; i++) { - if (filePatches[i].getPath(false).equals( - filePatch.getTargetPath())) + for (FilePatch2 filePatche : filePatches) { + if (filePatche.getPath(false).equals(filePatch.getTargetPath())) { return true; + } } } else if (mapping instanceof HunkResourceMapping) { HunkResult hunk = (HunkResult) mapping.getModelObject(); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchModelProvider.java index 3c075bc30..b35970891 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchModelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchModelProvider.java @@ -88,16 +88,17 @@ public class PatchModelProvider extends ModelProvider { if (resource.getType() == IResource.PROJECT) { if (patcher.isWorkspacePatch()) { DiffProject[] diffProjects = patcher.getDiffProjects(); - for (int i = 0; i < diffProjects.length; i++) { - if (diffProjects[i].getName().equals(resource.getName())) - return diffProjects[i]; + for (DiffProject diffProject : diffProjects) { + if (diffProject.getName().equals(resource.getName())) { + return diffProject; + } } } } else if (resource.getType() == IResource.FILE) { FilePatch2[] diffs = patcher.getDiffs(); - for (int i = 0; i < diffs.length; i++) { - if (resource.equals(getFile(diffs[i], patcher))) { - return diffs[i]; + for (FilePatch2 diff : diffs) { + if (resource.equals(getFile(diff, patcher))) { + return diff; } } } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchSyncContentProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchSyncContentProvider.java index 15650e607..910445115 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchSyncContentProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchSyncContentProvider.java @@ -117,9 +117,9 @@ public class PatchSyncContentProvider extends SynchronizationContentProvider { public Object[] getChildren(Object parent) { Object[] children = super.getChildren(parent); List result = new ArrayList(); - for (int i = 0; i < children.length; i++) { - if (children[i] instanceof PatchDiffNode) { - PatchDiffNode node = (PatchDiffNode) children[i]; + for (Object c : children) { + if (c instanceof PatchDiffNode) { + PatchDiffNode node = (PatchDiffNode) c; if (node.isEnabled()) result.add(node); // hide disabled nodes } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchWorkspace.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchWorkspace.java index 6c770a103..0ac93d379 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchWorkspace.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchWorkspace.java @@ -85,8 +85,8 @@ public class PatchWorkspace extends DiffNode implements IAdaptable { // see org.eclipse.compare.internal.patch.PatchCompareEditorInput.processDiffs(FilePatch2[]) private IDiffElement[] processDiffs(FilePatch2[] diffs) { List<IDiffElement> result = new ArrayList<>(); - for (int i = 0; i < diffs.length; i++) { - result.addAll(processDiff(diffs[i], this)); + for (FilePatch2 diff : diffs) { + result.addAll(processDiff(diff, this)); } return result.toArray(new IDiffElement[result.size()]); } @@ -94,12 +94,11 @@ public class PatchWorkspace extends DiffNode implements IAdaptable { // see org.eclipse.compare.internal.patch.PatchCompareEditorInput.processProjects(DiffProject[]) private IDiffElement[] processProjects(DiffProject[] diffProjects) { List<IDiffElement> result = new ArrayList<>(); - for (int i = 0; i < diffProjects.length; i++) { - PatchProjectDiffNode projectNode = new PatchProjectDiffNode(this, diffProjects[i], getPatcher().getConfiguration()); + for (DiffProject diffProject : diffProjects) { + PatchProjectDiffNode projectNode = new PatchProjectDiffNode(this, diffProject, getPatcher().getConfiguration()); result.add(projectNode); - FilePatch2[] diffs = diffProjects[i].getFileDiffs(); - for (int j = 0; j < diffs.length; j++) { - FilePatch2 fileDiff = diffs[j]; + FilePatch2[] diffs = diffProject.getFileDiffs(); + for (FilePatch2 fileDiff : diffs) { processDiff(fileDiff, projectNode); } } @@ -113,8 +112,7 @@ public class PatchWorkspace extends DiffNode implements IAdaptable { PatchFileDiffNode node = new PatchFileDiffNode(diffResult, parent, PatchFileDiffNode.getKind(diffResult), PatchFileDiffNode.getAncestorElement(diffResult), getLeftElement(diffResult), PatchFileDiffNode.getRightElement(diffResult)); result.add(node); HunkResult[] hunkResults = diffResult.getHunkResults(); - for (int i = 0; i < hunkResults.length; i++) { - HunkResult hunkResult = hunkResults[i]; + for (HunkResult hunkResult : hunkResults) { new HunkDiffNode(hunkResult, node, Differencer.CHANGE, HunkDiffNode.getAncestorElement(hunkResult, false), getLeftElement(hunkResult), HunkDiffNode.getRightElement(hunkResult, false)); // result.add(hunkDiffNode); } |