id="org.argeo.slc.client.ui.addResultFolder"
name="Add result folder">
</command>
+ <command
+ id="org.argeo.slc.client.ui.deleteItems"
+ defaultHandler="org.argeo.slc.client.ui.commands.DeleteItems"
+ name="Delete selected item(s)">
+ </command>
<command
defaultHandler="org.argeo.slc.client.ui.commands.RenameResultFolder"
id="org.argeo.slc.client.ui.renameResultFolder"
--- /dev/null
+/*\r
+ * Copyright (C) 2007-2012 Mathieu Baudier\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
+\r
+package org.argeo.slc.client.ui.commands;\r
+\r
+import java.util.ArrayList;\r
+import java.util.Iterator;\r
+import java.util.List;\r
+\r
+import javax.jcr.Node;\r
+import javax.jcr.RepositoryException;\r
+import javax.jcr.Session;\r
+\r
+import org.argeo.slc.SlcException;\r
+import org.argeo.slc.client.ui.ClientUiPlugin;\r
+import org.argeo.slc.client.ui.model.ResultFolder;\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.eclipse.core.commands.AbstractHandler;\r
+import org.eclipse.core.commands.ExecutionEvent;\r
+import org.eclipse.core.commands.ExecutionException;\r
+import org.eclipse.core.runtime.IProgressMonitor;\r
+import org.eclipse.core.runtime.IStatus;\r
+import org.eclipse.core.runtime.Status;\r
+import org.eclipse.core.runtime.jobs.Job;\r
+import org.eclipse.jface.dialogs.MessageDialog;\r
+import org.eclipse.jface.resource.ImageDescriptor;\r
+import org.eclipse.jface.viewers.ISelection;\r
+import org.eclipse.jface.viewers.IStructuredSelection;\r
+import org.eclipse.ui.handlers.HandlerUtil;\r
+\r
+/** Deletes one or many results */\r
+public class DeleteItems extends AbstractHandler {\r
+ public final static String ID = ClientUiPlugin.ID + ".deleteItems";\r
+ public final static ImageDescriptor DEFAULT_IMG_DESCRIPTOR = ClientUiPlugin\r
+ .getImageDescriptor("icons/removeAll.png");\r
+ public final static String DEFAULT_LABEL = "Delete selected item(s)";\r
+\r
+ public Object execute(final ExecutionEvent event) throws ExecutionException {\r
+ final ISelection selection = HandlerUtil\r
+ .getActiveWorkbenchWindow(event).getActivePage().getSelection();\r
+\r
+ // confirmation\r
+ StringBuffer buf = new StringBuffer("");\r
+ Iterator<?> lst = ((IStructuredSelection) selection).iterator();\r
+ while (lst.hasNext()) {\r
+ Object obj = lst.next();\r
+ if (obj instanceof ResultParent) {\r
+ ResultParent rp = ((ResultParent) obj);\r
+ buf.append(rp.getName()).append(", ");\r
+ }\r
+ }\r
+\r
+ String msg = "Nothing to delete";\r
+ // remove last separator\r
+ if (buf.lastIndexOf(", ") > -1) {\r
+ msg = "Do you want to delete following objects: "\r
+ + buf.substring(0, buf.lastIndexOf(", ")) + "?";\r
+ }\r
+ Boolean ok = MessageDialog.openConfirm(\r
+ HandlerUtil.getActiveShell(event), "Confirm deletion", msg);\r
+\r
+ if (!ok)\r
+ return null;\r
+\r
+ Job job = new Job("Delete results") {\r
+ @Override\r
+ protected IStatus run(IProgressMonitor monitor) {\r
+ if (selection != null\r
+ && selection instanceof IStructuredSelection) {\r
+ List<Node> nodes = new ArrayList<Node>();\r
+ Iterator<?> it = ((IStructuredSelection) selection)\r
+ .iterator();\r
+ Object obj = null;\r
+ while (it.hasNext()) {\r
+ obj = it.next();\r
+ if (obj instanceof ResultFolder) {\r
+ Node node = ((ResultFolder) obj).getNode();\r
+ nodes.add(node);\r
+ } else if (obj instanceof SingleResultNode) {\r
+ Node node = ((SingleResultNode) obj).getNode();\r
+ nodes.add(node);\r
+ }\r
+ }\r
+ try {\r
+ if (!nodes.isEmpty()) {\r
+ Session session = nodes.get(0).getSession();\r
+ monitor.beginTask("Delete results", nodes.size());\r
+ for (Node node : nodes) {\r
+ Node parent = node.getParent();\r
+ node.remove();\r
+ ResultParentUtils.updateStatusOnRemoval(parent);\r
+ monitor.worked(1);\r
+ }\r
+ session.save();\r
+ }\r
+\r
+ } catch (RepositoryException e) {\r
+ throw new SlcException(\r
+ "Unexpected error while deleteting node(s)", e);\r
+ }\r
+ monitor.done();\r
+ }\r
+ return Status.OK_STATUS;\r
+ }\r
+\r
+ };\r
+ job.setUser(true);\r
+ job.schedule();\r
+ return null;\r
+ }\r
+}\r
+++ /dev/null
-/*\r
- * Copyright (C) 2007-2012 Mathieu Baudier\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
-\r
-package org.argeo.slc.client.ui.commands;\r
-\r
-import java.util.ArrayList;\r
-import java.util.Iterator;\r
-import java.util.List;\r
-\r
-import javax.jcr.Node;\r
-import javax.jcr.RepositoryException;\r
-import javax.jcr.Session;\r
-\r
-import org.argeo.eclipse.ui.ErrorFeedback;\r
-import org.argeo.slc.client.ui.model.ResultFolder;\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.eclipse.core.commands.AbstractHandler;\r
-import org.eclipse.core.commands.ExecutionEvent;\r
-import org.eclipse.core.commands.ExecutionException;\r
-import org.eclipse.core.runtime.IProgressMonitor;\r
-import org.eclipse.core.runtime.IStatus;\r
-import org.eclipse.core.runtime.Status;\r
-import org.eclipse.core.runtime.jobs.Job;\r
-import org.eclipse.jface.dialogs.MessageDialog;\r
-import org.eclipse.jface.viewers.ISelection;\r
-import org.eclipse.jface.viewers.IStructuredSelection;\r
-import org.eclipse.ui.handlers.HandlerUtil;\r
-\r
-/** Deletes one or many results */\r
-public class DeleteResult extends AbstractHandler {\r
- /* DEPENDENCY INJECTION */\r
- private Session session;\r
-\r
- public Object execute(final ExecutionEvent event) throws ExecutionException {\r
- final ISelection selection = HandlerUtil\r
- .getActiveWorkbenchWindow(event).getActivePage().getSelection();\r
-\r
- // confirmation\r
- StringBuffer buf = new StringBuffer("");\r
- Iterator<?> lst = ((IStructuredSelection) selection).iterator();\r
- while (lst.hasNext()) {\r
- Object obj = lst.next();\r
- if (obj instanceof ResultParent) {\r
- ResultParent rp = ((ResultParent) obj);\r
- buf.append(rp.getName()).append(", ");\r
- }\r
-\r
- }\r
-\r
- String msg = "Nothing to delete";\r
- // remove last separator\r
- if (buf.lastIndexOf(", ") > -1) {\r
- msg = "Do you want to delete following objects: "\r
- + buf.substring(0, buf.lastIndexOf(", ")) + "?";\r
- }\r
- Boolean ok = MessageDialog.openConfirm(\r
- HandlerUtil.getActiveShell(event), "Confirm deletion", msg);\r
-\r
- if (!ok)\r
- return null;\r
-\r
- Job job = new Job("Delete results") {\r
- @Override\r
- protected IStatus run(IProgressMonitor monitor) {\r
- if (selection != null\r
- && selection instanceof IStructuredSelection) {\r
- List<String> nodes = new ArrayList<String>();\r
- Iterator<?> it = ((IStructuredSelection) selection)\r
- .iterator();\r
- Object obj = null;\r
- try {\r
- while (it.hasNext()) {\r
- obj = it.next();\r
- if (obj instanceof ResultFolder) {\r
- Node node = ((ResultFolder) obj).getNode();\r
- nodes.add(node.getPath());\r
- } else if (obj instanceof SingleResultNode) {\r
- Node node = ((SingleResultNode) obj).getNode();\r
- nodes.add(node.getPath());\r
- }\r
- }\r
- } catch (RepositoryException e) {\r
- ErrorFeedback.show("Cannot list nodes", e);\r
- return null;\r
- }\r
- monitor.beginTask("Delete results", nodes.size());\r
- Node node = null;\r
- try {\r
- for (final String path : nodes) {\r
- if (session.itemExists(path)) {\r
- node = session.getNode(path);\r
- Node parent = node.getParent();\r
- node.remove();\r
- ResultParentUtils.updateStatusOnRemoval(parent);\r
- }\r
- monitor.worked(1);\r
- }\r
- session.save();\r
- } catch (RepositoryException e) {\r
- ErrorFeedback.show("Cannot delete node " + node, e);\r
- }\r
- monitor.done();\r
- }\r
- return Status.OK_STATUS;\r
- }\r
-\r
- };\r
- job.setUser(true);\r
- job.schedule();\r
- return null;\r
- }\r
-\r
- /* DEPENDENCY INJECTION */\r
- public void setSession(Session session) {\r
- this.session = session;\r
- }\r
-}\r
import javax.jcr.nodetype.NodeType;
import org.argeo.slc.SlcException;
-import org.argeo.slc.jcr.SlcJcrResultUtils;
import org.argeo.slc.jcr.SlcNames;
import org.argeo.slc.jcr.SlcTypes;
/**
- * UI Tree component that wrap a node of type NT_UNSTRUCTURED.
+ * UI Tree component that wrap a node of type NT_UNSTRUCTURED or base node for
+ * UI specific, user defined tree structure of type SLC_MY_RESULTS_ROOT_FOLDER.
*
* It is used for
* <ul>
public synchronized Object[] getChildren() {
Object[] children = super.getChildren();
try {
- if (node.getPath().equals(
- SlcJcrResultUtils.getMyResultsBasePath(node.getSession())))
+ if (node.isNodeType(SlcTypes.SLC_MY_RESULT_ROOT_FOLDER))
return ResultParentUtils.orderChildren(children);
else
return children;
}
private boolean isPassed = true;
- private boolean isDisposed = false;
protected synchronized void setPassed(boolean isPassed) {
this.isPassed = isPassed;
@Override
public synchronized boolean hasChildren() {
- // sometimes in UI, disposed objects are still called.
- if (isDisposed)
- return false;
+ // only initialize when needed : correctly called by the jface framework
if (!isLoaded())
initialize();
return super.hasChildren();
}
public void forceFullRefresh() {
- if (isDisposed)
- return;
+ // if (isDisposed)
+ // return;
if (hasChildren())
clearChildren();
initialize();
public synchronized void dispose() {
super.dispose();
- isDisposed = true;
}
protected abstract void initialize();
-
}
return orderedChildren;
}
- public static ResultParent[] getResultsForDates(Session session,
+ public static List<Node> getResultsForDates(Session session,
List<String> dateRelPathes) {
if (dateRelPathes == null || dateRelPathes.size() == 0)
throw new SlcException("Specify at least one correct date as Path");
QueryResult result = q.execute();
NodeIterator ni = result.getNodes();
- ResultParent[] results = new ResultParent[(int) ni.getSize()];
- int i = 0;
+ List<Node> nodes = new ArrayList<Node>();
while (ni.hasNext()) {
- Node currNode = ni.nextNode();
- SingleResultNode srn = new SingleResultNode(null, currNode,
- currNode.getProperty(SlcNames.SLC_TEST_CASE)
- .getString());
-
- results[i] = srn;
- i++;
+ nodes.add(ni.nextNode());
}
- return results;
+ return nodes;
} catch (RepositoryException re) {
throw new SlcException(
"Unexpected error while getting Results for given date", re);
return;
}
} catch (RepositoryException e) {
- throw new SlcException("Unexpected error while updating status on removal", e);
+ throw new SlcException(
+ "Unexpected error while updating status on removal", e);
}
}
*/
package org.argeo.slc.client.ui.model;
+import java.util.List;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+
+import org.argeo.slc.SlcException;
+import org.argeo.slc.jcr.SlcNames;
+import org.argeo.slc.jcr.SlcTypes;
+
/**
- * UI Tree component. Virtual folder to list either other folders and/or a list
- * of results. Keeps a reference to its parent that might be null if the .
+ * UI Tree component. Virtual folder to list a list of results. Keeps a
+ * reference to its parent that might be null. It also keeps a reference to all
+ * nodes that must be displayed as children of the current virtual folder.
*/
public class VirtualFolder extends ResultParent {
- ResultParent[] children;
+ List<Node> displayedNodes;
- public VirtualFolder(VirtualFolder parent, ResultParent[] children,
+ public VirtualFolder(VirtualFolder parent, List<Node> displayedNodes,
String name) {
super(name);
setParent(parent);
- this.children = children;
- }
-
- @Override
- public synchronized void dispose() {
- super.dispose();
+ this.displayedNodes = displayedNodes;
}
@Override
protected void initialize() {
- if (children != null)
- for (ResultParent child : children)
- addChild(child);
- }
-
- public void resetChildren(ResultParent[] children) {
- clearChildren();
- this.children = children;
- initialize();
+ try {
+ for (Node currNode : displayedNodes) {
+ if (currNode.isNodeType(SlcTypes.SLC_TEST_RESULT)) {
+ SingleResultNode srn = new SingleResultNode(this, currNode,
+ currNode.getProperty(SlcNames.SLC_TEST_CASE)
+ .getString());
+ addChild(srn);
+ }
+ }
+ } catch (RepositoryException re) {
+ throw new SlcException(
+ "Unexpected error while initializing ParentNodeFolder : "
+ + getName(), re);
+ }
}
}
\ No newline at end of file
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
\r
sashForm.setWeights(getWeights());\r
\r
+ resultTreeViewer.setInput(initializeResultTree());\r
+ // Initialize observer\r
try {\r
ObservationManager observationManager = session.getWorkspace()\r
.getObservationManager();\r
} catch (RepositoryException e) {\r
throw new SlcException("Cannot register listeners", e);\r
}\r
-\r
- // Refresh the view to initialize it\r
- refresh(null);\r
}\r
\r
// The main tree viewer\r
* \r
*/\r
public void refresh(ResultParent resultParent) {\r
- if (log.isDebugEnabled())\r
- log.debug("Refreshing '" + resultParent + "'...");\r
+ // if (log.isDebugEnabled())\r
+ // log.debug("Refreshing '" + resultParent + "'...");\r
// Thread.dumpStack();\r
if (resultParent == null) {\r
resultTreeViewer.setInput(initializeResultTree());\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
\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
+ // Force initialization of the tree structure if needed\r
+ SlcJcrResultUtils.getSlcResultsParentNode(session);\r
+ SlcJcrResultUtils.getMyResultParentNode(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, 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 = 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
+ }\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
+ 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
+ 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
lastSelectedTargetElement = (ResultParent) target;\r
}\r
}\r
-\r
} catch (RepositoryException re) {\r
throw new SlcException(\r
"unexpected error while validating drop target", re);\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
protected void onEventInUiThread(List<Event> events)\r
throws RepositoryException {\r
- int i = 0;\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
- }\r
- }\r
- }\r
- if (log.isDebugEnabled())\r
- log.debug("treated events: " + i);\r
+ refresh(lastSelectedSourceElementParent);\r
+\r
+ // boolean wasRemoved = false;\r
+ // boolean wasAdded = false;\r
+ //\r
+ // for (Event event : events) {\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
+ // wasRemoved = true;\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
+ // wasAdded = true;\r
+ // // resultTreeViewer.expandToLevel(\r
+ // // lastSelectedTargetElement, 1);\r
+ // }\r
+ // }\r
+ // }\r
+ // }\r
+ // if (wasRemoved || wasAdded)\r
+ // refresh(lastSelectedSourceElementParent);\r
}\r
}\r
\r
}
}
+ /**
+ * Returns the base node to store SlcResults. If it does not exists, it is
+ * created. If a node already exists at the given path with the wrong type,
+ * it throws an exception.
+ *
+ * @param session
+ * @return
+ */
+ public static Node getSlcResultsParentNode(Session session) {
+ try {
+ String absPath = getSlcResultsBasePath(session);
+ if (session.nodeExists(absPath)) {
+ Node currNode = session.getNode(absPath);
+ if (currNode.isNodeType(NodeType.NT_UNSTRUCTURED))
+ return currNode;
+ else
+ throw new SlcException(
+ "A node already exists at this path : " + absPath
+ + " that has the wrong type. ");
+ } else {
+ Node slcResParNode = JcrUtils.mkdirs(session, absPath);
+ slcResParNode.setPrimaryType(NodeType.NT_UNSTRUCTURED);
+ session.save();
+ return slcResParNode;
+ }
+ } catch (RepositoryException re) {
+ throw new SlcException(
+ "Unexpected error while creating slcResult root parent node.",
+ re);
+ }
+ }
+
/**
* Returns the path to the current Result UI specific node, depending the
* current user
}
/**
- * Creates a new node with type NodeType.NT_UNSTRUCTURED at the given
- * absolute path. If a node already exists at the given path, returns that
- * node if it has the correct type and throws an exception otherwise.
+ * Creates a new node with type SlcTypes.SLC_MY_RESULT_ROOT_FOLDER at the
+ * given absolute path. If a node already exists at the given path, returns
+ * that node if it has the correct type and throws an exception otherwise.
*
* @param session
* @return
String absPath = getMyResultsBasePath(session);
if (session.nodeExists(absPath)) {
Node currNode = session.getNode(absPath);
- if (currNode.isNodeType(NodeType.NT_UNSTRUCTURED))
+ if (currNode.isNodeType(SlcTypes.SLC_MY_RESULT_ROOT_FOLDER))
return currNode;
else
throw new SlcException(
+ " that has the wrong type. ");
} else {
Node myResParNode = JcrUtils.mkdirs(session, absPath);
- myResParNode.setPrimaryType(NodeType.NT_UNSTRUCTURED);
+ myResParNode.setPrimaryType(SlcTypes.SLC_MY_RESULT_ROOT_FOLDER);
session.save();
return myResParNode;
}
+ JcrUtils.dateAsPath(now, true) + uuid;
}
- /** GEt the base for the user processeses. */
+ /** Get the base for the user processi. */
public static String getSlcProcessesBasePath(Session session) {
try {
Node userHome = UserJcrUtils.getUserHome(session);
public final static String SLC_CHECK = "slc:check";
public final static String SLC_PROPERTY = "slc:property";
public final static String SLC_DIFF_RESULT = "slc:diffResult";
+
+ // Node types used for user defined and managed result UI tree
+ public final static String SLC_MY_RESULT_ROOT_FOLDER = "slc:myResultRootFolder";
public final static String SLC_RESULT_FOLDER = "slc:resultFolder";
// Log levels
+ * (slc:resultFolder) *
+ * (slc:testResult) *
+// base node for user defined and managed result tree
+// simplify UI management
+[slc:myResultRootFolder] > nt:unstructured
++ * (slc:resultFolder) *
++ * (slc:testResult) *
+
[slc:check] > nt:unstructured
// true for PASSED, false for FAILED or ERROR
- slc:success (BOOLEAN) ! m
projects / gpl / argeo-slc.git / commitdiff