package org.argeo.slc.client.ui.views;\r
\r
import java.util.ArrayList;\r
+import java.util.Calendar;\r
import java.util.List;\r
\r
import javax.jcr.Node;\r
import javax.jcr.RepositoryException;\r
import javax.jcr.Session;\r
import javax.jcr.Value;\r
+import javax.jcr.nodetype.NodeType;\r
import javax.jcr.observation.Event;\r
import javax.jcr.observation.EventListener;\r
import javax.jcr.observation.ObservationManager;\r
import org.argeo.slc.SlcException;\r
import org.argeo.slc.client.ui.ClientUiPlugin;\r
import org.argeo.slc.client.ui.commands.AddResultFolder;\r
+import org.argeo.slc.client.ui.model.ParentNodeFolder;\r
import org.argeo.slc.client.ui.model.ResultFolder;\r
import org.argeo.slc.client.ui.model.ResultParent;\r
-import org.argeo.slc.client.ui.model.SimpleNodeFolder;\r
+import org.argeo.slc.client.ui.model.ResultParentUtils;\r
import org.argeo.slc.client.ui.model.SingleResultNode;\r
+import org.argeo.slc.client.ui.model.VirtualFolder;\r
import org.argeo.slc.client.ui.providers.ResultTreeContentProvider;\r
import org.argeo.slc.client.ui.providers.ResultTreeLabelProvider;\r
import org.argeo.slc.jcr.SlcJcrResultUtils;\r
\r
private EventListener resultsObserver = null;\r
\r
- private final static String[] observedNodeTypes = { SlcTypes.SLC_TEST_RESULT };\r
+ private final static String[] observedNodeTypes = {\r
+ SlcTypes.SLC_TEST_RESULT, SlcTypes.SLC_RESULT_FOLDER,\r
+ NodeType.NT_UNSTRUCTURED };\r
+\r
+ // FIXME cache to ease refresh after D&D\r
+ private ResultParent lastSelectedElement;\r
+ private ResultParent lastSelectedElementParent;\r
\r
/**\r
* To be overridden to adapt size of form and result frames.\r
\r
// Refresh the view to initialize it\r
refresh(null);\r
-\r
- try {\r
- ObservationManager observationManager = session.getWorkspace()\r
- .getObservationManager();\r
- // FIXME Will not be notified if empty result is deleted\r
- if (UserJcrUtils.getUserHome(session) != null) {\r
- resultsObserver = new ResultObserver(resultTreeViewer.getTree()\r
- .getDisplay());\r
- observationManager.addEventListener(resultsObserver,\r
- Event.PROPERTY_ADDED | Event.NODE_REMOVED, UserJcrUtils\r
- .getUserHome(session).getPath(), true, null,\r
- observedNodeTypes, false);\r
- }\r
- } catch (RepositoryException e) {\r
- throw new SlcException("Cannot register listeners", e);\r
- }\r
-\r
}\r
\r
// The main tree viewer\r
.getNode());\r
else\r
propertiesViewer.setInput(null);\r
+ lastSelectedElement = (ResultParent) firstItem;\r
+ lastSelectedElementParent = (ResultParent) ((ResultParent) firstItem)\r
+ .getParent();\r
}\r
}\r
});\r
-\r
return viewer;\r
}\r
\r
if (resultParent == null) {\r
resultTreeViewer.setInput(initializeResultTree());\r
if (resultsObserver == null) {\r
- // force initialization of the resultsObserver, only useful\r
- // if the current view has been displayed before a single\r
- // test has been run\r
try {\r
ObservationManager observationManager = session\r
.getWorkspace().getObservationManager();\r
resultsObserver = new ResultObserver(resultTreeViewer\r
.getTree().getDisplay());\r
observationManager.addEventListener(resultsObserver,\r
- Event.PROPERTY_ADDED | Event.NODE_REMOVED, UserJcrUtils\r
+ Event.NODE_ADDED | Event.NODE_REMOVED, UserJcrUtils\r
.getUserHome(session).getPath(), true,\r
null, observedNodeTypes, false);\r
} catch (RepositoryException e) {\r
ResultFolder currFolder = (ResultFolder) resultParent;\r
jcrRefresh(currFolder.getNode());\r
currFolder.forceFullRefresh();\r
+ resultTreeViewer.refresh(lastSelectedElement);\r
}\r
}\r
}\r
\r
private ResultParent[] initializeResultTree() {\r
- ResultParent[] roots = new ResultParent[2];\r
try {\r
- roots[0] = new ResultFolder(null,\r
- SlcJcrResultUtils.getMyResultParentNode(session),\r
- "My results");\r
- Node otherResultsPar = session.getNode(SlcJcrResultUtils\r
- .getSlcResultsBasePath(session));\r
- roots[1] = new SimpleNodeFolder(null, otherResultsPar,\r
- "All results");\r
- return roots;\r
+ if (session.nodeExists(SlcJcrResultUtils\r
+ .getSlcResultsBasePath(session))) {\r
+ ResultParent[] roots = new ResultParent[5];\r
+\r
+ // My results\r
+ roots[0] = new ParentNodeFolder(null,\r
+ SlcJcrResultUtils.getMyResultParentNode(session),\r
+ "My results");\r
+\r
+ // today\r
+ Calendar cal = Calendar.getInstance();\r
+ String relPath = JcrUtils.dateAsPath(cal);\r
+ List<String> datePathes = new ArrayList<String>();\r
+ datePathes.add(relPath);\r
+ roots[1] = new VirtualFolder(null,\r
+ ResultParentUtils.getResultsForDates(session,\r
+ datePathes), "Today");\r
+\r
+ // Yesterday\r
+ cal = Calendar.getInstance();\r
+ cal.add(Calendar.DAY_OF_YEAR, -1);\r
+ relPath = JcrUtils.dateAsPath(cal);\r
+ datePathes = new ArrayList<String>();\r
+ datePathes.add(relPath);\r
+ roots[2] = new VirtualFolder(null,\r
+ ResultParentUtils.getResultsForDates(session,\r
+ datePathes), "Yesterday");\r
+ // Last 7 days\r
+\r
+ cal = Calendar.getInstance();\r
+ datePathes = new ArrayList<String>();\r
+\r
+ for (int i = 0; i < 7; i++) {\r
+ cal.add(Calendar.DAY_OF_YEAR, -i);\r
+ relPath = JcrUtils.dateAsPath(cal);\r
+ datePathes.add(relPath);\r
+ }\r
+ roots[3] = new VirtualFolder(null,\r
+ ResultParentUtils.getResultsForDates(session,\r
+ datePathes), "Last 7 days");\r
+\r
+ // All results\r
+ Node otherResultsPar = session.getNode(SlcJcrResultUtils\r
+ .getSlcResultsBasePath(session));\r
+ roots[4] = new ParentNodeFolder(null, otherResultsPar,\r
+ "All results");\r
+ return roots;\r
+ } else\r
+ // no test has yet been processed, we leave the viewer blank\r
+ return null;\r
} catch (RepositoryException re) {\r
throw new ArgeoException(\r
"Unexpected error while initializing ResultTree.", re);\r
if (selection.size() == 1) {\r
Object obj = selection.getFirstElement();\r
try {\r
- Node targetParentNode = null;\r
- if (obj instanceof ResultFolder) {\r
- targetParentNode = ((ResultFolder) obj).getNode();\r
-\r
- if (targetParentNode.isNodeType(SlcTypes.SLC_RESULT_FOLDER))\r
- isMyResultFolder = true;\r
- }\r
+ if (obj instanceof ResultFolder\r
+ && (((ResultFolder) obj).getNode())\r
+ .isNodeType(SlcTypes.SLC_RESULT_FOLDER))\r
+ isMyResultFolder = true;\r
+ else if (obj instanceof ParentNodeFolder\r
+ && (((ParentNodeFolder) obj).getNode().getPath()\r
+ .startsWith(SlcJcrResultUtils\r
+ .getMyResultsBasePath(session))))\r
+ isMyResultFolder = true;\r
} catch (RepositoryException re) {\r
throw new SlcException(\r
"unexpected error while building condition for context menu",\r
// We can only drop under myResults\r
Node targetParentNode = null;\r
if (target instanceof ResultFolder) {\r
- Node currNode = ((ResultFolder) target).getNode();\r
-\r
- if (currNode.isNodeType(SlcTypes.SLC_RESULT_FOLDER)) {\r
- targetParentNode = currNode;\r
- }\r
+ targetParentNode = ((ResultFolder) target).getNode();\r
+ } else if (target instanceof ParentNodeFolder) {\r
+ if ((((ParentNodeFolder) target).getNode().getPath()\r
+ .startsWith(SlcJcrResultUtils\r
+ .getMyResultsBasePath(session))))\r
+ targetParentNode = ((ParentNodeFolder) target)\r
+ .getNode();\r
} else if (target instanceof SingleResultNode) {\r
Node currNode = ((SingleResultNode) target).getNode();\r
- if (currNode.getParent().isNodeType(\r
- SlcTypes.SLC_RESULT_FOLDER))\r
+ if (currNode\r
+ .getParent()\r
+ .getPath()\r
+ .startsWith(\r
+ SlcJcrResultUtils\r
+ .getMyResultsBasePath(session)))\r
targetParentNode = currNode.getParent();\r
}\r
if (targetParentNode != null) {\r
currParentNode = targetParentNode;\r
validDrop = true;\r
+ // FIXME\r
+ lastSelectedElement = (ResultParent) target;\r
+ lastSelectedElementParent = (ResultParent) ((ResultParent) target)\r
+ .getParent();\r
}\r
} catch (RepositoryException re) {\r
throw new SlcException(\r
Node target = currParentNode.addNode(source.getName(), source\r
.getPrimaryNodeType().getName());\r
JcrUtils.copy(source, target);\r
- updatePassedStatus(target, target.getNode(SlcNames.SLC_STATUS)\r
+ ResultParentUtils.updatePassedStatus(target, target.getNode(SlcNames.SLC_STATUS)\r
.getProperty(SlcNames.SLC_SUCCESS).getBoolean());\r
target.getSession().save();\r
} catch (RepositoryException re) {\r
}\r
return true;\r
}\r
-\r
- /**\r
- * recursively update passed status of the parent ResultFolder and its\r
- * parent if needed\r
- * \r
- * @param node\r
- * cannot be null\r
- * \r
- */\r
- private void updatePassedStatus(Node node, boolean passed) {\r
- try {\r
- Node pNode = node.getParent();\r
- boolean pStatus = pNode.getNode(SlcNames.SLC_STATUS)\r
- .getProperty(SlcNames.SLC_SUCCESS).getBoolean();\r
- if (pStatus == passed)\r
- // nothing to update\r
- return;\r
- else if (!passed) {\r
- // error we only update status of the result folder and its\r
- // parent if needed\r
- pNode.getNode(SlcNames.SLC_STATUS).setProperty(\r
- SlcNames.SLC_SUCCESS, passed);\r
- updatePassedStatus(pNode, passed);\r
- } else {\r
- // success we must first check if all siblings have also\r
- // successfully completed\r
- boolean success = true;\r
- NodeIterator ni = pNode.getNodes();\r
- children: while (ni.hasNext()) {\r
- Node currNode = ni.nextNode();\r
- if ((currNode.isNodeType(SlcTypes.SLC_DIFF_RESULT) || currNode\r
- .isNodeType(SlcTypes.SLC_RESULT_FOLDER))\r
- && !currNode.getNode(SlcNames.SLC_STATUS)\r
- .getProperty(SlcNames.SLC_SUCCESS)\r
- .getBoolean()) {\r
- success = false;\r
- break children;\r
- }\r
- }\r
- if (success) {\r
- pNode.getNode(SlcNames.SLC_STATUS).setProperty(\r
- SlcNames.SLC_SUCCESS, passed);\r
- updatePassedStatus(pNode, passed);\r
- } else\r
- // one of the siblings had also the failed status so\r
- // above tree remains unchanged.\r
- return;\r
- }\r
-\r
- } catch (RepositoryException e) {\r
- throw new SlcException("Cannot register listeners", e);\r
- }\r
- }\r
}\r
\r
class ResultObserver extends AsyncUiEventListener {\r
@Override\r
protected Boolean willProcessInUiThread(List<Event> events)\r
throws RepositoryException {\r
+ // unfiltered for the time being\r
+ return true;\r
+ // for (Event event : events) {\r
+ // getLog().debug("Received event " + event);\r
+ // int eventType = event.getType();\r
+ // if (eventType == Event.NODE_REMOVED)\r
+ // ;//return true;\r
+ // String path = event.getPath();\r
+ // int index = path.lastIndexOf('/');\r
+ // String propertyName = path.substring(index + 1);\r
+ // if (propertyName.equals(SlcNames.SLC_COMPLETED)\r
+ // || propertyName.equals(SlcNames.SLC_UUID)) {\r
+ // ;//return true;\r
+ // }\r
+ // }\r
+ // return false;\r
+ }\r
+\r
+ protected void onEventInUiThread(List<Event> events)\r
+ throws RepositoryException {\r
+\r
for (Event event : events) {\r
- // getLog().debug("Received event " + event);\r
+ getLog().debug("Received event " + event);\r
int eventType = event.getType();\r
- if (eventType == Event.NODE_REMOVED)\r
- return true;\r
- String path = event.getPath();\r
- int index = path.lastIndexOf('/');\r
- String propertyName = path.substring(index + 1);\r
- if (propertyName.equals(SlcNames.SLC_COMPLETED)\r
- || propertyName.equals(SlcNames.SLC_UUID)) {\r
- return true;\r
+ if (eventType == Event.NODE_REMOVED) {\r
+ String path = event.getPath();\r
+ int index = path.lastIndexOf('/');\r
+ String parPath = path.substring(0, index + 1);\r
+ if (session.nodeExists(parPath)) {\r
+ Node currNode = session.getNode(parPath);\r
+ if (currNode.isNodeType(NodeType.NT_UNSTRUCTURED)) {\r
+ refresh(null);\r
+ jcrRefresh(currNode);\r
+ resultTreeViewer.refresh(true);\r
+ resultTreeViewer.expandToLevel(\r
+ lastSelectedElementParent, 1);\r
+ \r
+ }\r
+ }\r
+ } else if (eventType == Event.NODE_ADDED) {\r
+ String path = event.getPath();\r
+ if (session.nodeExists(path)) {\r
+ Node currNode = session.getNode(path);\r
+ if (currNode.isNodeType(SlcTypes.SLC_DIFF_RESULT)\r
+ || currNode\r
+ .isNodeType(SlcTypes.SLC_RESULT_FOLDER)) {\r
+ refresh(null);\r
+ resultTreeViewer.expandToLevel(lastSelectedElement,\r
+ 1);\r
+ }\r
+ }\r
}\r
+ // String path = event.getPath();\r
+ // int index = path.lastIndexOf('/');\r
+ // String propertyName = path.substring(index + 1);\r
+ // if (propertyName.equals(SlcNames.SLC_COMPLETED)\r
+ // || propertyName.equals(SlcNames.SLC_UUID)) {\r
+ // }\r
}\r
- return false;\r
- }\r
\r
- protected void onEventInUiThread(List<Event> events)\r
- throws RepositoryException {\r
// FIXME implement correct behaviour. treeViewer selection is\r
// disposed by the drag & drop.\r
// resultTreeViewer.refresh();\r
// refresh(null);\r
// log.warn("Implement refresh.");\r
}\r
-\r
}\r
\r
class PropertiesContentProvider implements IStructuredContentProvider {\r
projects / gpl / argeo-slc.git / blobdiff