X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fplugins%2Forg.argeo.jcr.ui.explorer%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2Fui%2Fexplorer%2Fcommands%2FDeleteNodes.java;h=26d4cdd4323f85ed7f58df47cf952f96d9169d97;hb=3a3d316af102ba410d1d9e6de349d0c8f7ac044f;hp=a0e106906a3747b297d66f0c392505c761293fbf;hpb=c0b7b3f9d1781d074ab35d24017042fa9415e1e4;p=lgpl%2Fargeo-commons.git

diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/DeleteNodes.java b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/DeleteNodes.java
index a0e106906..26d4cdd43 100644
--- a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/DeleteNodes.java
+++ b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/DeleteNodes.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.jcr.ui.explorer.commands;
 
 import java.util.Iterator;
@@ -8,12 +23,13 @@ import javax.jcr.RepositoryException;
 import org.argeo.ArgeoException;
 import org.argeo.eclipse.ui.ErrorFeedback;
 import org.argeo.eclipse.ui.TreeParent;
-import org.argeo.jcr.ui.explorer.model.SingleJcrNode;
-import org.argeo.jcr.ui.explorer.model.WorkspaceNode;
+import org.argeo.jcr.ui.explorer.model.SingleJcrNodeElem;
+import org.argeo.jcr.ui.explorer.model.WorkspaceElem;
 import org.argeo.jcr.ui.explorer.views.GenericJcrBrowser;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.handlers.HandlerUtil;
@@ -22,26 +38,45 @@ import org.eclipse.ui.handlers.HandlerUtil;
  * Deletes the selected nodes: both in the JCR repository and in the UI view.
  * Warning no check is done, except implementation dependent native checks,
  * handle with care.
+ * 
+ * This handler is still 'hard linked' to a GenericJcrBrowser view to enable
+ * correct tree refresh when a node is added. This must be corrected in future
+ * versions.
  */
 public class DeleteNodes extends AbstractHandler {
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		ISelection selection = HandlerUtil.getActiveWorkbenchWindow(event)
 				.getActivePage().getSelection();
+		if (selection == null || !(selection instanceof IStructuredSelection))
+			return null;
+
 		GenericJcrBrowser view = (GenericJcrBrowser) HandlerUtil
 				.getActiveWorkbenchWindow(event).getActivePage()
 				.findView(HandlerUtil.getActivePartId(event));
 
-		if (selection != null && selection instanceof IStructuredSelection) {
+		// confirmation
+		StringBuffer buf = new StringBuffer("");
+		Iterator<?> lst = ((IStructuredSelection) selection).iterator();
+		while (lst.hasNext()) {
+			SingleJcrNodeElem sjn = ((SingleJcrNodeElem) lst.next());
+			buf.append(sjn.getName()).append(' ');
+		}
+		Boolean ok = MessageDialog.openConfirm(
+				HandlerUtil.getActiveShell(event), "Confirm deletion",
+				"Do you want to delete " + buf + "?");
+
+		// operation
+		if (ok) {
 			Iterator<?> it = ((IStructuredSelection) selection).iterator();
 			Object obj = null;
-			SingleJcrNode ancestor = null;
-			WorkspaceNode rootAncestor = null;
+			SingleJcrNodeElem ancestor = null;
+			WorkspaceElem rootAncestor = null;
 			try {
 				while (it.hasNext()) {
 					obj = it.next();
-					if (obj instanceof SingleJcrNode) {
+					if (obj instanceof SingleJcrNodeElem) {
 						// Cache objects
-						SingleJcrNode sjn = (SingleJcrNode) obj;
+						SingleJcrNodeElem sjn = (SingleJcrNodeElem) obj;
 						TreeParent tp = (TreeParent) sjn.getParent();
 						Node node = sjn.getNode();
 
@@ -52,10 +87,10 @@ public class DeleteNodes extends AbstractHandler {
 						tp.removeChild(sjn);
 
 						// Check if the parent is the root node
-						if (tp instanceof WorkspaceNode)
-							rootAncestor = (WorkspaceNode) tp;
+						if (tp instanceof WorkspaceElem)
+							rootAncestor = (WorkspaceElem) tp;
 						else
-							ancestor = getOlder(ancestor, (SingleJcrNode) tp);
+							ancestor = getOlder(ancestor, (SingleJcrNodeElem) tp);
 					}
 				}
 				if (rootAncestor != null)
@@ -69,7 +104,7 @@ public class DeleteNodes extends AbstractHandler {
 		return null;
 	}
 
-	private SingleJcrNode getOlder(SingleJcrNode A, SingleJcrNode B) {
+	private SingleJcrNodeElem getOlder(SingleJcrNodeElem A, SingleJcrNodeElem B) {
 		try {
 			if (A == null)
 				return B == null ? null : B;