- removed not needed assertion
- renamed variables
- if multi-page is enabled, don't create contact instance, that will be done on 2nd page
Signed-off-by: Roland Häder <roland@mxchange.org>
// Required personal data must be set
assert (this.isRequiredPersonalDataSet()) : "not all personal data is set"; //NOI18N
// Required personal data must be set
assert (this.isRequiredPersonalDataSet()) : "not all personal data is set"; //NOI18N
- // Create new contact instance
- Contact localContact = new UserContact();
-
// Generate phone number
DialableLandLineNumber phone = new LandLineNumber(this.getPhoneCountry(), this.getPhoneAreaCode(), this.getPhoneNumber());
DialableCellphoneNumber cellphone = new CellphoneNumber(this.getCellphoneCarrier(), this.getCellphoneNumber());
// Generate phone number
DialableLandLineNumber phone = new LandLineNumber(this.getPhoneCountry(), this.getPhoneAreaCode(), this.getPhoneNumber());
DialableCellphoneNumber cellphone = new CellphoneNumber(this.getCellphoneCarrier(), this.getCellphoneNumber());
assert (this.isRequiredPersonalDataSet()) : "not all personal data is set"; //NOI18N
// Create new user instance
assert (this.isRequiredPersonalDataSet()) : "not all personal data is set"; //NOI18N
// Create new user instance
- User localUser = new LoginUser();
+ User user = new LoginUser();
// Is user name required?
if (!this.isUserNameRequired()) {
// Is user name required?
if (!this.isUserNameRequired()) {
}
// Set user name and mode
}
// Set user name and mode
- localUser.setUserName(this.getUserName());
- localUser.setUserProfileMode(this.getUserProfileMode());
+ user.setUserName(this.getUserName());
+ user.setUserProfileMode(this.getUserProfileMode());
- // Create contact instance
- Contact contact = this.contactController.createContactInstance();
+ // Is multiple registration page
+ if (!this.registerController.isMultiplePageEnabled()) {
+ // Create contact instance
+ Contact contact = this.contactController.createContactInstance();
- // Debug message
- //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("{0}.createUserInstance: contact={1}", this.getClass().getSimpleName(), contact));
+ // Debug message
+ //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("{0}.createUserInstance: contact={1}", this.getClass().getSimpleName(), contact));
- // Set contact in user
- localUser.setUserContact(contact);
+ // Set contact in user
+ user.setUserContact(contact);
+ }
// Trace message
//* NOISY-DEBUG: */ System.out.println(MessageFormat.format("{0}.createUserInstance: user={1} - EXIT!", this.getClass().getSimpleName(), user));
// Return it
// Trace message
//* NOISY-DEBUG: */ System.out.println(MessageFormat.format("{0}.createUserInstance: user={1} - EXIT!", this.getClass().getSimpleName(), user));
// Return it
String contextParameter = FacesContext.getCurrentInstance().getExternalContext().getInitParameter("is_public_profile_enabled"); //NOI18N
// Is it set?
String contextParameter = FacesContext.getCurrentInstance().getExternalContext().getInitParameter("is_public_profile_enabled"); //NOI18N
// Is it set?
- boolean isPublicUserProfileEnabled = ((contextParameter instanceof String) && (contextParameter.toLowerCase().equals("true"))); //NOI18N
+ boolean isEnabled = ((contextParameter instanceof String) && (contextParameter.toLowerCase().equals("true"))); //NOI18N
// This requires user names being enabled, too.
// This requires user names being enabled, too.
- if ((isPublicUserProfileEnabled) && (!this.isUserNameRequired())) {
+ if ((isEnabled) && (!this.isUserNameRequired())) {
// Not valid state, users must be able to modify their profile, especially when it is public
throw new IllegalStateException("Public user profiles are enabled but user name requirement is disabled, this is not possible."); //NOI18N
}
// Return value
// Not valid state, users must be able to modify their profile, especially when it is public
throw new IllegalStateException("Public user profiles are enabled but user name requirement is disabled, this is not possible."); //NOI18N
}
// Return value
- return isPublicUserProfileEnabled;
String contextParameter = FacesContext.getCurrentInstance().getExternalContext().getInitParameter("is_user_name_required"); //NOI18N
// Is it set?
String contextParameter = FacesContext.getCurrentInstance().getExternalContext().getInitParameter("is_user_name_required"); //NOI18N
// Is it set?
- boolean isUserNameRequired = ((contextParameter instanceof String) && (contextParameter.toLowerCase().equals("true"))); //NOI18N
+ boolean isRequired = ((contextParameter instanceof String) && (contextParameter.toLowerCase().equals("true"))); //NOI18N
- return isUserNameRequired;