X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.interop.update%2Fsrc%2Forg%2Fsimantics%2Finterop%2Fupdate%2Fmodel%2FUpdateNode.java;h=54d6b2ce670bc3f28d4e3fa75e73dc1adaf34522;hb=961c51d828eace5c9ab9db9499f0af9a78f16192;hp=da78b9016638aceb359281f304cdcf2a8844c0ee;hpb=2a37041c6da8864656e7217dbcc3d6dae8cd65be;p=simantics%2Finterop.git

diff --git a/org.simantics.interop.update/src/org/simantics/interop/update/model/UpdateNode.java b/org.simantics.interop.update/src/org/simantics/interop/update/model/UpdateNode.java
index da78b90..54d6b2c 100644
--- a/org.simantics.interop.update/src/org/simantics/interop/update/model/UpdateNode.java
+++ b/org.simantics.interop.update/src/org/simantics/interop/update/model/UpdateNode.java
@@ -8,19 +8,16 @@ import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.common.utils.NameUtils;
 import org.simantics.db.exception.DatabaseException;
-import org.simantics.db.exception.NoSingleResultException;
-import org.simantics.db.exception.ServiceException;
-import org.simantics.db.exception.ValidationException;
 import org.simantics.layer0.Layer0;
 
 public class UpdateNode {
 
-	public enum Status {EXIST,DELETED,NEW,CONTAINS};
-	
-
-	private Status status;
+    private UpdateNode parent;
+	private UpdateStatus status;
 	private UpdateOp op;
 	private Resource r;
+	private String label;
+	private boolean visible = true;
 	
 	
 	private Collection<UpdateNode> children = new ArrayList<UpdateNode>();
@@ -30,18 +27,24 @@ public class UpdateNode {
 	 * @param status
 	 * @param changes
 	 */
-	public UpdateNode(Status status, UpdateOp op) {
+	public UpdateNode(ReadGraph g, UpdateStatus status, UpdateOp op) throws DatabaseException{
 
 		this.status = status;
 		this.op = op;
 		this.r = op.getResource();
+		init(g);
 	}
 	
-	public UpdateNode(Status status, Resource r) {
+	public UpdateNode(ReadGraph g, UpdateStatus status, Resource r) throws DatabaseException {
 
 		this.status = status;
 		this.op = null;
 		this.r = r;
+		init(g);
+	}
+	
+	protected void init(ReadGraph g) throws DatabaseException {
+		this.label = getLabel(g, r);
 	}
 	
 	public Resource getResource() {
@@ -49,15 +52,20 @@ public class UpdateNode {
 	}
 	
 	public Resource getParentResource(ReadGraph g) throws DatabaseException {
+		if (op != null) {
+			Resource parent = op.getParentResource(g);
+			if (parent != null)
+				return parent;
+		}
 		Layer0 l0 = Layer0.getInstance(g);
 		return g.getPossibleObject(r, l0.PartOf);
 	}
 	
-	public void setStatus(Status status) {
+	public void setStatus(UpdateStatus status) {
 		this.status = status;
 	}
 	
-	public Status getStatus() {
+	public UpdateStatus getStatus() {
 		return status;
 	}
 	
@@ -67,17 +75,29 @@ public class UpdateNode {
 	
 	public void addChild(UpdateNode node) {
 		children.add(node);
+		node.parent = this;
+		if (op != null && node.op != null) {
+			if (!op.getSubOps().contains(node.op)) {
+				op.addSubOp(node.op);
+				node.op.addParentOp(op);
+			}
+		}
 	}
 
 	public ImageDescriptor getImage(ReadGraph graph) throws DatabaseException {
 		return null;
 	}
 
-	public String getLabel(ReadGraph graph) throws DatabaseException {
-		return getLabel(graph,r);
+	public String getLabel() {
+		return label;
 	}
 	
-	protected String getLabel(ReadGraph graph, Resource r) throws ValidationException, ServiceException, NoSingleResultException {
+	@Override
+	public String toString() {
+		return label;
+	}
+	
+	protected String getLabel(ReadGraph graph, Resource r) throws DatabaseException {
 		String label = NameUtils.getSafeLabel(graph, r);
 		if (label.length() == 0)
 			label = NameUtils.getSafeName(graph, r);
@@ -89,5 +109,30 @@ public class UpdateNode {
 	public UpdateOp getOp() {
 		return op;
 	}
+	
+	public boolean isVisible() {
+		return visible;
+	}
+	
+	public void setVisible(boolean visible) {
+		this.visible = visible;
+		if (op != null)
+			op.visible = visible;
+		if (visible) {
+		    if (parent != null && !parent.visible)
+		        parent.setVisible(true);
+		} else {
+		    for (UpdateNode n : children)
+		        n.setVisible(false);
+		}
+	}
+	
+	public void setAllVisible(boolean visible) {
+        this.visible = visible;
+        if (op != null)
+            op.visible = visible;
+        for (UpdateNode n : children)
+             n.setAllVisible(visible);
+    }
 
 }