From: Bruno Sinou <bsinou@argeo.org>
Date: Thu, 15 Nov 2012 13:22:50 +0000 (+0000)
Subject: fix a bug on tree observer
X-Git-Tag: argeo-slc-2.1.7~529
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=e9d42272883f73b5b829bcefdb1d355bdcd5fc5e;p=gpl%2Fargeo-slc.git

fix a bug on tree observer

git-svn-id: https://svn.argeo.org/slc/trunk@5831 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

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..a830c9b96 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
@@ -742,42 +742,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 +760,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);
 		}
 	}