From: Roland Haeder Date: Thu, 15 Oct 2015 07:50:33 +0000 (+0200) Subject: Cleanup through inspection + updated jar(s) X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7aa25f312e6560bea95c4c3bc96597c351e0ab89;p=addressbook-war.git Cleanup through inspection + updated jar(s) Signed-off-by:Roland Häder --- diff --git a/lib/jcontacts-business-core.jar b/lib/jcontacts-business-core.jar index b0ead65c..2314d555 100644 Binary files a/lib/jcontacts-business-core.jar and b/lib/jcontacts-business-core.jar differ diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar index 4bf2b793..588f0e34 100644 Binary files a/lib/jcontacts-core.jar and b/lib/jcontacts-core.jar differ diff --git a/lib/jcontacts-lib.jar b/lib/jcontacts-lib.jar index badc884b..f13e33b9 100644 Binary files a/lib/jcontacts-lib.jar and b/lib/jcontacts-lib.jar differ diff --git a/lib/jcore-logger-lib.jar b/lib/jcore-logger-lib.jar index 50499372..ce30ba8a 100644 Binary files a/lib/jcore-logger-lib.jar and b/lib/jcore-logger-lib.jar differ diff --git a/lib/jcore.jar b/lib/jcore.jar index a6eb6775..1c2e5700 100644 Binary files a/lib/jcore.jar and b/lib/jcore.jar differ diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar index db108dde..6ea5dee8 100644 Binary files a/lib/jcoreee.jar and b/lib/jcoreee.jar differ diff --git a/lib/jcountry-core.jar b/lib/jcountry-core.jar index 9daf4363..eaf6110d 100644 Binary files a/lib/jcountry-core.jar and b/lib/jcountry-core.jar differ diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar index 97bdd394..9637788d 100644 Binary files a/lib/jphone-core.jar and b/lib/jphone-core.jar differ diff --git a/lib/juser-core.jar b/lib/juser-core.jar index 52192afb..404aa57a 100644 Binary files a/lib/juser-core.jar and b/lib/juser-core.jar differ diff --git a/lib/juser-lib.jar b/lib/juser-lib.jar index cf6b0ff7..3630a889 100644 Binary files a/lib/juser-lib.jar and b/lib/juser-lib.jar differ diff --git a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebBean.java b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebBean.java index 89427289..b50a4189 100644 --- a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebBean.java +++ b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebBean.java @@ -57,26 +57,17 @@ public class AddressbookWebBean implements AddressbookWebController { */ private AddressbookSessionBeanRemote addressbookBean; - /////////////////////// Properties ///////////////////// /** - * A list of all user's address books + * Address book id number (from URL for example) */ - private List usersAddressbooks; + private Long addressbookId; - /** - * A list of all user's shared (with others) address books - */ - private List sharedAddressbooks; /** * Name of the address book */ private String addressbookName; - /** - * Address book id number (from URL for example) - */ - private Long addressbookId; /** * Login controller @@ -84,6 +75,17 @@ public class AddressbookWebBean implements AddressbookWebController { @Inject private UserLoginWebController loginController; + /** + * A list of all user's shared (with others) address books + */ + private List sharedAddressbooks; + + /////////////////////// Properties ///////////////////// + /** + * A list of all user's address books + */ + private List usersAddressbooks; + /** * Default constructor */ @@ -155,17 +157,6 @@ public class AddressbookWebBean implements AddressbookWebController { return Collections.unmodifiableList(this.usersAddressbooks); } - @Override - public List allShares () { - // Is the user logged in? - if (!this.loginController.isUserLoggedIn()) { - // Not logged in - throw new FaceletException("This method can only be called as logged-in user."); //NOI18N - } - - return Collections.unmodifiableList(this.sharedAddressbooks); - } - @Override public List allEntries (final Addressbook addressbook) { // Is the user logged in? @@ -184,6 +175,17 @@ public class AddressbookWebBean implements AddressbookWebController { return this.allEntries(addressbook).size(); } + @Override + public List allShares () { + // Is the user logged in? + if (!this.loginController.isUserLoggedIn()) { + // Not logged in + throw new FaceletException("This method can only be called as logged-in user."); //NOI18N + } + + return Collections.unmodifiableList(this.sharedAddressbooks); + } + @Override public Long getAddressbookId () { return this.addressbookId; diff --git a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebController.java b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebController.java index b57cf584..38856559 100644 --- a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebController.java +++ b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebController.java @@ -35,7 +35,7 @@ public interface AddressbookWebController extends Serializable { *

* @return Whether the user has created at least one addressbook */ - public boolean hasCreatedAddressbooks (); + boolean hasCreatedAddressbooks (); /** * Creates a new address book with a name and redirects to proper target. @@ -44,21 +44,21 @@ public interface AddressbookWebController extends Serializable { *

* @return Target to redirect to */ - public String addAddressbook (); + String addAddressbook (); /** * Getter for address book name *

* @return Address book name */ - public String getAddressbookName (); + String getAddressbookName (); /** * Setter for address book name *

* @param addressbookName Address book name */ - public void setAddressbookName (final String addressbookName); + void setAddressbookName (final String addressbookName); /** * Checks if the given address book name is already used by the user. @@ -67,14 +67,14 @@ public interface AddressbookWebController extends Serializable { *

* @return Whether the name has already been used by the user */ - public boolean isAddressbookNameUsed (final String addressbookName); + boolean isAddressbookNameUsed (final String addressbookName); /** * Returns all address books with this user *

* @return A list of all address books by this user */ - public List allAddressbooks (); + List allAddressbooks (); /** * Returns a list of all address book entries for given address book @@ -83,14 +83,14 @@ public interface AddressbookWebController extends Serializable { *

* @return List of all entries */ - public List allEntries (final Addressbook addressbook); + List allEntries (final Addressbook addressbook); /** * Returns a list of all address books the user is sharing with others. *

* @return List of all shared address books */ - public List allShares (); + List allShares (); /** * Size of all entries in given address book @@ -99,19 +99,19 @@ public interface AddressbookWebController extends Serializable { *

* @return Size of the entries in address book */ - public int allEntriesSize (final Addressbook addressbook); + int allEntriesSize (final Addressbook addressbook); /** * Getter for address book id number *

* @return Address book id number */ - public Long getAddressbookId (); + Long getAddressbookId (); /** * Setter for address book id number *

* @param addressbookId Address book id number */ - public void setAddressbookId (final Long addressbookId); + void setAddressbookId (final Long addressbookId); } diff --git a/src/java/org/mxchange/addressbook/beans/country/CountryWebController.java b/src/java/org/mxchange/addressbook/beans/country/CountryWebController.java index 311af3bc..516079e7 100644 --- a/src/java/org/mxchange/addressbook/beans/country/CountryWebController.java +++ b/src/java/org/mxchange/addressbook/beans/country/CountryWebController.java @@ -32,5 +32,5 @@ public interface CountryWebController extends Serializable { *

* @return All countries */ - public List allCountries (); + List allCountries (); } diff --git a/src/java/org/mxchange/addressbook/beans/gender/GenderWebController.java b/src/java/org/mxchange/addressbook/beans/gender/GenderWebController.java index c3f6c4a8..cf054782 100644 --- a/src/java/org/mxchange/addressbook/beans/gender/GenderWebController.java +++ b/src/java/org/mxchange/addressbook/beans/gender/GenderWebController.java @@ -32,12 +32,12 @@ public interface GenderWebController extends Serializable { *

* @return All genders as array */ - public Gender[] getAllGenders (); + Gender[] getAllGenders (); /** * Getter for only selectable genders as array, UNKNOWN is not selectable *

* @return All genders as array */ - public List getSelectableGenders (); + List getSelectableGenders (); } diff --git a/src/java/org/mxchange/addressbook/beans/login/UserLoginWebController.java b/src/java/org/mxchange/addressbook/beans/login/UserLoginWebController.java index 96e785c6..4482179b 100644 --- a/src/java/org/mxchange/addressbook/beans/login/UserLoginWebController.java +++ b/src/java/org/mxchange/addressbook/beans/login/UserLoginWebController.java @@ -31,40 +31,40 @@ public interface UserLoginWebController extends Serializable { *

* @return Template type */ - public String getTemplateType (); + String getTemplateType (); /** * Setter for template type *

* @param templateType Template type */ - public void setTemplateType (final String templateType); + void setTemplateType (final String templateType); /** * Logins the user, if the account is found, confirmed and unlocked. *

* @return Redirect target */ - public String doLogin (); + String doLogin (); /** * Getter for logged-in user instance *

* @return Logged-in user instance */ - public User getLoggedInUser (); + User getLoggedInUser (); /** * Setter for logged-in user instance *

* @param loggedInUser Logged-in user instance */ - public void setLoggedInUser (final User loggedInUser); + void setLoggedInUser (final User loggedInUser); /** * Checks whether the user is logged-in *

* @return Whether the user is logged-in */ - public boolean isUserLoggedIn (); + boolean isUserLoggedIn (); } diff --git a/src/java/org/mxchange/addressbook/beans/register/UserRegisterWebController.java b/src/java/org/mxchange/addressbook/beans/register/UserRegisterWebController.java index 0b5ceb5c..120ccc0a 100644 --- a/src/java/org/mxchange/addressbook/beans/register/UserRegisterWebController.java +++ b/src/java/org/mxchange/addressbook/beans/register/UserRegisterWebController.java @@ -31,5 +31,5 @@ public interface UserRegisterWebController extends Serializable { *

* @return Redirection target */ - public String doRegister (); + String doRegister (); } diff --git a/src/java/org/mxchange/addressbook/beans/shares/SharesWebBean.java b/src/java/org/mxchange/addressbook/beans/shares/SharesWebBean.java index ce4e4675..b75df50e 100644 --- a/src/java/org/mxchange/addressbook/beans/shares/SharesWebBean.java +++ b/src/java/org/mxchange/addressbook/beans/shares/SharesWebBean.java @@ -40,6 +40,11 @@ public class SharesWebBean implements SharesWebController { */ private static final long serialVersionUID = 19_868_976_871_976_780L; + /** + * Cached flag whether the user is sharing address books + */ + private Boolean isUserSharing = null; + /** * Login controller injection */ @@ -51,10 +56,6 @@ public class SharesWebBean implements SharesWebController { */ private SharedAddressbooksSessionBeanRemote shareBean; - /** - * Cached flag whether the user is sharing address books - */ - private Boolean isUserSharing = null; /** * User id of sharee diff --git a/src/java/org/mxchange/addressbook/beans/shares/SharesWebController.java b/src/java/org/mxchange/addressbook/beans/shares/SharesWebController.java index 868fa810..f7b90a52 100644 --- a/src/java/org/mxchange/addressbook/beans/shares/SharesWebController.java +++ b/src/java/org/mxchange/addressbook/beans/shares/SharesWebController.java @@ -30,26 +30,26 @@ public interface SharesWebController extends Serializable { *

* @return Whether the current user is sharing address books */ - public boolean isSharingAddressbooks (); + boolean isSharingAddressbooks (); /** * Getter for sharee's user id *

* @return Sharee's user id */ - public Long getShareeUserId (); + Long getShareeUserId (); /** * Setter for sharee's user id *

* @param shareeUserId Sharee's user id */ - public void setShareeUserId (final Long shareeUserId); + void setShareeUserId (final Long shareeUserId); /** * Checks whether the sharee's user id is set *

* @return Whether the sharee's user id is set */ - public boolean isShareeUserIdSet (); + boolean isShareeUserIdSet (); } diff --git a/src/java/org/mxchange/addressbook/beans/smsprovider/SmsProviderWebController.java b/src/java/org/mxchange/addressbook/beans/smsprovider/SmsProviderWebController.java index 707185d7..915ba74c 100644 --- a/src/java/org/mxchange/addressbook/beans/smsprovider/SmsProviderWebController.java +++ b/src/java/org/mxchange/addressbook/beans/smsprovider/SmsProviderWebController.java @@ -32,5 +32,5 @@ public interface SmsProviderWebController extends Serializable { *

* @return All countries */ - public List allSmsProvider (); + List allSmsProvider (); } diff --git a/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java b/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java index 2ae27641..0b04027d 100644 --- a/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java +++ b/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java @@ -154,6 +154,11 @@ public class UserWebBean implements UserWebController { */ private Long phoneNumber; + /** + * A list of all public user profiles + */ + private List publicUserList; + /** * Street */ @@ -189,20 +194,16 @@ public class UserWebBean implements UserWebController { */ private String userPasswordRepeat; - /** - * ZIP code - */ - private Integer zipCode; /** - * A list of all public user profiles + * Whether the user wants a public profile */ - private List publicUserList; + private Boolean userProfilePublic; /** - * Whether the user wants a public profile + * ZIP code */ - private Boolean userProfilePublic; + private Integer zipCode; /** * Default constructor diff --git a/src/java/org/mxchange/addressbook/beans/user/UserWebController.java b/src/java/org/mxchange/addressbook/beans/user/UserWebController.java index e1e153c4..92cc995f 100644 --- a/src/java/org/mxchange/addressbook/beans/user/UserWebController.java +++ b/src/java/org/mxchange/addressbook/beans/user/UserWebController.java @@ -38,383 +38,383 @@ public interface UserWebController extends Serializable { *

* @param user User instance */ - public void addUserNameEmailAddress (final User user); + void addUserNameEmailAddress (final User user); /** * All public user profiles *

* @return A list of all public user profiles */ - public List allPublicUsers (); + List allPublicUsers (); /** * Clears all data in this bean */ - public void clearData (); + void clearData (); /** * Copies given user into the controller *

* @param user User instance */ - public void copyUser (final User user); + void copyUser (final User user); /** * Creates an instance from all properties *

* @return A user instance */ - public User createUserInstance (); + User createUserInstance (); /** * Getter for birth day *

* @return Birth day */ - public Date getBirthday (); + Date getBirthday (); /** * Setter for birth day *

* @param birthday Birth day */ - public void setBirthday (final Date birthday); + void setBirthday (final Date birthday); /** * Getter for ellphone number's carrier *

* @return Cellphone number's carrier */ - public SmsProvider getCellphoneCarrier (); + SmsProvider getCellphoneCarrier (); /** * Setter for cellphone number's carrier prefix *

* @param cellphoneCarrier Cellphone number's carrier prefix */ - public void setCellphoneCarrier (final SmsProvider cellphoneCarrier); + void setCellphoneCarrier (final SmsProvider cellphoneCarrier); /** * Getter for ellphone number *

* @return Cellphone number */ - public Long getCellphoneNumber (); + Long getCellphoneNumber (); /** * Setter for ellphone number *

* @param cellphoneNumber Cellphone number */ - public void setCellphoneNumber (final Long cellphoneNumber); + void setCellphoneNumber (final Long cellphoneNumber); /** * City *

* @return the city */ - public String getCity (); + String getCity (); /** * City *

* @param city the city to set */ - public void setCity (final String city); + void setCity (final String city); /** * Getter for comments *

* @return Comments */ - public String getComment (); + String getComment (); /** * Setter for comment *

* @param comment Comments */ - public void setComment (final String comment); + void setComment (final String comment); /** * Getter for country instance *

* @return Country instance */ - public Country getCountry (); + Country getCountry (); /** * Setter for country instance *

* @param country Country instance */ - public void setCountry (final Country country); + void setCountry (final Country country); /** * Getter for email address *

* @return Email address */ - public String getEmailAddress (); + String getEmailAddress (); /** * Setter for email address *

* @param emailAddress Email address */ - public void setEmailAddress (final String emailAddress); + void setEmailAddress (final String emailAddress); /** * Getter for email address, repeated *

* @return the emailAddress, repeated */ - public String getEmailAddressRepeat (); + String getEmailAddressRepeat (); /** * Setter for email address repeated *

* @param emailAddressRepeat the emailAddress to set */ - public void setEmailAddressRepeat (final String emailAddressRepeat); + void setEmailAddressRepeat (final String emailAddressRepeat); /** * Family name *

* @return the familyName */ - public String getFamilyName (); + String getFamilyName (); /** * Family name *

* @param familyName the familyName to set */ - public void setFamilyName (final String familyName); + void setFamilyName (final String familyName); /** * Getter for fax number's area code *

* @return Fax number's area code */ - public Integer getFaxAreaCode (); + Integer getFaxAreaCode (); /** * Setter for fax number's area code *

* @param faxAreaCode Fax number's area code */ - public void setFaxAreaCode (final Integer faxAreaCode); + void setFaxAreaCode (final Integer faxAreaCode); /** * Getter for fax's country instance *

* @return Fax' country instance */ - public Country getFaxCountry (); + Country getFaxCountry (); /** * Setter for fax's country instance *

* @param faxCountry Fax' country instance */ - public void setFaxCountry (final Country faxCountry); + void setFaxCountry (final Country faxCountry); /** * Getter for fax number *

* @return Fax number */ - public Long getFaxNumber (); + Long getFaxNumber (); /** * Setter for fax number *

* @param faxNumber Fax number */ - public void setFaxNumber (final Long faxNumber); + void setFaxNumber (final Long faxNumber); /** * First name *

* @return the first name */ - public String getFirstName (); + String getFirstName (); /** * First name *

* @param firstName the first name to set */ - public void setFirstName (final String firstName); + void setFirstName (final String firstName); /** * Gender of the contact *

* @return the gender */ - public Gender getGender (); + Gender getGender (); /** * Gender of the contact *

* @param gender the gender to set */ - public void setGender (final Gender gender); + void setGender (final Gender gender); /** * House number *

* @return the houseNumber */ - public Short getHouseNumber (); + Short getHouseNumber (); /** * House number *

* @param houseNumber the houseNumber to set */ - public void setHouseNumber (final Short houseNumber); + void setHouseNumber (final Short houseNumber); /** * Getter for phone number's area code *

* @return Phone number's area code */ - public Integer getPhoneAreaCode (); + Integer getPhoneAreaCode (); /** * Setter for phone number's area code *

* @param phoneAreaCode Phone number's area code */ - public void setPhoneAreaCode (final Integer phoneAreaCode); + void setPhoneAreaCode (final Integer phoneAreaCode); /** * Getter for phone number's country instance *

* @return Phone number's country instance */ - public Country getPhoneCountry (); + Country getPhoneCountry (); /** * Setter for phone number's country instance *

* @param phoneCountry Phone number's country instance */ - public void setPhoneCountry (final Country phoneCountry); + void setPhoneCountry (final Country phoneCountry); /** * Getter for phone number *

* @return Phone number */ - public Long getPhoneNumber (); + Long getPhoneNumber (); /** * Setter for phone number *

* @param phoneNumber Phone number */ - public void setPhoneNumber (final Long phoneNumber); + void setPhoneNumber (final Long phoneNumber); /** * Street *

* @return the street */ - public String getStreet (); + String getStreet (); /** * Street *

* @param street the street to set */ - public void setStreet (final String street); + void setStreet (final String street); /** * Getter for user id *

* @return User id */ - public Long getUserId (); + Long getUserId (); /** * Setter for user id *

* @param userId User id */ - public void setUserId (final Long userId); + void setUserId (final Long userId); /** * Getter for user name *

* @return User name */ - public String getUserName (); + String getUserName (); /** * Setter for user name *

* @param userName User name */ - public void setUserName (final String userName); + void setUserName (final String userName); /** * Getter for unencrypted user password *

* @return Unencrypted user password */ - public String getUserPassword (); + String getUserPassword (); /** * Setter for unencrypted user password *

* @param userPassword Unencrypted user password */ - public void setUserPassword (final String userPassword); + void setUserPassword (final String userPassword); /** * Getter for unencrypted user password repeated *

* @return Unencrypted user password repeated */ - public String getUserPasswordRepeat (); + String getUserPasswordRepeat (); /** * Setter for unencrypted user password repeated *

* @param userPasswordRepeat Unencrypted user password repeated */ - public void setUserPasswordRepeat (final String userPasswordRepeat); + void setUserPasswordRepeat (final String userPasswordRepeat); /** * ZIP code *

* @return the zipCode */ - public Integer getZipCode (); + Integer getZipCode (); /** * ZIP code *

* @param zipCode the zipCode to set */ - public void setZipCode (final Integer zipCode); + void setZipCode (final Integer zipCode); /** * Getter for user public profile flag *

* @return User public profile flag */ - public Boolean getUserProfilePublic (); + Boolean getUserProfilePublic (); /** * Setter for user public profile flag *

* @param userProfilePublic User public profile flag */ - public void setUserProfilePublic (final Boolean userProfilePublic); + void setUserProfilePublic (final Boolean userProfilePublic); /** * Checks whether user instance's email address is used @@ -423,28 +423,28 @@ public interface UserWebController extends Serializable { *

* @return Whether it is already used */ - public boolean isEmailAddressRegistered (final User user); + boolean isEmailAddressRegistered (final User user); /** * Checks whether all required personal data is set *

* @return Whether the required personal data is set */ - public boolean isRequiredPersonalDataSet (); + boolean isRequiredPersonalDataSet (); /** * Checks whether same email addresses have been entered *

* @return Whether same email addresses have been entered */ - public boolean isSameEmailAddressEntered (); + boolean isSameEmailAddressEntered (); /** * Checks whether same passwords has been entered *

* @return Whether same passwords has been entered */ - public boolean isSamePasswordEntered (); + boolean isSamePasswordEntered (); /** * Checks whether given user instance's name is used @@ -453,7 +453,7 @@ public interface UserWebController extends Serializable { *

* @return Whether it is already used */ - public boolean isUserNameRegistered (final User user); + boolean isUserNameRegistered (final User user); /** * Checks whether a public user account is registered. This means that at @@ -461,5 +461,5 @@ public interface UserWebController extends Serializable { *

* @return Whether at least one user has a public profile */ - public boolean isPublicUserRegistered (); + boolean isPublicUserRegistered (); }