From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 26 Jun 2012 10:42:06 +0000 (+0000)
Subject: Fix delete
X-Git-Tag: argeo-slc-2.1.7~705
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=6882f48a52fd579dc2af34ff3c85d78eba50311b;hp=94c035fa1fac1f2c7a9919854bb13770a95f8f05;p=gpl%2Fargeo-slc.git

Fix delete

git-svn-id: https://svn.argeo.org/slc/trunk@5349 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/eclipse/plugins/org.argeo.slc.client.ui.dist/META-INF/spring/commands.xml b/eclipse/plugins/org.argeo.slc.client.ui.dist/META-INF/spring/commands.xml
index 63d63517e..3cd4942ce 100644
--- a/eclipse/plugins/org.argeo.slc.client.ui.dist/META-INF/spring/commands.xml
+++ b/eclipse/plugins/org.argeo.slc.client.ui.dist/META-INF/spring/commands.xml
@@ -50,7 +50,6 @@
 	<bean id="org.argeo.slc.client.ui.dist.deleteArtifacts"
 		class="org.argeo.slc.client.ui.dist.commands.DeleteArtifacts"
 		scope="prototype">
-		<property name="repository" ref="javaRepository" />
 	</bean>
 	<bean id="refreshDistributionOverviewPage"
 		class="org.argeo.slc.client.ui.dist.commands.RefreshDistributionOverviewPage"
diff --git a/eclipse/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java b/eclipse/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java
index 5ced1609e..5e67975fc 100644
--- a/eclipse/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java
+++ b/eclipse/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java
@@ -3,9 +3,7 @@ package org.argeo.slc.client.ui.dist.commands;
 import java.util.Iterator;
 
 import javax.jcr.Node;
-import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
-import javax.jcr.Session;
 
 import org.argeo.ArgeoException;
 import org.argeo.slc.client.ui.dist.DistPlugin;
@@ -29,9 +27,6 @@ public class DeleteArtifacts extends AbstractHandler {
 	public final static String DEFAULT_LABEL = "Delete selected items";
 	public final static String DEFAULT_ICON_PATH = "icons/removeItem.gif";
 
-	/* DEPENDENCY INJECTION */
-	private Repository repository;
-
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		String msg = "Your are about to definitively remove these artifacts.\n"
 				+ "Do you really want to proceed ?";
@@ -40,9 +35,9 @@ public class DeleteArtifacts extends AbstractHandler {
 				.getWorkbench().getDisplay().getActiveShell(),
 				"Confirm deletion", msg);
 		if (result) {
-			Session session = null;
+			// Session session = null;
 			try {
-				session = repository.login();
+				// session = repository.login();
 				IWorkbenchPart activePart = DistPlugin.getDefault()
 						.getWorkbench().getActiveWorkbenchWindow()
 						.getActivePage().getActivePart();
@@ -57,25 +52,22 @@ public class DeleteArtifacts extends AbstractHandler {
 								.iterator();
 						while (it.hasNext()) {
 							Node node = (Node) it.next();
-							node.remove();
+							// we remove the artifactVersion, that is the parent
+							node.getParent().remove();
+							node.getSession().save();
 						}
 					}
-					session.save();
+					// session.save();
 				}
 				CommandHelpers.callCommand(RefreshDistributionOverviewPage.ID);
 			} catch (RepositoryException re) {
 				throw new ArgeoException(
 						"Unexpected error while deleting artifacts.", re);
 			} finally {
-				if (session != null)
-					session.logout();
+				// if (session != null)
+				// session.logout();
 			}
 		}
 		return null;
 	}
-
-	/* DEPENDENCY INJECTION */
-	public void setRepository(Repository repository) {
-		this.repository = repository;
-	}
 }