+/*\r
+ * Copyright (C) 2007-2012 Argeo GmbH\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ * http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
package org.argeo.slc.client.ui.views;\r
\r
-import java.awt.Window;\r
import java.util.ArrayList;\r
import java.util.Calendar;\r
import java.util.List;\r
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
import org.argeo.jcr.JcrUtils;\r
-import org.argeo.jcr.UserJcrUtils;\r
import org.argeo.slc.SlcException;\r
import org.argeo.slc.client.ui.ClientUiPlugin;\r
import org.argeo.slc.client.ui.SlcUiConstants;\r
import org.argeo.slc.client.ui.editors.ProcessEditorInput;\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.ResultItemsComparator;\r
+import org.argeo.slc.client.ui.model.ResultItemsComparer;\r
import org.argeo.slc.client.ui.model.ResultParent;\r
import org.argeo.slc.client.ui.model.ResultParentUtils;\r
import org.argeo.slc.client.ui.model.SingleResultNode;\r
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
private TreeViewer resultTreeViewer;\r
private TableViewer propertiesViewer;\r
\r
- private EventListener resultsObserver = null;\r
+ private EventListener myResultsObserver = null;\r
+ private EventListener allResultsObserver = null;\r
\r
- private final static String[] observedNodeTypes = {\r
+ // under My Results\r
+ private final static String[] observedNodeTypesUnderMyResult = {\r
SlcTypes.SLC_TEST_RESULT, SlcTypes.SLC_RESULT_FOLDER,\r
- NodeType.NT_UNSTRUCTURED };\r
+ SlcTypes.SLC_MY_RESULT_ROOT_FOLDER };\r
+\r
+ private final static String[] observedNodeTypesUnderAllResults = {\r
+ SlcTypes.SLC_TEST_RESULT, NodeType.NT_UNSTRUCTURED };\r
\r
// FIXME cache to ease D&D\r
private boolean isActionUnderMyResult = false;\r
- private ResultParent lastSelectedTargetElement;\r
+ // private ResultParent lastSelectedTargetElement;\r
private ResultParent lastSelectedSourceElement;\r
private ResultParent lastSelectedSourceElementParent;\r
private boolean isResultFolder = false;\r
\r
sashForm.setWeights(getWeights());\r
\r
+ setOrderedInput(resultTreeViewer);\r
+\r
+ // Initialize observer\r
try {\r
ObservationManager observationManager = session.getWorkspace()\r
.getObservationManager();\r
- resultsObserver = new ResultObserver(resultTreeViewer.getTree()\r
- .getDisplay());\r
- observationManager.addEventListener(resultsObserver,\r
- Event.NODE_MOVED | Event.NODE_ADDED | Event.NODE_REMOVED,\r
- UserJcrUtils.getUserHome(session).getPath(), true, null,\r
- observedNodeTypes, false);\r
+ myResultsObserver = new MyResultsObserver(resultTreeViewer\r
+ .getTree().getDisplay());\r
+ allResultsObserver = new AllResultsObserver(resultTreeViewer\r
+ .getTree().getDisplay());\r
+\r
+ // observe tree changes under MyResults\r
+ observationManager.addEventListener(myResultsObserver,\r
+ Event.NODE_ADDED | Event.NODE_REMOVED,\r
+ SlcJcrResultUtils.getMyResultsBasePath(session), true,\r
+ null, observedNodeTypesUnderMyResult, false);\r
+ // observe tree changes under All results\r
+ observationManager.addEventListener(allResultsObserver,\r
+ Event.NODE_ADDED | Event.NODE_REMOVED,\r
+ SlcJcrResultUtils.getSlcResultsBasePath(session), true,\r
+ null, observedNodeTypesUnderAllResults, false);\r
} catch (RepositoryException e) {\r
throw new SlcException("Cannot register listeners", e);\r
}\r
+ }\r
\r
- // Refresh the view to initialize it\r
- refresh(null);\r
+ /**\r
+ * Override default behaviour so that default defined order remains\r
+ * unchanged on first level of the tree\r
+ */\r
+ private void setOrderedInput(TreeViewer viewer) {\r
+ // Add specific ordering\r
+ resultTreeViewer.setInput(null);\r
+ viewer.setComparator(null);\r
+ resultTreeViewer.setInput(initializeResultTree());\r
+ viewer.setComparator(new ResultItemsComparator());\r
}\r
\r
// The main tree viewer\r
decorator));\r
viewer.addDoubleClickListener(new ViewDoubleClickListener());\r
\r
+ // Override default behaviour to insure that 2 distincts results that\r
+ // have the same name will be correctly and distincly returned by\r
+ // corresponding\r
+ // TreeViewer.getSelection() method.\r
+ viewer.setComparer(new ResultItemsComparer());\r
+\r
// viewer.setLabelProvider(rtLblProvider);\r
getSite().setSelectionProvider(viewer);\r
\r
* \r
*/\r
public void refresh(ResultParent resultParent) {\r
- if (log.isDebugEnabled())\r
- log.debug("Refreshing '" + resultParent + "'...");\r
- // Thread.dumpStack();\r
if (resultParent == null) {\r
- resultTreeViewer.setInput(initializeResultTree());\r
+ if (!resultTreeViewer.getTree().isDisposed()) {\r
+ TreePath[] tps = resultTreeViewer.getExpandedTreePaths();\r
+ setOrderedInput(resultTreeViewer);\r
+ resultTreeViewer.setExpandedTreePaths(tps);\r
+ } else\r
+ setOrderedInput(resultTreeViewer);\r
} else {\r
if (resultParent instanceof ParentNodeFolder) {\r
ParentNodeFolder currFolder = (ParentNodeFolder) resultParent;\r
currFolder.forceFullRefresh();\r
}\r
// FIXME: specific refresh does not work\r
- // resultTreeViewer.refresh(currFolder, true);\r
- TreePath[] tps = resultTreeViewer.getExpandedTreePaths();\r
- resultTreeViewer.setInput(initializeResultTree());\r
- resultTreeViewer.setExpandedTreePaths(tps);\r
+ // resultTreeViewer.refresh(resultParent, true);\r
+ refresh(null);\r
}\r
}\r
\r
* \r
*/\r
public boolean jcrRefresh(Node node) {\r
- if (log.isDebugEnabled())\r
- log.debug(" JCR refreshing " + node + "...");\r
+ // if (log.isDebugEnabled())\r
+ // log.debug(" JCR refreshing " + node + "...");\r
+ // Thread.dumpStack();\r
boolean isPassed = true;\r
try {\r
if (node.isNodeType(SlcTypes.SLC_TEST_RESULT)) {\r
.getProperty(SlcNames.SLC_SUCCESS).getBoolean();\r
} else if (node.isNodeType(SlcTypes.SLC_RESULT_FOLDER)) {\r
NodeIterator ni = node.getNodes();\r
- // quicker but wrong : refresh will stop as soon as a failed\r
- // test is found and the whole tree won't be refreshed\r
- // while (isPassed && ni.hasNext()){\r
while (ni.hasNext()) {\r
Node currChild = ni.nextNode();\r
isPassed = isPassed & jcrRefresh(currChild);\r
\r
private ResultParent[] initializeResultTree() {\r
try {\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
- SlcUiConstants.DEFAULT_MY_RESULTS_FOLDER_LABEL);\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
+ // Force initialization of the tree structure if needed\r
+ SlcJcrResultUtils.getSlcResultsParentNode(session);\r
+ SlcJcrResultUtils.getMyResultParentNode(session);\r
+ // Remove yesterday and last 7 days virtual folders\r
+ // ResultParent[] roots = new ResultParent[5];\r
+ ResultParent[] roots = new ResultParent[3];\r
+\r
+ // My results\r
+ roots[0] = new ParentNodeFolder(null,\r
+ SlcJcrResultUtils.getMyResultParentNode(session),\r
+ SlcUiConstants.DEFAULT_MY_RESULTS_FOLDER_LABEL);\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, datePathes),\r
+ "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, datePathes),\r
+ // "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, datePathes),\r
+ // "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
+ roots[2] = new ParentNodeFolder(null, otherResultsPar,\r
+ "All results");\r
+ return roots;\r
} catch (RepositoryException re) {\r
throw new ArgeoException(\r
"Unexpected error while initializing ResultTree.", re);\r
IWorkbenchWindow window = ClientUiPlugin.getDefault().getWorkbench()\r
.getActiveWorkbenchWindow();\r
\r
- // Building conditions\r
IStructuredSelection selection = (IStructuredSelection) resultTreeViewer\r
.getSelection();\r
boolean canAddSubfolder = false;\r
+ boolean canRenamefolder = false;\r
boolean isSingleResultNode = false;\r
+ // Building conditions\r
if (selection.size() == 1) {\r
Object obj = selection.getFirstElement();\r
try {\r
- // if (obj instanceof ResultFolder\r
- // && (((ResultFolder) obj).getNode())\r
- // .isNodeType(SlcTypes.SLC_RESULT_FOLDER))\r
- if (isResultFolder)\r
- canAddSubfolder = true;\r
- else if (obj instanceof SingleResultNode)\r
+ if (obj instanceof SingleResultNode)\r
isSingleResultNode = true;\r
- else if (obj instanceof ParentNodeFolder\r
- && (((ParentNodeFolder) obj).getNode().getPath()\r
- .startsWith(SlcJcrResultUtils\r
- .getMyResultsBasePath(session))))\r
- canAddSubfolder = true;\r
-\r
+ else if (obj instanceof ParentNodeFolder) {\r
+ Node cNode = ((ParentNodeFolder) obj).getNode();\r
+ if (cNode.isNodeType(SlcTypes.SLC_RESULT_FOLDER)) {\r
+ canAddSubfolder = true;\r
+ canRenamefolder = true;\r
+ } else if (cNode\r
+ .isNodeType(SlcTypes.SLC_MY_RESULT_ROOT_FOLDER)) {\r
+ canAddSubfolder = true;\r
+ }\r
+ }\r
} catch (RepositoryException re) {\r
throw new SlcException(\r
"unexpected error while building condition for context menu",\r
\r
CommandUtils.refreshCommand(menuManager, window, RenameResultFolder.ID,\r
RenameResultFolder.DEFAULT_LABEL,\r
- RenameResultFolder.DEFAULT_IMG_DESCRIPTOR, canAddSubfolder);\r
+ RenameResultFolder.DEFAULT_IMG_DESCRIPTOR, canRenamefolder);\r
\r
CommandUtils.refreshCommand(menuManager, window, RenameResultNode.ID,\r
RenameResultNode.DEFAULT_LABEL,\r
@Override\r
public boolean validateDrop(Object target, int operation,\r
TransferData transferType) {\r
-\r
boolean validDrop = false;\r
try {\r
// We can only drop under myResults\r
Node tpNode = null;\r
- if (target instanceof ResultFolder) {\r
+ if (target instanceof SingleResultNode) {\r
+ Node currNode = ((SingleResultNode) target).getNode();\r
+ String pPath = currNode.getParent().getPath();\r
+ if (pPath.startsWith(SlcJcrResultUtils\r
+ .getMyResultsBasePath(session)))\r
+ tpNode = currNode.getParent();\r
+ } else if (target instanceof ResultFolder) {\r
tpNode = ((ResultFolder) target).getNode();\r
} else if (target instanceof ParentNodeFolder) {\r
- if ((((ParentNodeFolder) target).getNode().getPath()\r
- .startsWith(SlcJcrResultUtils\r
- .getMyResultsBasePath(session))))\r
+ Node node = ((ParentNodeFolder) target).getNode();\r
+ if (node.isNodeType(SlcTypes.SLC_MY_RESULT_ROOT_FOLDER))\r
tpNode = ((ParentNodeFolder) target).getNode();\r
- } else if (target instanceof SingleResultNode) {\r
- Node currNode = ((SingleResultNode) target).getNode();\r
- if (currNode\r
- .getParent()\r
- .getPath()\r
- .startsWith(\r
- SlcJcrResultUtils\r
- .getMyResultsBasePath(session)))\r
- tpNode = currNode.getParent();\r
}\r
\r
if (tpNode != null) {\r
// Sanity check : we cannot move a folder to one of its sub\r
+ // folder or neither move an object in the same parent\r
// folder\r
boolean doit = true;\r
+ Node source = null;\r
if (isResultFolder) {\r
- Node source = ((ParentNodeFolder) lastSelectedSourceElement)\r
+ source = ((ParentNodeFolder) lastSelectedSourceElement)\r
.getNode();\r
- String sourcePath = source.getPath();\r
- String targetPath = tpNode.getPath();\r
- if (targetPath.startsWith(sourcePath))\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
+ .getNode();\r
+ String sourceParentPath = JcrUtils.parentPath(source\r
+ .getPath());\r
+ if (tpNode.getPath().equals(sourceParentPath))\r
doit = false;\r
}\r
if (doit) {\r
targetParentNode = tpNode;\r
validDrop = true;\r
- lastSelectedTargetElement = (ResultParent) target;\r
+ // lastSelectedTargetElement = (ResultParent) target;\r
}\r
}\r
-\r
} catch (RepositoryException re) {\r
throw new SlcException(\r
"unexpected error while validating drop target", re);\r
try {\r
Node source = session.getNodeByIdentifier((String) data);\r
\r
- // Check is a node with same name already exists at destination\r
String name;\r
if (source.hasProperty(Property.JCR_TITLE))\r
name = source.getProperty(Property.JCR_TITLE).getString();\r
else\r
name = source.getName();\r
\r
- if (targetParentNode.hasNode(name)) {\r
+ // Check if a user defined folder result with same name exists\r
+ // at target\r
+ if (targetParentNode.hasNode(name)\r
+ && targetParentNode.getNode(name).isNodeType(\r
+ SlcTypes.SLC_RESULT_FOLDER)) {\r
ConfirmOverwriteWizard wizard = new ConfirmOverwriteWizard(\r
name, targetParentNode);\r
WizardDialog dialog = new WizardDialog(Display.getDefault()\r
.getActiveShell(), wizard);\r
- \r
+\r
if (dialog.open() == WizardDialog.CANCEL)\r
return true;\r
\r
}\r
\r
Node target;\r
+ boolean passedStatus = source.getNode(SlcNames.SLC_STATUS)\r
+ .getProperty(SlcNames.SLC_SUCCESS).getBoolean();\r
if (!isActionUnderMyResult) {// Copy\r
- target = targetParentNode.addNode(name, source\r
+ target = targetParentNode.addNode(source.getName(), source\r
.getPrimaryNodeType().getName());\r
JcrUtils.copy(source, target);\r
} else {// move\r
String destPath = targetParentNode.getPath() + "/" + name;\r
session.move(sourcePath, destPath);\r
// session.save();\r
+ // Update passed status of the parent source Node\r
+ ResultParentUtils.updatePassedStatus(\r
+ session.getNode(JcrUtils.parentPath(sourcePath)),\r
+ true);\r
target = session.getNode(destPath);\r
+\r
}\r
if (!target.isNodeType(NodeType.MIX_TITLE))\r
target.addMixin(NodeType.MIX_TITLE);\r
target.setProperty(Property.JCR_TITLE, name);\r
- ResultParentUtils\r
- .updatePassedStatus(target,\r
- target.getNode(SlcNames.SLC_STATUS)\r
- .getProperty(SlcNames.SLC_SUCCESS)\r
- .getBoolean());\r
+ ResultParentUtils.updatePassedStatus(target.getParent(),\r
+ passedStatus);\r
session.save();\r
} catch (RepositoryException re) {\r
throw new SlcException(\r
}\r
}\r
\r
- class ResultObserver extends AsyncUiEventListener {\r
+ class MyResultsObserver extends AsyncUiEventListener {\r
\r
- public ResultObserver(Display display) {\r
+ public MyResultsObserver(Display display) {\r
super(display);\r
}\r
\r
\r
protected void onEventInUiThread(List<Event> events)\r
throws RepositoryException {\r
- int i = 0;\r
+ List<Node> nodesToRefresh = new ArrayList<Node>();\r
\r
for (Event event : events) {\r
- i++;\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
- refresh(lastSelectedSourceElementParent);\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
- // resultTreeViewer.expandToLevel(\r
- // lastSelectedTargetElement, 1);\r
- }\r
+ String parPath = JcrUtils.parentPath(event.getPath());\r
+ if (session.nodeExists(parPath)) {\r
+ Node node = session.getNode(parPath);\r
+ if (!nodesToRefresh.contains(node)) {\r
+ nodesToRefresh.add(node);\r
}\r
}\r
}\r
- if (log.isDebugEnabled())\r
- log.debug("treated events: " + i);\r
+\r
+ // Update check nodes\r
+ for (Node node : nodesToRefresh)\r
+ jcrRefresh(node);\r
+ refresh(null);\r
+ }\r
+ }\r
+\r
+ class AllResultsObserver extends AsyncUiEventListener {\r
+\r
+ public AllResultsObserver(Display display) {\r
+ super(display);\r
+ }\r
+\r
+ @Override\r
+ protected Boolean willProcessInUiThread(List<Event> events)\r
+ throws RepositoryException {\r
+ // unfiltered for the time being\r
+ return true;\r
+ }\r
+\r
+ protected void onEventInUiThread(List<Event> events)\r
+ throws RepositoryException {\r
+ if (lastSelectedSourceElementParent != null)\r
+ refresh(lastSelectedSourceElementParent);\r
}\r
}\r
\r
else\r
propertiesViewer.setInput(null);\r
// update cache for Drag & drop\r
- lastSelectedTargetElement = firstItem;\r
+ // lastSelectedTargetElement = firstItem;\r
lastSelectedSourceElement = firstItem;\r
lastSelectedSourceElementParent = (ResultParent) firstItem\r
.getParent();\r