From 3dd2fac453c0268721370c009d4b1515a9b02cd8 Mon Sep 17 00:00:00 2001 From: Bruno Sinou Date: Mon, 27 Apr 2015 14:34:01 +0000 Subject: [PATCH] Enhance comments, remove typos git-svn-id: https://svn.argeo.org/commons/trunk@8077 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../src/org/argeo/cms/users/UserPage.java | 19 +----- .../src/org/argeo/cms/users/UserPart.java | 58 +++++-------------- 2 files changed, 18 insertions(+), 59 deletions(-) diff --git a/org.argeo.cms/src/org/argeo/cms/users/UserPage.java b/org.argeo.cms/src/org/argeo/cms/users/UserPage.java index 83998baad..0b9844344 100644 --- a/org.argeo.cms/src/org/argeo/cms/users/UserPage.java +++ b/org.argeo.cms/src/org/argeo/cms/users/UserPage.java @@ -16,19 +16,9 @@ import org.eclipse.swt.widgets.Control; /** Enable management of a given user */ public class UserPage implements CmsUiProvider { - // Enable user CRUD // INJECTED + /* DEPENDENCY INJECTION */ private UserAdminService userAdminService; - // private UserDetailsManager userDetailsManager; - - // private JcrSecurityModel jcrSecurityModel; - - // public UserPage(UserAdminService userAdminService, - // JcrSecurityModel jcrSecurityModel) { - // this.userAdminService = userAdminService; - // this.jcrSecurityModel = jcrSecurityModel; - // } - @Override public Control createUi(Composite parent, Node context) throws RepositoryException { @@ -39,7 +29,7 @@ public class UserPage implements CmsUiProvider { Control control = userViewer.getControl(); - // FIXME not satisfying.close + // FIXME not satisfying. if (control instanceof UserPart) ((UserPart) control).setUserAdminService(userAdminService); @@ -74,9 +64,4 @@ public class UserPage implements CmsUiProvider { public void setUserAdminService(UserAdminService userAdminService) { this.userAdminService = userAdminService; } - - // public void setUserDetailsManager(UserDetailsManager userDetailsManager) - // { - // this.userDetailsManager = userDetailsManager; - // } } \ No newline at end of file diff --git a/org.argeo.cms/src/org/argeo/cms/users/UserPart.java b/org.argeo.cms/src/org/argeo/cms/users/UserPart.java index 935614737..b3e7c9cf2 100644 --- a/org.argeo.cms/src/org/argeo/cms/users/UserPart.java +++ b/org.argeo.cms/src/org/argeo/cms/users/UserPart.java @@ -46,8 +46,6 @@ public class UserPart extends StyledControl implements EditablePart, NodePart, private UserAdminService userAdminService; - // private UserDetailsManager userDetailsManager; - // TODO implement to provide user creation ability for anonymous user? // public UserPart(Composite parent, int swtStyle) { // super(parent, swtStyle); @@ -68,34 +66,22 @@ public class UserPart extends StyledControl implements EditablePart, NodePart, return getNode(); } - // Experimental, remove - // public void setMouseListener(MouseListener mouseListener) { - // super.setMouseListener(mouseListener); - // - // for (Text txt : texts) - // txt.addMouseListener(mouseListener); - // - // } - @Override protected Control createControl(Composite box, String style) { Composite body = new Composite(box, SWT.NO_FOCUS); body.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false)); - GridLayout layout = new GridLayout(2, false); - // GridLayout layout = CmsUtils.noSpaceGridLayout(new GridLayout(2, - // false)); - - body.setLayout(layout); CmsUtils.style(body, UserStyles.USER_FORM_TEXT); - // header - Label header = new Label(body, SWT.NONE); - header.setText(" Main user information"); - header.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, - 1)); - CmsUtils.style(header, UserStyles.USER_FORM_TITLE); + body.setLayout(new GridLayout(2, false)); - // form field + // Header + Label headerLbl = new Label(body, SWT.NONE); + headerLbl.setText(" Main user information"); + headerLbl.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, + 2, 1)); + CmsUtils.style(headerLbl, UserStyles.USER_FORM_TITLE); + + // Form field createTexts(body, UserStyles.USER_FORM_TEXT); if (isEditing()) @@ -103,18 +89,18 @@ public class UserPart extends StyledControl implements EditablePart, NodePart, txt.addFocusListener(this); // Change password link - // header - header = new Label(body, SWT.NONE); - header.setText(" Reset password"); - header.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, - 1)); - CmsUtils.style(header, UserStyles.USER_FORM_TITLE); + headerLbl = new Label(body, SWT.NONE); + headerLbl.setText(" Reset password"); + headerLbl.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, + 2, 1)); + CmsUtils.style(headerLbl, UserStyles.USER_FORM_TITLE); pwd1 = createLP(body, UserStyles.USER_FORM_TEXT, "Enter password"); pwd2 = createLP(body, UserStyles.USER_FORM_TEXT, "Re-Enter"); final Link link = new Link(body, SWT.NONE); - link.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, true, false, 2, 1)); + link.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, true, false, 2, + 1)); link.setText("Change password"); link.addSelectionListener(new SelectionAdapter() { private static final long serialVersionUID = 8348668888548451776L; @@ -170,22 +156,10 @@ public class UserPart extends StyledControl implements EditablePart, NodePart, Property.JCR_DESCRIPTION)); } - // protected Composite createEditLayout(Composite parent, String style) { - // Composite body = new Composite(parent, SWT.NO_FOCUS); - // GridLayout layout = new GridLayout(2, false); - // body.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false)); - // body.setLayout(layout); - // - // createTexts(body, UserStyles.USER_FORM_TEXT); - // - // return body; - // } - void refresh() { for (Text txt : texts) { txt.setText(get(getNode(), (String) txt.getData(KEY_PROP_NAME))); txt.setEditable(isEditing()); - // txt.setEnabled(isEditing()); } } -- 2.30.2