X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=base%2Fruntime%2Forg.argeo.eclipse.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Feclipse%2Fui%2FTreeParent.java;h=2dfd2e60c486e35a3b537cc6abea2ab928b6fa3c;hb=3a3d316af102ba410d1d9e6de349d0c8f7ac044f;hp=26bdbe615135a0bd9a6b0a76ad6280623c07de84;hpb=07b21659cba964ffdc81403718d0962c2d09175d;p=lgpl%2Fargeo-commons.git

diff --git a/base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/TreeParent.java b/base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/TreeParent.java
index 26bdbe615..2dfd2e60c 100644
--- a/base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/TreeParent.java
+++ b/base/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/TreeParent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2012 Mathieu Baudier
+ * Copyright (C) 2007-2012 Argeo GmbH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,12 @@ public class TreeParent {
 
 	private List<Object> children;
 
+	/**
+	 * Unique id within the context of a tree display. If set, equals() and
+	 * hashCode() methods will be based on it
+	 */
+	private String path = null;
+
 	/** False until at least one child has been added, then true until cleared */
 	private boolean loaded = false;
 
@@ -105,6 +111,10 @@ public class TreeParent {
 
 	public void setParent(TreeParent parent) {
 		this.parent = parent;
+		if (parent != null && parent.path != null)
+			this.path = parent.path + '/' + name;
+		else
+			this.path = '/' + name;
 	}
 
 	public TreeParent getParent() {
@@ -121,12 +131,18 @@ public class TreeParent {
 
 	@Override
 	public int hashCode() {
-		return name.hashCode();
+		if (path != null)
+			return path.hashCode();
+		else
+			return name.hashCode();
 	}
 
 	@Override
 	public boolean equals(Object obj) {
-		return name.equals(obj.toString());
+		if (path != null && obj instanceof TreeParent)
+			return path.equals(((TreeParent) obj).path);
+		else
+			return name.equals(obj.toString());
 	}
 
 }