From 6b00b50c0a6ce05849110b8522629eb993ddbaa6 Mon Sep 17 00:00:00 2001 From: Benjamin Barth Date: Tue, 22 Dec 2015 14:23:46 +0100 Subject: [PATCH 01/78] Enable user management menus for desktop and mobile --- .../com/sap/sailing/gwt/home/shared/ExperimentalFeatures.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/ExperimentalFeatures.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/ExperimentalFeatures.java index 5747976742c..292dc6e5440 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/ExperimentalFeatures.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/ExperimentalFeatures.java @@ -70,11 +70,11 @@ public class ExperimentalFeatures { /** * Enables/disables user management on desktop by showing/hiding the respective menu in the upper right corner. */ - public static final boolean SHOW_USER_MANAGEMENT_ON_DESKTOP = false; + public static final boolean SHOW_USER_MANAGEMENT_ON_DESKTOP = true; /** * Enables/disables user management on mobile UI by showing/hiding the respective menu item(s) in the upper right menu. */ - public static final boolean SHOW_USER_MANAGEMENT_ON_MOBILE = false; + public static final boolean SHOW_USER_MANAGEMENT_ON_MOBILE = true; /** * Provide buttons for user management login via social services like facebook or google. */ From ba3dc5098280f7b7ac13387803372559cfefa7df Mon Sep 17 00:00:00 2001 From: Benjamin Barth Date: Tue, 22 Dec 2015 14:44:19 +0100 Subject: [PATCH 02/78] Refactoring - Moved user management related client factory and context interfaces/classes to a respective package --- .../gwt/home/desktop/app/DesktopClientFactory.java | 4 ++-- .../app/TabletAndDesktopApplicationClientFactory.java | 4 ++-- .../gwt/home/desktop/partials/userHeader/UserHeader.java | 2 +- .../partials/useraccountDetails/UserAccountDetails.java | 2 +- .../user/profile/TabletAndDesktopUserProfileView.java | 2 +- .../places/user/profile/UserProfileClientFactory.java | 2 +- .../desktop/places/user/profile/UserProfileTabView.java | 2 +- .../home/desktop/places/user/profile/UserProfileView.java | 2 +- .../profile/detailstab/UserProfileDetailsTabView.java | 2 +- .../home/mobile/app/MobileApplicationClientFactory.java | 8 ++++---- .../gwt/home/mobile/partials/userdetails/UserDetails.java | 2 +- .../gwt/home/mobile/partials/userheader/UserHeader.java | 2 +- .../places/user/profile/UserProfileDetailsView.java | 2 +- .../places/user/profile/UserProfileDetailsViewImpl.java | 2 +- .../user/confirmation/ConfirmationClientFactory.java | 2 +- .../user/passwordreset/PasswordResetClientFactory.java | 2 +- .../home/shared/usermanagement/AsyncLoginCallback.java | 2 +- .../shared/usermanagement/UserManagementContextEvent.java | 2 +- .../UserManagementPlaceManagementController.java | 4 ++-- .../app/ClientFactoryWithUserManagementContext.java | 3 ++- .../app/ClientFactoryWithUserManagementService.java | 2 +- .../{ => usermanagement}/app/UserManagementContext.java | 2 +- .../app/UserManagementContextImpl.java | 2 +- .../usermanagement/create/CreateAccountActivity.java | 2 +- .../decorator/AuthorizedContentDecorator.java | 2 +- .../usermanagement/info/LoggedInUserInfoActivity.java | 4 ++-- .../usermanagement/recovery/PasswordRecoveryActivity.java | 2 +- .../home/shared/usermanagement/signin/SignInActivity.java | 2 +- 28 files changed, 36 insertions(+), 35 deletions(-) rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/{ => usermanagement}/app/ClientFactoryWithUserManagementContext.java (71%) rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/{ => usermanagement}/app/ClientFactoryWithUserManagementService.java (81%) rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/{ => usermanagement}/app/UserManagementContext.java (71%) rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/{ => usermanagement}/app/UserManagementContextImpl.java (93%) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/DesktopClientFactory.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/DesktopClientFactory.java index 9d6b10895cf..f1c3e64d1a8 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/DesktopClientFactory.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/DesktopClientFactory.java @@ -10,12 +10,12 @@ import com.sap.sailing.gwt.home.desktop.places.sponsoring.SponsoringClientFactor import com.sap.sailing.gwt.home.desktop.places.start.StartClientFactory; import com.sap.sailing.gwt.home.desktop.places.user.profile.UserProfileClientFactory; import com.sap.sailing.gwt.home.desktop.places.whatsnew.WhatsNewClientFactory; -import com.sap.sailing.gwt.home.shared.app.ClientFactoryWithUserManagementContext; -import com.sap.sailing.gwt.home.shared.app.ClientFactoryWithUserManagementService; import com.sap.sailing.gwt.home.shared.places.error.ErrorClientFactory; import com.sap.sailing.gwt.home.shared.places.searchresult.SearchResultClientFactory; import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationClientFactory; import com.sap.sailing.gwt.home.shared.places.user.passwordreset.PasswordResetClientFactory; +import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementContext; +import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementService; public interface DesktopClientFactory extends AboutUsClientFactory, ContactClientFactory, EventClientFactory, EventsClientFactory, StartClientFactory, SponsoringClientFactory, SolutionsClientFactory, diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/TabletAndDesktopApplicationClientFactory.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/TabletAndDesktopApplicationClientFactory.java index 4210978c8e7..94ab77b86c2 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/TabletAndDesktopApplicationClientFactory.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/TabletAndDesktopApplicationClientFactory.java @@ -19,8 +19,6 @@ import com.sap.sailing.gwt.home.desktop.places.whatsnew.TabletAndDesktopWhatsNew import com.sap.sailing.gwt.home.desktop.places.whatsnew.WhatsNewPlace.WhatsNewNavigationTabs; import com.sap.sailing.gwt.home.desktop.places.whatsnew.WhatsNewView; import com.sap.sailing.gwt.home.shared.app.PlaceNavigation; -import com.sap.sailing.gwt.home.shared.app.UserManagementContext; -import com.sap.sailing.gwt.home.shared.app.UserManagementContextImpl; import com.sap.sailing.gwt.home.shared.framework.WrappedPlaceManagementController; import com.sap.sailing.gwt.home.shared.partials.busy.BusyViewImpl; import com.sap.sailing.gwt.home.shared.places.searchresult.SearchResultView; @@ -34,6 +32,8 @@ import com.sap.sailing.gwt.home.shared.usermanagement.UserManagementContextEvent import com.sap.sailing.gwt.home.shared.usermanagement.UserManagementPlaceManagementController; import com.sap.sailing.gwt.home.shared.usermanagement.UserManagementPlaceManagementController.SignInSuccessfulEvent; import com.sap.sailing.gwt.home.shared.usermanagement.UserManagementRequestEvent; +import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementContext; +import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementContextImpl; import com.sap.sailing.gwt.home.shared.usermanagement.info.LoggedInUserInfoPlace; import com.sap.sailing.gwt.home.shared.usermanagement.view.UserManagementViewDesktop; import com.sap.sailing.gwt.ui.client.refresh.BusyView; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/userHeader/UserHeader.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/userHeader/UserHeader.java index 328e0359fa5..76363f69553 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/userHeader/UserHeader.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/userHeader/UserHeader.java @@ -6,7 +6,7 @@ import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.gwt.home.shared.app.UserManagementContext; +import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementContext; public class UserHeader extends Composite { private static MyUiBinder uiBinder = GWT.create(MyUiBinder.class); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/useraccountDetails/UserAccountDetails.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/useraccountDetails/UserAccountDetails.java index 81197e6fa2b..ceb1a9cb0c3 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/useraccountDetails/UserAccountDetails.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/useraccountDetails/UserAccountDetails.java @@ -11,7 +11,7 @@ import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.PasswordTextBox; import com.google.gwt.user.client.ui.TextBox; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.gwt.home.shared.app.UserManagementContext; +import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementContext; import com.sap.sse.security.ui.client.i18n.StringMessages; import com.sap.sse.security.ui.shared.UserDTO; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/TabletAndDesktopUserProfileView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/TabletAndDesktopUserProfileView.java index aeba06518eb..30cf3df7c34 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/TabletAndDesktopUserProfileView.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/TabletAndDesktopUserProfileView.java @@ -14,8 +14,8 @@ import com.sap.sailing.gwt.common.client.controls.tabbar.TabView; import com.sap.sailing.gwt.common.client.i18n.TextMessages; import com.sap.sailing.gwt.home.desktop.partials.userHeader.UserHeader; import com.sap.sailing.gwt.home.shared.app.ApplicationHistoryMapper; -import com.sap.sailing.gwt.home.shared.app.UserManagementContext; import com.sap.sailing.gwt.home.shared.places.user.profile.AbstractUserProfilePlace; +import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementContext; import com.sap.sailing.gwt.ui.client.StringMessages; public class TabletAndDesktopUserProfileView extends Composite implements UserProfileView { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileClientFactory.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileClientFactory.java index 29a80b343d1..8572b6d2059 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileClientFactory.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileClientFactory.java @@ -1,6 +1,6 @@ package com.sap.sailing.gwt.home.desktop.places.user.profile; -import com.sap.sailing.gwt.home.shared.app.ClientFactoryWithUserManagementContext; +import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementContext; import com.sap.sailing.gwt.ui.client.SailingClientFactory; import com.sap.sailing.gwt.ui.client.refresh.ErrorAndBusyClientFactory; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileTabView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileTabView.java index 4b34d7e2911..2e59abcb365 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileTabView.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileTabView.java @@ -1,8 +1,8 @@ package com.sap.sailing.gwt.home.desktop.places.user.profile; import com.sap.sailing.gwt.common.client.controls.tabbar.TabView; -import com.sap.sailing.gwt.home.shared.app.UserManagementContext; import com.sap.sailing.gwt.home.shared.places.user.profile.AbstractUserProfilePlace; +import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementContext; public interface UserProfileTabView extends TabView { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileView.java index 65519cf1b3a..dc76450934b 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileView.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileView.java @@ -6,10 +6,10 @@ import com.google.gwt.user.client.ui.IsWidget; import com.sap.sailing.gwt.common.client.controls.tabbar.TabView; import com.sap.sailing.gwt.home.desktop.partials.useraccountDetails.UserAccountDetails; import com.sap.sailing.gwt.home.shared.app.PlaceNavigation; -import com.sap.sailing.gwt.home.shared.app.UserManagementContext; import com.sap.sailing.gwt.home.shared.places.fakeseries.AbstractSeriesPlace; import com.sap.sailing.gwt.home.shared.places.start.StartPlace; import com.sap.sailing.gwt.home.shared.places.user.profile.AbstractUserProfilePlace; +import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementContext; import com.sap.sailing.gwt.home.shared.usermanagement.decorator.NotLoggedInPresenter; public interface UserProfileView extends IsWidget { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/detailstab/UserProfileDetailsTabView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/detailstab/UserProfileDetailsTabView.java index 383aecdc881..7c52044ca94 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/detailstab/UserProfileDetailsTabView.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/detailstab/UserProfileDetailsTabView.java @@ -10,8 +10,8 @@ import com.sap.sailing.gwt.common.client.controls.tabbar.TabView; import com.sap.sailing.gwt.home.desktop.partials.useraccountDetails.UserAccountDetails; import com.sap.sailing.gwt.home.desktop.places.user.profile.UserProfileTabView; import com.sap.sailing.gwt.home.desktop.places.user.profile.UserProfileView; -import com.sap.sailing.gwt.home.shared.app.UserManagementContext; import com.sap.sailing.gwt.home.shared.places.user.profile.UserProfileDetailsPlace; +import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementContext; import com.sap.sailing.gwt.home.shared.usermanagement.decorator.AuthorizedContentDecoratorDesktop; /** diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileApplicationClientFactory.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileApplicationClientFactory.java index 9d71b0daf61..ddc9c482922 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileApplicationClientFactory.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileApplicationClientFactory.java @@ -10,12 +10,8 @@ import com.sap.sailing.gwt.home.communication.SailingDispatchSystemImpl; import com.sap.sailing.gwt.home.desktop.app.ApplicationTopLevelView; import com.sap.sailing.gwt.home.mobile.places.error.ErrorViewImpl; import com.sap.sailing.gwt.home.mobile.places.searchresult.SearchResultViewImpl; -import com.sap.sailing.gwt.home.shared.app.ClientFactoryWithUserManagementContext; -import com.sap.sailing.gwt.home.shared.app.ClientFactoryWithUserManagementService; import com.sap.sailing.gwt.home.shared.app.PlaceNavigation; import com.sap.sailing.gwt.home.shared.app.ResettableNavigationPathDisplay; -import com.sap.sailing.gwt.home.shared.app.UserManagementContext; -import com.sap.sailing.gwt.home.shared.app.UserManagementContextImpl; import com.sap.sailing.gwt.home.shared.partials.busy.BusyViewImpl; import com.sap.sailing.gwt.home.shared.places.searchresult.SearchResultClientFactory; import com.sap.sailing.gwt.home.shared.places.searchresult.SearchResultView; @@ -29,6 +25,10 @@ import com.sap.sailing.gwt.home.shared.places.user.passwordreset.PasswordResetVi import com.sap.sailing.gwt.home.shared.places.user.passwordreset.PasswordResetViewImpl; import com.sap.sailing.gwt.home.shared.usermanagement.UserManagementContextEvent; import com.sap.sailing.gwt.home.shared.usermanagement.UserManagementRequestEvent; +import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementContext; +import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementService; +import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementContext; +import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementContextImpl; import com.sap.sailing.gwt.ui.client.refresh.BusyView; import com.sap.sailing.gwt.ui.client.refresh.ErrorAndBusyClientFactory; import com.sap.sse.gwt.client.mvp.ErrorView; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/userdetails/UserDetails.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/userdetails/UserDetails.java index a8778e7e165..8791d404eb3 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/userdetails/UserDetails.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/userdetails/UserDetails.java @@ -10,7 +10,7 @@ import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.PasswordTextBox; import com.google.gwt.user.client.ui.TextBox; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.gwt.home.shared.app.UserManagementContext; +import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementContext; import com.sap.sse.security.ui.client.i18n.StringMessages; import com.sap.sse.security.ui.shared.UserDTO; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/userheader/UserHeader.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/userheader/UserHeader.java index ac253f595c1..849aec8f807 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/userheader/UserHeader.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/userheader/UserHeader.java @@ -7,7 +7,7 @@ import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.gwt.home.shared.app.UserManagementContext; +import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementContext; import com.sap.sse.security.ui.shared.UserDTO; public class UserHeader extends Composite { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/UserProfileDetailsView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/UserProfileDetailsView.java index 4baf10ccf9b..6d4bd863fcf 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/UserProfileDetailsView.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/UserProfileDetailsView.java @@ -2,7 +2,7 @@ package com.sap.sailing.gwt.home.mobile.places.user.profile; import com.google.gwt.user.client.ui.IsWidget; import com.sap.sailing.gwt.home.mobile.partials.userdetails.UserDetails; -import com.sap.sailing.gwt.home.shared.app.UserManagementContext; +import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementContext; import com.sap.sailing.gwt.home.shared.usermanagement.decorator.NotLoggedInPresenter; public interface UserProfileDetailsView extends IsWidget { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/UserProfileDetailsViewImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/UserProfileDetailsViewImpl.java index b9d428c389a..c51d9703ca7 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/UserProfileDetailsViewImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/UserProfileDetailsViewImpl.java @@ -7,7 +7,7 @@ import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Widget; import com.sap.sailing.gwt.home.mobile.partials.userdetails.UserDetails; import com.sap.sailing.gwt.home.mobile.partials.userheader.UserHeader; -import com.sap.sailing.gwt.home.shared.app.UserManagementContext; +import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementContext; import com.sap.sailing.gwt.home.shared.usermanagement.decorator.AuthorizedContentDecoratorMobile; public class UserProfileDetailsViewImpl extends Composite implements UserProfileDetailsView { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/confirmation/ConfirmationClientFactory.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/confirmation/ConfirmationClientFactory.java index 4bc7f850396..7f3fe17ee48 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/confirmation/ConfirmationClientFactory.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/confirmation/ConfirmationClientFactory.java @@ -1,6 +1,6 @@ package com.sap.sailing.gwt.home.shared.places.user.confirmation; -import com.sap.sailing.gwt.home.shared.app.ClientFactoryWithUserManagementService; +import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementService; import com.sap.sailing.gwt.ui.client.refresh.ErrorAndBusyClientFactory; public interface ConfirmationClientFactory extends ClientFactoryWithUserManagementService, ErrorAndBusyClientFactory { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/passwordreset/PasswordResetClientFactory.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/passwordreset/PasswordResetClientFactory.java index bf195819f10..ccc08ec2277 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/passwordreset/PasswordResetClientFactory.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/passwordreset/PasswordResetClientFactory.java @@ -1,8 +1,8 @@ package com.sap.sailing.gwt.home.shared.places.user.passwordreset; -import com.sap.sailing.gwt.home.shared.app.ClientFactoryWithUserManagementService; import com.sap.sailing.gwt.home.shared.app.PlaceNavigation; import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationPlace; +import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementService; import com.sap.sailing.gwt.ui.client.refresh.ErrorAndBusyClientFactory; public interface PasswordResetClientFactory extends ClientFactoryWithUserManagementService, ErrorAndBusyClientFactory { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/AsyncLoginCallback.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/AsyncLoginCallback.java index 9b3ba08cdbc..e6670a2f00a 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/AsyncLoginCallback.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/AsyncLoginCallback.java @@ -2,8 +2,8 @@ package com.sap.sailing.gwt.home.shared.usermanagement; import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.rpc.AsyncCallback; -import com.sap.sailing.gwt.home.shared.app.ClientFactoryWithUserManagementService; import com.sap.sailing.gwt.home.shared.usermanagement.UserManagementPlaceManagementController.SignInSuccessfulEvent; +import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementService; import com.sap.sse.security.ui.client.i18n.StringMessages; import com.sap.sse.security.ui.shared.SuccessInfo; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/UserManagementContextEvent.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/UserManagementContextEvent.java index c2b56cb8e30..1f293eedeef 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/UserManagementContextEvent.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/UserManagementContextEvent.java @@ -2,7 +2,7 @@ package com.sap.sailing.gwt.home.shared.usermanagement; import com.google.gwt.event.shared.EventHandler; import com.google.gwt.event.shared.GwtEvent; -import com.sap.sailing.gwt.home.shared.app.UserManagementContext; +import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementContext; public class UserManagementContextEvent extends GwtEvent { public static final Type TYPE = new Type(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/UserManagementPlaceManagementController.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/UserManagementPlaceManagementController.java index c832078dbb2..d308e71a97f 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/UserManagementPlaceManagementController.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/UserManagementPlaceManagementController.java @@ -7,8 +7,6 @@ import com.google.gwt.place.shared.Place; import com.google.gwt.place.shared.PlaceController; import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.web.bindery.event.shared.EventBus; -import com.sap.sailing.gwt.home.shared.app.ClientFactoryWithUserManagementContext; -import com.sap.sailing.gwt.home.shared.app.ClientFactoryWithUserManagementService; import com.sap.sailing.gwt.home.shared.app.PlaceNavigation; import com.sap.sailing.gwt.home.shared.framework.WrappedPlaceManagementController; import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationActivity; @@ -16,6 +14,8 @@ import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationClie import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationPlace; import com.sap.sailing.gwt.home.shared.places.user.passwordreset.PasswordResetPlace; import com.sap.sailing.gwt.home.shared.places.user.profile.AbstractUserProfilePlace; +import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementContext; +import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementService; import com.sap.sailing.gwt.home.shared.usermanagement.create.CreateAccountActivity; import com.sap.sailing.gwt.home.shared.usermanagement.create.CreateAccountPlace; import com.sap.sailing.gwt.home.shared.usermanagement.info.LoggedInUserInfoActivity; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/app/ClientFactoryWithUserManagementContext.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/app/ClientFactoryWithUserManagementContext.java similarity index 71% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/app/ClientFactoryWithUserManagementContext.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/app/ClientFactoryWithUserManagementContext.java index 5ebae49f52f..f26435a6f34 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/app/ClientFactoryWithUserManagementContext.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/app/ClientFactoryWithUserManagementContext.java @@ -1,4 +1,5 @@ -package com.sap.sailing.gwt.home.shared.app; +package com.sap.sailing.gwt.home.shared.usermanagement.app; + diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/app/ClientFactoryWithUserManagementService.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/app/ClientFactoryWithUserManagementService.java similarity index 81% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/app/ClientFactoryWithUserManagementService.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/app/ClientFactoryWithUserManagementService.java index b9b97b5ad4b..fa84a084c05 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/app/ClientFactoryWithUserManagementService.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/app/ClientFactoryWithUserManagementService.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.home.shared.app; +package com.sap.sailing.gwt.home.shared.usermanagement.app; import com.sap.sse.security.ui.client.UserManagementServiceAsync; import com.sap.sse.security.ui.shared.UserDTO; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/app/UserManagementContext.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/app/UserManagementContext.java similarity index 71% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/app/UserManagementContext.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/app/UserManagementContext.java index a1d0eb83e5d..b38cb6c6c94 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/app/UserManagementContext.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/app/UserManagementContext.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.home.shared.app; +package com.sap.sailing.gwt.home.shared.usermanagement.app; import com.sap.sse.security.ui.shared.UserDTO; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/app/UserManagementContextImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/app/UserManagementContextImpl.java similarity index 93% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/app/UserManagementContextImpl.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/app/UserManagementContextImpl.java index 1f5a938464d..dc220237bb2 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/app/UserManagementContextImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/app/UserManagementContextImpl.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.home.shared.app; +package com.sap.sailing.gwt.home.shared.usermanagement.app; import java.util.ArrayList; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/create/CreateAccountActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/create/CreateAccountActivity.java index fa86fcd46fa..c63cd16958c 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/create/CreateAccountActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/create/CreateAccountActivity.java @@ -6,11 +6,11 @@ import com.google.gwt.place.shared.PlaceController; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.AcceptsOneWidget; -import com.sap.sailing.gwt.home.shared.app.ClientFactoryWithUserManagementService; import com.sap.sailing.gwt.home.shared.app.PlaceNavigation; import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationPlace; import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationPlace.Action; import com.sap.sailing.gwt.home.shared.usermanagement.AsyncLoginCallback; +import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementService; import com.sap.sailing.gwt.home.shared.usermanagement.signin.SignInPlace; import com.sap.sse.security.shared.UserManagementException; import com.sap.sse.security.ui.client.component.NewAccountValidator; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/decorator/AuthorizedContentDecorator.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/decorator/AuthorizedContentDecorator.java index 6cc7f6ab7ed..055d276257e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/decorator/AuthorizedContentDecorator.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/decorator/AuthorizedContentDecorator.java @@ -4,7 +4,7 @@ import com.google.gwt.uibinder.client.UiChild; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.gwt.home.shared.app.UserManagementContext; +import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementContext; import com.sap.sse.security.ui.client.i18n.StringMessages; public class AuthorizedContentDecorator extends Composite { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/info/LoggedInUserInfoActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/info/LoggedInUserInfoActivity.java index 26dae97bcf0..234ce532abc 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/info/LoggedInUserInfoActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/info/LoggedInUserInfoActivity.java @@ -5,12 +5,12 @@ import com.google.gwt.event.shared.EventBus; import com.google.gwt.place.shared.PlaceController; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.AcceptsOneWidget; -import com.sap.sailing.gwt.home.shared.app.ClientFactoryWithUserManagementContext; -import com.sap.sailing.gwt.home.shared.app.ClientFactoryWithUserManagementService; import com.sap.sailing.gwt.home.shared.app.PlaceNavigation; import com.sap.sailing.gwt.home.shared.places.user.profile.AbstractUserProfilePlace; import com.sap.sailing.gwt.home.shared.usermanagement.UserManagementContextEvent; import com.sap.sailing.gwt.home.shared.usermanagement.UserManagementRequestEvent; +import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementContext; +import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementService; import com.sap.sailing.gwt.home.shared.usermanagement.signin.SignInPlace; import com.sap.sse.gwt.client.mvp.ClientFactory; import com.sap.sse.security.ui.shared.SuccessInfo; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/recovery/PasswordRecoveryActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/recovery/PasswordRecoveryActivity.java index b330427f5a6..01eef5653e5 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/recovery/PasswordRecoveryActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/recovery/PasswordRecoveryActivity.java @@ -8,11 +8,11 @@ import com.google.gwt.place.shared.PlaceController; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.AcceptsOneWidget; -import com.sap.sailing.gwt.home.shared.app.ClientFactoryWithUserManagementService; import com.sap.sailing.gwt.home.shared.app.PlaceNavigation; import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationPlace; import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationPlace.Action; import com.sap.sailing.gwt.home.shared.places.user.passwordreset.PasswordResetPlace; +import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementService; import com.sap.sse.gwt.client.mvp.ClientFactory; import com.sap.sse.security.shared.UserManagementException; import com.sap.sse.security.ui.client.i18n.StringMessages; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/signin/SignInActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/signin/SignInActivity.java index 09b248661e7..0a6aa8106e3 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/signin/SignInActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/signin/SignInActivity.java @@ -4,9 +4,9 @@ import com.google.gwt.activity.shared.AbstractActivity; import com.google.gwt.event.shared.EventBus; import com.google.gwt.place.shared.PlaceController; import com.google.gwt.user.client.ui.AcceptsOneWidget; -import com.sap.sailing.gwt.home.shared.app.ClientFactoryWithUserManagementService; import com.sap.sailing.gwt.home.shared.usermanagement.AsyncLoginCallback; import com.sap.sailing.gwt.home.shared.usermanagement.UserManagementContextEvent; +import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementService; import com.sap.sailing.gwt.home.shared.usermanagement.create.CreateAccountPlace; import com.sap.sailing.gwt.home.shared.usermanagement.info.LoggedInUserInfoPlace; import com.sap.sailing.gwt.home.shared.usermanagement.recovery.PasswordRecoveryPlace; From 07f872b162a33ae808068f92bf1bffbc52f42812 Mon Sep 17 00:00:00 2001 From: Benjamin Barth Date: Tue, 22 Dec 2015 14:55:39 +0100 Subject: [PATCH 03/78] Refactoring - Renamed and reorganized user management related client factory interfaces and methods --- .../gwt/home/desktop/app/DesktopClientFactory.java | 4 ++-- .../app/TabletAndDesktopApplicationClientFactory.java | 2 +- .../mobile/app/MobileApplicationClientFactory.java | 10 +++++----- .../user/confirmation/ConfirmationClientFactory.java | 4 ++-- .../user/passwordreset/PasswordResetClientFactory.java | 4 ++-- .../home/shared/usermanagement/AsyncLoginCallback.java | 6 +++--- .../UserManagementPlaceManagementController.java | 6 +++--- .../app/ClientFactoryWithUserManagementContext.java | 5 +---- ...ntService.java => UserManagementClientFactory.java} | 4 +++- .../usermanagement/create/CreateAccountActivity.java | 6 +++--- .../usermanagement/info/LoggedInUserInfoActivity.java | 8 ++++---- .../recovery/PasswordRecoveryActivity.java | 4 ++-- .../shared/usermanagement/signin/SignInActivity.java | 6 +++--- 13 files changed, 34 insertions(+), 35 deletions(-) rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/app/{ClientFactoryWithUserManagementService.java => UserManagementClientFactory.java} (77%) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/DesktopClientFactory.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/DesktopClientFactory.java index f1c3e64d1a8..8383bf86ab0 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/DesktopClientFactory.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/DesktopClientFactory.java @@ -15,12 +15,12 @@ import com.sap.sailing.gwt.home.shared.places.searchresult.SearchResultClientFac import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationClientFactory; import com.sap.sailing.gwt.home.shared.places.user.passwordreset.PasswordResetClientFactory; import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementContext; -import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementService; +import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementClientFactory; public interface DesktopClientFactory extends AboutUsClientFactory, ContactClientFactory, EventClientFactory, EventsClientFactory, StartClientFactory, SponsoringClientFactory, SolutionsClientFactory, SearchResultClientFactory, WhatsNewClientFactory, SeriesClientFactory, UserProfileClientFactory, - ErrorClientFactory, ClientFactoryWithUserManagementContext, ClientFactoryWithUserManagementService, + ErrorClientFactory, ClientFactoryWithUserManagementContext, UserManagementClientFactory, ConfirmationClientFactory, PasswordResetClientFactory { DesktopPlacesNavigator getHomePlacesNavigator(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/TabletAndDesktopApplicationClientFactory.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/TabletAndDesktopApplicationClientFactory.java index 94ab77b86c2..7e0a84b033a 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/TabletAndDesktopApplicationClientFactory.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/TabletAndDesktopApplicationClientFactory.java @@ -160,7 +160,7 @@ public class TabletAndDesktopApplicationClientFactory extends AbstractApplicatio } @Override - public void resetUserManagementContext() { + public void didLogout() { uCtx = new UserManagementContextImpl(); securityProvider.getUserService().updateUser(true); getEventBus().fireEvent(new UserManagementRequestEvent()); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileApplicationClientFactory.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileApplicationClientFactory.java index ddc9c482922..a2b90f25d1a 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileApplicationClientFactory.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileApplicationClientFactory.java @@ -26,7 +26,7 @@ import com.sap.sailing.gwt.home.shared.places.user.passwordreset.PasswordResetVi import com.sap.sailing.gwt.home.shared.usermanagement.UserManagementContextEvent; import com.sap.sailing.gwt.home.shared.usermanagement.UserManagementRequestEvent; import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementContext; -import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementService; +import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementClientFactory; import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementContext; import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementContextImpl; import com.sap.sailing.gwt.ui.client.refresh.BusyView; @@ -49,7 +49,7 @@ import com.sap.sse.security.ui.shared.UserDTO; public class MobileApplicationClientFactory extends SecureClientFactoryImpl> implements ErrorAndBusyClientFactory, SearchResultClientFactory, ClientFactoryWithUserManagementContext, - ClientFactoryWithUserManagementService, ConfirmationClientFactory, PasswordResetClientFactory { + UserManagementClientFactory, ConfirmationClientFactory, PasswordResetClientFactory { private final MobilePlacesNavigator navigator; private final SailingDispatchSystem dispatch = new SailingDispatchSystemImpl(); private WithSecurity securityProvider; @@ -90,12 +90,12 @@ public class MobileApplicationClientFactory extends getUserManagementService().logout(new AsyncCallback() { @Override public void onSuccess(SuccessInfo result) { - resetUserManagementContext(); + didLogout(); } @Override public void onFailure(Throwable caught) { - resetUserManagementContext(); + didLogout(); } }); } @@ -141,7 +141,7 @@ public class MobileApplicationClientFactory extends } @Override - public void resetUserManagementContext() { + public void didLogout() { uCtx = new UserManagementContextImpl(); securityProvider.getUserService().updateUser(true); getEventBus().fireEvent(new UserManagementRequestEvent()); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/confirmation/ConfirmationClientFactory.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/confirmation/ConfirmationClientFactory.java index 7f3fe17ee48..07bbdc6b8ba 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/confirmation/ConfirmationClientFactory.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/confirmation/ConfirmationClientFactory.java @@ -1,9 +1,9 @@ package com.sap.sailing.gwt.home.shared.places.user.confirmation; -import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementService; +import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementClientFactory; import com.sap.sailing.gwt.ui.client.refresh.ErrorAndBusyClientFactory; -public interface ConfirmationClientFactory extends ClientFactoryWithUserManagementService, ErrorAndBusyClientFactory { +public interface ConfirmationClientFactory extends UserManagementClientFactory, ErrorAndBusyClientFactory { ConfirmationView createAccountConfirmationView(String message); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/passwordreset/PasswordResetClientFactory.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/passwordreset/PasswordResetClientFactory.java index ccc08ec2277..6e58a13814e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/passwordreset/PasswordResetClientFactory.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/passwordreset/PasswordResetClientFactory.java @@ -2,10 +2,10 @@ package com.sap.sailing.gwt.home.shared.places.user.passwordreset; import com.sap.sailing.gwt.home.shared.app.PlaceNavigation; import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationPlace; -import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementService; +import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementClientFactory; import com.sap.sailing.gwt.ui.client.refresh.ErrorAndBusyClientFactory; -public interface PasswordResetClientFactory extends ClientFactoryWithUserManagementService, ErrorAndBusyClientFactory { +public interface PasswordResetClientFactory extends UserManagementClientFactory, ErrorAndBusyClientFactory { PasswordResetView createPasswordResetView(); PlaceNavigation getPasswordResettedConfirmationNavigation(String username); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/AsyncLoginCallback.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/AsyncLoginCallback.java index e6670a2f00a..f2d5aa21265 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/AsyncLoginCallback.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/AsyncLoginCallback.java @@ -3,18 +3,18 @@ package com.sap.sailing.gwt.home.shared.usermanagement; import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.rpc.AsyncCallback; import com.sap.sailing.gwt.home.shared.usermanagement.UserManagementPlaceManagementController.SignInSuccessfulEvent; -import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementService; +import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementClientFactory; import com.sap.sse.security.ui.client.i18n.StringMessages; import com.sap.sse.security.ui.shared.SuccessInfo; public class AsyncLoginCallback implements AsyncCallback { - private final ClientFactoryWithUserManagementService clientFactory; + private final UserManagementClientFactory clientFactory; private final ErrorMessageView view; private final EventBus eventBus; private final boolean fireSignInSuccessfulEvent; - public AsyncLoginCallback(ClientFactoryWithUserManagementService clientFactory, ErrorMessageView view, + public AsyncLoginCallback(UserManagementClientFactory clientFactory, ErrorMessageView view, EventBus eventBus, boolean fireSignInSuccessfulEvent) { this.clientFactory = clientFactory; this.view = view; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/UserManagementPlaceManagementController.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/UserManagementPlaceManagementController.java index d308e71a97f..133b27e02ab 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/UserManagementPlaceManagementController.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/UserManagementPlaceManagementController.java @@ -15,7 +15,7 @@ import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationPlac import com.sap.sailing.gwt.home.shared.places.user.passwordreset.PasswordResetPlace; import com.sap.sailing.gwt.home.shared.places.user.profile.AbstractUserProfilePlace; import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementContext; -import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementService; +import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementClientFactory; import com.sap.sailing.gwt.home.shared.usermanagement.create.CreateAccountActivity; import com.sap.sailing.gwt.home.shared.usermanagement.create.CreateAccountPlace; import com.sap.sailing.gwt.home.shared.usermanagement.info.LoggedInUserInfoActivity; @@ -28,7 +28,7 @@ import com.sap.sailing.gwt.home.shared.usermanagement.view.UserManagementView; import com.sap.sse.gwt.client.mvp.ClientFactory; public class UserManagementPlaceManagementController - + extends WrappedPlaceManagementController { public UserManagementPlaceManagementController(CF clientFactory, @@ -46,7 +46,7 @@ public class UserManagementPlaceManagementController } private static class Configuration - + implements PlaceManagementConfiguration { private final CF clientFactory; private final PlaceNavigation createConfirmationNavigation; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/app/ClientFactoryWithUserManagementContext.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/app/ClientFactoryWithUserManagementContext.java index f26435a6f34..cfe6c5ea9e8 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/app/ClientFactoryWithUserManagementContext.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/app/ClientFactoryWithUserManagementContext.java @@ -1,9 +1,6 @@ package com.sap.sailing.gwt.home.shared.usermanagement.app; - - - public interface ClientFactoryWithUserManagementContext { + UserManagementContext getUserManagementContext(); - void resetUserManagementContext(); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/app/ClientFactoryWithUserManagementService.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/app/UserManagementClientFactory.java similarity index 77% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/app/ClientFactoryWithUserManagementService.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/app/UserManagementClientFactory.java index fa84a084c05..f420416b8a1 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/app/ClientFactoryWithUserManagementService.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/app/UserManagementClientFactory.java @@ -3,7 +3,9 @@ package com.sap.sailing.gwt.home.shared.usermanagement.app; import com.sap.sse.security.ui.client.UserManagementServiceAsync; import com.sap.sse.security.ui.shared.UserDTO; -public interface ClientFactoryWithUserManagementService { +public interface UserManagementClientFactory { + UserManagementServiceAsync getUserManagement(); void didLogin(UserDTO user); + void didLogout(); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/create/CreateAccountActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/create/CreateAccountActivity.java index c63cd16958c..57a50fbb9d8 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/create/CreateAccountActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/create/CreateAccountActivity.java @@ -10,7 +10,7 @@ import com.sap.sailing.gwt.home.shared.app.PlaceNavigation; import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationPlace; import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationPlace.Action; import com.sap.sailing.gwt.home.shared.usermanagement.AsyncLoginCallback; -import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementService; +import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementClientFactory; import com.sap.sailing.gwt.home.shared.usermanagement.signin.SignInPlace; import com.sap.sse.security.shared.UserManagementException; import com.sap.sse.security.ui.client.component.NewAccountValidator; @@ -19,7 +19,7 @@ import com.sap.sse.security.ui.shared.UserDTO; public class CreateAccountActivity extends AbstractActivity implements CreateAccountView.Presenter { - private final ClientFactoryWithUserManagementService clientFactory; + private final UserManagementClientFactory clientFactory; private final PlaceController placeController; private final CreateAccountView view = new CreateAccountViewImpl(); @@ -28,7 +28,7 @@ public class CreateAccountActivity extends AbstractActivity implements CreateAcc private final PlaceNavigation confirmationPlaceNav; private EventBus eventBus; - public CreateAccountActivity(CreateAccountPlace place, ClientFactoryWithUserManagementService clientFactory, + public CreateAccountActivity(CreateAccountPlace place, UserManagementClientFactory clientFactory, PlaceNavigation confirmationPlaceNav, PlaceController placeController) { this.clientFactory = clientFactory; this.confirmationPlaceNav = confirmationPlaceNav; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/info/LoggedInUserInfoActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/info/LoggedInUserInfoActivity.java index 234ce532abc..a2f783ec41a 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/info/LoggedInUserInfoActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/info/LoggedInUserInfoActivity.java @@ -10,12 +10,12 @@ import com.sap.sailing.gwt.home.shared.places.user.profile.AbstractUserProfilePl import com.sap.sailing.gwt.home.shared.usermanagement.UserManagementContextEvent; import com.sap.sailing.gwt.home.shared.usermanagement.UserManagementRequestEvent; import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementContext; -import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementService; +import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementClientFactory; import com.sap.sailing.gwt.home.shared.usermanagement.signin.SignInPlace; import com.sap.sse.gwt.client.mvp.ClientFactory; import com.sap.sse.security.ui.shared.SuccessInfo; -public class LoggedInUserInfoActivity +public class LoggedInUserInfoActivity extends AbstractActivity implements LoggedInUserInfoView.Presenter { private final CF clientFactory; @@ -58,12 +58,12 @@ public class LoggedInUserInfoActivity() { @Override public void onSuccess(SuccessInfo result) { - clientFactory.resetUserManagementContext(); + clientFactory.didLogout(); } @Override public void onFailure(Throwable caught) { - clientFactory.resetUserManagementContext(); + clientFactory.didLogout(); } }); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/recovery/PasswordRecoveryActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/recovery/PasswordRecoveryActivity.java index 01eef5653e5..7f7d3799969 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/recovery/PasswordRecoveryActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/recovery/PasswordRecoveryActivity.java @@ -12,12 +12,12 @@ import com.sap.sailing.gwt.home.shared.app.PlaceNavigation; import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationPlace; import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationPlace.Action; import com.sap.sailing.gwt.home.shared.places.user.passwordreset.PasswordResetPlace; -import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementService; +import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementClientFactory; import com.sap.sse.gwt.client.mvp.ClientFactory; import com.sap.sse.security.shared.UserManagementException; import com.sap.sse.security.ui.client.i18n.StringMessages; -public class PasswordRecoveryActivity extends AbstractActivity implements PasswordRecoveryView.Presenter { +public class PasswordRecoveryActivity extends AbstractActivity implements PasswordRecoveryView.Presenter { private final CF clientFactory; private final PlaceController placeController; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/signin/SignInActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/signin/SignInActivity.java index 0a6aa8106e3..15109c6c478 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/signin/SignInActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/signin/SignInActivity.java @@ -6,19 +6,19 @@ import com.google.gwt.place.shared.PlaceController; import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.sap.sailing.gwt.home.shared.usermanagement.AsyncLoginCallback; import com.sap.sailing.gwt.home.shared.usermanagement.UserManagementContextEvent; -import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementService; +import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementClientFactory; import com.sap.sailing.gwt.home.shared.usermanagement.create.CreateAccountPlace; import com.sap.sailing.gwt.home.shared.usermanagement.info.LoggedInUserInfoPlace; import com.sap.sailing.gwt.home.shared.usermanagement.recovery.PasswordRecoveryPlace; public class SignInActivity extends AbstractActivity implements SignInView.Presenter { - private final ClientFactoryWithUserManagementService clientFactory; + private final UserManagementClientFactory clientFactory; private final PlaceController placeController; private final SignInView view = new SignInViewImpl(); private EventBus eventBus; - public SignInActivity(SignInPlace place, ClientFactoryWithUserManagementService clientFactory, + public SignInActivity(SignInPlace place, UserManagementClientFactory clientFactory, PlaceController placeController) { this.clientFactory = clientFactory; this.placeController = placeController; From 930e700dd90a5e8b9f5c223876da2e93a1dd2830 Mon Sep 17 00:00:00 2001 From: Benjamin Barth Date: Tue, 22 Dec 2015 16:20:28 +0100 Subject: [PATCH 04/78] Refactoring - Reorganized user management related client factory interface hierarchy --- .../desktop/app/DesktopClientFactory.java | 5 +--- ...letAndDesktopApplicationClientFactory.java | 2 +- .../app/MobileApplicationClientFactory.java | 5 +--- .../AuthenticationActivity.java | 2 +- .../confirmation/ConfirmationActivity.java | 5 ++-- .../ConfirmationActivityProxy.java | 5 ++-- .../ConfirmationClientFactory.java | 3 +-- ...erManagementPlaceManagementController.java | 25 ++++++++----------- .../app/UserManagementClientFactory.java | 4 ++- .../info/LoggedInUserInfoActivity.java | 9 +++---- .../recovery/PasswordRecoveryActivity.java | 7 +++--- 11 files changed, 30 insertions(+), 42 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/DesktopClientFactory.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/DesktopClientFactory.java index 8383bf86ab0..0358071369f 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/DesktopClientFactory.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/DesktopClientFactory.java @@ -12,16 +12,13 @@ import com.sap.sailing.gwt.home.desktop.places.user.profile.UserProfileClientFac import com.sap.sailing.gwt.home.desktop.places.whatsnew.WhatsNewClientFactory; import com.sap.sailing.gwt.home.shared.places.error.ErrorClientFactory; import com.sap.sailing.gwt.home.shared.places.searchresult.SearchResultClientFactory; -import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationClientFactory; import com.sap.sailing.gwt.home.shared.places.user.passwordreset.PasswordResetClientFactory; -import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementContext; import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementClientFactory; public interface DesktopClientFactory extends AboutUsClientFactory, ContactClientFactory, EventClientFactory, EventsClientFactory, StartClientFactory, SponsoringClientFactory, SolutionsClientFactory, SearchResultClientFactory, WhatsNewClientFactory, SeriesClientFactory, UserProfileClientFactory, - ErrorClientFactory, ClientFactoryWithUserManagementContext, UserManagementClientFactory, - ConfirmationClientFactory, PasswordResetClientFactory { + ErrorClientFactory, UserManagementClientFactory, PasswordResetClientFactory { DesktopPlacesNavigator getHomePlacesNavigator(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/TabletAndDesktopApplicationClientFactory.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/TabletAndDesktopApplicationClientFactory.java index 7e0a84b033a..d9630538d7c 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/TabletAndDesktopApplicationClientFactory.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/TabletAndDesktopApplicationClientFactory.java @@ -75,7 +75,7 @@ public class TabletAndDesktopApplicationClientFactory extends AbstractApplicatio }); final UserManagementViewDesktop userManagementDisplay = new UserManagementViewDesktop(); - this.userManagementWizardController = new UserManagementPlaceManagementController( + this.userManagementWizardController = new UserManagementPlaceManagementController( this, getHomePlacesNavigator().getMailVerifiedConfirmationNavigation(), getHomePlacesNavigator().getPasswordResetNavigation(), getHomePlacesNavigator().getUserProfileNavigation(), userManagementDisplay, getEventBus()); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileApplicationClientFactory.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileApplicationClientFactory.java index a2b90f25d1a..ae4092ac4ba 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileApplicationClientFactory.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileApplicationClientFactory.java @@ -16,7 +16,6 @@ import com.sap.sailing.gwt.home.shared.partials.busy.BusyViewImpl; import com.sap.sailing.gwt.home.shared.places.searchresult.SearchResultClientFactory; import com.sap.sailing.gwt.home.shared.places.searchresult.SearchResultView; import com.sap.sailing.gwt.home.shared.places.start.StartPlace; -import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationClientFactory; import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationPlace; import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationView; import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationViewImpl; @@ -25,7 +24,6 @@ import com.sap.sailing.gwt.home.shared.places.user.passwordreset.PasswordResetVi import com.sap.sailing.gwt.home.shared.places.user.passwordreset.PasswordResetViewImpl; import com.sap.sailing.gwt.home.shared.usermanagement.UserManagementContextEvent; import com.sap.sailing.gwt.home.shared.usermanagement.UserManagementRequestEvent; -import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementContext; import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementClientFactory; import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementContext; import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementContextImpl; @@ -48,8 +46,7 @@ import com.sap.sse.security.ui.shared.UserDTO; */ public class MobileApplicationClientFactory extends SecureClientFactoryImpl> implements - ErrorAndBusyClientFactory, SearchResultClientFactory, ClientFactoryWithUserManagementContext, - UserManagementClientFactory, ConfirmationClientFactory, PasswordResetClientFactory { + ErrorAndBusyClientFactory, SearchResultClientFactory, UserManagementClientFactory, PasswordResetClientFactory { private final MobilePlacesNavigator navigator; private final SailingDispatchSystem dispatch = new SailingDispatchSystemImpl(); private WithSecurity securityProvider; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/authentication/AuthenticationActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/authentication/AuthenticationActivity.java index cf8fcabbe60..08b21f7605d 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/authentication/AuthenticationActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/authentication/AuthenticationActivity.java @@ -23,7 +23,7 @@ public class AuthenticationActivity extends AbstractActivity { public void start(final AcceptsOneWidget panel, EventBus eventBus) { panel.setWidget(userManagementView); WrappedPlaceManagementController userManagementController = - new UserManagementPlaceManagementController(clientFactory, + new UserManagementPlaceManagementController(clientFactory, clientFactory.getNavigator().getMailVerifiedConfirmationNavigation(), clientFactory.getNavigator().getPasswordResetNavigation(), clientFactory .getNavigator().getUserProfileNavigation(), userManagementView, eventBus); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/confirmation/ConfirmationActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/confirmation/ConfirmationActivity.java index 60b86408e78..245fa5a2463 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/confirmation/ConfirmationActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/confirmation/ConfirmationActivity.java @@ -4,15 +4,16 @@ import com.google.gwt.activity.shared.AbstractActivity; import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.AcceptsOneWidget; +import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementClientFactory; import com.sap.sse.gwt.client.async.MarkedAsyncCallback; import com.sap.sse.security.ui.client.i18n.StringMessages; public class ConfirmationActivity extends AbstractActivity implements ConfirmationView.Presenter { private final ConfirmationPlace place; - private final ConfirmationClientFactory clientFactory; + private final UserManagementClientFactory clientFactory; private final StringMessages i18n_sec = StringMessages.INSTANCE; - public ConfirmationActivity(ConfirmationPlace place, ConfirmationClientFactory clientFactory) { + public ConfirmationActivity(ConfirmationPlace place, UserManagementClientFactory clientFactory) { this.place = place; this.clientFactory = clientFactory; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/confirmation/ConfirmationActivityProxy.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/confirmation/ConfirmationActivityProxy.java index 4896a9153fc..4086662cb9e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/confirmation/ConfirmationActivityProxy.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/confirmation/ConfirmationActivityProxy.java @@ -1,13 +1,14 @@ package com.sap.sailing.gwt.home.shared.places.user.confirmation; import com.google.gwt.core.client.GWT; +import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementClientFactory; import com.sap.sse.gwt.client.mvp.AbstractActivityProxy; public class ConfirmationActivityProxy extends AbstractActivityProxy { private final ConfirmationPlace place; - private final ConfirmationClientFactory clientFactory; + private final UserManagementClientFactory clientFactory; - public ConfirmationActivityProxy(ConfirmationPlace place, ConfirmationClientFactory clientFactory) { + public ConfirmationActivityProxy(ConfirmationPlace place, UserManagementClientFactory clientFactory) { this.place = place; this.clientFactory = clientFactory; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/confirmation/ConfirmationClientFactory.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/confirmation/ConfirmationClientFactory.java index 07bbdc6b8ba..6d39701273a 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/confirmation/ConfirmationClientFactory.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/confirmation/ConfirmationClientFactory.java @@ -1,9 +1,8 @@ package com.sap.sailing.gwt.home.shared.places.user.confirmation; -import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementClientFactory; import com.sap.sailing.gwt.ui.client.refresh.ErrorAndBusyClientFactory; -public interface ConfirmationClientFactory extends UserManagementClientFactory, ErrorAndBusyClientFactory { +public interface ConfirmationClientFactory extends ErrorAndBusyClientFactory { ConfirmationView createAccountConfirmationView(String message); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/UserManagementPlaceManagementController.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/UserManagementPlaceManagementController.java index 133b27e02ab..e75b67b441f 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/UserManagementPlaceManagementController.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/UserManagementPlaceManagementController.java @@ -10,11 +10,9 @@ import com.google.web.bindery.event.shared.EventBus; import com.sap.sailing.gwt.home.shared.app.PlaceNavigation; import com.sap.sailing.gwt.home.shared.framework.WrappedPlaceManagementController; import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationActivity; -import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationClientFactory; import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationPlace; import com.sap.sailing.gwt.home.shared.places.user.passwordreset.PasswordResetPlace; import com.sap.sailing.gwt.home.shared.places.user.profile.AbstractUserProfilePlace; -import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementContext; import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementClientFactory; import com.sap.sailing.gwt.home.shared.usermanagement.create.CreateAccountActivity; import com.sap.sailing.gwt.home.shared.usermanagement.create.CreateAccountPlace; @@ -25,18 +23,15 @@ import com.sap.sailing.gwt.home.shared.usermanagement.recovery.PasswordRecoveryP import com.sap.sailing.gwt.home.shared.usermanagement.signin.SignInActivity; import com.sap.sailing.gwt.home.shared.usermanagement.signin.SignInPlace; import com.sap.sailing.gwt.home.shared.usermanagement.view.UserManagementView; -import com.sap.sse.gwt.client.mvp.ClientFactory; -public class UserManagementPlaceManagementController - - extends WrappedPlaceManagementController { +public class UserManagementPlaceManagementController extends WrappedPlaceManagementController { - public UserManagementPlaceManagementController(CF clientFactory, + public UserManagementPlaceManagementController(UserManagementClientFactory clientFactory, PlaceNavigation createConfirmationNavigation, PlaceNavigation passwordResetPlaceNav, PlaceNavigation userProfileNavigation, UserManagementView userManagementView, EventBus globalEventBus) { - super(new Configuration(clientFactory, createConfirmationNavigation, passwordResetPlaceNav, userProfileNavigation, userManagementView)); + super(new Configuration(clientFactory, createConfirmationNavigation, passwordResetPlaceNav, userProfileNavigation, userManagementView)); globalEventBus.addHandler(UserManagementContextEvent.TYPE, new UserManagementContextEvent.Handler() { @Override public void onUserChangeEvent(UserManagementContextEvent event) { @@ -45,17 +40,16 @@ public class UserManagementPlaceManagementController }); } - private static class Configuration - - implements PlaceManagementConfiguration { - private final CF clientFactory; + private static class Configuration implements PlaceManagementConfiguration { + private final UserManagementClientFactory clientFactory; private final PlaceNavigation createConfirmationNavigation; private final PlaceNavigation userProfileNavigation; private final UserManagementView userManagementView; private PlaceController placeController; private final PlaceNavigation passwordResetPlaceNav; - public Configuration(CF clientFactory, PlaceNavigation createConfirmationNavigation, + public Configuration(UserManagementClientFactory clientFactory, + PlaceNavigation createConfirmationNavigation, PlaceNavigation passwordResetPlaceNav, PlaceNavigation userProfileNavigation, UserManagementView userManagementView) { @@ -92,9 +86,10 @@ public class UserManagementPlaceManagementController return new CreateAccountActivity((CreateAccountPlace) placeToUse, clientFactory, createConfirmationNavigation, placeController); } else if (placeToUse instanceof PasswordRecoveryPlace) { - return new PasswordRecoveryActivity((PasswordRecoveryPlace) placeToUse, clientFactory, passwordResetPlaceNav, placeController); + return new PasswordRecoveryActivity((PasswordRecoveryPlace) placeToUse, clientFactory, + passwordResetPlaceNav, placeController); } else if (placeToUse instanceof LoggedInUserInfoPlace) { - return new LoggedInUserInfoActivity((LoggedInUserInfoPlace) placeToUse, clientFactory, + return new LoggedInUserInfoActivity((LoggedInUserInfoPlace) placeToUse, clientFactory, userProfileNavigation, placeController); } else if (placeToUse instanceof ConfirmationPlace) { return new ConfirmationActivity((ConfirmationPlace) placeToUse, clientFactory); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/app/UserManagementClientFactory.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/app/UserManagementClientFactory.java index f420416b8a1..2fd69aabce1 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/app/UserManagementClientFactory.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/app/UserManagementClientFactory.java @@ -1,9 +1,11 @@ package com.sap.sailing.gwt.home.shared.usermanagement.app; +import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationClientFactory; +import com.sap.sse.gwt.client.mvp.ClientFactory; import com.sap.sse.security.ui.client.UserManagementServiceAsync; import com.sap.sse.security.ui.shared.UserDTO; -public interface UserManagementClientFactory { +public interface UserManagementClientFactory extends ClientFactory, ClientFactoryWithUserManagementContext, ConfirmationClientFactory { UserManagementServiceAsync getUserManagement(); void didLogin(UserDTO user); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/info/LoggedInUserInfoActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/info/LoggedInUserInfoActivity.java index a2f783ec41a..1acea01621c 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/info/LoggedInUserInfoActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/info/LoggedInUserInfoActivity.java @@ -9,20 +9,17 @@ import com.sap.sailing.gwt.home.shared.app.PlaceNavigation; import com.sap.sailing.gwt.home.shared.places.user.profile.AbstractUserProfilePlace; import com.sap.sailing.gwt.home.shared.usermanagement.UserManagementContextEvent; import com.sap.sailing.gwt.home.shared.usermanagement.UserManagementRequestEvent; -import com.sap.sailing.gwt.home.shared.usermanagement.app.ClientFactoryWithUserManagementContext; import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementClientFactory; import com.sap.sailing.gwt.home.shared.usermanagement.signin.SignInPlace; -import com.sap.sse.gwt.client.mvp.ClientFactory; import com.sap.sse.security.ui.shared.SuccessInfo; -public class LoggedInUserInfoActivity - extends AbstractActivity implements LoggedInUserInfoView.Presenter { +public class LoggedInUserInfoActivity extends AbstractActivity implements LoggedInUserInfoView.Presenter { - private final CF clientFactory; + private final UserManagementClientFactory clientFactory; private final PlaceNavigation userProfileNavigation; private final PlaceController placeController; - public LoggedInUserInfoActivity(LoggedInUserInfoPlace place, CF clientFactory, + public LoggedInUserInfoActivity(LoggedInUserInfoPlace place, UserManagementClientFactory clientFactory, PlaceNavigation userProfileNavigation, PlaceController placeController) { this.clientFactory = clientFactory; this.userProfileNavigation = userProfileNavigation; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/recovery/PasswordRecoveryActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/recovery/PasswordRecoveryActivity.java index 7f7d3799969..d1a07293492 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/recovery/PasswordRecoveryActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/recovery/PasswordRecoveryActivity.java @@ -13,18 +13,17 @@ import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationPlac import com.sap.sailing.gwt.home.shared.places.user.confirmation.ConfirmationPlace.Action; import com.sap.sailing.gwt.home.shared.places.user.passwordreset.PasswordResetPlace; import com.sap.sailing.gwt.home.shared.usermanagement.app.UserManagementClientFactory; -import com.sap.sse.gwt.client.mvp.ClientFactory; import com.sap.sse.security.shared.UserManagementException; import com.sap.sse.security.ui.client.i18n.StringMessages; -public class PasswordRecoveryActivity extends AbstractActivity implements PasswordRecoveryView.Presenter { +public class PasswordRecoveryActivity extends AbstractActivity implements PasswordRecoveryView.Presenter { - private final CF clientFactory; + private final UserManagementClientFactory clientFactory; private final PlaceController placeController; private final PasswordRecoveryView view = new PasswordRecoveryViewImpl(); private final PlaceNavigation passwordResetPlaceNav; - public PasswordRecoveryActivity(PasswordRecoveryPlace place, CF clientFactory, + public PasswordRecoveryActivity(PasswordRecoveryPlace place, UserManagementClientFactory clientFactory, PlaceNavigation passwordResetPlaceNav, PlaceController placeController) { this.clientFactory = clientFactory; this.passwordResetPlaceNav = passwordResetPlaceNav; From 3a6e30f725fa906c09fb99f935384514e2912340 Mon Sep 17 00:00:00 2001 From: Papick Garcia Taboada Date: Wed, 20 Jan 2016 10:18:20 +0100 Subject: [PATCH 05/78] Added "company" to security i18n --- .../java/com/sap/sse/security/ui/client/i18n/StringMessages.java | 1 + .../sap/sse/security/ui/client/i18n/StringMessages.properties | 1 + .../sap/sse/security/ui/client/i18n/StringMessages_de.properties | 1 + 3 files changed, 3 insertions(+) diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/i18n/StringMessages.java b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/i18n/StringMessages.java index 0e5b267a780..e99374db2ca 100755 --- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/i18n/StringMessages.java +++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/i18n/StringMessages.java @@ -6,6 +6,7 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages { public static final StringMessages INSTANCE = GWT.create(StringMessages.class); String name(); + String company(); String password(); String passwordRepeat(); String loggedIn(String username); diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/i18n/StringMessages.properties b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/i18n/StringMessages.properties index c7c025f54d2..f42321c8b35 100644 --- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/i18n/StringMessages.properties +++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/i18n/StringMessages.properties @@ -1,4 +1,5 @@ name=Name +company=Company password=Password passwordRepeat=Repeat password loggedIn=Logged in as user {0}! diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/i18n/StringMessages_de.properties b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/i18n/StringMessages_de.properties index d86af34f440..f1de82d471b 100644 --- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/i18n/StringMessages_de.properties +++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/i18n/StringMessages_de.properties @@ -1,4 +1,5 @@ name=Name +company=Unternehmen password=Passwort passwordRepeat=Passwort Wiederholung loggedIn=Angemeldet als Benutzer {0}! From 825748d4a41e70ca04197e46f9a36290dd121eef Mon Sep 17 00:00:00 2001 From: Papick Garcia Taboada Date: Wed, 20 Jan 2016 10:20:11 +0100 Subject: [PATCH 06/78] Added company to UI --- .../partials/useraccountDetails/UserAccountDetails.java | 6 +++++- .../partials/useraccountDetails/UserAccountDetails.ui.xml | 8 +++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/useraccountDetails/UserAccountDetails.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/useraccountDetails/UserAccountDetails.java index ceb1a9cb0c3..8dcb4d9ef3d 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/useraccountDetails/UserAccountDetails.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/useraccountDetails/UserAccountDetails.java @@ -28,7 +28,10 @@ public class UserAccountDetails extends Composite { @UiField DivElement editImageLinkUi; @UiField InputElement usernameUi; - @UiField InputElement nameUi; + @UiField + TextBox nameUi; + @UiField + TextBox companyUi; @UiField TextBox emailUi; @UiField PasswordTextBox oldPasswordUi; @UiField PasswordTextBox newPasswordUi; @@ -54,6 +57,7 @@ public class UserAccountDetails extends Composite { editImageLinkUi.getStyle().setBackgroundImage("url(images/home/userdefault.svg)"); nameUi.setValue(currentUser.getName()); + companyUi.setValue(currentUser.getCompany()); usernameUi.setValue(currentUser.getName()); emailUi.setValue(currentUser.getEmail()); oldPasswordUi.setValue(""); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/useraccountDetails/UserAccountDetails.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/useraccountDetails/UserAccountDetails.ui.xml index 19250ade29a..3839dca7440 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/useraccountDetails/UserAccountDetails.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/useraccountDetails/UserAccountDetails.ui.xml @@ -24,7 +24,13 @@ - + + +
+ +