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
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
- resultTreeViewer.setInput(initializeResultTree());\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
+ /**\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
protected TreeViewer createResultsTreeViewer(Composite parent) {\r
int style = SWT.BORDER | SWT.MULTI;\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
.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
if (doit) {\r
targetParentNode = tpNode;\r
validDrop = true;\r
- lastSelectedTargetElement = (ResultParent) target;\r
+ // lastSelectedTargetElement = (ResultParent) target;\r
}\r
}\r
} catch (RepositoryException 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
}\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
- refresh(lastSelectedSourceElementParent);\r
+ List<Node> nodesToRefresh = new ArrayList<Node>();\r
+\r
+ for (Event event : events) {\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
+\r
+ // Update check nodes\r
+ for (Node node : nodesToRefresh)\r
+ jcrRefresh(node);\r
+ refresh(null);\r
\r
// boolean wasRemoved = false;\r
// boolean wasAdded = false;\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
+ for (Event event : events) {\r
+ if (log.isDebugEnabled())\r
+ log.debug("Received event " + event);\r
+ }\r
+ refresh(lastSelectedSourceElementParent);\r
+ }\r
+ }\r
+\r
class PropertiesContentProvider implements IStructuredContentProvider {\r
\r
public void dispose() {\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