X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ui.admin%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Finternal%2FUiAdminUtils.java;h=871877a0e21d349f2cf36a469fca092fb7c6a0de;hb=8260f4470f514ea347ca53f5b4dfc632c4a4de66;hp=05858cbd4e4b290a74a0afb5821137e4e734a2de;hpb=1b8ad59bf691c15ed1317378a83c71c56c81cad2;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java
index 05858cbd4..871877a0e 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java
@@ -1,59 +1,32 @@
 package org.argeo.security.ui.admin.internal;
 
-import java.security.AccessController;
-import java.security.Principal;
+import javax.transaction.UserTransaction;
 
-import javax.security.auth.Subject;
-import javax.security.auth.x500.X500Principal;
-
-import org.osgi.service.useradmin.Role;
-import org.osgi.service.useradmin.User;
+import org.argeo.cms.CmsException;
+import org.argeo.security.ui.admin.internal.providers.UserTransactionProvider;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.services.ISourceProviderService;
 
 /** First effort to centralize back end methods used by the user admin UI */
 public class UiAdminUtils {
-	public final static String getUsername() {
-		Subject subject = Subject.getSubject(AccessController.getContext());
-		Principal principal = subject.getPrincipals(X500Principal.class)
-				.iterator().next();
-		return principal.getName();
-
-	}
-
-	public final static String getUsername(User user) {
-		String cn = getProperty(user, UserAdminConstants.KEY_CN);
-		if (isEmpty(cn))
-			cn = getProperty(user, UserAdminConstants.KEY_UID);
-		return cn;
-	}
-
-	public final static String getProperty(Role role, String key) {
-		Object obj = role.getProperties().get(key);
-		if (obj != null)
-			return (String) obj;
-		else
-			return "";
-	}
-
-	public final static String getDefaultCn(String firstName, String lastName) {
-		return (firstName.trim() + " " + lastName.trim() + " ").trim();
-	}
-
 	/*
 	 * INTERNAL METHODS: Below methods are meant to stay here and are not part
 	 * of a potential generic backend to manage the useradmin
 	 */
-	public final static boolean notNull(String string) {
-		if (string == null)
-			return false;
-		else
-			return !"".equals(string.trim());
+	/** Easily notify the ActiveWindow that the transaction had a state change */
+	public final static void notifyTransactionStateChange(
+			UserTransaction userTransaction) {
+		try {
+			IWorkbenchWindow aww = PlatformUI.getWorkbench()
+					.getActiveWorkbenchWindow();
+			ISourceProviderService sourceProviderService = (ISourceProviderService) aww
+					.getService(ISourceProviderService.class);
+			UserTransactionProvider esp = (UserTransactionProvider) sourceProviderService
+					.getSourceProvider(UserTransactionProvider.TRANSACTION_STATE);
+			esp.fireTransactionStateChange();
+		} catch (Exception e) {
+			throw new CmsException("Unable to begin transaction", e);
+		}
 	}
-
-	public final static boolean isEmpty(String string) {
-		if (string == null)
-			return true;
-		else
-			return "".equals(string.trim());
-	}
-
 }
\ No newline at end of file