From: Marko Luukkainen Date: Tue, 14 Jan 2020 12:16:09 +0000 (+0200) Subject: Default dependencies made delete op to apply additions X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F42%2F3742%2F1;p=simantics%2Finterop.git Default dependencies made delete op to apply additions gitlab #16 Change-Id: I5ccf1ffeb5fca0db25c3fde13b6bf85566a749ef (cherry picked from commit 5274548dca947158883acf2565ef41ebfbf49330) --- diff --git a/org.simantics.interop.update/src/org/simantics/interop/update/model/AddDeleteUpdateOp.java b/org.simantics.interop.update/src/org/simantics/interop/update/model/AddDeleteUpdateOp.java index 854ad54..d04c6a9 100644 --- a/org.simantics.interop.update/src/org/simantics/interop/update/model/AddDeleteUpdateOp.java +++ b/org.simantics.interop.update/src/org/simantics/interop/update/model/AddDeleteUpdateOp.java @@ -37,10 +37,10 @@ public abstract class AddDeleteUpdateOp extends UpdateOp { @Override public boolean requiresOp(UpdateOp op) { if (add) { - if (getParentOps().contains(op)) + if (getParentOps().contains(op) && op.isAdd()) return true; } else { - if (getSubOps().contains(op)) + if (getSubOps().contains(op) && op.isDelete()) return true; } return false;