From: Marko Luukkainen Date: Tue, 21 Feb 2017 14:51:41 +0000 (+0200) Subject: Still fixing code after git self conflicts X-Git-Tag: v1.31.0~33 X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=ef2657cda7569d14943361a211a537d7d92bce27;p=simantics%2Finterop.git Still fixing code after git self conflicts refs #7045 Change-Id: I2a90f04ad9a7788732caa1f9842b10e875565f14 --- diff --git a/org.simantics.interop.update/src/org/simantics/interop/update/model/UpdateTree.java b/org.simantics.interop.update/src/org/simantics/interop/update/model/UpdateTree.java index b8e53f1..b7a2c4b 100644 --- a/org.simantics.interop.update/src/org/simantics/interop/update/model/UpdateTree.java +++ b/org.simantics.interop.update/src/org/simantics/interop/update/model/UpdateTree.java @@ -70,7 +70,7 @@ public abstract class UpdateTree { return node; } - private boolean connectParent(ReadGraph g, UpdateNode node) throws DatabaseException { + protected boolean connectParent(ReadGraph g, UpdateNode node) throws DatabaseException { UpdateNode parent = null; while (true) { Resource parentResource = node.getParentResource(g);