diff options
author | Michael Valenta | 2003-07-08 20:06:34 +0000 |
---|---|---|
committer | Michael Valenta | 2003-07-08 20:06:34 +0000 |
commit | b8bbddff68750c18c337c26edb9f25376a52720b (patch) | |
tree | ed323f04ea15eebaecb78137563fb29738e3b8d4 | |
parent | f4214c9371dd40efb602bf090099638067033fc7 (diff) | |
download | eclipse.platform.team-b8bbddff68750c18c337c26edb9f25376a52720b.tar.gz eclipse.platform.team-b8bbddff68750c18c337c26edb9f25376a52720b.tar.xz eclipse.platform.team-b8bbddff68750c18c337c26edb9f25376a52720b.zip |
39773: [Live sync view] confused by two resources with the same name
-rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/compare/SyncInfoCompareInput.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/compare/SyncInfoCompareInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/compare/SyncInfoCompareInput.java index 50eafc814..a846f7d17 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/compare/SyncInfoCompareInput.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/compare/SyncInfoCompareInput.java @@ -161,13 +161,17 @@ public class SyncInfoCompareInput extends CompareEditorInput { public boolean equals(Object other) { if(other == this) return true; if(other instanceof SyncInfoCompareInput) { - return node.equals(((SyncInfoCompareInput)other).getCompareResult()); + return equals(node, (SyncInfoDiffNode)((SyncInfoCompareInput)other).getCompareResult()); } else if(other instanceof SyncInfoCompareInputFinder) { return true; } return false; } + private boolean equals(SyncInfoDiffNode node1, SyncInfoDiffNode node2) { + return ((LocalResourceTypedElement)node1.getLeft()).getResource().equals(((LocalResourceTypedElement)node2.getLeft()).getResource()); + } + /* (non-Javadoc) * @see CompareEditorInput#saveChanges(org.eclipse.core.runtime.IProgressMonitor) */ |