Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2006-01-30 15:57:22 +0000
committerMichael Valenta2006-01-30 15:57:22 +0000
commit8cd1eb9ed6304f01854453e5eafbbb97bb546330 (patch)
tree284af1ebc02fd5c4f5d06acdca6e9b7ef70fab8f /bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationContentProvider.java
parent2613f43a2bc0f867032ee430fd7f3afb418b5a30 (diff)
downloadeclipse.platform.team-8cd1eb9ed6304f01854453e5eafbbb97bb546330.tar.gz
eclipse.platform.team-8cd1eb9ed6304f01854453e5eafbbb97bb546330.tar.xz
eclipse.platform.team-8cd1eb9ed6304f01854453e5eafbbb97bb546330.zip
Renamed IDiffNode to IDiff
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationContentProvider.java')
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationContentProvider.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationContentProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationContentProvider.java
index c7ebc8d4d..08e27212d 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationContentProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationContentProvider.java
@@ -495,11 +495,11 @@ public abstract class SynchronizationContentProvider implements ICommonContentPr
// TODO: need to do this asynchronously
traversals = getTraversals(context, object, null);
}
- IDiffNode[] deltas = context.getDiffTree().getDiffs(traversals);
+ IDiff[] deltas = context.getDiffTree().getDiffs(traversals);
if (deltas.length > 0) {
boolean include = false;
for (int j = 0; j < deltas.length; j++) {
- IDiffNode delta = deltas[j];
+ IDiff delta = deltas[j];
if (delta instanceof IThreeWayDiff) {
IThreeWayDiff twd = (IThreeWayDiff) delta;
if (includeDirection(twd.getDirection())) {

Back to the top