import java.text.SimpleDateFormat;\r
import java.util.ArrayList;\r
import java.util.Calendar;\r
+import java.util.Iterator;\r
import java.util.List;\r
\r
import javax.jcr.Node;\r
import javax.jcr.NodeIterator;\r
import javax.jcr.Property;\r
+import javax.jcr.Repository;\r
import javax.jcr.RepositoryException;\r
import javax.jcr.Session;\r
import javax.jcr.nodetype.NodeType;\r
import org.argeo.slc.client.ui.ClientUiPlugin;\r
import org.argeo.slc.client.ui.SlcUiConstants;\r
import org.argeo.slc.client.ui.commands.AddResultFolder;\r
+import org.argeo.slc.client.ui.commands.DeleteItems;\r
+import org.argeo.slc.client.ui.commands.RefreshJcrResultTreeView;\r
import org.argeo.slc.client.ui.commands.RenameResultFolder;\r
import org.argeo.slc.client.ui.commands.RenameResultNode;\r
import org.argeo.slc.client.ui.editors.ProcessEditor;\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.client.ui.wizards.ConfirmOverwriteWizard;\r
import org.argeo.slc.jcr.SlcJcrResultUtils;\r
import org.argeo.slc.jcr.SlcNames;\r
import org.argeo.slc.jcr.SlcTypes;\r
import org.eclipse.jface.action.IMenuListener;\r
import org.eclipse.jface.action.IMenuManager;\r
import org.eclipse.jface.action.MenuManager;\r
+import org.eclipse.jface.dialogs.MessageDialog;\r
import org.eclipse.jface.viewers.ColumnLabelProvider;\r
import org.eclipse.jface.viewers.DecoratingLabelProvider;\r
import org.eclipse.jface.viewers.DoubleClickEvent;\r
import org.eclipse.jface.viewers.TreeViewer;\r
import org.eclipse.jface.viewers.Viewer;\r
import org.eclipse.jface.viewers.ViewerDropAdapter;\r
-import org.eclipse.jface.wizard.WizardDialog;\r
import org.eclipse.swt.SWT;\r
import org.eclipse.swt.custom.SashForm;\r
import org.eclipse.swt.dnd.DND;\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 lastSelectedSourceElement;\r
- private ResultParent lastSelectedSourceElementParent;\r
private boolean isResultFolder = false;\r
\r
- // FIXME we cache the fact that we are moving a node to avoid exception\r
- // triggered by the "Add Node" event while moving\r
- // boolean isMoveInProgress = false;\r
-\r
/**\r
* To be overridden to adapt size of form and result frames.\r
*/\r
*/\r
private void setOrderedInput(TreeViewer viewer) {\r
// Add specific ordering\r
- resultTreeViewer.setInput(null);\r
+ viewer.setInput(null);\r
viewer.setComparator(null);\r
- resultTreeViewer.setInput(initializeResultTree());\r
+ viewer.setInput(initializeResultTree());\r
viewer.setComparator(new ResultItemsComparator());\r
}\r
\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
+ // corresponding TreeViewer.getSelection() method.\r
viewer.setComparer(new ResultItemsComparer());\r
\r
// viewer.setLabelProvider(rtLblProvider);\r
}\r
});\r
viewer.getTree().setMenu(menu);\r
+ menuManager.setRemoveAllWhenShown(true);\r
+\r
getSite().registerContextMenu(menuManager, viewer);\r
\r
// add change listener to display TestResult information in the property\r
else if (SlcNames.SLC_MESSAGE.equals(name))\r
value = "Message";\r
else if (SlcNames.SLC_ERROR_MESSAGE.equals(name))\r
- value = "Error";\r
+ value = "Error";\r
return value;\r
} catch (RepositoryException e) {\r
throw new ArgeoException(\r
value = dateFormat.format(date.getTime());\r
} else if (SlcNames.SLC_SUCCESS.equals(name)) {\r
if (property.getValue().getBoolean())\r
- value = "SUCCESS";\r
+ value = "PASSED";\r
else {\r
- if (property.getParent().hasNode(\r
+ if (property.getParent().hasProperty(\r
SlcNames.SLC_ERROR_MESSAGE))\r
value = "ERROR";\r
else\r
boolean isPassed = true;\r
try {\r
if (node.isNodeType(SlcTypes.SLC_TEST_RESULT)) {\r
- isPassed = node.getNode(SlcNames.SLC_STATUS)\r
+ isPassed = node.getNode(SlcNames.SLC_AGGREGATED_STATUS)\r
.getProperty(SlcNames.SLC_SUCCESS).getBoolean();\r
} else if (node.isNodeType(SlcTypes.SLC_RESULT_FOLDER)) {\r
NodeIterator ni = node.getNodes();\r
Node currChild = ni.nextNode();\r
isPassed = isPassed & jcrRefresh(currChild);\r
}\r
- if (isPassed != node.getNode(SlcNames.SLC_STATUS)\r
+ if (isPassed != node.getNode(SlcNames.SLC_AGGREGATED_STATUS)\r
.getProperty(SlcNames.SLC_SUCCESS).getBoolean()) {\r
- node.getNode(SlcNames.SLC_STATUS).setProperty(\r
+ node.getNode(SlcNames.SLC_AGGREGATED_STATUS).setProperty(\r
SlcNames.SLC_SUCCESS, isPassed);\r
node.getSession().save();\r
return isPassed;\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
+ boolean isUnderMyResult = false;\r
+ boolean validMultipleDelete = false;\r
+ try {\r
+\r
+ // Building conditions\r
+ if (selection.size() == 1) {\r
+ Object obj = selection.getFirstElement();\r
if (obj instanceof SingleResultNode)\r
isSingleResultNode = true;\r
else if (obj instanceof ParentNodeFolder) {\r
if (cNode.isNodeType(SlcTypes.SLC_RESULT_FOLDER)) {\r
canAddSubfolder = true;\r
canRenamefolder = true;\r
+ isUnderMyResult = 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
- re);\r
+ } else {\r
+ @SuppressWarnings("rawtypes")\r
+ Iterator it = selection.iterator();\r
+ multicheck: while (it.hasNext()) {\r
+ validMultipleDelete = true;\r
+ Object obj = it.next();\r
+ if (obj instanceof SingleResultNode)\r
+ continue multicheck;\r
+ else if (obj instanceof ParentNodeFolder) {\r
+ Node cNode = ((ParentNodeFolder) obj).getNode();\r
+ if (cNode.isNodeType(SlcTypes.SLC_RESULT_FOLDER))\r
+ continue multicheck;\r
+ else {\r
+ validMultipleDelete = false;\r
+ break multicheck;\r
+ }\r
+ } else {\r
+ validMultipleDelete = false;\r
+ break multicheck;\r
+ }\r
+ }\r
}\r
+ } catch (RepositoryException re) {\r
+ throw new SlcException(\r
+ "unexpected error while building condition for context menu",\r
+ re);\r
}\r
+\r
// Effective Refresh\r
+ CommandUtils.refreshCommand(menuManager, window,\r
+ RefreshJcrResultTreeView.ID,\r
+ RefreshJcrResultTreeView.DEFAULT_LABEL,\r
+ RefreshJcrResultTreeView.DEFAULT_IMG_DESCRIPTOR, true);\r
+\r
+ CommandUtils.refreshCommand(menuManager, window, DeleteItems.ID,\r
+ DeleteItems.DEFAULT_LABEL, DeleteItems.DEFAULT_IMG_DESCRIPTOR,\r
+ isUnderMyResult || isSingleResultNode || validMultipleDelete);\r
+\r
CommandUtils.refreshCommand(menuManager, window, AddResultFolder.ID,\r
AddResultFolder.DEFAULT_LABEL,\r
ClientUiPlugin.getDefault().getWorkbench().getSharedImages()\r
RenameResultFolder.DEFAULT_LABEL,\r
RenameResultFolder.DEFAULT_IMG_DESCRIPTOR, canRenamefolder);\r
\r
+ // Command removed for the time being.\r
CommandUtils.refreshCommand(menuManager, window, RenameResultNode.ID,\r
RenameResultNode.DEFAULT_LABEL,\r
- RenameResultNode.DEFAULT_IMG_DESCRIPTOR, isSingleResultNode);\r
+ RenameResultNode.DEFAULT_IMG_DESCRIPTOR, false);\r
+\r
+ // Test to be removed\r
+ // If you use this pattern, do not forget to call\r
+ // menuManager.setRemoveAllWhenShown(true);\r
+ // when creating the menuManager\r
+\r
+ // menuManager.add(new Action("Test") {\r
+ // public void run() {\r
+ // log.debug("do something");\r
+ // }\r
+ // });\r
}\r
\r
/* INNER CLASSES */\r
IStructuredSelection selection = (IStructuredSelection) resultTreeViewer\r
.getSelection();\r
boolean doIt = false;\r
- // only one node at a time for the time being.\r
- if (selection.size() == 1) {\r
- try {\r
+\r
+ // FIXME clean this code.\r
+ try {\r
+ if (selection.size() == 1) {\r
Object obj = selection.getFirstElement();\r
- if (obj instanceof SingleResultNode) {\r
- Node tNode = ((SingleResultNode) obj).getNode();\r
- if (tNode.getPrimaryNodeType().isNodeType(\r
- SlcTypes.SLC_TEST_RESULT)) {\r
- doIt = true;\r
- isResultFolder = false;\r
- }\r
- } else if (obj instanceof ResultFolder) {\r
+ if (obj instanceof ResultFolder) {\r
Node tNode = ((ResultFolder) obj).getNode();\r
if (tNode.getPrimaryNodeType().isNodeType(\r
SlcTypes.SLC_RESULT_FOLDER)) {\r
doIt = true;\r
isResultFolder = true;\r
}\r
+ } else\r
+ isResultFolder = false;\r
+ } else\r
+ isResultFolder = false;\r
+\r
+ if (!isResultFolder) {\r
+ @SuppressWarnings("rawtypes")\r
+ Iterator it = selection.iterator();\r
+ while (it.hasNext()) {\r
+ Object obj = it.next();\r
+ if (obj instanceof SingleResultNode) {\r
+ Node tNode = ((SingleResultNode) obj).getNode();\r
+ if (tNode.getPrimaryNodeType().isNodeType(\r
+ SlcTypes.SLC_TEST_RESULT)) {\r
+ doIt = true;\r
+ }\r
+ }\r
}\r
- } catch (RepositoryException re) {\r
- throw new SlcException(\r
- "unexpected error while validating drag source", re);\r
}\r
+\r
+ } catch (RepositoryException re) {\r
+ throw new SlcException(\r
+ "unexpected error while validating drag source", re);\r
}\r
event.doit = doIt;\r
}\r
public void dragSetData(DragSourceEvent event) {\r
IStructuredSelection selection = (IStructuredSelection) resultTreeViewer\r
.getSelection();\r
- Object obj = selection.getFirstElement();\r
+\r
try {\r
- Node first;\r
- if (obj instanceof SingleResultNode) {\r
- first = ((SingleResultNode) obj).getNode();\r
- event.data = first.getIdentifier();\r
- } else if (obj instanceof ResultFolder) {\r
- first = ((ResultFolder) obj).getNode();\r
- event.data = first.getIdentifier();\r
+ // specific case of a result folder\r
+ if (isResultFolder) {\r
+ Object obj = selection.getFirstElement();\r
+ event.data = ((ResultFolder) obj).getNode().getIdentifier();\r
+ } else {\r
+ @SuppressWarnings("rawtypes")\r
+ Iterator it = selection.iterator();\r
+ StringBuilder nodes = new StringBuilder();\r
+ while (it.hasNext()) {\r
+ Object obj = it.next();\r
+ if (obj instanceof SingleResultNode) {\r
+ Node tNode = ((SingleResultNode) obj).getNode();\r
+ if (tNode.getPrimaryNodeType().isNodeType(\r
+ SlcTypes.SLC_TEST_RESULT)) {\r
+ nodes.append(tNode.getIdentifier()).append(";");\r
+ }\r
+ }\r
+ }\r
+ event.data = nodes.toString();\r
}\r
} catch (RepositoryException re) {\r
throw new SlcException("unexpected error while setting data",\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
- source = ((ParentNodeFolder) lastSelectedSourceElement)\r
- .getNode();\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
- }\r
+ targetParentNode = tpNode;\r
+ validDrop = true;\r
}\r
} catch (RepositoryException re) {\r
throw new SlcException(\r
// clear selection to prevent unwanted scrolling of the UI\r
resultTreeViewer.setSelection(null);\r
try {\r
- Node source = session.getNodeByIdentifier((String) data);\r
-\r
- String name;\r
- if (source.hasProperty(Property.JCR_TITLE))\r
- name = source.getProperty(Property.JCR_TITLE).getString();\r
- else if (source.hasProperty(SlcNames.SLC_TEST_CASE))\r
- name = source.getProperty(SlcNames.SLC_TEST_CASE)\r
- .getString();\r
- else\r
- name = source.getName();\r
-\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
- if (dialog.open() == WizardDialog.CANCEL)\r
- return true;\r
-\r
- if (wizard.overwrite()) {\r
- targetParentNode.getNode(name).remove();\r
- // session.save();\r
- } else\r
- name = wizard.newName();\r
- }\r
+ if (isResultFolder) {\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
+ Node source = session.getNodeByIdentifier((String) data);\r
+ if (targetParentNode.getPath().startsWith(source.getPath())\r
+ || source.getParent().getPath()\r
+ .equals(targetParentNode.getPath()))\r
+ return false;\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(source.getName(), source\r
- .getPrimaryNodeType().getName());\r
- JcrUtils.copy(source, target);\r
- } else {// move\r
+ // Move\r
String sourcePath = source.getPath();\r
- String destPath = targetParentNode.getPath() + "/" + name;\r
+ String destPath = targetParentNode.getPath() + "/"\r
+ + source.getName();\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
+ // Node target = session.getNode(destPath);\r
+ session.save();\r
+ return true;\r
+ }\r
+\r
+ String[] datas = ((String) data).split(";");\r
+ nodesToCopy: for (String id : datas) {\r
+\r
+ Node source = session.getNodeByIdentifier(id);\r
+ String name;\r
+ if (source.hasProperty(Property.JCR_TITLE))\r
+ name = source.getProperty(Property.JCR_TITLE)\r
+ .getString();\r
+ else if (source.hasProperty(SlcNames.SLC_TEST_CASE))\r
+ name = source.getProperty(SlcNames.SLC_TEST_CASE)\r
+ .getString();\r
+ else\r
+ name = source.getName();\r
+\r
+ // Check if another copy of the same test instance already\r
+ // exists at target\r
+ NodeIterator ni = targetParentNode.getNodes();\r
+ String slcUid = source.getProperty(SlcNames.SLC_UUID)\r
+ .getString();\r
+ while (ni.hasNext()) {\r
+ Node curr = ni.nextNode();\r
+ if (curr.hasProperty(SlcNames.SLC_UUID)\r
+ && slcUid.equals(curr.getProperty(\r
+ SlcNames.SLC_UUID).getString())) {\r
+ MessageDialog\r
+ .openWarning(\r
+ PlatformUI.getWorkbench()\r
+ .getDisplay()\r
+ .getActiveShell(),\r
+ "Duplicated instance.",\r
+ "An instance of the same test case ("\r
+ + name\r
+ + ") exists at destination.\n "\r
+ + "This item will not be neither copied nor moved.");\r
+ continue nodesToCopy;\r
\r
+ }\r
+ }\r
+\r
+ Node target;\r
+ boolean passedStatus = false;\r
+ if (source.hasNode(SlcNames.SLC_AGGREGATED_STATUS))\r
+ passedStatus = source\r
+ .getNode(SlcNames.SLC_AGGREGATED_STATUS)\r
+ .getProperty(SlcNames.SLC_SUCCESS).getBoolean();\r
+\r
+ boolean isActionUnderMyResult = source.getPath()\r
+ .startsWith(\r
+ SlcJcrResultUtils\r
+ .getMyResultsBasePath(session));\r
+\r
+ if (!isActionUnderMyResult) {// Copy\r
+ target = targetParentNode.addNode(source.getName(),\r
+ source.getPrimaryNodeType().getName());\r
+ JcrUtils.copy(source, target);\r
+ } else {// move\r
+ String sourcePath = source.getPath();\r
+ String destPath = targetParentNode.getPath() + "/"\r
+ + name;\r
+ session.move(sourcePath, destPath);\r
+ // Update passed status of the parent source Node\r
+ ResultParentUtils\r
+ .updatePassedStatus(session.getNode(JcrUtils\r
+ .parentPath(sourcePath)), 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.updatePassedStatus(target.getParent(),\r
+ passedStatus);\r
+ session.save();\r
}\r
- if (!target.isNodeType(NodeType.MIX_TITLE))\r
- target.addMixin(NodeType.MIX_TITLE);\r
- target.setProperty(Property.JCR_TITLE, name);\r
- ResultParentUtils.updatePassedStatus(target.getParent(),\r
- passedStatus);\r
- session.save();\r
} catch (RepositoryException re) {\r
throw new SlcException(\r
"unexpected error while copying dropped node", re);\r
+\r
}\r
return true;\r
}\r
\r
protected void onEventInUiThread(List<Event> events)\r
throws RepositoryException {\r
- if (lastSelectedSourceElementParent != null)\r
- refresh(lastSelectedSourceElementParent);\r
+ refresh(null);\r
+ // if (lastSelectedSourceElementParent != null)\r
+ // refresh(lastSelectedSourceElementParent);\r
}\r
}\r
\r
props.add(node.getProperty(SlcNames.SLC_TEST_CASE));\r
if (node.hasProperty(SlcNames.SLC_COMPLETED))\r
props.add(node.getProperty(SlcNames.SLC_COMPLETED));\r
- if (node.hasNode(SlcNames.SLC_STATUS)) {\r
- Node status = node.getNode(SlcNames.SLC_STATUS);\r
+ if (node.hasNode(SlcNames.SLC_AGGREGATED_STATUS)) {\r
+ Node status = node\r
+ .getNode(SlcNames.SLC_AGGREGATED_STATUS);\r
props.add(status.getProperty(SlcNames.SLC_SUCCESS));\r
if (status.hasProperty(SlcNames.SLC_MESSAGE))\r
props.add(status\r
propertiesViewer.setInput(null);\r
// update cache for Drag & drop\r
// lastSelectedTargetElement = firstItem;\r
- lastSelectedSourceElement = firstItem;\r
- lastSelectedSourceElementParent = (ResultParent) firstItem\r
- .getParent();\r
- String pPath = "";\r
- try {\r
-\r
- if (firstItem instanceof ParentNodeFolder)\r
- pPath = ((ParentNodeFolder) firstItem).getNode()\r
- .getPath();\r
- else if (firstItem instanceof SingleResultNode)\r
- pPath = ((SingleResultNode) firstItem).getNode()\r
- .getPath();\r
- } catch (RepositoryException e) {\r
- throw new SlcException(\r
- "Unexpected error while checking parent UI tree", e);\r
- }\r
- if ((pPath.startsWith(SlcJcrResultUtils\r
- .getMyResultsBasePath(session))))\r
- isActionUnderMyResult = true;\r
- else\r
- isActionUnderMyResult = false;\r
+ // lastSelectedSourceElement = firstItem;\r
+ // lastSelectedSourceElementParent = (ResultParent) firstItem\r
+ // .getParent();\r
+ // String pPath = "";\r
+ // try {\r
+ //\r
+ // if (firstItem instanceof ParentNodeFolder)\r
+ // pPath = ((ParentNodeFolder) firstItem).getNode()\r
+ // .getPath();\r
+ // else if (firstItem instanceof SingleResultNode)\r
+ // pPath = ((SingleResultNode) firstItem).getNode()\r
+ // .getPath();\r
+ // } catch (RepositoryException e) {\r
+ // throw new SlcException(\r
+ // "Unexpected error while checking parent UI tree", e);\r
+ // }\r
+ // if ((pPath.startsWith(SlcJcrResultUtils\r
+ // .getMyResultsBasePath(session))))\r
+ // isActionUnderMyResult = true;\r
+ // else\r
+ // isActionUnderMyResult = false;\r
}\r
}\r
}\r
}\r
\r
/* DEPENDENCY INJECTION */\r
+ @Deprecated\r
public void setSession(Session session) {\r
this.session = session;\r
}\r
\r
-}\r
+ public void dispose() {\r
+ // JcrUtils.unregisterQuietly(session.getWorkspace(), resultsObserver);\r
+ JcrUtils.logoutQuietly(session);\r
+ super.dispose();\r
+ }\r
+\r
+ public void setRepository(Repository repository) {\r
+ try {\r
+ session = repository.login();\r
+ } catch (RepositoryException re) {\r
+ throw new SlcException("Unable to log in Repository " + repository,\r
+ re);\r
+ }\r
+ }\r
+}
\ No newline at end of file
projects / gpl / argeo-slc.git / blobdiff