X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=plugins%2Forg.argeo.slc.client.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fviews%2FJcrResultTreeView.java;h=152e15c6e89bdf4f40cc44a1664d4a701b2ae0f2;hb=fa3ef281f77b9006aec8825e4a56840d78cff64f;hp=9a9fb696268ac2612f02a26287fbb97b7a5b079b;hpb=78a1f1f21b5785919ffe25ddb9baf12aadff5f37;p=gpl%2Fargeo-slc.git

diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultTreeView.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultTreeView.java
index 9a9fb6962..152e15c6e 100644
--- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultTreeView.java
+++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultTreeView.java
@@ -32,8 +32,6 @@ import javax.jcr.observation.Event;
 import javax.jcr.observation.EventListener;
 import javax.jcr.observation.ObservationManager;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
 import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;
 import org.argeo.eclipse.ui.utils.CommandUtils;
@@ -103,7 +101,8 @@ import org.eclipse.ui.part.ViewPart;
 public class JcrResultTreeView extends ViewPart {
 	public final static String ID = ClientUiPlugin.ID + ".jcrResultTreeView";
 
-	private final static Log log = LogFactory.getLog(JcrResultTreeView.class);
+	// private final static Log log =
+	// LogFactory.getLog(JcrResultTreeView.class);
 
 	/* DEPENDENCY INJECTION */
 	private Session session;
@@ -619,7 +618,9 @@ public class JcrResultTreeView extends ViewPart {
 					if (isResultFolder) {
 						source = ((ParentNodeFolder) lastSelectedSourceElement)
 								.getNode();
-						if (tpNode.getPath().startsWith(source.getPath()))
+						if (tpNode.getPath().startsWith(source.getPath())
+								|| source.getParent().getPath()
+										.equals(tpNode.getPath()))
 							doit = false;
 					} else if (lastSelectedSourceElement instanceof SingleResultNode) {
 						source = ((SingleResultNode) lastSelectedSourceElement)
@@ -742,42 +743,6 @@ public class JcrResultTreeView extends ViewPart {
 			for (Node node : nodesToRefresh)
 				jcrRefresh(node);
 			refresh(null);
-
-			// boolean wasRemoved = false;
-			// boolean wasAdded = false;
-			//
-			// for (Event event : events) {
-			// // if (log.isDebugEnabled())
-			// // log.debug("Received event " + event);
-			// int eventType = event.getType();
-			// if (eventType == Event.NODE_REMOVED) {
-			// String path = event.getPath();
-			// String parPath = JcrUtils.parentPath(path);
-			// if (session.nodeExists(parPath)) {
-			// Node currNode = session.getNode(parPath);
-			// if (currNode.isNodeType(NodeType.NT_UNSTRUCTURED)) {
-			// // jcrRefresh(currNode);
-			// wasRemoved = true;
-			// }
-			// }
-			// } else if (eventType == Event.NODE_ADDED) {
-			// // refresh(lastSelectedTargetElement);
-			// String path = event.getPath();
-			// if (session.nodeExists(path)) {
-			// Node currNode = session.getNode(path);
-			// if (currNode.isNodeType(SlcTypes.SLC_TEST_RESULT)
-			// || currNode
-			// .isNodeType(SlcTypes.SLC_RESULT_FOLDER)) {
-			// // refresh(lastSelectedTargetElement);
-			// wasAdded = true;
-			// // resultTreeViewer.expandToLevel(
-			// // lastSelectedTargetElement, 1);
-			// }
-			// }
-			// }
-			// }
-			// if (wasRemoved || wasAdded)
-			// refresh(lastSelectedSourceElementParent);
 		}
 	}
 
@@ -796,11 +761,8 @@ public class JcrResultTreeView extends ViewPart {
 
 		protected void onEventInUiThread(List<Event> events)
 				throws RepositoryException {
-			for (Event event : events) {
-				if (log.isDebugEnabled())
-					log.debug("Received event " + event);
-			}
-			refresh(lastSelectedSourceElementParent);
+			if (lastSelectedSourceElementParent != null)
+				refresh(lastSelectedSourceElementParent);
 		}
 	}