X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=plugins%2Forg.argeo.slc.client.ui.dist%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fdist%2Fcommands%2FDeleteWorkspace.java;h=d4a7783a48857c937cc74ab52c1b75a1dea029a3;hb=706b98df2c68382d7bd501fa05cb128f329087ee;hp=357b9e7c33d7a5ba7783b3fa214369eb12c71caa;hpb=0d236262a853a1286b317c30d64d4692bc21c7a4;p=gpl%2Fargeo-slc.git

diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/DeleteWorkspace.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/DeleteWorkspace.java
index 357b9e7c3..d4a7783a4 100644
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/DeleteWorkspace.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/DeleteWorkspace.java
@@ -34,6 +34,7 @@ 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.resource.ImageDescriptor;
 
 /**
  * Delete chosen workspace in the current repository.
@@ -42,13 +43,14 @@ import org.eclipse.jface.dialogs.MessageDialog;
  * removing all nodes of type {@code NodeType.NT_FOLDER} and
  * {@code NodeType.NT_UNSTRUCTURED}
  */
-
 public class DeleteWorkspace extends AbstractHandler {
 	// private static final Log log = LogFactory.getLog(DeleteWorkspace.class);
 
 	public final static String ID = DistPlugin.ID + ".deleteWorkspace";
 	public final static String DEFAULT_LABEL = "Clear";
-	public final static String DEFAULT_ICON_PATH = "icons/removeItem.gif";
+	public final static ImageDescriptor DEFAULT_ICON = DistPlugin
+			.getImageDescriptor("icons/removeItem.gif");
+
 	public final static String PARAM_WORKSPACE_NAME = "workspaceName";
 	public final static String PARAM_TARGET_REPO_PATH = "targetRepoPath";
 
@@ -64,7 +66,6 @@ public class DeleteWorkspace extends AbstractHandler {
 
 		Session nodeSession = null;
 		Session session = null;
-
 		try {
 			nodeSession = nodeRepository.login();
 			Node repoNode = nodeSession.getNode(targetRepoPath);
@@ -74,7 +75,7 @@ public class DeleteWorkspace extends AbstractHandler {
 					keyring, repoNode);
 
 			String msg = "Your are about to completely delete workspace ["
-					+ workspaceName + "].\n Do you really want to proceed ?";
+					+ workspaceName + "].\n Do you really want to proceed?";
 			boolean result = MessageDialog.openConfirm(DistPlugin.getDefault()
 					.getWorkbench().getDisplay().getActiveShell(),
 					"Confirm workspace deletion", msg);
@@ -83,10 +84,10 @@ public class DeleteWorkspace extends AbstractHandler {
 				// msg =
 				// "There is no possible turning back, are your REALLY sure you want to proceed ?";
 				msg = "WARNING: \nCurrent Jackrabbit version used does "
-						+ "not support workspace management.\n"
+						+ "not support workspace deletion.\n"
 						+ "Thus, the workspace will only be cleaned so "
 						+ "that you can launch fetch process again.\n\n"
-						+ "Do you still want to proceed ?";
+						+ "Do you still want to proceed?";
 				result = MessageDialog.openConfirm(DistPlugin.getDefault()
 						.getWorkbench().getDisplay().getActiveShell(),
 						"Confirm workspace deletion", msg);
@@ -94,11 +95,9 @@ public class DeleteWorkspace extends AbstractHandler {
 
 			if (result) {
 				session = repository.login(credentials, workspaceName);
-
 				// TODO use this with a newer version of Jackrabbit
 				// Workspace wsp = session.getWorkspace();
 				// wsp.deleteWorkspace(workspaceName);
-
 				NodeIterator nit = session.getRootNode().getNodes();
 				while (nit.hasNext()) {
 					Node node = nit.nextNode();