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=f68f887dca33c98e925862c203dab27926ae5480;hb=refs%2Fchanges%2F00%2F4900%2F1;hp=3a7953174bd3ffb6b080af45cbe8f039ed5ced72;hpb=ed79a91bdd86658d28be3d50322a0d4d8cff98dc;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 3a79531..f68f887 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
@@ -1,7 +1,9 @@
 package org.simantics.interop.update.model;
 
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.simantics.db.ReadGraph;
@@ -12,6 +14,7 @@ import org.simantics.layer0.Layer0;
 
 public class UpdateNode {
 
+    private UpdateNode parent;
 	private UpdateStatus status;
 	private UpdateOp op;
 	private Resource r;
@@ -19,7 +22,7 @@ public class UpdateNode {
 	private boolean visible = true;
 	
 	
-	private Collection<UpdateNode> children = new ArrayList<UpdateNode>();
+	private List<UpdateNode> children;
 	/**
 	 * 
 	 * @param resource old Resource if status is DELETED or EXISTS.
@@ -51,6 +54,11 @@ 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);
 	}
@@ -63,12 +71,18 @@ public class UpdateNode {
 		return status;
 	}
 	
-	public Collection<UpdateNode> getChildren() {
+	@SuppressWarnings("unchecked")
+	public List<UpdateNode> getChildren() {
+		if (children == null)
+			return Collections.EMPTY_LIST;
 		return children;
 	}
 	
 	public void addChild(UpdateNode node) {
+		if (children == null)
+			children = new ArrayList<UpdateNode>(2);
 		children.add(node);
+		node.parent = this;
 		if (op != null && node.op != null) {
 			if (!op.getSubOps().contains(node.op)) {
 				op.addSubOp(node.op);
@@ -76,6 +90,17 @@ public class UpdateNode {
 			}
 		}
 	}
+	
+	public void sort() {
+		if (children == null)
+			return;
+		Collections.sort(this.children, new Comparator<UpdateNode>() {
+			@Override
+			public int compare(UpdateNode o1, UpdateNode o2) {
+				return o1.getLabel().compareTo(o2.getLabel());
+			}
+		});
+	}
 
 	public ImageDescriptor getImage(ReadGraph graph) throws DatabaseException {
 		return null;
@@ -111,6 +136,23 @@ public class UpdateNode {
 		this.visible = visible;
 		if (op != null)
 			op.visible = visible;
+		if (visible) {
+		    if (parent != null && !parent.visible)
+		        parent.setVisible(true);
+		} else {
+			if (children != null)
+				for (UpdateNode n : children)
+					n.setVisible(false);
+		}
+	}
+	
+	public void setAllVisible(boolean visible) {
+		this.visible = visible;
+		if (op != null)
+			op.visible = visible;
+		if (children != null)
+			for (UpdateNode n : children)
+				n.setAllVisible(visible);
 	}
 
 }