+/*\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.util.ArrayList;\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.commands.AddResultFolder;\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.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
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.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.jface.viewers.SelectionChangedEvent;\r
import org.eclipse.jface.viewers.TableViewer;\r
import org.eclipse.jface.viewers.TableViewerColumn;\r
+import org.eclipse.jface.viewers.TreePath;\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
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
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
- // FIXME cache to ease refresh after D&D\r
- private ResultParent lastSelectedElement;\r
- private ResultParent lastSelectedElementParent;\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
sashForm.setWeights(getWeights());\r
\r
- // Refresh the view to initialize it\r
- refresh(null);\r
+ setOrderedInput(resultTreeViewer);\r
+\r
+ // Initialize observer\r
+ try {\r
+ ObservationManager observationManager = session.getWorkspace()\r
+ .getObservationManager();\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
.getDecoratorManager().getLabelDecorator();\r
viewer.setLabelProvider(new DecoratingLabelProvider(rtLblProvider,\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
// add change listener to display TestResult information in the property\r
// viewer\r
- viewer.addSelectionChangedListener(new ISelectionChangedListener() {\r
- public void selectionChanged(SelectionChangedEvent event) {\r
- if (!event.getSelection().isEmpty()) {\r
- IStructuredSelection sel = (IStructuredSelection) event\r
- .getSelection();\r
- Object firstItem = sel.getFirstElement();\r
- if (firstItem instanceof SingleResultNode)\r
- propertiesViewer\r
- .setInput(((SingleResultNode) firstItem)\r
- .getNode());\r
- else\r
- propertiesViewer.setInput(null);\r
- lastSelectedElement = (ResultParent) firstItem;\r
- lastSelectedElementParent = (ResultParent) ((ResultParent) firstItem)\r
- .getParent();\r
- }\r
- }\r
- });\r
+ viewer.addSelectionChangedListener(new MySelectionChangedListener());\r
return viewer;\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
\r
+ /**\r
+ * refreshes the passed resultParent and its corresponding subtree. It\r
+ * refreshes the whole viewer if null is passed.\r
+ * \r
+ * @param ResultParent\r
+ * \r
+ */\r
+ public void refresh(ResultParent resultParent) {\r
+ if (resultParent == null) {\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
+ jcrRefresh(currFolder.getNode());\r
+ currFolder.forceFullRefresh();\r
+ }\r
+ // FIXME: specific refresh does not work\r
+ // resultTreeViewer.refresh(resultParent, true);\r
+ refresh(null);\r
+ }\r
+ }\r
+\r
/**\r
* refreshes the passed node and its corresponding subtree.\r
* \r
* \r
*/\r
public boolean jcrRefresh(Node 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
return isPassed;\r
}\r
\r
- /**\r
- * refreshes the passed resultParent and its corresponding subtree. It\r
- * refreshes the whole viewer if null is passed.\r
- * \r
- * @param ResultParent\r
- * \r
- */\r
- public void refresh(ResultParent resultParent) {\r
- if (resultParent == null) {\r
- resultTreeViewer.setInput(initializeResultTree());\r
- if (resultsObserver == null) {\r
- try {\r
- ObservationManager observationManager = session\r
- .getWorkspace().getObservationManager();\r
- resultsObserver = new ResultObserver(resultTreeViewer\r
- .getTree().getDisplay());\r
- observationManager.addEventListener(resultsObserver,\r
- Event.NODE_ADDED | Event.NODE_REMOVED, UserJcrUtils\r
- .getUserHome(session).getPath(), true,\r
- null, observedNodeTypes, false);\r
- } catch (RepositoryException e) {\r
- throw new SlcException("Cannot register listeners", e);\r
- }\r
- }\r
-\r
- } else {\r
- // FIXME implement refresh for a specific ResultParent object.\r
- if (resultParent instanceof ResultFolder) {\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
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
- "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
+ // 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 isMyResultFolder = false;\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
- isMyResultFolder = true;\r
- else if (obj instanceof ParentNodeFolder\r
- && (((ParentNodeFolder) obj).getNode().getPath()\r
- .startsWith(SlcJcrResultUtils\r
- .getMyResultsBasePath(session))))\r
- isMyResultFolder = true;\r
+ if (obj instanceof SingleResultNode)\r
+ isSingleResultNode = true;\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
AddResultFolder.DEFAULT_LABEL,\r
ClientUiPlugin.getDefault().getWorkbench().getSharedImages()\r
.getImageDescriptor(ISharedImages.IMG_OBJ_ADD),\r
- isMyResultFolder);\r
+ canAddSubfolder);\r
+\r
+ CommandUtils.refreshCommand(menuManager, window, RenameResultFolder.ID,\r
+ RenameResultFolder.DEFAULT_LABEL,\r
+ RenameResultFolder.DEFAULT_IMG_DESCRIPTOR, canRenamefolder);\r
+\r
+ CommandUtils.refreshCommand(menuManager, window, RenameResultNode.ID,\r
+ RenameResultNode.DEFAULT_LABEL,\r
+ RenameResultNode.DEFAULT_IMG_DESCRIPTOR, isSingleResultNode);\r
}\r
\r
/* INNER CLASSES */\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
// only one node at a time for the time being.\r
if (selection.size() == 1) {\r
- Object obj = selection.getFirstElement();\r
- if (obj instanceof SingleResultNode) {\r
- Node tNode = ((SingleResultNode) obj).getNode();\r
- try {\r
+ try {\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
- && (tNode.getPath()\r
- .startsWith(SlcJcrResultUtils\r
- .getSlcResultsBasePath(session))))\r
+ SlcTypes.SLC_TEST_RESULT)) {\r
doIt = true;\r
- } catch (RepositoryException re) {\r
- throw new SlcException(\r
- "unexpected error while validating drag source",\r
- re);\r
+ isResultFolder = false;\r
+ }\r
+ } else 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
}\r
+ } catch (RepositoryException re) {\r
+ throw new SlcException(\r
+ "unexpected error while validating drag source", re);\r
}\r
}\r
event.doit = doIt;\r
IStructuredSelection selection = (IStructuredSelection) resultTreeViewer\r
.getSelection();\r
Object obj = selection.getFirstElement();\r
- if (obj instanceof SingleResultNode) {\r
- Node first = ((SingleResultNode) obj).getNode();\r
- try {\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
- } catch (RepositoryException re) {\r
- throw new SlcException(\r
- "unexpected error while setting data", re);\r
}\r
+ } catch (RepositoryException re) {\r
+ throw new SlcException("unexpected error while setting data",\r
+ re);\r
}\r
}\r
\r
public void dragFinished(DragSourceEvent event) {\r
- // implement here tree refresh in case of a move.\r
+ // refresh is done via observer\r
}\r
}\r
\r
// Implementation of the Drop Listener\r
protected class ViewDropListener extends ViewerDropAdapter {\r
-\r
- private Node currParentNode = null;\r
+ private Node targetParentNode = null;\r
\r
public ViewDropListener(Viewer viewer) {\r
super(viewer);\r
boolean validDrop = false;\r
try {\r
// We can only drop under myResults\r
- Node targetParentNode = null;\r
- if (target instanceof ResultFolder) {\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 tpNode = null;\r
+ 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
- targetParentNode = currNode.getParent();\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
+ Node node = ((ParentNodeFolder) target).getNode();\r
+ if (node.isNodeType(SlcTypes.SLC_MY_RESULT_ROOT_FOLDER))\r
+ tpNode = ((ParentNodeFolder) target).getNode();\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
+ 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
}\r
} catch (RepositoryException re) {\r
throw new SlcException(\r
\r
@Override\r
public boolean performDrop(Object data) {\r
-\r
+ // clear selection to prevent unwanted scrolling of the UI\r
+ resultTreeViewer.setSelection(null);\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
+\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
+\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
+ String sourcePath = source.getPath();\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.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
\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
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
+ List<Node> nodesToRefresh = new ArrayList<Node>();\r
\r
for (Event event : events) {\r
- getLog().debug("Received event " + event);\r
- int eventType = event.getType();\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
+ 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
- // 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
+ // 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
class PropertiesContentProvider implements IStructuredContentProvider {\r
- // private JcrItemsComparator itemComparator = new JcrItemsComparator();\r
\r
public void dispose() {\r
}\r
}\r
}\r
\r
+ class MySelectionChangedListener implements ISelectionChangedListener {\r
+\r
+ public void selectionChanged(SelectionChangedEvent event) {\r
+ if (!event.getSelection().isEmpty()) {\r
+ IStructuredSelection sel = (IStructuredSelection) event\r
+ .getSelection();\r
+ ResultParent firstItem = (ResultParent) sel.getFirstElement();\r
+ if (firstItem instanceof SingleResultNode)\r
+ propertiesViewer.setInput(((SingleResultNode) firstItem)\r
+ .getNode());\r
+ else\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
+ }\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