diff options
| author | Michael Valenta | 2005-12-09 16:56:16 +0000 |
|---|---|---|
| committer | Michael Valenta | 2005-12-09 16:56:16 +0000 |
| commit | 3c90d5972a8bcff9d2c10d3262c4ea47999679e3 (patch) | |
| tree | 4640c37d4c962bbfab7707373585c4a5e5ac5173 /bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DefaultResourceMappingMerger.java | |
| parent | a2d76da07bba1371cb9c1b3c255bc5a7253eb50d (diff) | |
| download | eclipse.platform.team-3c90d5972a8bcff9d2c10d3262c4ea47999679e3.tar.gz eclipse.platform.team-3c90d5972a8bcff9d2c10d3262c4ea47999679e3.tar.xz eclipse.platform.team-3c90d5972a8bcff9d2c10d3262c4ea47999679e3.zip | |
Bug 120052 Create an IResourceDiffTree
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DefaultResourceMappingMerger.java')
| -rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DefaultResourceMappingMerger.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DefaultResourceMappingMerger.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DefaultResourceMappingMerger.java index 08545498e..d6f1fb1fc 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DefaultResourceMappingMerger.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DefaultResourceMappingMerger.java @@ -49,7 +49,7 @@ public class DefaultResourceMappingMerger implements IResourceMappingMerger { for (int i = 0; i < mappings.length; i++) { ResourceMapping mapping = mappings[i]; ResourceTraversal[] traversals = mergeContext.getScope().getTraversals(mapping); - IDiffNode[] deltas = mergeContext.getDiffs(traversals); + IDiffNode[] deltas = mergeContext.getDiffTree().getDiffs(traversals); for (int j = 0; j < deltas.length; j++) { IDiffNode delta = deltas[j]; result.add(delta); |