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%2Fproviders%2FUserTransactionProvider.java;h=71abe01208f311da745051da9b1a22b611dcfda7;hb=2728afed20a95052f93c41ec641808ec5f01f4fb;hp=a53cfb2dfff4cd71dfcec75f4ce67639366605be;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/providers/UserTransactionProvider.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserTransactionProvider.java index a53cfb2df..71abe0120 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserTransactionProvider.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserTransactionProvider.java @@ -3,13 +3,11 @@ package org.argeo.cms.ui.workbench.internal.useradmin.providers; import java.util.HashMap; import java.util.Map; -import javax.transaction.Status; -import javax.transaction.UserTransaction; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.cms.CmsException; import org.argeo.cms.ui.workbench.WorkbenchUiPlugin; +import org.argeo.osgi.transaction.WorkTransaction; import org.eclipse.ui.AbstractSourceProvider; import org.eclipse.ui.ISources; @@ -24,7 +22,7 @@ public class UserTransactionProvider extends AbstractSourceProvider { public final static String STATUS_NO_TRANSACTION = "status.noTransaction"; /* DEPENDENCY INJECTION */ - private UserTransaction userTransaction; + private WorkTransaction userTransaction; @Override public String[] getProvidedSourceNames() { @@ -45,7 +43,7 @@ public class UserTransactionProvider extends AbstractSourceProvider { private String getInternalCurrentState() { try { String transactionState; - if (userTransaction.getStatus() == Status.STATUS_NO_TRANSACTION) + if (userTransaction.isNoTransactionStatus()) transactionState = STATUS_NO_TRANSACTION; else // if (userTransaction.getStatus() == Status.STATUS_ACTIVE) @@ -68,7 +66,7 @@ public class UserTransactionProvider extends AbstractSourceProvider { } /* DEPENDENCY INJECTION */ - public void setUserTransaction(UserTransaction userTransaction) { + public void setUserTransaction(WorkTransaction userTransaction) { this.userTransaction = userTransaction; } }