import java.util.ArrayList;
import java.util.List;
-import org.argeo.ArgeoException;
+import org.argeo.cms.CmsException;
+import org.argeo.cms.util.useradmin.UserAdminUtils;
+import org.argeo.osgi.useradmin.LdifName;
import org.argeo.security.ui.admin.SecurityAdminPlugin;
-import org.argeo.security.ui.admin.internal.UserAdminConstants;
+import org.argeo.security.ui.admin.internal.UiUserAdminListener;
import org.argeo.security.ui.admin.internal.UserAdminWrapper;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.forms.AbstractFormPart;
import org.eclipse.ui.forms.editor.FormEditor;
import org.osgi.service.useradmin.Authorization;
import org.osgi.service.useradmin.Role;
import org.osgi.service.useradmin.UserAdminEvent;
/** Editor for a user, might be a user or a group. */
-public class UserEditor extends FormEditor implements UserAdminConstants {
+public class UserEditor extends FormEditor {
private static final long serialVersionUID = 8357851520380820241L;
- public final static String ID = SecurityAdminPlugin.PLUGIN_ID
+ public final static String USER_EDITOR_ID = SecurityAdminPlugin.PLUGIN_ID
+ ".userEditor";
+ public final static String GROUP_EDITOR_ID = SecurityAdminPlugin.PLUGIN_ID
+ + ".groupEditor";
/* DEPENDENCY INJECTION */
private UserAdminWrapper userAdminWrapper;
private User user;
private String username;
+ private NameChangeListener listener;
+
public void init(IEditorSite site, IEditorInput input)
throws PartInitException {
super.init(site, input);
username = ((UserEditorInput) getEditorInput()).getUsername();
user = (User) userAdmin.getRole(username);
- String commonName = getProperty(KEY_CN);
-
- setPartName(commonName != null ? commonName : "username");
-
- // TODO: following has been disabled because it causes NPE after a
- // login/logout on RAP
- // Image titleIcon = user.getType() == Role.GROUP ?
- // SecurityAdminImages.ICON_GROUP
- // : SecurityAdminImages.ICON_USER;
- // setTitleImage(titleIcon);
+ listener = new NameChangeListener(site.getShell().getDisplay(), user);
+ userAdminWrapper.addListener(listener);
+ updateEditorTitle(null);
}
/**
- * returns the list of all authorisation for the given user or of the
+ * returns the list of all authorization for the given user or of the
* current displayed user if parameter is null
*/
protected List<User> getFlatGroups(User aUser) {
}
void updateEditorTitle(String title) {
+ if (title == null) {
+ String commonName = UserAdminUtils.getProperty(user,
+ LdifName.cn.name());
+ title = "".equals(commonName) ? user.getName() : commonName;
+ }
setPartName(title);
}
else
addPage(new UserMainPage(this, userAdminWrapper));
} catch (Exception e) {
- throw new ArgeoException("Cannot add pages", e);
+ throw new CmsException("Cannot add pages", e);
}
}
- protected String getProperty(String key) {
- Object obj = user.getProperties().get(key);
- if (obj != null)
- return (String) obj;
- else
- return "";
- }
-
- /**
- * Updates the property in the working copy. The transaction must be
- * explicitly committed to persist the update.
- */
- @SuppressWarnings("unchecked")
- protected void setProperty(String key, String value) {
- user.getProperties().put(key, value);
- }
-
@Override
public void doSave(IProgressMonitor monitor) {
userAdminWrapper.beginTransactionIfNeeded();
commitPages(true);
+ userAdminWrapper.commitOrNotifyTransactionStateChange();
firePropertyChange(PROP_DIRTY);
userAdminWrapper.notifyListeners(new UserAdminEvent(null,
UserAdminEvent.ROLE_REMOVED, user));
return false;
}
- public void refresh() {
-
- }
-
@Override
public void dispose() {
+ userAdminWrapper.removeListener(listener);
super.dispose();
}
+ // CONTROLERS FOR THIS EDITOR AND ITS PAGES
+
+ private class NameChangeListener extends UiUserAdminListener {
+
+ private final User user;
+
+ public NameChangeListener(Display display, User user) {
+ super(display);
+ this.user = user;
+ }
+
+ @Override
+ public void roleChangedToUiThread(UserAdminEvent event) {
+ Role changedRole = event.getRole();
+ if (changedRole == null || changedRole.equals(user))
+ updateEditorTitle(null);
+ }
+ }
+
+ class MainInfoListener extends UiUserAdminListener {
+ private final AbstractFormPart part;
+
+ public MainInfoListener(Display display, AbstractFormPart part) {
+ super(display);
+ this.part = part;
+ }
+
+ @Override
+ public void roleChangedToUiThread(UserAdminEvent event) {
+ // Rollback
+ if (event.getRole() == null)
+ part.markStale();
+ }
+ }
+
+ class GroupChangeListener extends UiUserAdminListener {
+ private final AbstractFormPart part;
+
+ public GroupChangeListener(Display display, AbstractFormPart part) {
+ super(display);
+ this.part = part;
+ }
+
+ @Override
+ public void roleChangedToUiThread(UserAdminEvent event) {
+ // always mark as stale
+ part.markStale();
+ }
+ }
+
+ /** Registers a listener that will notify this part */
+ class FormPartML implements ModifyListener {
+ private static final long serialVersionUID = 6299808129505381333L;
+ private AbstractFormPart formPart;
+
+ public FormPartML(AbstractFormPart generalPart) {
+ this.formPart = generalPart;
+ }
+
+ public void modifyText(ModifyEvent e) {
+ // Discard event when the control does not have the focus, typically
+ // to avoid all editors being marked as dirty during a Rollback
+ if (((Control) e.widget).isFocusControl())
+ formPart.markDirty();
+ }
+ }
+
/* DEPENDENCY INJECTION */
public void setUserAdminWrapper(UserAdminWrapper userAdminWrapper) {
this.userAdminWrapper = userAdminWrapper;