From 8fece8d144e70cc8e5d2afba6613cefe49e49bb1 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 17 Oct 2015 23:00:44 +0200 Subject: [PATCH] Renaming-season has started again: - renamed all foo-scoped beans to BarWebFooBean and also their interfaces - removed "id" from ui:include --- ...bBean.java => AddressbookWebSessionBean.java} | 16 ++++++++-------- ...java => AddressbookWebSessionController.java} | 4 ++-- ...bBean.java => CountryWebApplicationBean.java} | 4 ++-- ...java => CountryWebApplicationController.java} | 2 +- ...ebBean.java => GenderWebApplicationBean.java} | 4 ++-- ....java => GenderWebApplicationController.java} | 2 +- ...WebBean.java => UserLoginWebSessionBean.java} | 12 ++++++------ ...r.java => UserLoginWebSessionController.java} | 2 +- ...bBean.java => UserProfileWebRequestBean.java} | 10 +++++----- ...java => UserProfileWebRequestController.java} | 2 +- ...n.java => ProfileModeWebApplicationBean.java} | 4 ++-- ... => ProfileModeWebApplicationController.java} | 2 +- ...Bean.java => UserRegisterWebSessionBean.java} | 8 ++++---- ...ava => UserRegisterWebSessionController.java} | 2 +- ...resWebBean.java => SharesWebSessionBean.java} | 8 ++++---- ...ller.java => SharesWebSessionController.java} | 2 +- ...n.java => SmsProviderWebApplicationBean.java} | 4 ++-- ... => SmsProviderWebApplicationController.java} | 2 +- ...{UserWebBean.java => UserWebSessionBean.java} | 8 ++++---- ...roller.java => UserWebSessionController.java} | 2 +- .../converter/country/CountryConverter.java | 4 ++-- .../smsprovider/SmsProviderConverter.java | 4 ++-- .../converter/user/UserConverter.java | 4 ++-- web/login/login_shared_addressbooks.xhtml | 2 +- web/login/login_start_sharing_addressbook.xhtml | 2 +- web/user/show_addressbook.xhtml | 2 +- web/user/user_list.xhtml | 4 ++-- 27 files changed, 61 insertions(+), 61 deletions(-) rename src/java/org/mxchange/addressbook/beans/addressbook/{AddressbookWebBean.java => AddressbookWebSessionBean.java} (95%) rename src/java/org/mxchange/addressbook/beans/addressbook/{AddressbookWebController.java => AddressbookWebSessionController.java} (98%) rename src/java/org/mxchange/addressbook/beans/country/{CountryWebBean.java => CountryWebApplicationBean.java} (94%) rename src/java/org/mxchange/addressbook/beans/country/{CountryWebController.java => CountryWebApplicationController.java} (93%) rename src/java/org/mxchange/addressbook/beans/gender/{GenderWebBean.java => GenderWebApplicationBean.java} (92%) rename src/java/org/mxchange/addressbook/beans/gender/{GenderWebController.java => GenderWebApplicationController.java} (94%) rename src/java/org/mxchange/addressbook/beans/login/{UserLoginWebBean.java => UserLoginWebSessionBean.java} (91%) rename src/java/org/mxchange/addressbook/beans/login/{UserLoginWebController.java => UserLoginWebSessionController.java} (96%) rename src/java/org/mxchange/addressbook/beans/profile/{UserProfileWebBean.java => UserProfileWebRequestBean.java} (90%) rename src/java/org/mxchange/addressbook/beans/profile/{UserProfileWebController.java => UserProfileWebRequestController.java} (95%) rename src/java/org/mxchange/addressbook/beans/profilemode/{ProfileModeWebBean.java => ProfileModeWebApplicationBean.java} (90%) rename src/java/org/mxchange/addressbook/beans/profilemode/{ProfileModeWebController.java => ProfileModeWebApplicationController.java} (93%) rename src/java/org/mxchange/addressbook/beans/register/{UserRegisterWebBean.java => UserRegisterWebSessionBean.java} (94%) rename src/java/org/mxchange/addressbook/beans/register/{UserRegisterWebController.java => UserRegisterWebSessionController.java} (93%) rename src/java/org/mxchange/addressbook/beans/shares/{SharesWebBean.java => SharesWebSessionBean.java} (97%) rename src/java/org/mxchange/addressbook/beans/shares/{SharesWebController.java => SharesWebSessionController.java} (97%) rename src/java/org/mxchange/addressbook/beans/smsprovider/{SmsProviderWebBean.java => SmsProviderWebApplicationBean.java} (94%) rename src/java/org/mxchange/addressbook/beans/smsprovider/{SmsProviderWebController.java => SmsProviderWebApplicationController.java} (93%) rename src/java/org/mxchange/addressbook/beans/user/{UserWebBean.java => UserWebSessionBean.java} (98%) rename src/java/org/mxchange/addressbook/beans/user/{UserWebController.java => UserWebSessionController.java} (99%) diff --git a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebBean.java b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java similarity index 95% rename from src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebBean.java rename to src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java index 1b9dbc98..18334615 100644 --- a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebBean.java +++ b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java @@ -34,7 +34,7 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.login.UserLoginWebController; +import org.mxchange.addressbook.beans.login.UserLoginWebSessionController; import org.mxchange.addressbook.events.addressbook.AddressbookLoadedEvent; import org.mxchange.addressbook.exceptions.AddressbookNameAlreadyUsedException; import org.mxchange.addressbook.model.addressbook.Addressbook; @@ -52,7 +52,7 @@ import org.mxchange.jusercore.model.user.User; */ @Named ("addressbookController") @SessionScoped -public class AddressbookWebBean implements AddressbookWebController { +public class AddressbookWebSessionBean implements AddressbookWebSessionController { /** * Map for count of user's shared addresses @@ -98,7 +98,7 @@ public class AddressbookWebBean implements AddressbookWebController { * Login controller */ @Inject - private UserLoginWebController loginController; + private UserLoginWebSessionController loginController; /** * A list of all user's address books @@ -108,7 +108,7 @@ public class AddressbookWebBean implements AddressbookWebController { /** * Default constructor */ - public AddressbookWebBean () { + public AddressbookWebSessionBean () { // Try it try { // Get initial context @@ -122,7 +122,7 @@ public class AddressbookWebBean implements AddressbookWebController { } // Init list - AddressbookWebBean.countSharesList = new ConcurrentHashMap<>(0); + AddressbookWebSessionBean.countSharesList = new ConcurrentHashMap<>(0); } @Override @@ -266,16 +266,16 @@ public class AddressbookWebBean implements AddressbookWebController { @Override public Integer countAllUserSharedAddressbooks (final User user) { // Is there cache? - if (AddressbookWebBean.countSharesList.containsKey(user)) { + if (AddressbookWebSessionBean.countSharesList.containsKey(user)) { // Return it instead - return AddressbookWebBean.countSharesList.get(user); + return AddressbookWebSessionBean.countSharesList.get(user); } // Call EJB ("expensive") Integer count = this.addressbookBean.countAllUserSharedAddressbooks(user); // Add to list - AddressbookWebBean.countSharesList.put(user, count); + AddressbookWebSessionBean.countSharesList.put(user, count); // Return it return count; diff --git a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebController.java b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionController.java similarity index 98% rename from src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebController.java rename to src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionController.java index 905e5109..6c995c9b 100644 --- a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebController.java +++ b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionController.java @@ -30,7 +30,7 @@ import org.mxchange.jusercore.model.user.User; *

* @author Roland Haeder */ -public interface AddressbookWebController extends Serializable { +public interface AddressbookWebSessionController extends Serializable { /** * Checks whether the user has created addressbooks. For this method to work @@ -207,5 +207,5 @@ public interface AddressbookWebController extends Serializable { *

* @return Whether the address book is loaded */ - public boolean isAddressbookLoaded (); + boolean isAddressbookLoaded (); } diff --git a/src/java/org/mxchange/addressbook/beans/country/CountryWebBean.java b/src/java/org/mxchange/addressbook/beans/country/CountryWebApplicationBean.java similarity index 94% rename from src/java/org/mxchange/addressbook/beans/country/CountryWebBean.java rename to src/java/org/mxchange/addressbook/beans/country/CountryWebApplicationBean.java index 5a167583..c8535609 100644 --- a/src/java/org/mxchange/addressbook/beans/country/CountryWebBean.java +++ b/src/java/org/mxchange/addressbook/beans/country/CountryWebApplicationBean.java @@ -35,7 +35,7 @@ import org.mxchange.jcountry.data.Country; */ @Named ("country") @ApplicationScoped -public class CountryWebBean implements CountryWebController { +public class CountryWebApplicationBean implements CountryWebApplicationController { /** * Serial number @@ -55,7 +55,7 @@ public class CountryWebBean implements CountryWebController { /** * Default constructor */ - public CountryWebBean () { + public CountryWebApplicationBean () { // Try this try { // Get initial context diff --git a/src/java/org/mxchange/addressbook/beans/country/CountryWebController.java b/src/java/org/mxchange/addressbook/beans/country/CountryWebApplicationController.java similarity index 93% rename from src/java/org/mxchange/addressbook/beans/country/CountryWebController.java rename to src/java/org/mxchange/addressbook/beans/country/CountryWebApplicationController.java index 516079e7..d6d40a09 100644 --- a/src/java/org/mxchange/addressbook/beans/country/CountryWebController.java +++ b/src/java/org/mxchange/addressbook/beans/country/CountryWebApplicationController.java @@ -25,7 +25,7 @@ import org.mxchange.jcountry.data.Country; *

* @author Roland Haeder */ -public interface CountryWebController extends Serializable { +public interface CountryWebApplicationController extends Serializable { /** * A list of all countries diff --git a/src/java/org/mxchange/addressbook/beans/gender/GenderWebBean.java b/src/java/org/mxchange/addressbook/beans/gender/GenderWebApplicationBean.java similarity index 92% rename from src/java/org/mxchange/addressbook/beans/gender/GenderWebBean.java rename to src/java/org/mxchange/addressbook/beans/gender/GenderWebApplicationBean.java index a315d4a8..7c29ee41 100644 --- a/src/java/org/mxchange/addressbook/beans/gender/GenderWebBean.java +++ b/src/java/org/mxchange/addressbook/beans/gender/GenderWebApplicationBean.java @@ -29,7 +29,7 @@ import org.mxchange.jcontacts.contact.gender.GenderUtils; */ @Named ("gender") @ApplicationScoped -public class GenderWebBean implements GenderWebController { +public class GenderWebApplicationBean implements GenderWebApplicationController { /** * Serial number @@ -39,7 +39,7 @@ public class GenderWebBean implements GenderWebController { /** * Default constructor */ - public GenderWebBean () { + public GenderWebApplicationBean () { } @Override diff --git a/src/java/org/mxchange/addressbook/beans/gender/GenderWebController.java b/src/java/org/mxchange/addressbook/beans/gender/GenderWebApplicationController.java similarity index 94% rename from src/java/org/mxchange/addressbook/beans/gender/GenderWebController.java rename to src/java/org/mxchange/addressbook/beans/gender/GenderWebApplicationController.java index cf054782..fc24d3b5 100644 --- a/src/java/org/mxchange/addressbook/beans/gender/GenderWebController.java +++ b/src/java/org/mxchange/addressbook/beans/gender/GenderWebApplicationController.java @@ -25,7 +25,7 @@ import org.mxchange.jcontacts.contact.gender.Gender; *

* @author Roland Haeder */ -public interface GenderWebController extends Serializable { +public interface GenderWebApplicationController extends Serializable { /** * Getter for all genders as array diff --git a/src/java/org/mxchange/addressbook/beans/login/UserLoginWebBean.java b/src/java/org/mxchange/addressbook/beans/login/UserLoginWebSessionBean.java similarity index 91% rename from src/java/org/mxchange/addressbook/beans/login/UserLoginWebBean.java rename to src/java/org/mxchange/addressbook/beans/login/UserLoginWebSessionBean.java index 4752b3ed..564184c0 100644 --- a/src/java/org/mxchange/addressbook/beans/login/UserLoginWebBean.java +++ b/src/java/org/mxchange/addressbook/beans/login/UserLoginWebSessionBean.java @@ -26,7 +26,7 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.user.UserWebController; +import org.mxchange.addressbook.beans.user.UserWebSessionController; import org.mxchange.jusercore.container.login.LoginContainer; import org.mxchange.jusercore.container.login.UserLoginContainer; import org.mxchange.jusercore.events.login.UserLoggedInEvent; @@ -46,7 +46,7 @@ import org.mxchange.jusercore.model.user.status.UserAccountStatus; */ @Named ("loginController") @SessionScoped -public class UserLoginWebBean implements UserLoginWebController { +public class UserLoginWebSessionBean implements UserLoginWebSessionController { /** * Serial number @@ -80,7 +80,7 @@ public class UserLoginWebBean implements UserLoginWebController { * User controller */ @Inject - private UserWebController userController; + private UserWebSessionController userController; /** * Flag whether the user has logged-in, set only from inside @@ -90,7 +90,7 @@ public class UserLoginWebBean implements UserLoginWebController { /** * Default constructor */ - public UserLoginWebBean () { + public UserLoginWebSessionBean () { try { // Get initial context Context context = new InitialContext(); @@ -160,13 +160,13 @@ public class UserLoginWebBean implements UserLoginWebController { @Override public boolean isUserLoggedIn () { // Trace message - // NOISY: System.out.println(MessageFormat.format("UserLoginWebBean:isUserLoggedIn: this.loggedInUser={0},this.templateType={1} - CALLED!", this.getLoggedInUser(), this.getTemplateType())); + // NOISY: System.out.println(MessageFormat.format("UserLoginWebSessionBean:isUserLoggedIn: this.loggedInUser={0},this.templateType={1} - CALLED!", this.getLoggedInUser(), this.getTemplateType())); // Compare instance this.userLoggedIn = ((this.getLoggedInUser() instanceof User) && (Objects.equals(this.getLoggedInUser().getUserAccountStatus(), UserAccountStatus.CONFIRMED))); // Trace message - // NOISY: System.out.println(MessageFormat.format("UserLoginWebBean:isUserLoggedIn: this.userLoggedIn={0} - EXIT!", this.userLoggedIn)); + // NOISY: System.out.println(MessageFormat.format("UserLoginWebSessionBean:isUserLoggedIn: this.userLoggedIn={0} - EXIT!", this.userLoggedIn)); // Return it return this.userLoggedIn; } diff --git a/src/java/org/mxchange/addressbook/beans/login/UserLoginWebController.java b/src/java/org/mxchange/addressbook/beans/login/UserLoginWebSessionController.java similarity index 96% rename from src/java/org/mxchange/addressbook/beans/login/UserLoginWebController.java rename to src/java/org/mxchange/addressbook/beans/login/UserLoginWebSessionController.java index 507c8dbd..a0641a10 100644 --- a/src/java/org/mxchange/addressbook/beans/login/UserLoginWebController.java +++ b/src/java/org/mxchange/addressbook/beans/login/UserLoginWebSessionController.java @@ -24,7 +24,7 @@ import org.mxchange.jusercore.model.user.User; *

* @author Roland Haeder */ -public interface UserLoginWebController extends Serializable { +public interface UserLoginWebSessionController extends Serializable { /** * Getter for template type diff --git a/src/java/org/mxchange/addressbook/beans/profile/UserProfileWebBean.java b/src/java/org/mxchange/addressbook/beans/profile/UserProfileWebRequestBean.java similarity index 90% rename from src/java/org/mxchange/addressbook/beans/profile/UserProfileWebBean.java rename to src/java/org/mxchange/addressbook/beans/profile/UserProfileWebRequestBean.java index eb7923f0..5e7d87c3 100644 --- a/src/java/org/mxchange/addressbook/beans/profile/UserProfileWebBean.java +++ b/src/java/org/mxchange/addressbook/beans/profile/UserProfileWebRequestBean.java @@ -21,8 +21,8 @@ import javax.enterprise.context.RequestScoped; import javax.faces.view.facelets.FaceletException; import javax.inject.Inject; import javax.inject.Named; -import org.mxchange.addressbook.beans.login.UserLoginWebController; -import org.mxchange.addressbook.beans.user.UserWebController; +import org.mxchange.addressbook.beans.login.UserLoginWebSessionController; +import org.mxchange.addressbook.beans.user.UserWebSessionController; import org.mxchange.jusercore.exceptions.UserNotFoundException; import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; @@ -34,7 +34,7 @@ import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; */ @Named (value = "profileController") @RequestScoped -public class UserProfileWebBean implements UserProfileWebController { +public class UserProfileWebRequestBean implements UserProfileWebRequestController { /** * Serial number @@ -45,7 +45,7 @@ public class UserProfileWebBean implements UserProfileWebController { * Login controller */ @Inject - private UserLoginWebController loginController; + private UserLoginWebSessionController loginController; /** * User instance @@ -56,7 +56,7 @@ public class UserProfileWebBean implements UserProfileWebController { * User controller */ @Inject - private UserWebController userController; + private UserWebSessionController userController; @Override public User getUser () { diff --git a/src/java/org/mxchange/addressbook/beans/profile/UserProfileWebController.java b/src/java/org/mxchange/addressbook/beans/profile/UserProfileWebRequestController.java similarity index 95% rename from src/java/org/mxchange/addressbook/beans/profile/UserProfileWebController.java rename to src/java/org/mxchange/addressbook/beans/profile/UserProfileWebRequestController.java index f36702e2..5da13a3a 100644 --- a/src/java/org/mxchange/addressbook/beans/profile/UserProfileWebController.java +++ b/src/java/org/mxchange/addressbook/beans/profile/UserProfileWebRequestController.java @@ -24,7 +24,7 @@ import org.mxchange.jusercore.model.user.User; *

* @author Roland Haeder */ -public interface UserProfileWebController extends Serializable { +public interface UserProfileWebRequestController extends Serializable { /** * Checks if the user profile link is visible diff --git a/src/java/org/mxchange/addressbook/beans/profilemode/ProfileModeWebBean.java b/src/java/org/mxchange/addressbook/beans/profilemode/ProfileModeWebApplicationBean.java similarity index 90% rename from src/java/org/mxchange/addressbook/beans/profilemode/ProfileModeWebBean.java rename to src/java/org/mxchange/addressbook/beans/profilemode/ProfileModeWebApplicationBean.java index a7506ee5..211a3fa9 100644 --- a/src/java/org/mxchange/addressbook/beans/profilemode/ProfileModeWebBean.java +++ b/src/java/org/mxchange/addressbook/beans/profilemode/ProfileModeWebApplicationBean.java @@ -27,7 +27,7 @@ import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; */ @Named ("profileMode") @ApplicationScoped -public class ProfileModeWebBean implements ProfileModeWebController { +public class ProfileModeWebApplicationBean implements ProfileModeWebApplicationController { /** * Serial number @@ -37,7 +37,7 @@ public class ProfileModeWebBean implements ProfileModeWebController { /** * Default constructor */ - public ProfileModeWebBean () { + public ProfileModeWebApplicationBean () { } @Override diff --git a/src/java/org/mxchange/addressbook/beans/profilemode/ProfileModeWebController.java b/src/java/org/mxchange/addressbook/beans/profilemode/ProfileModeWebApplicationController.java similarity index 93% rename from src/java/org/mxchange/addressbook/beans/profilemode/ProfileModeWebController.java rename to src/java/org/mxchange/addressbook/beans/profilemode/ProfileModeWebApplicationController.java index 2f6a7ae5..2c29594b 100644 --- a/src/java/org/mxchange/addressbook/beans/profilemode/ProfileModeWebController.java +++ b/src/java/org/mxchange/addressbook/beans/profilemode/ProfileModeWebApplicationController.java @@ -24,7 +24,7 @@ import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; *

* @author Roland Haeder */ -public interface ProfileModeWebController extends Serializable { +public interface ProfileModeWebApplicationController extends Serializable { /** * Getter for all genders as array diff --git a/src/java/org/mxchange/addressbook/beans/register/UserRegisterWebBean.java b/src/java/org/mxchange/addressbook/beans/register/UserRegisterWebSessionBean.java similarity index 94% rename from src/java/org/mxchange/addressbook/beans/register/UserRegisterWebBean.java rename to src/java/org/mxchange/addressbook/beans/register/UserRegisterWebSessionBean.java index 8282a2f5..cd3aa79b 100644 --- a/src/java/org/mxchange/addressbook/beans/register/UserRegisterWebBean.java +++ b/src/java/org/mxchange/addressbook/beans/register/UserRegisterWebSessionBean.java @@ -26,7 +26,7 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.user.UserWebController; +import org.mxchange.addressbook.beans.user.UserWebSessionController; import org.mxchange.jusercore.events.registration.RegisteredUserEvent; import org.mxchange.jusercore.events.registration.UserRegisteredEvent; import org.mxchange.jusercore.exceptions.DataRepeatMismatchException; @@ -44,7 +44,7 @@ import org.mxchange.jusercore.model.user.status.UserAccountStatus; */ @Named ("registerController") @SessionScoped -public class UserRegisterWebBean implements UserRegisterWebController { +public class UserRegisterWebSessionBean implements UserRegisterWebSessionController { /** * Serial number @@ -67,12 +67,12 @@ public class UserRegisterWebBean implements UserRegisterWebController { * User controller */ @Inject - private UserWebController userController; + private UserWebSessionController userController; /** * Default constructor */ - public UserRegisterWebBean () { + public UserRegisterWebSessionBean () { try { // Get initial context Context context = new InitialContext(); diff --git a/src/java/org/mxchange/addressbook/beans/register/UserRegisterWebController.java b/src/java/org/mxchange/addressbook/beans/register/UserRegisterWebSessionController.java similarity index 93% rename from src/java/org/mxchange/addressbook/beans/register/UserRegisterWebController.java rename to src/java/org/mxchange/addressbook/beans/register/UserRegisterWebSessionController.java index 120ccc0a..f232b2a3 100644 --- a/src/java/org/mxchange/addressbook/beans/register/UserRegisterWebController.java +++ b/src/java/org/mxchange/addressbook/beans/register/UserRegisterWebSessionController.java @@ -23,7 +23,7 @@ import java.io.Serializable; *

* @author Roland Haeder */ -public interface UserRegisterWebController extends Serializable { +public interface UserRegisterWebSessionController extends Serializable { /** * Registers the user, if not found. Otherwise this method should throw an diff --git a/src/java/org/mxchange/addressbook/beans/shares/SharesWebBean.java b/src/java/org/mxchange/addressbook/beans/shares/SharesWebSessionBean.java similarity index 97% rename from src/java/org/mxchange/addressbook/beans/shares/SharesWebBean.java rename to src/java/org/mxchange/addressbook/beans/shares/SharesWebSessionBean.java index bfb768d3..b493921a 100644 --- a/src/java/org/mxchange/addressbook/beans/shares/SharesWebBean.java +++ b/src/java/org/mxchange/addressbook/beans/shares/SharesWebSessionBean.java @@ -31,7 +31,7 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.login.UserLoginWebController; +import org.mxchange.addressbook.beans.login.UserLoginWebSessionController; import org.mxchange.addressbook.events.sharing.AddressbookSharingEvent; import org.mxchange.addressbook.events.sharing.StartedAddressbookSharingEvent; import org.mxchange.addressbook.events.sharing.type.SharingType; @@ -48,7 +48,7 @@ import org.mxchange.jusercore.model.user.User; */ @Named (value = "shareController") @SessionScoped -public class SharesWebBean implements SharesWebController { +public class SharesWebSessionBean implements SharesWebSessionController { /** * Serial number @@ -64,7 +64,7 @@ public class SharesWebBean implements SharesWebController { * Login controller injection */ @Inject - private UserLoginWebController loginController; + private UserLoginWebSessionController loginController; /** * Share instance @@ -96,7 +96,7 @@ public class SharesWebBean implements SharesWebController { /** * Default constructor */ - public SharesWebBean () { + public SharesWebSessionBean () { // Try it try { // Get initial context diff --git a/src/java/org/mxchange/addressbook/beans/shares/SharesWebController.java b/src/java/org/mxchange/addressbook/beans/shares/SharesWebSessionController.java similarity index 97% rename from src/java/org/mxchange/addressbook/beans/shares/SharesWebController.java rename to src/java/org/mxchange/addressbook/beans/shares/SharesWebSessionController.java index 650e27f9..4b50139a 100644 --- a/src/java/org/mxchange/addressbook/beans/shares/SharesWebController.java +++ b/src/java/org/mxchange/addressbook/beans/shares/SharesWebSessionController.java @@ -28,7 +28,7 @@ import org.mxchange.jusercore.model.user.User; *

* @author Roland Haeder */ -public interface SharesWebController extends Serializable { +public interface SharesWebSessionController extends Serializable { /** * Observer method for ended sharing events diff --git a/src/java/org/mxchange/addressbook/beans/smsprovider/SmsProviderWebBean.java b/src/java/org/mxchange/addressbook/beans/smsprovider/SmsProviderWebApplicationBean.java similarity index 94% rename from src/java/org/mxchange/addressbook/beans/smsprovider/SmsProviderWebBean.java rename to src/java/org/mxchange/addressbook/beans/smsprovider/SmsProviderWebApplicationBean.java index be9c7eeb..78428784 100644 --- a/src/java/org/mxchange/addressbook/beans/smsprovider/SmsProviderWebBean.java +++ b/src/java/org/mxchange/addressbook/beans/smsprovider/SmsProviderWebApplicationBean.java @@ -35,7 +35,7 @@ import org.mxchange.jphone.phonenumbers.smsprovider.SmsProvider; */ @Named ("cellphone") @ApplicationScoped -public class SmsProviderWebBean implements SmsProviderWebController { +public class SmsProviderWebApplicationBean implements SmsProviderWebApplicationController { /** * Serial number @@ -55,7 +55,7 @@ public class SmsProviderWebBean implements SmsProviderWebController { /** * Default constructor */ - public SmsProviderWebBean () { + public SmsProviderWebApplicationBean () { // Try this try { // Get initial context diff --git a/src/java/org/mxchange/addressbook/beans/smsprovider/SmsProviderWebController.java b/src/java/org/mxchange/addressbook/beans/smsprovider/SmsProviderWebApplicationController.java similarity index 93% rename from src/java/org/mxchange/addressbook/beans/smsprovider/SmsProviderWebController.java rename to src/java/org/mxchange/addressbook/beans/smsprovider/SmsProviderWebApplicationController.java index 915ba74c..c2adbef5 100644 --- a/src/java/org/mxchange/addressbook/beans/smsprovider/SmsProviderWebController.java +++ b/src/java/org/mxchange/addressbook/beans/smsprovider/SmsProviderWebApplicationController.java @@ -25,7 +25,7 @@ import org.mxchange.jphone.phonenumbers.smsprovider.SmsProvider; *

* @author Roland Haeder */ -public interface SmsProviderWebController extends Serializable { +public interface SmsProviderWebApplicationController extends Serializable { /** * A list of all countries diff --git a/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java b/src/java/org/mxchange/addressbook/beans/user/UserWebSessionBean.java similarity index 98% rename from src/java/org/mxchange/addressbook/beans/user/UserWebBean.java rename to src/java/org/mxchange/addressbook/beans/user/UserWebSessionBean.java index 8bb0bf65..a3ace0cb 100644 --- a/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java +++ b/src/java/org/mxchange/addressbook/beans/user/UserWebSessionBean.java @@ -32,7 +32,7 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.login.UserLoginWebController; +import org.mxchange.addressbook.beans.login.UserLoginWebSessionController; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.UserContact; import org.mxchange.jcontacts.contact.gender.Gender; @@ -59,7 +59,7 @@ import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; */ @Named ("userController") @SessionScoped -public class UserWebBean implements UserWebController { +public class UserWebSessionBean implements UserWebSessionController { /** * Serial number @@ -216,12 +216,12 @@ public class UserWebBean implements UserWebController { * Login bean (controller) */ @Inject - private UserLoginWebController loginController; + private UserLoginWebSessionController loginController; /** * Default constructor */ - public UserWebBean () { + public UserWebSessionBean () { // Set gender to UNKNOWN this.gender = Gender.UNKNOWN; diff --git a/src/java/org/mxchange/addressbook/beans/user/UserWebController.java b/src/java/org/mxchange/addressbook/beans/user/UserWebSessionController.java similarity index 99% rename from src/java/org/mxchange/addressbook/beans/user/UserWebController.java rename to src/java/org/mxchange/addressbook/beans/user/UserWebSessionController.java index e153f8d5..abc75f66 100644 --- a/src/java/org/mxchange/addressbook/beans/user/UserWebController.java +++ b/src/java/org/mxchange/addressbook/beans/user/UserWebSessionController.java @@ -33,7 +33,7 @@ import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; *

* @author Roland Haeder */ -public interface UserWebController extends Serializable { +public interface UserWebSessionController extends Serializable { /** * Tries to lookup user by given id number. If the user is not found or the diff --git a/src/java/org/mxchange/addressbook/converter/country/CountryConverter.java b/src/java/org/mxchange/addressbook/converter/country/CountryConverter.java index 25d172ff..695d8336 100644 --- a/src/java/org/mxchange/addressbook/converter/country/CountryConverter.java +++ b/src/java/org/mxchange/addressbook/converter/country/CountryConverter.java @@ -28,7 +28,7 @@ import javax.inject.Inject; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.country.CountryWebController; +import org.mxchange.addressbook.beans.country.CountryWebApplicationController; import org.mxchange.jcoreeelogger.beans.local.logger.Log; import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal; import org.mxchange.jcountry.data.Country; @@ -45,7 +45,7 @@ public class CountryConverter implements Converter { * Country bean */ @Inject - private CountryWebController countryController; + private CountryWebApplicationController countryController; /** * Logger instance diff --git a/src/java/org/mxchange/addressbook/converter/smsprovider/SmsProviderConverter.java b/src/java/org/mxchange/addressbook/converter/smsprovider/SmsProviderConverter.java index 06422b04..898df45a 100644 --- a/src/java/org/mxchange/addressbook/converter/smsprovider/SmsProviderConverter.java +++ b/src/java/org/mxchange/addressbook/converter/smsprovider/SmsProviderConverter.java @@ -28,7 +28,7 @@ import javax.inject.Inject; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.smsprovider.SmsProviderWebController; +import org.mxchange.addressbook.beans.smsprovider.SmsProviderWebApplicationController; import org.mxchange.jcoreeelogger.beans.local.logger.Log; import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal; import org.mxchange.jphone.phonenumbers.smsprovider.SmsProvider; @@ -51,7 +51,7 @@ public class SmsProviderConverter implements Converter { * SMS provider bean */ @Inject - private SmsProviderWebController providerController; + private SmsProviderWebApplicationController providerController; @Override public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) { diff --git a/src/java/org/mxchange/addressbook/converter/user/UserConverter.java b/src/java/org/mxchange/addressbook/converter/user/UserConverter.java index 92f93d2f..9162dfed 100644 --- a/src/java/org/mxchange/addressbook/converter/user/UserConverter.java +++ b/src/java/org/mxchange/addressbook/converter/user/UserConverter.java @@ -27,7 +27,7 @@ import javax.inject.Inject; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.user.UserWebController; +import org.mxchange.addressbook.beans.user.UserWebSessionController; import org.mxchange.jcoreeelogger.beans.local.logger.Log; import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal; import org.mxchange.jusercore.exceptions.UserNotFoundException; @@ -51,7 +51,7 @@ public class UserConverter implements Converter { * User bean */ @Inject - private UserWebController userController; + private UserWebSessionController userController; @Override public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) { diff --git a/web/login/login_shared_addressbooks.xhtml b/web/login/login_shared_addressbooks.xhtml index f63cf622..8ce811db 100644 --- a/web/login/login_shared_addressbooks.xhtml +++ b/web/login/login_shared_addressbooks.xhtml @@ -32,7 +32,7 @@ #{msg.SHAREE_USER_NAME} - + diff --git a/web/login/login_start_sharing_addressbook.xhtml b/web/login/login_start_sharing_addressbook.xhtml index 87d25a72..38660fcb 100644 --- a/web/login/login_start_sharing_addressbook.xhtml +++ b/web/login/login_start_sharing_addressbook.xhtml @@ -29,7 +29,7 @@ #{msg.USER_NAME} - + diff --git a/web/user/show_addressbook.xhtml b/web/user/show_addressbook.xhtml index ba477df5..35e10d81 100644 --- a/web/user/show_addressbook.xhtml +++ b/web/user/show_addressbook.xhtml @@ -33,7 +33,7 @@ #{msg.ADDRESSBOOK_OWNER} - + diff --git a/web/user/user_list.xhtml b/web/user/user_list.xhtml index 286620b9..4e78e200 100644 --- a/web/user/user_list.xhtml +++ b/web/user/user_list.xhtml @@ -22,14 +22,14 @@ #{msg.USER_ID} - + #{msg.USER_NAME} - + -- 2.39.5