diff options
| author | mzhu | 2011-06-29 05:35:52 +0000 |
|---|---|---|
| committer | mzhu | 2011-06-29 05:35:52 +0000 |
| commit | ab497d9c466e2699312f3c9709f78c479cfbe667 (patch) | |
| tree | 0ed51ec4d2b08679c265da8a2ad30abc4f771672 | |
| parent | c18667e82555fc54a54f6c16c8a5e3542977bb3b (diff) | |
| download | rt.equinox.p2-ab497d9c466e2699312f3c9709f78c479cfbe667.tar.gz rt.equinox.p2-ab497d9c466e2699312f3c9709f78c479cfbe667.tar.xz rt.equinox.p2-ab497d9c466e2699312f3c9709f78c479cfbe667.zip | |
fix 350020
2 files changed, 20 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableIUElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableIUElement.java index 96972fa6a..4cb5b9dcf 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableIUElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableIUElement.java @@ -159,7 +159,16 @@ public class AvailableIUElement extends QueriedElement implements IIUElement { return false; if (iu == null) return false; - return iu.equals(((AvailableIUElement) obj).getIU()); + if (!iu.equals(((AvailableIUElement) obj).getIU())) + return false; + + Object parent = getParent(this); + Object objParent = ((AvailableIUElement) obj).getParent(obj); + if (parent != null && objParent != null) + return parent.equals(objParent); + else if (parent == null && objParent == null) + return true; + return false; } public int hashCode() { diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/InstalledIUElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/InstalledIUElement.java index e251968d6..433d527fb 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/InstalledIUElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/InstalledIUElement.java @@ -111,7 +111,16 @@ public class InstalledIUElement extends QueriedElement implements IIUElement { return false; if (iu == null) return false; - return iu.equals(((InstalledIUElement) obj).getIU()); + if (!iu.equals(((InstalledIUElement) obj).getIU())) + return false; + + Object parent = getParent(this); + Object objParent = ((InstalledIUElement) obj).getParent(obj); + if (parent != null && objParent != null) + return parent.equals(objParent); + else if (parent == null && objParent == null) + return true; + return false; } public int hashCode() { |