Adapt run as OSGi to felix Gogo console

[gpl/argeo-slc.git] / plugins / org.argeo.slc.client.ui.dist / src / main / java / org / argeo / slc / client / ui / dist / commands / ManageWorkspaceAuth.java

diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/ManageWorkspaceAuth.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/ManageWorkspaceAuth.java
index 3f47b78da745dd1538d80d618836f529f47e127c..bd64aeb3af9eab6c77818a3843542d77b8466b16 100644 (file)
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/ManageWorkspaceAuth.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/ManageWorkspaceAuth.java
@@ -20,6 +20,7 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
 import org.argeo.ArgeoException;
+import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.argeo.slc.client.ui.dist.wizards.ChangeRightsWizard;
 import org.eclipse.core.commands.AbstractHandler;
@@ -30,24 +31,21 @@ import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.ui.handlers.HandlerUtil;
 
 /**
- * Open a dialog to change rights on the root node of the current workspace.
+ * Open a dialog to manage rights on the current workspace's root node.
  */
-
 public class ManageWorkspaceAuth extends AbstractHandler {
        // private static final Log log =
        // LogFactory.getLog(ManageWorkspaceAuth.class);
        public final static String ID = DistPlugin.ID + ".manageWorkspaceAuth";
-       public final static String PARAM_WORKSPACE_NAME = DistPlugin.ID
-                       + ".workspaceName";
        public final static String DEFAULT_LABEL = "Manage Rights";
-       // public final static String DEFAULT_ICON_PATH = "icons/changeRights.gif";
        public final static ImageDescriptor DEFAULT_ICON = DistPlugin
                        .getImageDescriptor("icons/changeRights.gif");
 
+       public final static String PARAM_WORKSPACE_NAME = DistPlugin.ID
+                       + ".workspaceName";
 
        /* DEPENDENCY INJECTION */
        private Repository repository;
-
        private Session session;
 
        public Object execute(ExecutionEvent event) throws ExecutionException {
@@ -60,11 +58,10 @@ public class ManageWorkspaceAuth extends AbstractHandler {
                        dialog.open();
                        return null;
                } catch (RepositoryException re) {
-                       throw new ArgeoException(
-                                       "Unexpected error while creating the new workspace.", re);
+                       throw new ArgeoException("Cannot log in the repository "
+                                       + repository + " in workspace " + workspaceName, re);
                } finally {
-                       if (session != null)
-                               session.logout();
+                       JcrUtils.logoutQuietly(session);
                }
        }