X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ui.admin%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Finternal%2Fproviders%2FUserAdminAbstractLP.java;h=89901fa7c49c1c17675cc8eb5b5d349ea4a0c0a2;hb=f0be5ec381492eff23d4576ee4122734af4ad877;hp=68138ca26d7ce3628da54c115001966dbf851b2c;hpb=732542c8de267ed7d6cbb8c66b84cc90c8ad22d7;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserAdminAbstractLP.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserAdminAbstractLP.java index 68138ca26..89901fa7c 100644 --- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserAdminAbstractLP.java +++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/providers/UserAdminAbstractLP.java @@ -3,8 +3,9 @@ package org.argeo.security.ui.admin.internal.providers; import javax.naming.InvalidNameException; import javax.naming.ldap.LdapName; +import org.argeo.ArgeoException; +import org.argeo.osgi.useradmin.LdifName; import org.argeo.security.ui.admin.internal.UiAdminUtils; -import org.argeo.security.ui.admin.internal.UserAdminConstants; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.viewers.ColumnLabelProvider; import org.eclipse.swt.SWT; @@ -16,8 +17,7 @@ import org.osgi.service.useradmin.User; * Utility class that add font modifications to a column label provider * depending on the given user properties */ -public abstract class UserAdminAbstractLP extends ColumnLabelProvider implements - UserAdminConstants { +public abstract class UserAdminAbstractLP extends ColumnLabelProvider { private static final long serialVersionUID = 137336765024922368L; // private Font italic; @@ -29,13 +29,17 @@ public abstract class UserAdminAbstractLP extends ColumnLabelProvider implements try { LdapName selfUserName = UiAdminUtils.getLdapName(); String userName = UiAdminUtils.getProperty((User) element, - UserAdminConstants.KEY_DN); + LdifName.dn.name()); LdapName userLdapName = new LdapName(userName); - if (userLdapName.equals(selfUserName)) + if (userLdapName.equals(selfUserName)) { + if (bold == null) + bold = JFaceResources.getFontRegistry() + .defaultFontDescriptor().setStyle(SWT.BOLD) + .createFont(Display.getCurrent()); return bold; + } } catch (InvalidNameException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + throw new ArgeoException("cannot parse dn for " + element, e); } // Disabled as Italic @@ -57,7 +61,7 @@ public abstract class UserAdminAbstractLP extends ColumnLabelProvider implements // italic = JFaceResources.getFontRegistry().defaultFontDescriptor() // .setStyle(SWT.ITALIC).createFont(display); bold = JFaceResources.getFontRegistry().defaultFontDescriptor() - .setStyle(SWT.BOLD).createFont(display); + .setStyle(SWT.BOLD).createFont(Display.getCurrent()); } public abstract String getText(User user);