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%2FManageWorkspaceAuth.java;h=bd64aeb3af9eab6c77818a3843542d77b8466b16;hb=39ceeb3083d5d9df0cf2f93bd26285e4c33234e3;hp=717e86bf48e33629e3de8b601cccdeafe7de6fda;hpb=651d33e13bfa9a7b46464be412023ee747e612e8;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/ManageWorkspaceAuth.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/ManageWorkspaceAuth.java
index 717e86bf4..bd64aeb3a 100644
--- 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
@@ -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.slc.client.ui.dist.commands;
 
 import javax.jcr.Repository;
@@ -5,30 +20,32 @@ 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;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jface.resource.ImageDescriptor;
 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 DEFAULT_LABEL = "Manage Rights";
+	public final static ImageDescriptor DEFAULT_ICON = DistPlugin
+			.getImageDescriptor("icons/changeRights.gif");
+
 	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";
 
 	/* DEPENDENCY INJECTION */
 	private Repository repository;
-
 	private Session session;
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
@@ -41,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);
 		}
 	}