| commit | 3b56100a3697a0446716a48284c38dd157aeddf7 | [log] [tgz] |
|---|---|---|
| author | jeremie.tatibouet <jeremie.tatibouet@cea.fr> | Thu Sep 14 16:00:52 2017 +0200 |
| committer | jeremie.tatibouet <jeremie.tatibouet@cea.fr> | Thu Sep 14 16:00:52 2017 +0200 |
| tree | 473c686e10b41ce52adfd4c442f3248a2c8e3890 | |
| parent | 7885476bd489c37119e6c85f9fe54d6213eb202f [diff] |
FUML13-26 Reference::equal should use Object::equals Change-Id: I2f011e932c310eade548a203f1887d358cba2571 Signed-off-by: jeremie.tatibouet <jeremie.tatibouet@cea.fr>
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/Object_.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/Object_.java index 85afc17..6e6142a 100644 --- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/Object_.java +++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/Object_.java
@@ -140,6 +140,13 @@ } return types; } + + @Override + public Boolean equals(IValue otherValue) { + // Test if this object is equal to the otherValue. + // To be equal, the otherValue must be the same object as this object. + return this == otherValue; + } public IObjectActivation getObjectActivation() { return this.objectActivation;
diff --git a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/Reference.java b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/Reference.java index f27cb1a..021ae1b 100644 --- a/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/Reference.java +++ b/bundles/core/engines/org.eclipse.papyrus.moka.fuml/generated/org/eclipse/papyrus/moka/fuml/Semantics/impl/Classes/Kernel/Reference.java
@@ -59,7 +59,11 @@ // referent as this reference. boolean isEqual = false; if (otherValue instanceof Reference) { - isEqual = (((Reference) otherValue).referent == this.referent); + if (this.referent == null) { + isEqual = ((Reference)otherValue).referent == null; + } else { + isEqual = this.referent.equals(((Reference) otherValue).referent); + } } return isEqual; }