+

[gpl/argeo-slc.git] / plugins / org.argeo.slc.client.ui / src / main / java / org / argeo / slc / client / ui / views / JcrResultTreeView.java

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