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.commands.AddResultFolder;\r
+import org.argeo.slc.client.ui.editors.ProcessEditor;\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.ResultParent;\r
import org.eclipse.jface.action.MenuManager;\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.IDoubleClickListener;\r
import org.eclipse.jface.viewers.ILabelDecorator;\r
import org.eclipse.jface.viewers.ISelectionChangedListener;\r
import org.eclipse.jface.viewers.IStructuredContentProvider;\r
import org.eclipse.swt.widgets.Display;\r
import org.eclipse.swt.widgets.Menu;\r
import org.eclipse.ui.ISharedImages;\r
+import org.eclipse.ui.IWorkbenchPage;\r
import org.eclipse.ui.IWorkbenchWindow;\r
+import org.eclipse.ui.PlatformUI;\r
import org.eclipse.ui.part.ViewPart;\r
\r
/** SLC generic JCR Result tree view. */\r
NodeType.NT_UNSTRUCTURED };\r
\r
// FIXME cache to ease refresh after D&D\r
- private ResultParent lastSelectedElement;\r
- private ResultParent lastSelectedElementParent;\r
+ private ResultParent lastSelectedTargetElement;\r
+ private ResultParent lastSelectedTargetElementParent;\r
+ private ResultParent lastSelectedSourceElementParent;\r
\r
/**\r
* To be overridden to adapt size of form and result frames.\r
.getDecoratorManager().getLabelDecorator();\r
viewer.setLabelProvider(new DecoratingLabelProvider(rtLblProvider,\r
decorator));\r
+ viewer.addDoubleClickListener(new ViewDoubleClickListener());\r
+\r
// viewer.setLabelProvider(rtLblProvider);\r
getSite().setSelectionProvider(viewer);\r
\r
.getNode());\r
else\r
propertiesViewer.setInput(null);\r
- lastSelectedElement = (ResultParent) firstItem;\r
- lastSelectedElementParent = (ResultParent) ((ResultParent) firstItem)\r
+ lastSelectedTargetElement = (ResultParent) firstItem;\r
+ lastSelectedTargetElementParent = (ResultParent) ((ResultParent) firstItem)\r
.getParent();\r
}\r
}\r
return propertiesViewer;\r
}\r
\r
+ /**\r
+ * Override to provide specific behaviour. Typically to enable the display\r
+ * of a result file.\r
+ * \r
+ * @param evt\r
+ */\r
+ protected void processDoubleClick(DoubleClickEvent evt) {\r
+ Object obj = ((IStructuredSelection) evt.getSelection())\r
+ .getFirstElement();\r
+ try {\r
+ if (obj instanceof SingleResultNode) {\r
+ SingleResultNode srNode = (SingleResultNode) obj;\r
+ Node node = srNode.getNode();\r
+ // FIXME: open a default result editor\r
+ if (node.isNodeType(SlcTypes.SLC_PROCESS)) {\r
+ IWorkbenchPage activePage = PlatformUI.getWorkbench()\r
+ .getActiveWorkbenchWindow().getActivePage();\r
+ activePage.openEditor(\r
+ new ProcessEditorInput(node.getPath()),\r
+ ProcessEditor.ID);\r
+ }\r
+ }\r
+ } catch (Exception e) {\r
+ throw new SlcException("Cannot open " + obj, e);\r
+ }\r
+ }\r
+\r
@Override\r
public void setFocus() {\r
}\r
ResultFolder currFolder = (ResultFolder) resultParent;\r
jcrRefresh(currFolder.getNode());\r
currFolder.forceFullRefresh();\r
- resultTreeViewer.refresh(lastSelectedElement);\r
+ resultTreeViewer.refresh(lastSelectedTargetElement);\r
}\r
}\r
}\r
// My results\r
roots[0] = new ParentNodeFolder(null,\r
SlcJcrResultUtils.getMyResultParentNode(session),\r
- "My results");\r
+ SlcUiConstants.DEFAULT_MY_RESULTS_FOLDER_LABEL);\r
\r
// today\r
Calendar cal = Calendar.getInstance();\r
\r
public void dragStart(DragSourceEvent event) {\r
// Check if the drag action should start.\r
-\r
IStructuredSelection selection = (IStructuredSelection) resultTreeViewer\r
.getSelection();\r
boolean doIt = false;\r
if (obj instanceof SingleResultNode) {\r
Node tNode = ((SingleResultNode) obj).getNode();\r
try {\r
+ // if (tNode.getPrimaryNodeType().isNodeType(\r
+ // SlcTypes.SLC_TEST_RESULT)\r
+ // && (tNode.getPath()\r
+ // .startsWith(SlcJcrResultUtils\r
+ // .getSlcResultsBasePath(session))))\r
if (tNode.getPrimaryNodeType().isNodeType(\r
- SlcTypes.SLC_TEST_RESULT)\r
- && (tNode.getPath()\r
- .startsWith(SlcJcrResultUtils\r
- .getSlcResultsBasePath(session))))\r
+ SlcTypes.SLC_TEST_RESULT))\r
doIt = true;\r
+ lastSelectedSourceElementParent = (ResultParent) ((SingleResultNode) obj)\r
+ .getParent();\r
} catch (RepositoryException re) {\r
throw new SlcException(\r
"unexpected error while validating drag source",\r
Node first = ((SingleResultNode) obj).getNode();\r
try {\r
event.data = first.getIdentifier();\r
+\r
} catch (RepositoryException re) {\r
throw new SlcException(\r
"unexpected error while setting data", re);\r
protected class ViewDropListener extends ViewerDropAdapter {\r
\r
private Node currParentNode = null;\r
+ private boolean copyNode = true;\r
\r
public ViewDropListener(Viewer viewer) {\r
super(viewer);\r
currParentNode = targetParentNode;\r
validDrop = true;\r
// FIXME\r
- lastSelectedElement = (ResultParent) target;\r
- lastSelectedElementParent = (ResultParent) ((ResultParent) target)\r
+ lastSelectedTargetElement = (ResultParent) target;\r
+ lastSelectedTargetElementParent = (ResultParent) ((ResultParent) target)\r
.getParent();\r
}\r
+ // Check if it's a move or a copy\r
+ if (validDrop) {\r
+ String pPath = "";\r
+ if (lastSelectedSourceElementParent instanceof ResultFolder)\r
+ pPath = ((ResultFolder) lastSelectedSourceElementParent)\r
+ .getNode().getPath();\r
+ if ((pPath.startsWith(SlcJcrResultUtils\r
+ .getMyResultsBasePath(session))))\r
+ copyNode = false;\r
+ }\r
} catch (RepositoryException re) {\r
throw new SlcException(\r
"unexpected error while validating drop target", re);\r
\r
try {\r
Node source = session.getNodeByIdentifier((String) data);\r
- Node target = currParentNode.addNode(source.getName(), source\r
- .getPrimaryNodeType().getName());\r
- JcrUtils.copy(source, target);\r
- ResultParentUtils\r
- .updatePassedStatus(target,\r
- target.getNode(SlcNames.SLC_STATUS)\r
- .getProperty(SlcNames.SLC_SUCCESS)\r
- .getBoolean());\r
- target.getSession().save();\r
+ if (copyNode) {\r
+ Node target = currParentNode.addNode(source.getName(),\r
+ source.getPrimaryNodeType().getName());\r
+ JcrUtils.copy(source, target);\r
+ ResultParentUtils.updatePassedStatus(\r
+ target,\r
+ target.getNode(SlcNames.SLC_STATUS)\r
+ .getProperty(SlcNames.SLC_SUCCESS)\r
+ .getBoolean());\r
+ target.getSession().save();\r
+ } else // move only\r
+ {\r
+ String sourcePath = source.getPath();\r
+ String destPath = currParentNode.getPath() + "/"\r
+ + source.getName();\r
+ session.move(sourcePath, destPath);\r
+ session.save();\r
+ Node target = session.getNode(destPath);\r
+ ResultParentUtils.updatePassedStatus(\r
+ target,\r
+ target.getNode(SlcNames.SLC_STATUS)\r
+ .getProperty(SlcNames.SLC_SUCCESS)\r
+ .getBoolean());\r
+ session.save();\r
+ }\r
} catch (RepositoryException re) {\r
throw new SlcException(\r
"unexpected error while copying dropped node", re);\r
jcrRefresh(currNode);\r
resultTreeViewer.refresh(true);\r
resultTreeViewer.expandToLevel(\r
- lastSelectedElementParent, 1);\r
+ lastSelectedTargetElementParent, 1);\r
\r
}\r
}\r
|| currNode\r
.isNodeType(SlcTypes.SLC_RESULT_FOLDER)) {\r
refresh(null);\r
- resultTreeViewer.expandToLevel(lastSelectedElement,\r
- 1);\r
+ resultTreeViewer.expandToLevel(\r
+ lastSelectedTargetElement, 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
-\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
class PropertiesContentProvider implements IStructuredContentProvider {\r
- // private JcrItemsComparator itemComparator = new JcrItemsComparator();\r
\r
public void dispose() {\r
}\r
}\r
}\r
\r
+ class ViewDoubleClickListener implements IDoubleClickListener {\r
+ public void doubleClick(DoubleClickEvent evt) {\r
+ processDoubleClick(evt);\r
+ }\r
+\r
+ }\r
+\r
/* DEPENDENCY INJECTION */\r
public void setSession(Session session) {\r
this.session = session;\r
projects / gpl / argeo-slc.git / blobdiff