svnno****@sourc*****
svnno****@sourc*****
2007年 7月 19日 (木) 16:23:41 JST
Revision: 315
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=315
Author: shinsuke
Date: 2007-07-19 16:23:41 +0900 (Thu, 19 Jul 2007)
Log Message:
-----------
reviewed navigation flow for forgotton password. code alignment.
Modified Paths:
--------------
pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/UserRegistrationService.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalSecretAnswerPage.java
pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/label.properties
pal-admin/trunk/src/main/webapp/view/registration/publicPortalSecretAnswer.html
-------------- next part --------------
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/UserRegistrationService.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/UserRegistrationService.java 2007-07-19 06:54:48 UTC (rev 314)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/UserRegistrationService.java 2007-07-19 07:23:41 UTC (rev 315)
@@ -39,8 +39,7 @@
import org.apache.jetspeed.security.UserPrincipal;
import org.seasar.teeda.extension.util.LabelHelper;
-public class UserRegistrationService implements Serializable
-{
+public class UserRegistrationService implements Serializable {
/**
*
*/
@@ -58,315 +57,313 @@
private static final String CTX_RETURN_URL = "returnURL";
- public void register(UserRegistrationPage page) throws CommonException
- {
+ public void register(UserRegistrationPage page) throws CommonException {
- if (!UserRegistrationUtil.getBoolean(PALAdminConstants.FORCE_GENERATED_PASSWORD))
- {
- if (page.getPassword() == null || page.getPassword().equals(""))
- {
- throw new CommonException("error.lacking.password", "The password is null.");
+ if (!UserRegistrationUtil
+ .getBoolean(PALAdminConstants.FORCE_GENERATED_PASSWORD)) {
+ if (page.getPassword() == null || page.getPassword().equals("")) {
+ throw new CommonException("error.lacking.password",
+ "The password is null.");
}
}
- if (UserRegistrationUtil.getBoolean(PALAdminConstants.FORCE_USE_EMAIL_AS_USERNAME))
- {
+ if (UserRegistrationUtil
+ .getBoolean(PALAdminConstants.FORCE_USE_EMAIL_AS_USERNAME)) {
// force user.name to be same as email
page.setUserName(page.getUserBusinessInfoOnlineEmail());
}
boolean userIdExistsFlag = true;
- try
- {
+ try {
PortalComponentUtil.getUserManager().getUser(page.getUserName());
- }
- catch (org.apache.jetspeed.security.SecurityException e)
- {
+ } catch (org.apache.jetspeed.security.SecurityException e) {
userIdExistsFlag = false;
}
- if (userIdExistsFlag)
- {
- throw new CommonException("error.userid_already_exists", "The user id already exists.");
+ if (userIdExistsFlag) {
+ throw new CommonException("error.userid_already_exists",
+ "The user id already exists.");
}
- if (UserRegistrationUtil.getBoolean(PALAdminConstants.FORCE_UNIQUE_EMAIL))
- {
+ if (UserRegistrationUtil
+ .getBoolean(PALAdminConstants.FORCE_UNIQUE_EMAIL)) {
boolean emailExistsFlag = true;
User user = null;
- try
- {
- user = PortalComponentUtil.getPortalAdministration().lookupUserFromEmail(page.getUserBusinessInfoOnlineEmail());
- }
- catch (AdministrationEmailException e)
- {
+ try {
+ user = PortalComponentUtil.getPortalAdministration()
+ .lookupUserFromEmail(
+ page.getUserBusinessInfoOnlineEmail());
+ } catch (AdministrationEmailException e) {
emailExistsFlag = false;
}
- if ((emailExistsFlag) || (user != null))
- {
- throw new CommonException("error.email_already_exists", "The email already exists.");
+ if ((emailExistsFlag) || (user != null)) {
+ throw new CommonException("error.email_already_exists",
+ "The email already exists.");
}
}
- if (UserRegistrationUtil.getBoolean(PALAdminConstants.FORCE_GENERATED_PASSWORD))
- {
- try
- {
- String password = PortalComponentUtil.getPortalAdministration().generatePassword();
+ if (UserRegistrationUtil
+ .getBoolean(PALAdminConstants.FORCE_GENERATED_PASSWORD)) {
+ try {
+ String password = PortalComponentUtil.getPortalAdministration()
+ .generatePassword();
page.setPassword(password);
+ } catch (Exception e) {
+ throw new CommonException("error.failed_to_add",
+ "Could not create password.", e);
}
- catch (Exception e)
- {
- throw new CommonException("error.failed_to_add", "Could not create password.", e);
+ } else {
+ if (!page.getPassword().equals(page.getVerifyPassword())) {
+ throw new CommonException("error.two_passwords_do_not_match",
+ "Two passwords do not match.");
}
}
- else
- {
- if (!page.getPassword().equals(page.getVerifyPassword()))
- {
- throw new CommonException("error.two_passwords_do_not_match", "Two passwords do not match.");
- }
- }
// we think we're good to go, let's create the user!
Map<String, String> userInfo = createUserInfoMap(page);
- try
- {
- PortalComponentUtil.getPortalAdministration().registerUser(page.getUserName(), page.getPassword(),
- UserRegistrationUtil.getStringList(PALAdminConstants.ROLES),
- UserRegistrationUtil.getStringList(PALAdminConstants.GROUPS), userInfo, // note use of only
- // PLT.D values here.
- UserRegistrationUtil.getStringMap(PALAdminConstants.RULES), null); // passing in null causes use of default
+ try {
+ PortalComponentUtil.getPortalAdministration()
+ .registerUser(
+ page.getUserName(),
+ page.getPassword(),
+ UserRegistrationUtil
+ .getStringList(PALAdminConstants.ROLES),
+ UserRegistrationUtil
+ .getStringList(PALAdminConstants.GROUPS),
+ userInfo, // note use of only
+ // PLT.D values here.
+ UserRegistrationUtil
+ .getStringMap(PALAdminConstants.RULES),
+ null); // passing in null causes use of default
+ } catch (RegistrationException e) {
+ throw new CommonException("error.failed_to_add",
+ "Could not register a user.", e);
}
- catch (RegistrationException e)
- {
- throw new CommonException("error.failed_to_add", "Could not register a user.", e);
- }
// template
String templ = getTemplatePath(page.getFacesContext());
- if (templ == null)
- {
- throw new CommonException("error.registration_completed_but_could_not_send", "Email template is not available.");
+ if (templ == null) {
+ throw new CommonException(
+ "error.registration_completed_but_could_not_send",
+ "Email template is not available.");
}
- if (UserRegistrationUtil.getBoolean(PALAdminConstants.SEND_MAIL))
- {
- if (page.getPassword() != null)
- {
+ if (UserRegistrationUtil.getBoolean(PALAdminConstants.SEND_MAIL)) {
+ if (page.getPassword() != null) {
userInfo.put("password", page.getPassword());
}
- try
- {
+ try {
PortalComponentUtil.getPortalAdministration().sendEmail(
- (PortletConfig) page.getFacesContext().getExternalContext().getRequestMap().get(
- "javax.portlet.PortletConfig"), page.getUserBusinessInfoOnlineEmail(),
- getUserRegistrationEmailSubject(page.getLabelHelper()), templ, userInfo);
+ (PortletConfig) page.getFacesContext()
+ .getExternalContext().getRequestMap().get(
+ "javax.portlet.PortletConfig"),
+ page.getUserBusinessInfoOnlineEmail(),
+ getUserRegistrationEmailSubject(page.getLabelHelper()),
+ templ, userInfo);
+ } catch (AdministrationEmailException e) {
+ throw new CommonException(
+ "error.registration_completed_but_could_not_send",
+ "Could not send a registration mail.", e);
}
- catch (AdministrationEmailException e)
- {
- throw new CommonException("error.registration_completed_but_could_not_send", "Could not send a registration mail.",
- e);
- }
}
}
- public void setSecretQuestion(PublicPortalSecretAnswerPage page) throws CommonException
- {
+ public void setSecretQuestion(PublicPortalSecretAnswerPage page)
+ throws CommonException {
User user = null;
- try
- {
- user = PortalComponentUtil.getPortalAdministration().lookupUserFromEmail(page.getEmail());
+ try {
+ user = PortalComponentUtil.getPortalAdministration()
+ .lookupUserFromEmail(page.getEmail());
+ } catch (Exception e) {
+ page.setUserSecretQuestion(page.getLabelHelper().getLabelValue(
+ "secretQuestion.1"));
+ throw new CommonException("forgotten.email_address_not_found",
+ "The email is not found..", e);
}
- catch (Exception e)
- {
- throw new CommonException("forgotten.email_address_not_found", "The email is not found..", e);
- }
- page.setUserSecretQuestion(user.getUserAttributes().get("user.secret.question", "-"));
+ page.setUserSecretQuestion(user.getUserAttributes().get(
+ "user.secret.question", "-"));
}
- public boolean checkSecretAnswer(PublicPortalSecretAnswerPage page) throws CommonException
- {
+ public boolean checkSecretAnswer(PublicPortalSecretAnswerPage page)
+ throws CommonException {
User user = null;
- try
- {
- user = PortalComponentUtil.getPortalAdministration().lookupUserFromEmail(page.getEmail());
+ try {
+ user = PortalComponentUtil.getPortalAdministration()
+ .lookupUserFromEmail(page.getEmail());
+ } catch (Exception e) {
+ throw new CommonException("forgotten.email_address_not_found",
+ "The email is not found..", e);
}
- catch (Exception e)
- {
- throw new CommonException("forgotten.email_address_not_found", "The email is not found..", e);
- }
- String userSecretAnswer = user.getUserAttributes().get("user.secret.answer", "");
- if (userSecretAnswer.equals(page.getUserSecretAnswer()))
- {
+ String userSecretAnswer = user.getUserAttributes().get(
+ "user.secret.answer", "");
+ if (userSecretAnswer.equals(page.getUserSecretAnswer())) {
return true;
- }
- else if (page.getUserSecretAnswer() == null && userSecretAnswer.equals(""))
- {
+ } else if (page.getUserSecretAnswer() == null
+ && userSecretAnswer.equals("")) {
return true;
}
return false;
}
- public void sendNewPassword(ForgottenPasswordPage page) throws CommonException
- {
+ public void sendNewPassword(ForgottenPasswordPage page)
+ throws CommonException {
User user = null;
- try
- {
- user = PortalComponentUtil.getPortalAdministration().lookupUserFromEmail(page.getEmail());
+ try {
+ user = PortalComponentUtil.getPortalAdministration()
+ .lookupUserFromEmail(page.getEmail());
+ } catch (Exception e) {
+ throw new CommonException("forgotten.email_address_not_found",
+ "The email is not found..", e);
}
- catch (Exception e)
- {
- throw new CommonException("forgotten.email_address_not_found", "The email is not found..", e);
- }
String userName = getUserName(user);
- String newPassword = PortalComponentUtil.getPortalAdministration().generatePassword();
+ String newPassword = PortalComponentUtil.getPortalAdministration()
+ .generatePassword();
Map<String, String> userAttributes = new HashMap<String, String>();
- try
- {
+ try {
Preferences pref = user.getUserAttributes();
String[] keys = pref.keys();
- if (keys != null)
- {
- for (int ix = 0; ix < keys.length; ix++)
- {
+ if (keys != null) {
+ for (int ix = 0; ix < keys.length; ix++) {
// TODO: how the hell do i tell the pref type
// ASSuming they are all strings (sigh)
userAttributes.put(keys[ix], pref.get(keys[ix], ""));
}
}
+ } catch (BackingStoreException e) {
+ throw new CommonException("failed_to_send",
+ "Could not access preferences. ", e);
}
- catch (BackingStoreException e)
- {
- throw new CommonException("failed_to_send", "Could not access preferences. ", e);
- }
String urlGUID = makeGUID(userName, newPassword);
// special attributes
- userAttributes.put(CTX_RETURN_URL, generateReturnURL(page.getFacesContext(), urlGUID));
+ userAttributes.put(CTX_RETURN_URL, generateReturnURL(page
+ .getFacesContext(), urlGUID));
userAttributes.put(CTX_NEW_PASSWORD, newPassword);
userAttributes.put(CTX_USER_NAME, userName);
String templ = getTemplatePath(page.getFacesContext());
- if (templ == null)
- {
- throw new CommonException("failed_to_send", "Email template is not available.");
+ if (templ == null) {
+ throw new CommonException("failed_to_send",
+ "Email template is not available.");
}
- try
- {
- PortalComponentUtil.getPortalAdministration().sendEmail(
- (PortletConfig) page.getFacesContext().getExternalContext().getRequestMap().get("javax.portlet.PortletConfig"),
- page.getEmail(), getForgottenPasswordEmailSubject(page.getLabelHelper()), templ, userAttributes);
+ try {
+ PortalComponentUtil.getPortalAdministration()
+ .sendEmail(
+ (PortletConfig) page.getFacesContext()
+ .getExternalContext().getRequestMap().get(
+ "javax.portlet.PortletConfig"),
+ page.getEmail(),
+ getForgottenPasswordEmailSubject(page
+ .getLabelHelper()), templ, userAttributes);
+ } catch (AdministrationEmailException e) {
+ throw new CommonException("failed_to_send",
+ "Could not send a mail.", e);
}
- catch (AdministrationEmailException e)
- {
- throw new CommonException("failed_to_send", "Could not send a mail.", e);
- }
//TODO this is currently hacked with a hash map... needs to move to either a DB table
// or to some sort of credential
Map<String, String> map = new HashMap<String, String>();
map.put("user.name", userName);
map.put("password", newPassword);
- PortalComponentUtil.getPortalAdministration().putNewLoginInfo(urlGUID, map);
+ PortalComponentUtil.getPortalAdministration().putNewLoginInfo(urlGUID,
+ map);
}
- public void updatePassword(ResetPasswordPage page) throws CommonException
- {
- Map map = PortalComponentUtil.getPortalAdministration().getNewLoginInfo(page.getGuid());
- if (map == null)
- {
- throw new CommonException("forgotten.unable_to_update_pw", "The login info is null. ");
+ public void updatePassword(ResetPasswordPage page) throws CommonException {
+ Map map = PortalComponentUtil.getPortalAdministration()
+ .getNewLoginInfo(page.getGuid());
+ if (map == null) {
+ throw new CommonException("forgotten.unable_to_update_pw",
+ "The login info is null. ");
}
String userName = (String) map.get("user.name");
String newPassword = (String) map.get("password");
// Here's where a break should be. The following code should be put into the RETURN portlet
- try
- {
- PortalComponentUtil.getUserManager().setPassword(userName, null, newPassword);
- PortalComponentUtil.getUserManager().setPasswordUpdateRequired(userName, true);
+ try {
+ PortalComponentUtil.getUserManager().setPassword(userName, null,
+ newPassword);
+ PortalComponentUtil.getUserManager().setPasswordUpdateRequired(
+ userName, true);
+ } catch (SecurityException e) {
+ throw new CommonException("forgotten.unable_to_update_pw",
+ "Could not update a password.", e);
}
- catch (SecurityException e)
- {
- throw new CommonException("forgotten.unable_to_update_pw", "Could not update a password.", e);
- }
// if we got here stuff is changed... removed the key from the map
- PortalComponentUtil.getPortalAdministration().removeNewLoginInfo(page.getGuid());
+ PortalComponentUtil.getPortalAdministration().removeNewLoginInfo(
+ page.getGuid());
}
- protected String getTemplatePath(FacesContext facesContext)
- {
- JetspeedTemplateLocator templateLocator = UserRegistrationUtil.getTemplateLocator();
- String templateLocation = UserRegistrationUtil.getString(PALAdminConstants.EMAIL_TEMPLATE_LOCATION);
- String templateName = UserRegistrationUtil.getString(PALAdminConstants.EMAIL_TEMPLATE_NAME);
- if (templateLocator == null)
- {
+ protected String getTemplatePath(FacesContext facesContext) {
+ JetspeedTemplateLocator templateLocator = UserRegistrationUtil
+ .getTemplateLocator();
+ String templateLocation = UserRegistrationUtil
+ .getString(PALAdminConstants.EMAIL_TEMPLATE_LOCATION);
+ String templateName = UserRegistrationUtil
+ .getString(PALAdminConstants.EMAIL_TEMPLATE_NAME);
+ if (templateLocator == null) {
return templateLocation + PATH_SEPARATOR + templateName;
}
- RequestContext requestContext = (RequestContext) facesContext.getExternalContext().getRequestMap().get(
- PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
+ RequestContext requestContext = (RequestContext) facesContext
+ .getExternalContext().getRequestMap().get(
+ PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
Locale locale = facesContext.getViewRoot().getLocale();
- try
- {
- LocatorDescriptor locator = templateLocator.createLocatorDescriptor("email");
+ try {
+ LocatorDescriptor locator = templateLocator
+ .createLocatorDescriptor("email");
locator.setName(templateName);
locator.setMediaType(requestContext.getMediaType());
locator.setLanguage(locale.getLanguage());
locator.setCountry(locale.getCountry());
- TemplateDescriptor template = templateLocator.locateTemplate(locator);
+ TemplateDescriptor template = templateLocator
+ .locateTemplate(locator);
return template.getAppRelativePath();
- }
- catch (TemplateLocatorException e)
- {
+ } catch (TemplateLocatorException e) {
return templateLocation + PATH_SEPARATOR + templateName;
}
}
- protected String getUserRegistrationEmailSubject(LabelHelper labelHelper)
- {
- String emailSubject = labelHelper.getLabelValue(EMAIL_SUBJECT_USER_REGISTRATION);
+ protected String getUserRegistrationEmailSubject(LabelHelper labelHelper) {
+ String emailSubject = labelHelper
+ .getLabelValue(EMAIL_SUBJECT_USER_REGISTRATION);
if (emailSubject == null)
emailSubject = "Registration Confirmation";
return emailSubject;
}
- protected String getForgottenPasswordEmailSubject(LabelHelper labelHelper)
- {
- String emailSubject = labelHelper.getLabelValue(EMAIL_SUBJECT_FORGOTTEN_PASSWORD);
+ protected String getForgottenPasswordEmailSubject(LabelHelper labelHelper) {
+ String emailSubject = labelHelper
+ .getLabelValue(EMAIL_SUBJECT_FORGOTTEN_PASSWORD);
if (emailSubject == null)
emailSubject = "Password Notification";
return emailSubject;
}
- protected String getUserName(User user)
- {
+ protected String getUserName(User user) {
Principal principal = null;
Iterator principals = user.getSubject().getPrincipals().iterator();
- while (principals.hasNext())
- {
+ while (principals.hasNext()) {
Object o = principals.next();
- if (o instanceof UserPrincipal)
- {
+ if (o instanceof UserPrincipal) {
principal = (Principal) o;
return principal.toString();
}
@@ -375,8 +372,7 @@
return null;
}
- protected String makeGUID(String user, String newpw)
- {
+ protected String makeGUID(String user, String newpw) {
// This is a quicky version
long num = (long) user.hashCode() + (long) newpw.hashCode(); // Possible collisions here...
long d = new Date().getTime();
@@ -385,733 +381,715 @@
return retval;
}
- protected String generateReturnURL(FacesContext facesContext, String urlGUID)
- {
- String fullPath = UserRegistrationUtil.getString(PALAdminConstants.RETURN_PATH) + "?guid=" + urlGUID;
+ protected String generateReturnURL(FacesContext facesContext, String urlGUID) {
+ String fullPath = UserRegistrationUtil
+ .getString(PALAdminConstants.RETURN_PATH)
+ + "?guid=" + urlGUID;
// NOTE: getPortalURL will encode the fullPath for us
- String url = PortalComponentUtil.getPortalAdministration().getPortalURL(
- (PortletRequest) facesContext.getExternalContext().getRequest(),
- (PortletResponse) facesContext.getExternalContext().getResponse(), fullPath);
+ String url = PortalComponentUtil.getPortalAdministration()
+ .getPortalURL(
+ (PortletRequest) facesContext.getExternalContext()
+ .getRequest(),
+ (PortletResponse) facesContext.getExternalContext()
+ .getResponse(), fullPath);
return url;
}
- public void loadPage(PublicPortalRegistrationUpdatePage page) throws CommonException
- {
- Principal userPrincipal = FacesContext.getCurrentInstance().getExternalContext().getUserPrincipal();
- if (userPrincipal == null)
- {
- throw new CommonException("could.not.find.your.credential", "User principal is null.");
+ public void loadPage(PublicPortalRegistrationUpdatePage page)
+ throws CommonException {
+ Principal userPrincipal = FacesContext.getCurrentInstance()
+ .getExternalContext().getUserPrincipal();
+ if (userPrincipal == null) {
+ throw new CommonException("could.not.find.your.credential",
+ "User principal is null.");
}
User user;
- try
- {
- user = PortalComponentUtil.getUserManager().getUser(userPrincipal.getName());
- if (user == null)
- {
- throw new CommonException("could.not.find.your.account", "User is null.");
+ try {
+ user = PortalComponentUtil.getUserManager().getUser(
+ userPrincipal.getName());
+ if (user == null) {
+ throw new CommonException("could.not.find.your.account",
+ "User is null.");
}
+ } catch (SecurityException e) {
+ throw new CommonException("could.not.find.your.account",
+ "User is null.", e);
}
- catch (SecurityException e)
- {
- throw new CommonException("could.not.find.your.account", "User is null.", e);
- }
Preferences userAttributes = user.getUserAttributes();
updateUserInfo(page, userAttributes);
}
- public void update(PublicPortalRegistrationUpdatePage page) throws CommonException
- {
- Principal userPrincipal = page.getFacesContext().getExternalContext().getUserPrincipal();
- if (userPrincipal == null)
- {
- throw new CommonException("could.not.find.your.credential", "User principal is null.");
+ public void update(PublicPortalRegistrationUpdatePage page)
+ throws CommonException {
+ Principal userPrincipal = page.getFacesContext().getExternalContext()
+ .getUserPrincipal();
+ if (userPrincipal == null) {
+ throw new CommonException("could.not.find.your.credential",
+ "User principal is null.");
}
- if (page.getPassword() != null && !page.getPassword().equals(""))
- {
- if (page.getPassword().equals(page.getVerifyPassword()))
- {
- try
- {
- PortalComponentUtil.getUserManager().setPassword(userPrincipal.getName(), null, page.getPassword());
+ if (page.getPassword() != null && !page.getPassword().equals("")) {
+ if (page.getPassword().equals(page.getVerifyPassword())) {
+ try {
+ PortalComponentUtil.getUserManager().setPassword(
+ userPrincipal.getName(), null, page.getPassword());
+ } catch (SecurityException e) {
+ throw new CommonException("could.not.update.password",
+ "Could not update a password.", e);
}
- catch (SecurityException e)
- {
- throw new CommonException("could.not.update.password", "Could not update a password.", e);
- }
+ } else {
+ throw new CommonException("could.not.match.passwords",
+ "Could not match passwords.");
}
- else
- {
- throw new CommonException("could.not.match.passwords", "Could not match passwords.");
- }
}
User user;
- try
- {
- user = PortalComponentUtil.getUserManager().getUser(userPrincipal.getName());
- if (user == null)
- {
- throw new CommonException("could.not.find.your.account", "User is null.");
+ try {
+ user = PortalComponentUtil.getUserManager().getUser(
+ userPrincipal.getName());
+ if (user == null) {
+ throw new CommonException("could.not.find.your.account",
+ "User is null.");
}
+ } catch (SecurityException e) {
+ throw new CommonException("could.not.find.your.account",
+ "User is null.", e);
}
- catch (SecurityException e)
- {
- throw new CommonException("could.not.find.your.account", "User is null.", e);
- }
Preferences userAttributes = user.getUserAttributes();
Map<String, String> userInfo = createUserInfoMap(page);
- for (Iterator<Map.Entry<String, String>> ite = userInfo.entrySet().iterator(); ite.hasNext();)
- {
+ for (Iterator<Map.Entry<String, String>> ite = userInfo.entrySet()
+ .iterator(); ite.hasNext();) {
Map.Entry<String, String> entry = ite.next();
userAttributes.put(entry.getKey(), entry.getValue());
}
}
- protected void updateUserInfo(UserRegistrationPage page, Preferences userAttributes)
- {
- if (userAttributes.get("user.business-info.online.email", null) != null)
- {
- page.setUserBusinessInfoOnlineEmail(userAttributes.get("user.business-info.online.email", ""));
+ protected void updateUserInfo(UserRegistrationPage page,
+ Preferences userAttributes) {
+ if (userAttributes.get("user.business-info.online.email", null) != null) {
+ page.setUserBusinessInfoOnlineEmail(userAttributes.get(
+ "user.business-info.online.email", ""));
}
- if (userAttributes.get("user.name", null) != null)
- {
+ if (userAttributes.get("user.name", null) != null) {
page.setUserName(userAttributes.get("user.name", ""));
}
- if (userAttributes.get("user.bdate", null) != null)
- {
+ if (userAttributes.get("user.bdate", null) != null) {
page.setUserBdate(userAttributes.get("user.bdate", ""));
}
- if (userAttributes.get("user.gender", null) != null)
- {
+ if (userAttributes.get("user.gender", null) != null) {
page.setUserGender(userAttributes.get("user.gender", ""));
}
- if (userAttributes.get("user.employer", null) != null)
- {
+ if (userAttributes.get("user.employer", null) != null) {
page.setUserEmployer(userAttributes.get("user.employer", ""));
}
- if (userAttributes.get("user.department", null) != null)
- {
+ if (userAttributes.get("user.department", null) != null) {
page.setUserDepartment(userAttributes.get("user.department", ""));
}
- if (userAttributes.get("user.jobtitle", null) != null)
- {
+ if (userAttributes.get("user.jobtitle", null) != null) {
page.setUserJobtitle(userAttributes.get("user.jobtitle", ""));
}
- if (userAttributes.get("user.name.prefix", null) != null)
- {
+ if (userAttributes.get("user.name.prefix", null) != null) {
page.setUserNamePrefix(userAttributes.get("user.name.prefix", ""));
}
- if (userAttributes.get("user.name.given", null) != null)
- {
+ if (userAttributes.get("user.name.given", null) != null) {
page.setUserNameGiven(userAttributes.get("user.name.given", ""));
}
- if (userAttributes.get("user.name.family", null) != null)
- {
+ if (userAttributes.get("user.name.family", null) != null) {
page.setUserNameFamily(userAttributes.get("user.name.family", ""));
}
- if (userAttributes.get("user.name.middle", null) != null)
- {
+ if (userAttributes.get("user.name.middle", null) != null) {
page.setUserNameMiddle(userAttributes.get("user.name.middle", ""));
}
- if (userAttributes.get("user.name.suffix", null) != null)
- {
+ if (userAttributes.get("user.name.suffix", null) != null) {
page.setUserNameSuffix(userAttributes.get("user.name.suffix", ""));
}
- if (userAttributes.get("user.name.nickName", null) != null)
- {
- page.setUserNameNickName(userAttributes.get("user.name.nickName", ""));
+ if (userAttributes.get("user.name.nickName", null) != null) {
+ page.setUserNameNickName(userAttributes.get("user.name.nickName",
+ ""));
}
- if (userAttributes.get("user.home-info.postal.name", null) != null)
- {
- page.setUserHomeInfoPostalName(userAttributes.get("user.home-info.postal.name", ""));
+ if (userAttributes.get("user.home-info.postal.name", null) != null) {
+ page.setUserHomeInfoPostalName(userAttributes.get(
+ "user.home-info.postal.name", ""));
}
- if (userAttributes.get("user.home-info.postal.street", null) != null)
- {
- page.setUserHomeInfoPostalStreet(userAttributes.get("user.home-info.postal.street", ""));
+ if (userAttributes.get("user.home-info.postal.street", null) != null) {
+ page.setUserHomeInfoPostalStreet(userAttributes.get(
+ "user.home-info.postal.street", ""));
}
- if (userAttributes.get("user.home-info.postal.city", null) != null)
- {
- page.setUserHomeInfoPostalCity(userAttributes.get("user.home-info.postal.city", ""));
+ if (userAttributes.get("user.home-info.postal.city", null) != null) {
+ page.setUserHomeInfoPostalCity(userAttributes.get(
+ "user.home-info.postal.city", ""));
}
- if (userAttributes.get("user.home-info.postal.stateprov", null) != null)
- {
- page.setUserHomeInfoPostalStateprov(userAttributes.get("user.home-info.postal.stateprov", ""));
+ if (userAttributes.get("user.home-info.postal.stateprov", null) != null) {
+ page.setUserHomeInfoPostalStateprov(userAttributes.get(
+ "user.home-info.postal.stateprov", ""));
}
- if (userAttributes.get("user.home-info.postal.postalcode", null) != null)
- {
- page.setUserHomeInfoPostalPostalcode(userAttributes.get("user.home-info.postal.postalcode", ""));
+ if (userAttributes.get("user.home-info.postal.postalcode", null) != null) {
+ page.setUserHomeInfoPostalPostalcode(userAttributes.get(
+ "user.home-info.postal.postalcode", ""));
}
- if (userAttributes.get("user.home-info.postal.country", null) != null)
- {
- page.setUserHomeInfoPostalCountry(userAttributes.get("user.home-info.postal.country", ""));
+ if (userAttributes.get("user.home-info.postal.country", null) != null) {
+ page.setUserHomeInfoPostalCountry(userAttributes.get(
+ "user.home-info.postal.country", ""));
}
- if (userAttributes.get("user.home-info.postal.organization", null) != null)
- {
- page.setUserHomeInfoPostalOrganization(userAttributes.get("user.home-info.postal.organization", ""));
+ if (userAttributes.get("user.home-info.postal.organization", null) != null) {
+ page.setUserHomeInfoPostalOrganization(userAttributes.get(
+ "user.home-info.postal.organization", ""));
}
- if (userAttributes.get("user.home-info.telecom.telephone.intcode", null) != null)
- {
- page.setUserHomeInfoTelecomTelephoneIntcode(userAttributes.get("user.home-info.telecom.telephone.intcode", ""));
+ if (userAttributes
+ .get("user.home-info.telecom.telephone.intcode", null) != null) {
+ page.setUserHomeInfoTelecomTelephoneIntcode(userAttributes.get(
+ "user.home-info.telecom.telephone.intcode", ""));
}
- if (userAttributes.get("user.home-info.telecom.telephone.loccode", null) != null)
- {
- page.setUserHomeInfoTelecomTelephoneLoccode(userAttributes.get("user.home-info.telecom.telephone.loccode", ""));
+ if (userAttributes
+ .get("user.home-info.telecom.telephone.loccode", null) != null) {
+ page.setUserHomeInfoTelecomTelephoneLoccode(userAttributes.get(
+ "user.home-info.telecom.telephone.loccode", ""));
}
- if (userAttributes.get("user.home-info.telecom.telephone.number", null) != null)
- {
- page.setUserHomeInfoTelecomTelephoneNumber(userAttributes.get("user.home-info.telecom.telephone.number", ""));
+ if (userAttributes.get("user.home-info.telecom.telephone.number", null) != null) {
+ page.setUserHomeInfoTelecomTelephoneNumber(userAttributes.get(
+ "user.home-info.telecom.telephone.number", ""));
}
- if (userAttributes.get("user.home-info.telecom.telephone.ext", null) != null)
- {
- page.setUserHomeInfoTelecomTelephoneExt(userAttributes.get("user.home-info.telecom.telephone.ext", ""));
+ if (userAttributes.get("user.home-info.telecom.telephone.ext", null) != null) {
+ page.setUserHomeInfoTelecomTelephoneExt(userAttributes.get(
+ "user.home-info.telecom.telephone.ext", ""));
}
- if (userAttributes.get("user.home-info.telecom.telephone.comment", null) != null)
- {
- page.setUserHomeInfoTelecomTelephoneComment(userAttributes.get("user.home-info.telecom.telephone.comment", ""));
+ if (userAttributes
+ .get("user.home-info.telecom.telephone.comment", null) != null) {
+ page.setUserHomeInfoTelecomTelephoneComment(userAttributes.get(
+ "user.home-info.telecom.telephone.comment", ""));
}
- if (userAttributes.get("user.home-info.telecom.fax.intcode", null) != null)
- {
- page.setUserHomeInfoTelecomFaxIntcode(userAttributes.get("user.home-info.telecom.fax.intcode", ""));
+ if (userAttributes.get("user.home-info.telecom.fax.intcode", null) != null) {
+ page.setUserHomeInfoTelecomFaxIntcode(userAttributes.get(
+ "user.home-info.telecom.fax.intcode", ""));
}
- if (userAttributes.get("user.home-info.telecom.fax.loccode", null) != null)
- {
- page.setUserHomeInfoTelecomFaxLoccode(userAttributes.get("user.home-info.telecom.fax.loccode", ""));
+ if (userAttributes.get("user.home-info.telecom.fax.loccode", null) != null) {
+ page.setUserHomeInfoTelecomFaxLoccode(userAttributes.get(
+ "user.home-info.telecom.fax.loccode", ""));
}
- if (userAttributes.get("user.home-info.telecom.fax.number", null) != null)
- {
- page.setUserHomeInfoTelecomFaxNumber(userAttributes.get("user.home-info.telecom.fax.number", ""));
+ if (userAttributes.get("user.home-info.telecom.fax.number", null) != null) {
+ page.setUserHomeInfoTelecomFaxNumber(userAttributes.get(
+ "user.home-info.telecom.fax.number", ""));
}
- if (userAttributes.get("user.home-info.telecom.fax.ext", null) != null)
- {
- page.setUserHomeInfoTelecomFaxExt(userAttributes.get("user.home-info.telecom.fax.ext", ""));
+ if (userAttributes.get("user.home-info.telecom.fax.ext", null) != null) {
+ page.setUserHomeInfoTelecomFaxExt(userAttributes.get(
+ "user.home-info.telecom.fax.ext", ""));
}
- if (userAttributes.get("user.home-info.telecom.fax.comment", null) != null)
- {
- page.setUserHomeInfoTelecomFaxComment(userAttributes.get("user.home-info.telecom.fax.comment", ""));
+ if (userAttributes.get("user.home-info.telecom.fax.comment", null) != null) {
+ page.setUserHomeInfoTelecomFaxComment(userAttributes.get(
+ "user.home-info.telecom.fax.comment", ""));
}
- if (userAttributes.get("user.home-info.telecom.mobile.intcode", null) != null)
- {
- page.setUserHomeInfoTelecomMobileIntcode(userAttributes.get("user.home-info.telecom.mobile.intcode", ""));
+ if (userAttributes.get("user.home-info.telecom.mobile.intcode", null) != null) {
+ page.setUserHomeInfoTelecomMobileIntcode(userAttributes.get(
+ "user.home-info.telecom.mobile.intcode", ""));
}
- if (userAttributes.get("user.home-info.telecom.mobile.loccode", null) != null)
- {
- page.setUserHomeInfoTelecomMobileLoccode(userAttributes.get("user.home-info.telecom.mobile.loccode", ""));
+ if (userAttributes.get("user.home-info.telecom.mobile.loccode", null) != null) {
+ page.setUserHomeInfoTelecomMobileLoccode(userAttributes.get(
+ "user.home-info.telecom.mobile.loccode", ""));
}
- if (userAttributes.get("user.home-info.telecom.mobile.number", null) != null)
- {
- page.setUserHomeInfoTelecomMobileNumber(userAttributes.get("user.home-info.telecom.mobile.number", ""));
+ if (userAttributes.get("user.home-info.telecom.mobile.number", null) != null) {
+ page.setUserHomeInfoTelecomMobileNumber(userAttributes.get(
+ "user.home-info.telecom.mobile.number", ""));
}
- if (userAttributes.get("user.home-info.telecom.mobile.ext", null) != null)
- {
- page.setUserHomeInfoTelecomMobileExt(userAttributes.get("user.home-info.telecom.mobile.ext", ""));
+ if (userAttributes.get("user.home-info.telecom.mobile.ext", null) != null) {
+ page.setUserHomeInfoTelecomMobileExt(userAttributes.get(
+ "user.home-info.telecom.mobile.ext", ""));
}
- if (userAttributes.get("user.home-info.telecom.mobile.comment", null) != null)
- {
- page.setUserHomeInfoTelecomMobileComment(userAttributes.get("user.home-info.telecom.mobile.comment", ""));
+ if (userAttributes.get("user.home-info.telecom.mobile.comment", null) != null) {
+ page.setUserHomeInfoTelecomMobileComment(userAttributes.get(
+ "user.home-info.telecom.mobile.comment", ""));
}
- if (userAttributes.get("user.home-info.telecom.pager.intcode", null) != null)
- {
- page.setUserHomeInfoTelecomPagerIntcode(userAttributes.get("user.home-info.telecom.pager.intcode", ""));
+ if (userAttributes.get("user.home-info.telecom.pager.intcode", null) != null) {
+ page.setUserHomeInfoTelecomPagerIntcode(userAttributes.get(
+ "user.home-info.telecom.pager.intcode", ""));
}
- if (userAttributes.get("user.home-info.telecom.pager.loccode", null) != null)
- {
- page.setUserHomeInfoTelecomPagerLoccode(userAttributes.get("user.home-info.telecom.pager.loccode", ""));
+ if (userAttributes.get("user.home-info.telecom.pager.loccode", null) != null) {
+ page.setUserHomeInfoTelecomPagerLoccode(userAttributes.get(
+ "user.home-info.telecom.pager.loccode", ""));
}
- if (userAttributes.get("user.home-info.telecom.pager.number", null) != null)
- {
- page.setUserHomeInfoTelecomPagerNumber(userAttributes.get("user.home-info.telecom.pager.number", ""));
+ if (userAttributes.get("user.home-info.telecom.pager.number", null) != null) {
+ page.setUserHomeInfoTelecomPagerNumber(userAttributes.get(
+ "user.home-info.telecom.pager.number", ""));
}
- if (userAttributes.get("user.home-info.telecom.pager.ext", null) != null)
- {
- page.setUserHomeInfoTelecomPagerExt(userAttributes.get("user.home-info.telecom.pager.ext", ""));
+ if (userAttributes.get("user.home-info.telecom.pager.ext", null) != null) {
+ page.setUserHomeInfoTelecomPagerExt(userAttributes.get(
+ "user.home-info.telecom.pager.ext", ""));
}
- if (userAttributes.get("user.home-info.telecom.pager.comment", null) != null)
- {
- page.setUserHomeInfoTelecomPagerComment(userAttributes.get("user.home-info.telecom.pager.comment", ""));
+ if (userAttributes.get("user.home-info.telecom.pager.comment", null) != null) {
+ page.setUserHomeInfoTelecomPagerComment(userAttributes.get(
+ "user.home-info.telecom.pager.comment", ""));
}
- if (userAttributes.get("user.home-info.online.email", null) != null)
- {
- page.setUserHomeInfoOnlineEmail(userAttributes.get("user.home-info.online.email", ""));
+ if (userAttributes.get("user.home-info.online.email", null) != null) {
+ page.setUserHomeInfoOnlineEmail(userAttributes.get(
+ "user.home-info.online.email", ""));
}
- if (userAttributes.get("user.home-info.online.uri", null) != null)
- {
- page.setUserHomeInfoOnlineUri(userAttributes.get("user.home-info.online.uri", ""));
+ if (userAttributes.get("user.home-info.online.uri", null) != null) {
+ page.setUserHomeInfoOnlineUri(userAttributes.get(
+ "user.home-info.online.uri", ""));
}
- if (userAttributes.get("user.business-info.postal.name", null) != null)
- {
- page.setUserBusinessInfoPostalName(userAttributes.get("user.business-info.postal.name", ""));
+ if (userAttributes.get("user.business-info.postal.name", null) != null) {
+ page.setUserBusinessInfoPostalName(userAttributes.get(
+ "user.business-info.postal.name", ""));
}
- if (userAttributes.get("user.business-info.postal.street", null) != null)
- {
- page.setUserBusinessInfoPostalStreet(userAttributes.get("user.business-info.postal.street", ""));
+ if (userAttributes.get("user.business-info.postal.street", null) != null) {
+ page.setUserBusinessInfoPostalStreet(userAttributes.get(
+ "user.business-info.postal.street", ""));
}
- if (userAttributes.get("user.business-info.postal.city", null) != null)
- {
- page.setUserBusinessInfoPostalCity(userAttributes.get("user.business-info.postal.city", ""));
+ if (userAttributes.get("user.business-info.postal.city", null) != null) {
+ page.setUserBusinessInfoPostalCity(userAttributes.get(
+ "user.business-info.postal.city", ""));
}
- if (userAttributes.get("user.business-info.postal.stateprov", null) != null)
- {
- page.setUserBusinessInfoPostalStateprov(userAttributes.get("user.business-info.postal.stateprov", ""));
+ if (userAttributes.get("user.business-info.postal.stateprov", null) != null) {
+ page.setUserBusinessInfoPostalStateprov(userAttributes.get(
+ "user.business-info.postal.stateprov", ""));
}
- if (userAttributes.get("user.business-info.postal.postalcode", null) != null)
- {
- page.setUserBusinessInfoPostalPostalcode(userAttributes.get("user.business-info.postal.postalcode", ""));
+ if (userAttributes.get("user.business-info.postal.postalcode", null) != null) {
+ page.setUserBusinessInfoPostalPostalcode(userAttributes.get(
+ "user.business-info.postal.postalcode", ""));
}
- if (userAttributes.get("user.business-info.postal.country", null) != null)
- {
- page.setUserBusinessInfoPostalCountry(userAttributes.get("user.business-info.postal.country", ""));
+ if (userAttributes.get("user.business-info.postal.country", null) != null) {
+ page.setUserBusinessInfoPostalCountry(userAttributes.get(
+ "user.business-info.postal.country", ""));
}
- if (userAttributes.get("user.business-info.postal.organization", null) != null)
- {
- page.setUserBusinessInfoPostalOrganization(userAttributes.get("user.business-info.postal.organization", ""));
+ if (userAttributes.get("user.business-info.postal.organization", null) != null) {
+ page.setUserBusinessInfoPostalOrganization(userAttributes.get(
+ "user.business-info.postal.organization", ""));
}
- if (userAttributes.get("user.business-info.telecom.telephone.intcode", null) != null)
- {
- page.setUserBusinessInfoTelecomTelephoneIntcode(userAttributes.get("user.business-info.telecom.telephone.intcode", ""));
+ if (userAttributes.get("user.business-info.telecom.telephone.intcode",
+ null) != null) {
+ page.setUserBusinessInfoTelecomTelephoneIntcode(userAttributes.get(
+ "user.business-info.telecom.telephone.intcode", ""));
}
- if (userAttributes.get("user.business-info.telecom.telephone.loccode", null) != null)
- {
- page.setUserBusinessInfoTelecomTelephoneLoccode(userAttributes.get("user.business-info.telecom.telephone.loccode", ""));
+ if (userAttributes.get("user.business-info.telecom.telephone.loccode",
+ null) != null) {
+ page.setUserBusinessInfoTelecomTelephoneLoccode(userAttributes.get(
+ "user.business-info.telecom.telephone.loccode", ""));
}
- if (userAttributes.get("user.business-info.telecom.telephone.number", null) != null)
- {
- page.setUserBusinessInfoTelecomTelephoneNumber(userAttributes.get("user.business-info.telecom.telephone.number", ""));
+ if (userAttributes.get("user.business-info.telecom.telephone.number",
+ null) != null) {
+ page.setUserBusinessInfoTelecomTelephoneNumber(userAttributes.get(
+ "user.business-info.telecom.telephone.number", ""));
}
- if (userAttributes.get("user.business-info.telecom.telephone.ext", null) != null)
- {
- page.setUserBusinessInfoTelecomTelephoneExt(userAttributes.get("user.business-info.telecom.telephone.ext", ""));
+ if (userAttributes
+ .get("user.business-info.telecom.telephone.ext", null) != null) {
+ page.setUserBusinessInfoTelecomTelephoneExt(userAttributes.get(
+ "user.business-info.telecom.telephone.ext", ""));
}
- if (userAttributes.get("user.business-info.telecom.telephone.comment", null) != null)
- {
- page.setUserBusinessInfoTelecomTelephoneComment(userAttributes.get("user.business-info.telecom.telephone.comment", ""));
+ if (userAttributes.get("user.business-info.telecom.telephone.comment",
+ null) != null) {
+ page.setUserBusinessInfoTelecomTelephoneComment(userAttributes.get(
+ "user.business-info.telecom.telephone.comment", ""));
}
- if (userAttributes.get("user.business-info.telecom.fax.intcode", null) != null)
- {
- page.setUserBusinessInfoTelecomFaxIntcode(userAttributes.get("user.business-info.telecom.fax.intcode", ""));
+ if (userAttributes.get("user.business-info.telecom.fax.intcode", null) != null) {
+ page.setUserBusinessInfoTelecomFaxIntcode(userAttributes.get(
+ "user.business-info.telecom.fax.intcode", ""));
}
- if (userAttributes.get("user.business-info.telecom.fax.loccode", null) != null)
- {
- page.setUserBusinessInfoTelecomFaxLoccode(userAttributes.get("user.business-info.telecom.fax.loccode", ""));
+ if (userAttributes.get("user.business-info.telecom.fax.loccode", null) != null) {
+ page.setUserBusinessInfoTelecomFaxLoccode(userAttributes.get(
+ "user.business-info.telecom.fax.loccode", ""));
}
- if (userAttributes.get("user.business-info.telecom.fax.number", null) != null)
- {
- page.setUserBusinessInfoTelecomFaxNumber(userAttributes.get("user.business-info.telecom.fax.number", ""));
+ if (userAttributes.get("user.business-info.telecom.fax.number", null) != null) {
+ page.setUserBusinessInfoTelecomFaxNumber(userAttributes.get(
+ "user.business-info.telecom.fax.number", ""));
}
- if (userAttributes.get("user.business-info.telecom.fax.ext", null) != null)
- {
- page.setUserBusinessInfoTelecomFaxExt(userAttributes.get("user.business-info.telecom.fax.ext", ""));
+ if (userAttributes.get("user.business-info.telecom.fax.ext", null) != null) {
+ page.setUserBusinessInfoTelecomFaxExt(userAttributes.get(
+ "user.business-info.telecom.fax.ext", ""));
}
- if (userAttributes.get("user.business-info.telecom.fax.comment", null) != null)
- {
- page.setUserBusinessInfoTelecomFaxComment(userAttributes.get("user.business-info.telecom.fax.comment", ""));
+ if (userAttributes.get("user.business-info.telecom.fax.comment", null) != null) {
+ page.setUserBusinessInfoTelecomFaxComment(userAttributes.get(
+ "user.business-info.telecom.fax.comment", ""));
}
- if (userAttributes.get("user.business-info.telecom.mobile.intcode", null) != null)
- {
- page.setUserBusinessInfoTelecomMobileIntcode(userAttributes.get("user.business-info.telecom.mobile.intcode", ""));
+ if (userAttributes.get("user.business-info.telecom.mobile.intcode",
+ null) != null) {
+ page.setUserBusinessInfoTelecomMobileIntcode(userAttributes.get(
+ "user.business-info.telecom.mobile.intcode", ""));
}
- if (userAttributes.get("user.business-info.telecom.mobile.loccode", null) != null)
- {
- page.setUserBusinessInfoTelecomMobileLoccode(userAttributes.get("user.business-info.telecom.mobile.loccode", ""));
+ if (userAttributes.get("user.business-info.telecom.mobile.loccode",
+ null) != null) {
+ page.setUserBusinessInfoTelecomMobileLoccode(userAttributes.get(
+ "user.business-info.telecom.mobile.loccode", ""));
}
- if (userAttributes.get("user.business-info.telecom.mobile.number", null) != null)
- {
- page.setUserBusinessInfoTelecomMobileNumber(userAttributes.get("user.business-info.telecom.mobile.number", ""));
+ if (userAttributes
+ .get("user.business-info.telecom.mobile.number", null) != null) {
+ page.setUserBusinessInfoTelecomMobileNumber(userAttributes.get(
+ "user.business-info.telecom.mobile.number", ""));
}
- if (userAttributes.get("user.business-info.telecom.mobile.ext", null) != null)
- {
- page.setUserBusinessInfoTelecomMobileExt(userAttributes.get("user.business-info.telecom.mobile.ext", ""));
+ if (userAttributes.get("user.business-info.telecom.mobile.ext", null) != null) {
+ page.setUserBusinessInfoTelecomMobileExt(userAttributes.get(
+ "user.business-info.telecom.mobile.ext", ""));
}
- if (userAttributes.get("user.business-info.telecom.mobile.comment", null) != null)
- {
- page.setUserBusinessInfoTelecomMobileComment(userAttributes.get("user.business-info.telecom.mobile.comment", ""));
+ if (userAttributes.get("user.business-info.telecom.mobile.comment",
+ null) != null) {
+ page.setUserBusinessInfoTelecomMobileComment(userAttributes.get(
+ "user.business-info.telecom.mobile.comment", ""));
}
- if (userAttributes.get("user.business-info.telecom.pager.intcode", null) != null)
- {
- page.setUserBusinessInfoTelecomPagerIntcode(userAttributes.get("user.business-info.telecom.pager.intcode", ""));
+ if (userAttributes
+ .get("user.business-info.telecom.pager.intcode", null) != null) {
+ page.setUserBusinessInfoTelecomPagerIntcode(userAttributes.get(
+ "user.business-info.telecom.pager.intcode", ""));
}
- if (userAttributes.get("user.business-info.telecom.pager.loccode", null) != null)
- {
- page.setUserBusinessInfoTelecomPagerLoccode(userAttributes.get("user.business-info.telecom.pager.loccode", ""));
+ if (userAttributes
+ .get("user.business-info.telecom.pager.loccode", null) != null) {
+ page.setUserBusinessInfoTelecomPagerLoccode(userAttributes.get(
+ "user.business-info.telecom.pager.loccode", ""));
}
- if (userAttributes.get("user.business-info.telecom.pager.number", null) != null)
- {
- page.setUserBusinessInfoTelecomPagerNumber(userAttributes.get("user.business-info.telecom.pager.number", ""));
+ if (userAttributes.get("user.business-info.telecom.pager.number", null) != null) {
+ page.setUserBusinessInfoTelecomPagerNumber(userAttributes.get(
+ "user.business-info.telecom.pager.number", ""));
}
- if (userAttributes.get("user.business-info.telecom.pager.ext", null) != null)
- {
- page.setUserBusinessInfoTelecomPagerExt(userAttributes.get("user.business-info.telecom.pager.ext", ""));
+ if (userAttributes.get("user.business-info.telecom.pager.ext", null) != null) {
+ page.setUserBusinessInfoTelecomPagerExt(userAttributes.get(
+ "user.business-info.telecom.pager.ext", ""));
}
- if (userAttributes.get("user.business-info.telecom.pager.comment", null) != null)
- {
- page.setUserBusinessInfoTelecomPagerComment(userAttributes.get("user.business-info.telecom.pager.comment", ""));
+ if (userAttributes
+ .get("user.business-info.telecom.pager.comment", null) != null) {
+ page.setUserBusinessInfoTelecomPagerComment(userAttributes.get(
+ "user.business-info.telecom.pager.comment", ""));
}
- if (userAttributes.get("user.business-info.online.uri", null) != null)
- {
- page.setUserBusinessInfoOnlineUri(userAttributes.get("user.business-info.online.uri", ""));
+ if (userAttributes.get("user.business-info.online.uri", null) != null) {
+ page.setUserBusinessInfoOnlineUri(userAttributes.get(
+ "user.business-info.online.uri", ""));
}
- if (page instanceof PublicPortalRegistrationUpdatePage)
- {
+ if (page instanceof PublicPortalRegistrationUpdatePage) {
PublicPortalRegistrationUpdatePage p = (PublicPortalRegistrationUpdatePage) page;
- if (userAttributes.get("user.bdate.year", null) != null)
- {
+ if (userAttributes.get("user.bdate.year", null) != null) {
p.setUserBdateYear(userAttributes.getInt("user.bdate.year", 0));
}
- if (userAttributes.get("user.bdate.month", null) != null)
- {
- p.setUserBdateMonth(userAttributes.getInt("user.bdate.month", 0));
+ if (userAttributes.get("user.bdate.month", null) != null) {
+ p.setUserBdateMonth(userAttributes
+ .getInt("user.bdate.month", 0));
}
- if (userAttributes.get("user.bdate.date", null) != null)
- {
+ if (userAttributes.get("user.bdate.date", null) != null) {
p.setUserBdateDate(userAttributes.getInt("user.bdate.date", 0));
}
- if (userAttributes.get("user.industry", null) != null)
- {
+ if (userAttributes.get("user.industry", null) != null) {
p.setUserIndustry(userAttributes.get("user.industry", ""));
}
- if (userAttributes.get("user.secret.question", null) != null)
- {
- p.setUserSecretQuestion(userAttributes.get("user.secret.question", ""));
+ if (userAttributes.get("user.secret.question", null) != null) {
+ p.setUserSecretQuestion(userAttributes.get(
+ "user.secret.question", ""));
}
- if (userAttributes.get("user.secret.answer", null) != null)
- {
- p.setUserSecretAnswer(userAttributes.get("user.secret.answer", ""));
+ if (userAttributes.get("user.secret.answer", null) != null) {
+ p.setUserSecretAnswer(userAttributes.get("user.secret.answer",
+ ""));
}
- if (userAttributes.get("user.name.given.yomi", null) != null)
- {
- p.setUserNameGivenYomi(userAttributes.get("user.name.given.yomi", ""));
+ if (userAttributes.get("user.name.given.yomi", null) != null) {
+ p.setUserNameGivenYomi(userAttributes.get(
+ "user.name.given.yomi", ""));
}
- if (userAttributes.get("user.name.family.yomi", null) != null)
- {
- p.setUserNameFamilyYomi(userAttributes.get("user.name.family.yomi", ""));
+ if (userAttributes.get("user.name.family.yomi", null) != null) {
+ p.setUserNameFamilyYomi(userAttributes.get(
+ "user.name.family.yomi", ""));
}
}
}
- protected Map<String, String> createUserInfoMap(UserRegistrationPage page)
- {
+ protected Map<String, String> createUserInfoMap(UserRegistrationPage page) {
Map<String, String> userInfo = new HashMap<String, String>();
- if (page.getUserBusinessInfoOnlineEmail() != null)
- {
- userInfo.put("user.business-info.online.email", page.getUserBusinessInfoOnlineEmail());
+ if (page.getUserBusinessInfoOnlineEmail() != null) {
+ userInfo.put("user.business-info.online.email", page
+ .getUserBusinessInfoOnlineEmail());
}
- if (page.getUserName() != null)
- {
+ if (page.getUserName() != null) {
userInfo.put("user.name", page.getUserName());
}
- if (page.getUserBdate() != null)
- {
+ if (page.getUserBdate() != null) {
userInfo.put("user.bdate", page.getUserBdate());
}
- if (page.getUserGender() != null)
- {
+ if (page.getUserGender() != null) {
userInfo.put("user.gender", page.getUserGender());
}
- if (page.getUserEmployer() != null)
- {
+ if (page.getUserEmployer() != null) {
userInfo.put("user.employer", page.getUserEmployer());
}
- if (page.getUserDepartment() != null)
- {
+ if (page.getUserDepartment() != null) {
userInfo.put("user.department", page.getUserDepartment());
}
- if (page.getUserJobtitle() != null)
- {
+ if (page.getUserJobtitle() != null) {
userInfo.put("user.jobtitle", page.getUserJobtitle());
}
- if (page.getUserNamePrefix() != null)
- {
+ if (page.getUserNamePrefix() != null) {
userInfo.put("user.name.prefix", page.getUserNamePrefix());
}
- if (page.getUserNameGiven() != null)
- {
+ if (page.getUserNameGiven() != null) {
userInfo.put("user.name.given", page.getUserNameGiven());
}
- if (page.getUserNameFamily() != null)
- {
+ if (page.getUserNameFamily() != null) {
userInfo.put("user.name.family", page.getUserNameFamily());
}
- if (page.getUserNameMiddle() != null)
- {
+ if (page.getUserNameMiddle() != null) {
userInfo.put("user.name.middle", page.getUserNameMiddle());
}
- if (page.getUserNameSuffix() != null)
- {
+ if (page.getUserNameSuffix() != null) {
userInfo.put("user.name.suffix", page.getUserNameSuffix());
}
- if (page.getUserNameNickName() != null)
- {
+ if (page.getUserNameNickName() != null) {
userInfo.put("user.name.nickName", page.getUserNameNickName());
}
- if (page.getUserHomeInfoPostalName() != null)
- {
- userInfo.put("user.home-info.postal.name", page.getUserHomeInfoPostalName());
+ if (page.getUserHomeInfoPostalName() != null) {
+ userInfo.put("user.home-info.postal.name", page
+ .getUserHomeInfoPostalName());
}
- if (page.getUserHomeInfoPostalStreet() != null)
- {
- userInfo.put("user.home-info.postal.street", page.getUserHomeInfoPostalStreet());
+ if (page.getUserHomeInfoPostalStreet() != null) {
+ userInfo.put("user.home-info.postal.street", page
+ .getUserHomeInfoPostalStreet());
}
- if (page.getUserHomeInfoPostalCity() != null)
- {
- userInfo.put("user.home-info.postal.city", page.getUserHomeInfoPostalCity());
+ if (page.getUserHomeInfoPostalCity() != null) {
+ userInfo.put("user.home-info.postal.city", page
+ .getUserHomeInfoPostalCity());
}
- if (page.getUserHomeInfoPostalStateprov() != null)
- {
- userInfo.put("user.home-info.postal.stateprov", page.getUserHomeInfoPostalStateprov());
+ if (page.getUserHomeInfoPostalStateprov() != null) {
+ userInfo.put("user.home-info.postal.stateprov", page
+ .getUserHomeInfoPostalStateprov());
}
- if (page.getUserHomeInfoPostalPostalcode() != null)
- {
- userInfo.put("user.home-info.postal.postalcode", page.getUserHomeInfoPostalPostalcode());
+ if (page.getUserHomeInfoPostalPostalcode() != null) {
+ userInfo.put("user.home-info.postal.postalcode", page
+ .getUserHomeInfoPostalPostalcode());
}
- if (page.getUserHomeInfoPostalCountry() != null)
- {
- userInfo.put("user.home-info.postal.country", page.getUserHomeInfoPostalCountry());
+ if (page.getUserHomeInfoPostalCountry() != null) {
+ userInfo.put("user.home-info.postal.country", page
+ .getUserHomeInfoPostalCountry());
}
- if (page.getUserHomeInfoPostalOrganization() != null)
- {
- userInfo.put("user.home-info.postal.organization", page.getUserHomeInfoPostalOrganization());
+ if (page.getUserHomeInfoPostalOrganization() != null) {
+ userInfo.put("user.home-info.postal.organization", page
+ .getUserHomeInfoPostalOrganization());
}
- if (page.getUserHomeInfoTelecomTelephoneIntcode() != null)
- {
- userInfo.put("user.home-info.telecom.telephone.intcode", page.getUserHomeInfoTelecomTelephoneIntcode());
+ if (page.getUserHomeInfoTelecomTelephoneIntcode() != null) {
+ userInfo.put("user.home-info.telecom.telephone.intcode", page
+ .getUserHomeInfoTelecomTelephoneIntcode());
}
- if (page.getUserHomeInfoTelecomTelephoneLoccode() != null)
- {
- userInfo.put("user.home-info.telecom.telephone.loccode", page.getUserHomeInfoTelecomTelephoneLoccode());
+ if (page.getUserHomeInfoTelecomTelephoneLoccode() != null) {
+ userInfo.put("user.home-info.telecom.telephone.loccode", page
+ .getUserHomeInfoTelecomTelephoneLoccode());
}
- if (page.getUserHomeInfoTelecomTelephoneNumber() != null)
- {
- userInfo.put("user.home-info.telecom.telephone.number", page.getUserHomeInfoTelecomTelephoneNumber());
+ if (page.getUserHomeInfoTelecomTelephoneNumber() != null) {
+ userInfo.put("user.home-info.telecom.telephone.number", page
+ .getUserHomeInfoTelecomTelephoneNumber());
}
- if (page.getUserHomeInfoTelecomTelephoneExt() != null)
- {
- userInfo.put("user.home-info.telecom.telephone.ext", page.getUserHomeInfoTelecomTelephoneExt());
+ if (page.getUserHomeInfoTelecomTelephoneExt() != null) {
+ userInfo.put("user.home-info.telecom.telephone.ext", page
+ .getUserHomeInfoTelecomTelephoneExt());
}
- if (page.getUserHomeInfoTelecomTelephoneComment() != null)
- {
- userInfo.put("user.home-info.telecom.telephone.comment", page.getUserHomeInfoTelecomTelephoneComment());
+ if (page.getUserHomeInfoTelecomTelephoneComment() != null) {
+ userInfo.put("user.home-info.telecom.telephone.comment", page
+ .getUserHomeInfoTelecomTelephoneComment());
}
- if (page.getUserHomeInfoTelecomFaxIntcode() != null)
- {
- userInfo.put("user.home-info.telecom.fax.intcode", page.getUserHomeInfoTelecomFaxIntcode());
+ if (page.getUserHomeInfoTelecomFaxIntcode() != null) {
+ userInfo.put("user.home-info.telecom.fax.intcode", page
+ .getUserHomeInfoTelecomFaxIntcode());
}
- if (page.getUserHomeInfoTelecomFaxLoccode() != null)
- {
- userInfo.put("user.home-info.telecom.fax.loccode", page.getUserHomeInfoTelecomFaxLoccode());
+ if (page.getUserHomeInfoTelecomFaxLoccode() != null) {
+ userInfo.put("user.home-info.telecom.fax.loccode", page
+ .getUserHomeInfoTelecomFaxLoccode());
}
- if (page.getUserHomeInfoTelecomFaxNumber() != null)
- {
- userInfo.put("user.home-info.telecom.fax.number", page.getUserHomeInfoTelecomFaxNumber());
+ if (page.getUserHomeInfoTelecomFaxNumber() != null) {
+ userInfo.put("user.home-info.telecom.fax.number", page
+ .getUserHomeInfoTelecomFaxNumber());
}
- if (page.getUserHomeInfoTelecomFaxExt() != null)
- {
- userInfo.put("user.home-info.telecom.fax.ext", page.getUserHomeInfoTelecomFaxExt());
+ if (page.getUserHomeInfoTelecomFaxExt() != null) {
+ userInfo.put("user.home-info.telecom.fax.ext", page
+ .getUserHomeInfoTelecomFaxExt());
}
- if (page.getUserHomeInfoTelecomFaxComment() != null)
- {
- userInfo.put("user.home-info.telecom.fax.comment", page.getUserHomeInfoTelecomFaxComment());
+ if (page.getUserHomeInfoTelecomFaxComment() != null) {
+ userInfo.put("user.home-info.telecom.fax.comment", page
+ .getUserHomeInfoTelecomFaxComment());
}
- if (page.getUserHomeInfoTelecomMobileIntcode() != null)
- {
- userInfo.put("user.home-info.telecom.mobile.intcode", page.getUserHomeInfoTelecomMobileIntcode());
+ if (page.getUserHomeInfoTelecomMobileIntcode() != null) {
+ userInfo.put("user.home-info.telecom.mobile.intcode", page
+ .getUserHomeInfoTelecomMobileIntcode());
}
- if (page.getUserHomeInfoTelecomMobileLoccode() != null)
- {
- userInfo.put("user.home-info.telecom.mobile.loccode", page.getUserHomeInfoTelecomMobileLoccode());
+ if (page.getUserHomeInfoTelecomMobileLoccode() != null) {
+ userInfo.put("user.home-info.telecom.mobile.loccode", page
+ .getUserHomeInfoTelecomMobileLoccode());
}
- if (page.getUserHomeInfoTelecomMobileNumber() != null)
- {
- userInfo.put("user.home-info.telecom.mobile.number", page.getUserHomeInfoTelecomMobileNumber());
+ if (page.getUserHomeInfoTelecomMobileNumber() != null) {
+ userInfo.put("user.home-info.telecom.mobile.number", page
+ .getUserHomeInfoTelecomMobileNumber());
}
- if (page.getUserHomeInfoTelecomMobileExt() != null)
- {
- userInfo.put("user.home-info.telecom.mobile.ext", page.getUserHomeInfoTelecomMobileExt());
+ if (page.getUserHomeInfoTelecomMobileExt() != null) {
+ userInfo.put("user.home-info.telecom.mobile.ext", page
+ .getUserHomeInfoTelecomMobileExt());
}
- if (page.getUserHomeInfoTelecomMobileComment() != null)
- {
- userInfo.put("user.home-info.telecom.mobile.comment", page.getUserHomeInfoTelecomMobileComment());
+ if (page.getUserHomeInfoTelecomMobileComment() != null) {
+ userInfo.put("user.home-info.telecom.mobile.comment", page
+ .getUserHomeInfoTelecomMobileComment());
}
- if (page.getUserHomeInfoTelecomPagerIntcode() != null)
- {
- userInfo.put("user.home-info.telecom.pager.intcode", page.getUserHomeInfoTelecomPagerIntcode());
+ if (page.getUserHomeInfoTelecomPagerIntcode() != null) {
+ userInfo.put("user.home-info.telecom.pager.intcode", page
+ .getUserHomeInfoTelecomPagerIntcode());
}
- if (page.getUserHomeInfoTelecomPagerLoccode() != null)
- {
- userInfo.put("user.home-info.telecom.pager.loccode", page.getUserHomeInfoTelecomPagerLoccode());
+ if (page.getUserHomeInfoTelecomPagerLoccode() != null) {
+ userInfo.put("user.home-info.telecom.pager.loccode", page
+ .getUserHomeInfoTelecomPagerLoccode());
}
- if (page.getUserHomeInfoTelecomPagerNumber() != null)
- {
- userInfo.put("user.home-info.telecom.pager.number", page.getUserHomeInfoTelecomPagerNumber());
+ if (page.getUserHomeInfoTelecomPagerNumber() != null) {
+ userInfo.put("user.home-info.telecom.pager.number", page
+ .getUserHomeInfoTelecomPagerNumber());
}
- if (page.getUserHomeInfoTelecomPagerExt() != null)
- {
- userInfo.put("user.home-info.telecom.pager.ext", page.getUserHomeInfoTelecomPagerExt());
+ if (page.getUserHomeInfoTelecomPagerExt() != null) {
+ userInfo.put("user.home-info.telecom.pager.ext", page
+ .getUserHomeInfoTelecomPagerExt());
}
- if (page.getUserHomeInfoTelecomPagerComment() != null)
- {
- userInfo.put("user.home-info.telecom.pager.comment", page.getUserHomeInfoTelecomPagerComment());
+ if (page.getUserHomeInfoTelecomPagerComment() != null) {
+ userInfo.put("user.home-info.telecom.pager.comment", page
+ .getUserHomeInfoTelecomPagerComment());
}
- if (page.getUserHomeInfoOnlineEmail() != null)
- {
- userInfo.put("user.home-info.online.email", page.getUserHomeInfoOnlineEmail());
+ if (page.getUserHomeInfoOnlineEmail() != null) {
+ userInfo.put("user.home-info.online.email", page
+ .getUserHomeInfoOnlineEmail());
}
- if (page.getUserHomeInfoOnlineUri() != null)
- {
- userInfo.put("user.home-info.online.uri", page.getUserHomeInfoOnlineUri());
+ if (page.getUserHomeInfoOnlineUri() != null) {
+ userInfo.put("user.home-info.online.uri", page
+ .getUserHomeInfoOnlineUri());
}
- if (page.getUserBusinessInfoPostalName() != null)
- {
- userInfo.put("user.business-info.postal.name", page.getUserBusinessInfoPostalName());
+ if (page.getUserBusinessInfoPostalName() != null) {
+ userInfo.put("user.business-info.postal.name", page
+ .getUserBusinessInfoPostalName());
}
- if (page.getUserBusinessInfoPostalStreet() != null)
- {
- userInfo.put("user.business-info.postal.street", page.getUserBusinessInfoPostalStreet());
+ if (page.getUserBusinessInfoPostalStreet() != null) {
+ userInfo.put("user.business-info.postal.street", page
+ .getUserBusinessInfoPostalStreet());
}
- if (page.getUserBusinessInfoPostalCity() != null)
- {
- userInfo.put("user.business-info.postal.city", page.getUserBusinessInfoPostalCity());
+ if (page.getUserBusinessInfoPostalCity() != null) {
+ userInfo.put("user.business-info.postal.city", page
+ .getUserBusinessInfoPostalCity());
}
- if (page.getUserBusinessInfoPostalStateprov() != null)
- {
- userInfo.put("user.business-info.postal.stateprov", page.getUserBusinessInfoPostalStateprov());
+ if (page.getUserBusinessInfoPostalStateprov() != null) {
+ userInfo.put("user.business-info.postal.stateprov", page
+ .getUserBusinessInfoPostalStateprov());
}
- if (page.getUserBusinessInfoPostalPostalcode() != null)
- {
- userInfo.put("user.business-info.postal.postalcode", page.getUserBusinessInfoPostalPostalcode());
+ if (page.getUserBusinessInfoPostalPostalcode() != null) {
+ userInfo.put("user.business-info.postal.postalcode", page
+ .getUserBusinessInfoPostalPostalcode());
}
- if (page.getUserBusinessInfoPostalCountry() != null)
- {
- userInfo.put("user.business-info.postal.country", page.getUserBusinessInfoPostalCountry());
+ if (page.getUserBusinessInfoPostalCountry() != null) {
+ userInfo.put("user.business-info.postal.country", page
+ .getUserBusinessInfoPostalCountry());
}
- if (page.getUserBusinessInfoPostalOrganization() != null)
- {
- userInfo.put("user.business-info.postal.organization", page.getUserBusinessInfoPostalOrganization());
+ if (page.getUserBusinessInfoPostalOrganization() != null) {
+ userInfo.put("user.business-info.postal.organization", page
+ .getUserBusinessInfoPostalOrganization());
}
- if (page.getUserBusinessInfoTelecomTelephoneIntcode() != null)
- {
- userInfo.put("user.business-info.telecom.telephone.intcode", page.getUserBusinessInfoTelecomTelephoneIntcode());
+ if (page.getUserBusinessInfoTelecomTelephoneIntcode() != null) {
+ userInfo.put("user.business-info.telecom.telephone.intcode", page
+ .getUserBusinessInfoTelecomTelephoneIntcode());
}
- if (page.getUserBusinessInfoTelecomTelephoneLoccode() != null)
- {
- userInfo.put("user.business-info.telecom.telephone.loccode", page.getUserBusinessInfoTelecomTelephoneLoccode());
+ if (page.getUserBusinessInfoTelecomTelephoneLoccode() != null) {
+ userInfo.put("user.business-info.telecom.telephone.loccode", page
+ .getUserBusinessInfoTelecomTelephoneLoccode());
}
- if (page.getUserBusinessInfoTelecomTelephoneNumber() != null)
- {
- userInfo.put("user.business-info.telecom.telephone.number", page.getUserBusinessInfoTelecomTelephoneNumber());
+ if (page.getUserBusinessInfoTelecomTelephoneNumber() != null) {
+ userInfo.put("user.business-info.telecom.telephone.number", page
+ .getUserBusinessInfoTelecomTelephoneNumber());
}
- if (page.getUserBusinessInfoTelecomTelephoneExt() != null)
- {
- userInfo.put("user.business-info.telecom.telephone.ext", page.getUserBusinessInfoTelecomTelephoneExt());
+ if (page.getUserBusinessInfoTelecomTelephoneExt() != null) {
+ userInfo.put("user.business-info.telecom.telephone.ext", page
+ .getUserBusinessInfoTelecomTelephoneExt());
}
- if (page.getUserBusinessInfoTelecomTelephoneComment() != null)
- {
- userInfo.put("user.business-info.telecom.telephone.comment", page.getUserBusinessInfoTelecomTelephoneComment());
+ if (page.getUserBusinessInfoTelecomTelephoneComment() != null) {
+ userInfo.put("user.business-info.telecom.telephone.comment", page
+ .getUserBusinessInfoTelecomTelephoneComment());
}
- if (page.getUserBusinessInfoTelecomFaxIntcode() != null)
- {
- userInfo.put("user.business-info.telecom.fax.intcode", page.getUserBusinessInfoTelecomFaxIntcode());
+ if (page.getUserBusinessInfoTelecomFaxIntcode() != null) {
+ userInfo.put("user.business-info.telecom.fax.intcode", page
+ .getUserBusinessInfoTelecomFaxIntcode());
}
- if (page.getUserBusinessInfoTelecomFaxLoccode() != null)
- {
- userInfo.put("user.business-info.telecom.fax.loccode", page.getUserBusinessInfoTelecomFaxLoccode());
+ if (page.getUserBusinessInfoTelecomFaxLoccode() != null) {
+ userInfo.put("user.business-info.telecom.fax.loccode", page
+ .getUserBusinessInfoTelecomFaxLoccode());
}
- if (page.getUserBusinessInfoTelecomFaxNumber() != null)
- {
- userInfo.put("user.business-info.telecom.fax.number", page.getUserBusinessInfoTelecomFaxNumber());
+ if (page.getUserBusinessInfoTelecomFaxNumber() != null) {
+ userInfo.put("user.business-info.telecom.fax.number", page
+ .getUserBusinessInfoTelecomFaxNumber());
}
- if (page.getUserBusinessInfoTelecomFaxExt() != null)
- {
- userInfo.put("user.business-info.telecom.fax.ext", page.getUserBusinessInfoTelecomFaxExt());
+ if (page.getUserBusinessInfoTelecomFaxExt() != null) {
+ userInfo.put("user.business-info.telecom.fax.ext", page
+ .getUserBusinessInfoTelecomFaxExt());
}
- if (page.getUserBusinessInfoTelecomFaxComment() != null)
- {
- userInfo.put("user.business-info.telecom.fax.comment", page.getUserBusinessInfoTelecomFaxComment());
+ if (page.getUserBusinessInfoTelecomFaxComment() != null) {
+ userInfo.put("user.business-info.telecom.fax.comment", page
+ .getUserBusinessInfoTelecomFaxComment());
}
- if (page.getUserBusinessInfoTelecomMobileIntcode() != null)
- {
- userInfo.put("user.business-info.telecom.mobile.intcode", page.getUserBusinessInfoTelecomMobileIntcode());
+ if (page.getUserBusinessInfoTelecomMobileIntcode() != null) {
+ userInfo.put("user.business-info.telecom.mobile.intcode", page
+ .getUserBusinessInfoTelecomMobileIntcode());
}
- if (page.getUserBusinessInfoTelecomMobileLoccode() != null)
- {
- userInfo.put("user.business-info.telecom.mobile.loccode", page.getUserBusinessInfoTelecomMobileLoccode());
+ if (page.getUserBusinessInfoTelecomMobileLoccode() != null) {
+ userInfo.put("user.business-info.telecom.mobile.loccode", page
+ .getUserBusinessInfoTelecomMobileLoccode());
}
- if (page.getUserBusinessInfoTelecomMobileNumber() != null)
- {
- userInfo.put("user.business-info.telecom.mobile.number", page.getUserBusinessInfoTelecomMobileNumber());
+ if (page.getUserBusinessInfoTelecomMobileNumber() != null) {
+ userInfo.put("user.business-info.telecom.mobile.number", page
+ .getUserBusinessInfoTelecomMobileNumber());
}
- if (page.getUserBusinessInfoTelecomMobileExt() != null)
- {
- userInfo.put("user.business-info.telecom.mobile.ext", page.getUserBusinessInfoTelecomMobileExt());
+ if (page.getUserBusinessInfoTelecomMobileExt() != null) {
+ userInfo.put("user.business-info.telecom.mobile.ext", page
+ .getUserBusinessInfoTelecomMobileExt());
}
- if (page.getUserBusinessInfoTelecomMobileComment() != null)
- {
- userInfo.put("user.business-info.telecom.mobile.comment", page.getUserBusinessInfoTelecomMobileComment());
+ if (page.getUserBusinessInfoTelecomMobileComment() != null) {
+ userInfo.put("user.business-info.telecom.mobile.comment", page
+ .getUserBusinessInfoTelecomMobileComment());
}
- if (page.getUserBusinessInfoTelecomPagerIntcode() != null)
- {
- userInfo.put("user.business-info.telecom.pager.intcode", page.getUserBusinessInfoTelecomPagerIntcode());
+ if (page.getUserBusinessInfoTelecomPagerIntcode() != null) {
+ userInfo.put("user.business-info.telecom.pager.intcode", page
+ .getUserBusinessInfoTelecomPagerIntcode());
}
- if (page.getUserBusinessInfoTelecomPagerLoccode() != null)
- {
- userInfo.put("user.business-info.telecom.pager.loccode", page.getUserBusinessInfoTelecomPagerLoccode());
+ if (page.getUserBusinessInfoTelecomPagerLoccode() != null) {
+ userInfo.put("user.business-info.telecom.pager.loccode", page
+ .getUserBusinessInfoTelecomPagerLoccode());
}
- if (page.getUserBusinessInfoTelecomPagerNumber() != null)
- {
- userInfo.put("user.business-info.telecom.pager.number", page.getUserBusinessInfoTelecomPagerNumber());
+ if (page.getUserBusinessInfoTelecomPagerNumber() != null) {
+ userInfo.put("user.business-info.telecom.pager.number", page
+ .getUserBusinessInfoTelecomPagerNumber());
}
- if (page.getUserBusinessInfoTelecomPagerExt() != null)
- {
- userInfo.put("user.business-info.telecom.pager.ext", page.getUserBusinessInfoTelecomPagerExt());
+ if (page.getUserBusinessInfoTelecomPagerExt() != null) {
+ userInfo.put("user.business-info.telecom.pager.ext", page
+ .getUserBusinessInfoTelecomPagerExt());
}
- if (page.getUserBusinessInfoTelecomPagerComment() != null)
- {
- userInfo.put("user.business-info.telecom.pager.comment", page.getUserBusinessInfoTelecomPagerComment());
+ if (page.getUserBusinessInfoTelecomPagerComment() != null) {
+ userInfo.put("user.business-info.telecom.pager.comment", page
+ .getUserBusinessInfoTelecomPagerComment());
}
- if (page.getUserBusinessInfoOnlineUri() != null)
- {
- userInfo.put("user.business-info.online.uri", page.getUserBusinessInfoOnlineUri());
+ if (page.getUserBusinessInfoOnlineUri() != null) {
+ userInfo.put("user.business-info.online.uri", page
+ .getUserBusinessInfoOnlineUri());
}
- if (page instanceof PublicPortalRegistrationPage)
- {
+ if (page instanceof PublicPortalRegistrationPage) {
PublicPortalRegistrationPage p = (PublicPortalRegistrationPage) page;
- if (p.getUserBdateYear() != null)
- {
- userInfo.put("user.bdate.year", p.getUserBdateYear().toString());
+ if (p.getUserBdateYear() != null) {
+ userInfo
+ .put("user.bdate.year", p.getUserBdateYear().toString());
}
- if (p.getUserBdateMonth() != null)
- {
- userInfo.put("user.bdate.month", p.getUserBdateMonth().toString());
+ if (p.getUserBdateMonth() != null) {
+ userInfo.put("user.bdate.month", p.getUserBdateMonth()
+ .toString());
}
- if (p.getUserBdateDate() != null)
- {
- userInfo.put("user.bdate.date", p.getUserBdateDate().toString());
+ if (p.getUserBdateDate() != null) {
+ userInfo
+ .put("user.bdate.date", p.getUserBdateDate().toString());
}
- if (p.getUserIndustry() != null)
- {
+ if (p.getUserIndustry() != null) {
userInfo.put("user.industry", p.getUserIndustry());
}
- if (p.getUserSecretQuestion() != null)
- {
+ if (p.getUserSecretQuestion() != null) {
userInfo.put("user.secret.question", p.getUserSecretQuestion());
}
- if (p.getUserSecretAnswer() != null)
- {
+ if (p.getUserSecretAnswer() != null) {
userInfo.put("user.secret.answer", p.getUserSecretAnswer());
}
- if (p.getUserNameGivenYomi() != null)
- {
+ if (p.getUserNameGivenYomi() != null) {
userInfo.put("user.name.given.yomi", p.getUserNameGivenYomi());
}
- if (p.getUserNameFamilyYomi() != null)
- {
- userInfo.put("user.name.family.yomi", p.getUserNameFamilyYomi());
+ if (p.getUserNameFamilyYomi() != null) {
+ userInfo
+ .put("user.name.family.yomi", p.getUserNameFamilyYomi());
}
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalSecretAnswerPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalSecretAnswerPage.java 2007-07-19 06:54:48 UTC (rev 314)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalSecretAnswerPage.java 2007-07-19 07:23:41 UTC (rev 315)
@@ -6,6 +6,8 @@
import jp.sf.pal.common.util.FacesMessageUtil;
import org.seasar.framework.log.Logger;
+import org.seasar.teeda.extension.annotation.takeover.TakeOver;
+import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
public class PublicPortalSecretAnswerPage extends ForgottenPasswordPage
implements Serializable {
@@ -56,12 +58,18 @@
FacesMessageUtil.addInfoMessage("incorrect.scret.answer");
}
} catch (CommonException e) {
- FacesMessageUtil.addErrorMessage(e.getMessageId());
+ // FacesMessageUtil.addErrorMessage(e.getMessageId());
+ FacesMessageUtil.addInfoMessage("incorrect.scret.answer");
logger.log("EPA0002", new Object[] { this.toString() }, e);
}
return null;
}
+ @TakeOver(type = TakeOverType.NEVER)
+ public Class<?> doBack() {
+ return PublicPortalForgottenPasswordPage.class;
+ }
+
public String initialize() {
return null;
}
@@ -80,7 +88,7 @@
getUserRegistrationService().setSecretQuestion(this);
} catch (CommonException e) {
logger.log("EPA0005", new Object[] { this.toString() }, e);
- return PublicPortalForgottenPasswordPage.class;
+ // return PublicPortalForgottenPasswordPage.class;
}
// render FacesMessage
@@ -92,4 +100,8 @@
return getLabelHelper().getLabelValue("Next");
}
+ public String getDoBackValue() {
+ return getLabelHelper().getLabelValue("Back");
+ }
+
}
Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/label.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/label.properties 2007-07-19 06:54:48 UTC (rev 314)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/label.properties 2007-07-19 07:23:41 UTC (rev 315)
@@ -166,6 +166,7 @@
publicPortalForgottenPassword.Next=\u6b21\u3078
publicPortalSecretAnswer.pageMessage=\u30e6\u30fc\u30b6\u30fc\u767b\u9332\u6642\u306b\u5165\u529b\u3057\u305f\u300c\u79d8\u5bc6\u306e\u8cea\u554f\u300d\u306b\u5bfe\u3059\u308b\u300c\u79d8\u5bc6\u306e\u7b54\u3048\u300d\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
publicPortalSecretAnswer.Finish=\u65b0\u898f\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u9001\u4fe1
+publicPortalSecretAnswer.Back=\u623b\u308b
publicPortalSecretAnswer.userSecretQuestion=\u79d8\u5bc6\u306e\u8cea\u554f
publicPortalSecretAnswer.userSecretAnswer=\u79d8\u5bc6\u306e\u7b54\u3048
publicPortalForgottenPasswordCompleted.forgottenPasswordAgain=\u518d\u5ea6\u3001\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u518d\u767a\u884c\u3092\u884c\u3046\u5834\u5408\u306f\u3001\u4ee5\u4e0b\u306e\u30ea\u30f3\u30af\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044\u3002
Modified: pal-admin/trunk/src/main/webapp/view/registration/publicPortalSecretAnswer.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/registration/publicPortalSecretAnswer.html 2007-07-19 06:54:48 UTC (rev 314)
+++ pal-admin/trunk/src/main/webapp/view/registration/publicPortalSecretAnswer.html 2007-07-19 07:23:41 UTC (rev 315)
@@ -11,20 +11,23 @@
<span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
</div>
<!-- content: BEGIN -->
- <div class="portlet-form-label">
- <label id="pageMessageLabel" class="portlet-form-label"></label>
+ <div style="margin:10px;">
+ <div class="portlet-form-label">
+ <label id="pageMessageLabel" class="portlet-form-label"></label>
+ </div>
+ <input id="email" type="hidden" class="portlet-form-input-field" size="24" />
+ <div>
+ <label id="userSecretQuestionLabel" for="email" class="portlet-form-label">email</label>:
+ <span id="userSecretQuestion">質問</span>
+ </div>
+ <div>
+ <label id="userSecretAnswerLabel" for="email" class="portlet-form-label">email</label>:
+ <input id="userSecretAnswer" type="text" class="portlet-form-input-field" size="24" />
+ </div>
</div>
- <input id="email" type="hidden" class="portlet-form-input-field" size="24" />
- <div>
- <label id="userSecretQuestionLabel" for="email" class="portlet-form-label">email</label>:
- <span id="userSecretQuestion">質問</span>
- </div>
- <div>
- <label id="userSecretAnswerLabel" for="email" class="portlet-form-label">email</label>:
- <input id="userSecretAnswer" type="text" class="portlet-form-input-field" size="24" />
- </div>
<div style="text-align:center;">
<input type="button" id="doFinish" value="Finish" onclick="location.href='publicPortalForgottenPasswordCompleted.html'" class="portlet-form-button" />
+ <input type="button" id="doBack" value="Back" onclick="location.href='publicPortalForgottenPassword.html'" class="portlet-form-button" />
</div>
<!-- content: END -->
</form>