/*\r
- * Copyright (C) 2007-2012 Mathieu Baudier\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
* 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.HashMap;\r
import java.util.Iterator;\r
-import java.util.List;\r
+import java.util.Map;\r
\r
import javax.jcr.Node;\r
import javax.jcr.RepositoryException;\r
.getActiveWorkbenchWindow(event).getActivePage().getSelection();\r
\r
// confirmation\r
- StringBuffer buf = new StringBuffer("");\r
+ StringBuilder buf = new StringBuilder("");\r
Iterator<?> lst = ((IStructuredSelection) selection).iterator();\r
while (lst.hasNext()) {\r
Object obj = lst.next();\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
+ msg = "Do you want to delete following objects (and their children): "\r
+ buf.substring(0, buf.lastIndexOf(", ")) + "?";\r
}\r
Boolean ok = MessageDialog.openConfirm(\r
protected IStatus run(IProgressMonitor monitor) {\r
if (selection != null\r
&& selection instanceof IStructuredSelection) {\r
- List<Node> nodes = new ArrayList<Node>();\r
+ Map<String, Node> nodes = new HashMap<String, 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
+\r
+ while (it.hasNext()) {\r
+ obj = it.next();\r
+ if (obj instanceof ResultFolder) {\r
+ Node node = ((ResultFolder) obj).getNode();\r
+ nodes.put(node.getPath(), node);\r
+ } else if (obj instanceof SingleResultNode) {\r
+ Node node = ((SingleResultNode) obj).getNode();\r
+ nodes.put(node.getPath(), node);\r
+ }\r
+ }\r
if (!nodes.isEmpty()) {\r
- Session session = nodes.get(0).getSession();\r
+ Session session = null;\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
+ for (String path : nodes.keySet()) {\r
+ if (session == null)\r
+ session = nodes.get(path).getSession();\r
+\r
+ // check if the item has not already been\r
+ // deleted while deleting one of its ancestor\r
+ if (session.itemExists(path)) {\r
+ Node parent = nodes.get(path).getParent();\r
+ nodes.get(path).remove();\r
+ ResultParentUtils.updatePassedStatus(\r
+ parent, true);\r
+ }\r
monitor.worked(1);\r
}\r
session.save();\r
job.schedule();\r
return null;\r
}\r
-}\r
+}
\ No newline at end of file