Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ResourceMappingMerger.java')
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ResourceMappingMerger.java12
1 files changed, 4 insertions, 8 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ResourceMappingMerger.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ResourceMappingMerger.java
index b3c994661..702087800 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ResourceMappingMerger.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/ResourceMappingMerger.java
@@ -71,11 +71,9 @@ public abstract class ResourceMappingMerger implements IResourceMappingMerger {
public ISchedulingRule getMergeRule(IMergeContext context) {
ResourceMapping[] mappings = context.getScope().getMappings(getModelProvider().getId());
ISchedulingRule rule = null;
- for (int i = 0; i < mappings.length; i++) {
- ResourceMapping mapping = mappings[i];
+ for (ResourceMapping mapping : mappings) {
IProject[] mappingProjects = mapping.getProjects();
- for (int j = 0; j < mappingProjects.length; j++) {
- IProject project = mappingProjects[j];
+ for (IProject project : mappingProjects) {
if (rule == null) {
rule = project;
} else {
@@ -105,12 +103,10 @@ public abstract class ResourceMappingMerger implements IResourceMappingMerger {
private IDiff[] getSetToMerge(IMergeContext mergeContext) {
ResourceMapping[] mappings = mergeContext.getScope().getMappings(getModelProvider().getDescriptor().getId());
Set<IDiff> result = new HashSet<>();
- for (int i = 0; i < mappings.length; i++) {
- ResourceMapping mapping = mappings[i];
+ for (ResourceMapping mapping : mappings) {
ResourceTraversal[] traversals = mergeContext.getScope().getTraversals(mapping);
IDiff[] deltas = mergeContext.getDiffTree().getDiffs(traversals);
- for (int j = 0; j < deltas.length; j++) {
- IDiff delta = deltas[j];
+ for (IDiff delta : deltas) {
result.add(delta);
}
}

Back to the top