From: Marko Luukkainen <marko.luukkainen@semantum.fi>
Date: Mon, 13 Jan 2020 09:22:50 +0000 (+0200)
Subject: Improve PropertyChange.equals for asserted properties.
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F74%2F3774%2F1;p=simantics%2Finterop.git

Improve PropertyChange.equals for asserted properties.

gitlab #10

Change-Id: I5ab2954f2cbcb0eb1b2a1bb116c0611ad7457298
---

diff --git a/org.simantics.interop.update/src/org/simantics/interop/update/model/PropertyChange.java b/org.simantics.interop.update/src/org/simantics/interop/update/model/PropertyChange.java
index 5220736..de28055 100644
--- a/org.simantics.interop.update/src/org/simantics/interop/update/model/PropertyChange.java
+++ b/org.simantics.interop.update/src/org/simantics/interop/update/model/PropertyChange.java
@@ -81,7 +81,15 @@ public class PropertyChange {
 		if (obj.getClass() != this.getClass())
 			return false;
 		PropertyChange c = (PropertyChange)obj;
-		return pair.equals(c.pair);
+		if (!leftSubject.equals(c.leftSubject))
+			return false;
+		if (!rightSubject.equals(c.rightSubject))
+			return false;
+		if (pair.first != null && pair.first.equals(c.pair.first))
+			return true;
+		if (pair.second != null && pair.second.equals(c.pair.second))
+			return true;
+		return false;
 	}
 	
 	public void apply(WriteGraph graph) throws DatabaseException {