X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fusers%2FUserPart.java;h=b3e7c9cf2377d19c8621a9e5fef820c1231f0fb4;hb=170c56881f05f1028c35e6fe8c6e69dfd764c30e;hp=66f50b885a8c1fcc2c8c2665a6c2007e690829c4;hpb=b24a4a0c22f8fb24800d9484160764544796cc17;p=lgpl%2Fargeo-commons.git

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 66f50b885..b3e7c9cf2 100644
--- a/org.argeo.cms/src/org/argeo/cms/users/UserPart.java
+++ b/org.argeo.cms/src/org/argeo/cms/users/UserPart.java
@@ -9,7 +9,7 @@ import javax.jcr.Property;
 import javax.jcr.RepositoryException;
 
 import org.argeo.ArgeoException;
-import org.argeo.cms.CmsUtils;
+import org.argeo.cms.util.CmsUtils;
 import org.argeo.cms.viewers.EditablePart;
 import org.argeo.cms.viewers.NodePart;
 import org.argeo.cms.widgets.StyledControl;
@@ -21,7 +21,6 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.FocusEvent;
 import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.events.MouseListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
@@ -47,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);
@@ -69,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(" General");
-		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())
@@ -104,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(" Change 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("<a>Change password</a>");
 		link.addSelectionListener(new SelectionAdapter() {
 			private static final long serialVersionUID = 8348668888548451776L;
@@ -171,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());
 		}
 	}
 
@@ -288,12 +261,6 @@ public class UserPart extends StyledControl implements EditablePart, NodePart,
 		}
 	}
 
-	/* DEPENDENCY INJECTION */
-	// public void setUserDetailsManager(UserDetailsManager userDetailsManager)
-	// {
-	// this.userDetailsManager = userDetailsManager;
-	// }
-
 	public void setUserAdminService(UserAdminService userAdminService) {
 		this.userAdminService = userAdminService;
 	}