From: Patrick Tasse <patrick.tasse@gmail.com>
Date: Thu, 28 Apr 2016 17:47:27 +0000 (-0400)
Subject: tmf: Fix TmfProjectModelElement.equals()
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=e9dd77b521a76a2e9d674352d5b89cdfdb2c0755;p=deliverable%2Ftracecompass.git

tmf: Fix TmfProjectModelElement.equals()

Elements of different types but with equal path should not be considered
equal. This avoids clashes between trace names and 'virtual' resource
name used by some elements, such as module id for an analysis element.

Change-Id: Id2238a9e8fe4ba9b8daede86b3a2b54d0de3b815
Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-on: https://git.eclipse.org/r/71628
Reviewed-by: Hudson CI
Reviewed-by: Alexandre Montplaisir <alexmonthy@efficios.com>
---

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfProjectModelElement.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfProjectModelElement.java
index 62a42ccae3..b87817159e 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfProjectModelElement.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfProjectModelElement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 Ericsson
+ * Copyright (c) 2010, 2016 Ericsson
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v1.0 which
@@ -186,7 +186,7 @@ public abstract class TmfProjectModelElement implements ITmfProjectModelElement
         if (other == null) {
             return false;
         }
-        if (!(other instanceof TmfProjectModelElement)) {
+        if (!(other.getClass().equals(this.getClass()))) {
             return false;
         }
         TmfProjectModelElement element = (TmfProjectModelElement) other;