From 82ac6611c2e1afa4af78ea58b8d5c694f6bb3a92 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Tue, 6 Oct 2015 08:29:36 +0200
Subject: [PATCH] =?utf8?q?Continued:=20-=20added=20missing=20properties=20?=
 =?utf8?q?userName=20and=20comments=20(getter/setter)=20-=20added=20user?=
 =?utf8?q?=20name=20to=20registration=20form=20-=20updated=20jar=20Signed-?=
 =?utf8?q?off-by:Roland=20H=C3=A4der=20<roland@mxchange.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 lib/juser-core.jar                            | Bin 10223 -> 10231 bytes
 .../addressbook/beans/user/UserWebBean.java   |  37 +++++++++++++++---
 .../beans/user/UserWebController.java         |  28 +++++++++++++
 .../localization/bundle_de_DE.properties      |   1 +
 .../localization/bundle_en_US.properties      |   1 +
 .../guest/guest_registration_form.tpl         |  12 ++++++
 6 files changed, 74 insertions(+), 5 deletions(-)

diff --git a/lib/juser-core.jar b/lib/juser-core.jar
index 9f4d28016bd74ed088844f6a0089b4ec33c9129f..a5c15c7f86ebce62030ecaffb02d4573ecb239a4 100644
GIT binary patch
delta 478
zcmaFw|J|QAz?+$ci-CcIf#HUu+eBUs=IcPpVj44ucTpZpebxX`ljRtV!1Osrjmfo4
z+^9MyPiC}$%G!cyJ|-6sy*ZT0oJA1GaIa;3dQMY-fdPaKCog1Fn0%j^b@Bmz&dI0Q
z_<d(_F-S4gaWP0T)N?aPgNO!(Mi8qBB-RXKwSZWyAXXcQ)ed5HfLNU%Ru_oX4Py0h
zP1a#o=i>zOr?N9lV`rGo&M;$h4EuU^HrCSO)S}|aoctP$GdCOYZ(|p)VW?$bWKb<;
zs6h#c&Hu%uS-|d>m0rdOW*n2*!UpzPt+E9ukS6a?wg>ZnDeHr29Ti9jq^mfA`D;{s
z!So*$4=7)Ha*`?}45zDxfW_Xa7V@G5&g2}mAh66qHEEV#VhjwEA9AZrW>Xge3red?
ivq(ro1ryZ8!Gcvl!GkhD!HIlUlP{}_v6U$^0098qWQ8gK

delta 531
zcmezF|K6WBz?+$ci-CcIfg!ERbt10@b1IOsn8pm^U6cn?pEW?#WI0A7Fnx|uV{$DM
zH>%FblNl|bvbJEFkI4l@Zw_TLXW;`f+(XwUzf=@pU{Dm8Y#^;Md9@mU^r?Tl_AxLp
z7&FY|Vvu5}<zkRzsN-gk1`+iP4Iow{NURCOY6h`dK&(~}s}00z2eCRptWFTC3&iRM
zv3fWstFx<fvNKF&XPCy$Fnx0j`+D}t!u)ECGd5fCZ(|paVW?qXWKb<;h(YoHW_EFD
z7O=BbrI#^+8RulSuz@|)s%!xYo5=^1?ZJE|6@4&mq5|=FzKRo=@2@I7`Me4ws901z
zpklsYdcJB1nEs|($cqvtlS|Zsz%nP*q?ta6O;%KupIo58I+;sdOaY{D<&8g~QH%@>
zAZ!Q>G8kCWC?E}293joG6X4CrB*F}jQ1{0PhYG{l7#Kj<0j3K`FKOH<1Jx)y`L?<k
JTb?pV766GpgW&)G

diff --git a/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java b/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java
index aa652c8f..36affa12 100644
--- a/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java
+++ b/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java
@@ -69,11 +69,6 @@ public class UserWebBean implements UserWebController {
 	 */
 	private String countryCode;
 
-	/**
-	 * Remote user bean
-	 */
-	private final UserSessionBeanRemote userBean;
-
 	/**
 	 * Email address
 	 */
@@ -114,6 +109,16 @@ public class UserWebBean implements UserWebController {
 	 */
 	private String street;
 
+	/**
+	 * Remote user bean
+	 */
+	private final UserSessionBeanRemote userBean;
+
+	/**
+	 * User name
+	 */
+	private String userName;
+
 	/**
 	 * ZIP code
 	 */
@@ -149,6 +154,7 @@ public class UserWebBean implements UserWebController {
 
 		// Create new user instance
 		User user = new LoginUser();
+		user.setUserName(this.getUserName());
 
 		// Create new contact
 		Contact contact = new UserContact(this.getGender(), this.getFirstName(), this.getFamilyName(), this.getCompanyName());
@@ -159,6 +165,7 @@ public class UserWebBean implements UserWebController {
 		contact.setPhoneNumber(this.getPhoneNumber());
 		contact.setFaxNumber(this.getFaxNumber());
 		contact.setCellphoneNumber(this.getCellphoneNumber());
+		contact.setComment(this.getComment());
 
 		// Set contact in user
 		user.setContact(contact);
@@ -189,6 +196,16 @@ public class UserWebBean implements UserWebController {
 		this.city = city;
 	}
 
+	@Override
+	public String getComment () {
+		return this.comment;
+	}
+
+	@Override
+	public void setComment (final String comment) {
+		this.comment = comment;
+	}
+
 	@Override
 	public String getCompanyName () {
 		return this.companyName;
@@ -289,6 +306,16 @@ public class UserWebBean implements UserWebController {
 		this.street = street;
 	}
 
+	@Override
+	public String getUserName () {
+		return this.userName;
+	}
+
+	@Override
+	public void setUserName (final String userName) {
+		this.userName = userName;
+	}
+
 	@Override
 	public Integer getZipCode () {
 		return this.zipCode;
diff --git a/src/java/org/mxchange/addressbook/beans/user/UserWebController.java b/src/java/org/mxchange/addressbook/beans/user/UserWebController.java
index 0dcf0429..085c0e64 100644
--- a/src/java/org/mxchange/addressbook/beans/user/UserWebController.java
+++ b/src/java/org/mxchange/addressbook/beans/user/UserWebController.java
@@ -62,6 +62,34 @@ public interface UserWebController extends Serializable {
 	 */
 	public void setCity (final String city);
 
+	/**
+	 * Getter for comments
+	 * <p>
+	 * @return Comments
+	 */
+	public String getComment ();
+
+	/**
+	 * Setter for comment
+	 * <p>
+	 * @param comment Comments
+	 */
+	public void setComment (final String comment);
+
+	/**
+	 * Getter for user name
+	 * <p>
+	 * @return User name
+	 */
+	public String getUserName ();
+
+	/**
+	 * Setter for user name
+	 * <p>
+	 * @param userName User name
+	 */
+	public void setUserName (final String userName);
+
 	/**
 	 * Company name
 	 * <p>
diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 69d1da9b..f1df412f 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -107,3 +107,4 @@ MENU_USER_TITLE=Benutzer
 ENTER_USER_NAME=Benutzernamen:
 BUTTON_USER_LOGIN=Einloggen
 BUTTON_CONTINUE_STEP_2=Weiter zu Schritt 2
+GUEST_REGISTRATION_ENTER_USER_NAME=Benutzernamen eingeben:
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 2d4e31f4..53fbc1d2 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -107,3 +107,4 @@ MENU_USER_TITLE=User
 ENTER_USER_NAME=User name:
 BUTTON_USER_LOGIN=Login
 BUTTON_CONTINUE_STEP_2=Weiter zu Schritt 2
+GUEST_REGISTRATION_ENTER_USER_NAME=Enter user name:
diff --git a/web/WEB-INF/templates/guest/guest_registration_form.tpl b/web/WEB-INF/templates/guest/guest_registration_form.tpl
index 4b6f9e3d..67513825 100644
--- a/web/WEB-INF/templates/guest/guest_registration_form.tpl
+++ b/web/WEB-INF/templates/guest/guest_registration_form.tpl
@@ -18,6 +18,18 @@
 				<fieldset id="login_data">
 					<legend title="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND_TITLE}">#{msg.GUEST_REGISTRATION_EMAIL_LEGEND}</legend>
 
+					<div class="table_row">
+						<div class="table_left">
+							<h:outputLabel for="userName" value="#{msg.GUEST_REGISTRATION_ENTER_USER_NAME}" />
+						</div>
+
+						<div class="table_right">
+							<h:inputText class="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" />
+						</div>
+
+						<div class="clear"></div>
+					</div>
+
 					<div class="table_row">
 						<div class="table_left">
 							<h:outputLabel for="emailAddress1" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL1}" />
-- 
2.39.5