X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=legacy%2Fargeo-commons%2Forg.argeo.cms.ui.workbench%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Fworkbench%2Finternal%2Fuseradmin%2Fcommands%2FUserTransactionHandler.java;h=f9e2ded16c1aea9749123f75131877183a8b0729;hb=2728afed20a95052f93c41ec641808ec5f01f4fb;hp=69fd0711a3fd3a8f063eb7e22b3fb9dd8982ffcb;hpb=e89dfe9dc78f57a9e6af8def551393d88f4747c6;p=gpl%2Fargeo-slc.git

diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/UserTransactionHandler.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/UserTransactionHandler.java
index 69fd0711a..f9e2ded16 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/UserTransactionHandler.java
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/UserTransactionHandler.java
@@ -1,27 +1,10 @@
-/*
- * 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.cms.ui.workbench.internal.useradmin.commands;
 
-import javax.transaction.Status;
-import javax.transaction.UserTransaction;
-
 import org.argeo.cms.CmsException;
 import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.cms.ui.workbench.internal.useradmin.UiAdminUtils;
 import org.argeo.cms.ui.workbench.internal.useradmin.UserAdminWrapper;
+import org.argeo.osgi.transaction.WorkTransaction;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -29,8 +12,7 @@ import org.osgi.service.useradmin.UserAdminEvent;
 
 /** Manage the transaction that is bound to the current perspective */
 public class UserTransactionHandler extends AbstractHandler {
-	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID
-			+ ".userTransactionHandler";
+	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID + ".userTransactionHandler";
 
 	public final static String PARAM_COMMAND_ID = "param.commandId";
 
@@ -43,26 +25,24 @@ public class UserTransactionHandler extends AbstractHandler {
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		String commandId = event.getParameter(PARAM_COMMAND_ID);
-		final UserTransaction userTransaction = userAdminWrapper
-				.getUserTransaction();
+		final WorkTransaction userTransaction = userAdminWrapper.getUserTransaction();
 		try {
 			if (TRANSACTION_BEGIN.equals(commandId)) {
-				if (userTransaction.getStatus() != Status.STATUS_NO_TRANSACTION)
+				if (!userTransaction.isNoTransactionStatus())
 					throw new CmsException("A transaction already exists");
 				else
 					userTransaction.begin();
 			} else if (TRANSACTION_COMMIT.equals(commandId)) {
-				if (userTransaction.getStatus() == Status.STATUS_NO_TRANSACTION)
+				if (userTransaction.isNoTransactionStatus())
 					throw new CmsException("No transaction.");
 				else
 					userTransaction.commit();
 			} else if (TRANSACTION_ROLLBACK.equals(commandId)) {
-				if (userTransaction.getStatus() == Status.STATUS_NO_TRANSACTION)
+				if (userTransaction.isNoTransactionStatus())
 					throw new CmsException("No transaction to rollback.");
 				else {
 					userTransaction.rollback();
-					userAdminWrapper.notifyListeners(new UserAdminEvent(null,
-							UserAdminEvent.ROLE_CHANGED, null));
+					userAdminWrapper.notifyListeners(new UserAdminEvent(null, UserAdminEvent.ROLE_CHANGED, null));
 				}
 			}
 
@@ -80,8 +60,7 @@ public class UserTransactionHandler extends AbstractHandler {
 		} catch (CmsException e) {
 			throw e;
 		} catch (Exception e) {
-			throw new CmsException("Unable to call " + commandId + " on "
-					+ userTransaction, e);
+			throw new CmsException("Unable to call " + commandId + " on " + userTransaction, e);
 		}
 		return null;
 	}