From 8a6e83e07129e3ba08b67554f861adf438433829 Mon Sep 17 00:00:00 2001 From: Kai Boernert Date: Wed, 4 Oct 2017 11:14:33 +0200 Subject: [PATCH 01/12] register button logic --- .../MoreLoginInformation.java | 18 +++++++++++++++++- .../MoreLoginInformation.ui.xml | 3 +++ .../MoreLoginInformationActivity.java | 9 ++++++++- .../home/mobile/app/MobileActivityMapper.java | 2 +- .../home/mobile/app/MobilePlacesNavigator.java | 5 +++-- .../MoreLoginInformationActivity.java | 12 ++++++++++-- .../MoreLoginInformationMobile.java | 17 ++++++++++++++++- .../MoreLoginInformationMobile.ui.xml | 4 +--- .../authentication/AuthenticationPlace.java | 7 ++++++- .../profile/AbstractUserProfileActivity.java | 2 +- 10 files changed, 66 insertions(+), 13 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.java index 201e26e5c18..f816a8c2aa1 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.java @@ -1,7 +1,12 @@ package com.sap.sailing.gwt.home.desktop.places.morelogininformation; import com.google.gwt.core.client.GWT; +import com.google.gwt.dom.client.Element; import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.DOM; +import com.google.gwt.user.client.Event; +import com.google.gwt.user.client.EventListener; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Widget; @@ -15,8 +20,19 @@ public class MoreLoginInformation extends Composite { interface MoreLoginInformationUiBinder extends UiBinder { } - public MoreLoginInformation() { + @UiField + Element register; + + public MoreLoginInformation(Runnable onRegisterClick) { initWidget(uiBinder.createAndBindUi(this)); + DOM.sinkEvents(register, Event.ONCLICK); + Event.setEventListener(register, new EventListener() { + @Override + public void onBrowserEvent(Event event) { + GWT.debugger(); + onRegisterClick.run(); + } + }); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.ui.xml index a1cc6eec030..fae65c183ba 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.ui.xml @@ -9,6 +9,8 @@ .clear { clear: both; } + .register{ + }

@@ -16,5 +18,6 @@ + TODO: register diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformationActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformationActivity.java index ff8807962d2..07873cd9c53 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformationActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformationActivity.java @@ -1,6 +1,7 @@ package com.sap.sailing.gwt.home.desktop.places.morelogininformation; import com.google.gwt.activity.shared.Activity; +import com.google.gwt.core.shared.GWT; import com.google.gwt.event.shared.EventBus; import com.google.gwt.place.shared.Place; import com.google.gwt.user.client.ui.AcceptsOneWidget; @@ -27,7 +28,13 @@ public class MoreLoginInformationActivity implements Activity { @Override public void start(AcceptsOneWidget panel, EventBus eventBus) { - panel.setWidget(new MoreLoginInformation()); + panel.setWidget(new MoreLoginInformation(new Runnable() { + @Override + public void run() { + GWT.debugger(); +// eventBus.fireEvent(new RegistrationRequestEvent()); + } + })); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileActivityMapper.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileActivityMapper.java index 584dba34565..4f2f81080a5 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileActivityMapper.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileActivityMapper.java @@ -87,7 +87,7 @@ public class MobileActivityMapper implements ActivityMapper { } else if (place instanceof ImprintPlace) { return new ImprintActivityProxy((ImprintPlace) place); } else if (place instanceof MoreLoginInformationPlace) { - return new MoreLoginInformationActivity(place); + return new MoreLoginInformationActivity(place, clientFactory); } else { return null; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobilePlacesNavigator.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobilePlacesNavigator.java index 95b583c87f7..8f2cb6f2d48 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobilePlacesNavigator.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobilePlacesNavigator.java @@ -22,7 +22,8 @@ public class MobilePlacesNavigator extends HomePlacesNavigator { return createPlaceNavigation(baseUrl, isOnRemoteServer, place); } - public PlaceNavigation getSignInNavigation() { - return createLocalPlaceNavigation(new AuthenticationPlace()); + public PlaceNavigation getSignInNavigation(boolean registration) { + return createLocalPlaceNavigation(new AuthenticationPlace(registration)); } + } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationActivity.java index 52d7052e88f..6d9f3c801f7 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationActivity.java @@ -4,10 +4,13 @@ import com.google.gwt.activity.shared.Activity; import com.google.gwt.event.shared.EventBus; import com.google.gwt.place.shared.Place; import com.google.gwt.user.client.ui.AcceptsOneWidget; +import com.sap.sailing.gwt.home.mobile.app.MobileApplicationClientFactory; public class MoreLoginInformationActivity implements Activity { + private MobileApplicationClientFactory clientFactory; - public MoreLoginInformationActivity(Place place) { + public MoreLoginInformationActivity(Place place, MobileApplicationClientFactory clientFactory) { + this.clientFactory = clientFactory; } @Override @@ -27,7 +30,12 @@ public class MoreLoginInformationActivity implements Activity { @Override public void start(AcceptsOneWidget panel, EventBus eventBus) { - panel.setWidget(new MoreLoginInformationMobile()); + panel.setWidget(new MoreLoginInformationMobile(new Runnable() { + @Override + public void run() { + clientFactory.getNavigator().getSignInNavigation(true).goToPlace(); + } + })); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationMobile.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationMobile.java index b198e2a321b..6afff44bff4 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationMobile.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationMobile.java @@ -1,7 +1,12 @@ package com.sap.sailing.gwt.home.mobile.places.morelogininformation; import com.google.gwt.core.client.GWT; +import com.google.gwt.dom.client.Element; import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.DOM; +import com.google.gwt.user.client.Event; +import com.google.gwt.user.client.EventListener; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Widget; @@ -15,8 +20,18 @@ public class MoreLoginInformationMobile extends Composite { interface MoreLoginInformationUiBinder extends UiBinder { } - public MoreLoginInformationMobile() { + @UiField + public Element register; + + public MoreLoginInformationMobile(Runnable onRegisterClick) { initWidget(uiBinder.createAndBindUi(this)); + DOM.sinkEvents(register, Event.ONCLICK); + Event.setEventListener(register, new EventListener() { + @Override + public void onBrowserEvent(Event event) { + onRegisterClick.run(); + } + }); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationMobile.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationMobile.ui.xml index ae50e0ffb0a..5186218c393 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationMobile.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationMobile.ui.xml @@ -47,13 +47,11 @@ image="{local_res.notifications}" content="{i18n.moreLoginInformationSectionUserNotificationsDescription}" /> - diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/authentication/AuthenticationPlace.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/authentication/AuthenticationPlace.java index 61ad9c061da..6a547555ef0 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/authentication/AuthenticationPlace.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/authentication/AuthenticationPlace.java @@ -9,6 +9,11 @@ import com.sap.sailing.gwt.home.shared.places.PlaceTokenPrefixes; import com.sap.sse.security.ui.client.i18n.StringMessages; public class AuthenticationPlace extends Place implements HasMobileVersion, HasLocationTitle { + private boolean register; + + public AuthenticationPlace(boolean register) { + this.register = register; + } @Override public String getLocationTitle() { @@ -24,7 +29,7 @@ public class AuthenticationPlace extends Place implements HasMobileVersion, HasL @Override public AuthenticationPlace getPlace(String token) { - return new AuthenticationPlace(); + return new AuthenticationPlace(false); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/AbstractUserProfileActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/AbstractUserProfileActivity.java index c7aba5a97b4..27f6010996b 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/AbstractUserProfileActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/AbstractUserProfileActivity.java @@ -15,7 +15,7 @@ public abstract class AbstractUserProfileActivity extends AbstractActivity imple @Override public void doTriggerLoginForm() { - clientFactory.getNavigator().getSignInNavigation().goToPlace(); + clientFactory.getNavigator().getSignInNavigation(false).goToPlace(); } @Override From 89c95fce207d8c86b203e7582ad56917dfd8263f Mon Sep 17 00:00:00 2001 From: Kai Boernert Date: Tue, 17 Oct 2017 19:04:02 +0200 Subject: [PATCH 02/12] initial implementation supporting desktop and mobile --- .../com.google.appengine.eclipse.core.prefs | 3 +++ .../home/desktop/app/DesktopActivityMapper.java | 2 +- .../MoreLoginInformation.java | 1 - .../MoreLoginInformationActivity.java | 10 ++++++---- .../places/user/profile/UserProfileActivity.java | 2 +- .../gwt/home/mobile/app/MobileActivityMapper.java | 2 -- .../home/mobile/app/MobilePlacesNavigator.java | 4 ++-- .../gwt/home/mobile/partials/header/Header.java | 2 +- .../authentication/AuthenticationActivity.java | 6 ++++++ .../user/authentication/AuthenticationPlace.java | 11 ++++++++--- .../authentication/AuthenticationManagerImpl.java | 2 +- .../AuthenticationRequestEvent.java | 11 ++++++++++- .../decorator/FlyoutNotLoggedInPresenter.java | 2 +- .../info/LoggedInUserInfoActivity.java | 2 +- .../view/FlyoutAuthenticationPresenter.java | 15 ++++++++++++++- 15 files changed, 55 insertions(+), 20 deletions(-) create mode 100644 java/com.sap.sailing.dashboards.gwt/.settings/com.google.appengine.eclipse.core.prefs diff --git a/java/com.sap.sailing.dashboards.gwt/.settings/com.google.appengine.eclipse.core.prefs b/java/com.sap.sailing.dashboards.gwt/.settings/com.google.appengine.eclipse.core.prefs new file mode 100644 index 00000000000..bbc4057855b --- /dev/null +++ b/java/com.sap.sailing.dashboards.gwt/.settings/com.google.appengine.eclipse.core.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +googleCloudSqlEnabled=false +localDevMySqlEnabled=true diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/DesktopActivityMapper.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/DesktopActivityMapper.java index cd607d79b82..220f6e78f97 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/DesktopActivityMapper.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/app/DesktopActivityMapper.java @@ -88,7 +88,7 @@ public class DesktopActivityMapper implements ActivityMapper { } else if (place instanceof ImprintPlace) { return new ImprintActivityProxy((ImprintPlace) place); } else if (place instanceof MoreLoginInformationPlace) { - return new MoreLoginInformationActivity(place); + return new MoreLoginInformationActivity(place, clientFactory); } else { return null; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.java index f816a8c2aa1..82cc756ca6f 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.java @@ -29,7 +29,6 @@ public class MoreLoginInformation extends Composite { Event.setEventListener(register, new EventListener() { @Override public void onBrowserEvent(Event event) { - GWT.debugger(); onRegisterClick.run(); } }); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformationActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformationActivity.java index 07873cd9c53..0b37ecab955 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformationActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformationActivity.java @@ -1,14 +1,17 @@ package com.sap.sailing.gwt.home.desktop.places.morelogininformation; import com.google.gwt.activity.shared.Activity; -import com.google.gwt.core.shared.GWT; import com.google.gwt.event.shared.EventBus; import com.google.gwt.place.shared.Place; import com.google.gwt.user.client.ui.AcceptsOneWidget; +import com.sap.sailing.gwt.home.desktop.app.DesktopClientFactory; +import com.sap.sse.security.ui.authentication.AuthenticationRequestEvent; public class MoreLoginInformationActivity implements Activity { + private DesktopClientFactory clientFactory; - public MoreLoginInformationActivity(Place place) { + public MoreLoginInformationActivity(Place place, DesktopClientFactory clientFactory) { + this.clientFactory = clientFactory; } @Override @@ -31,8 +34,7 @@ public class MoreLoginInformationActivity implements Activity { panel.setWidget(new MoreLoginInformation(new Runnable() { @Override public void run() { - GWT.debugger(); -// eventBus.fireEvent(new RegistrationRequestEvent()); + clientFactory.getEventBus().fireEvent(new AuthenticationRequestEvent(true)); } })); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivity.java index fb850c0e925..db66cbbbaa8 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivity.java @@ -91,7 +91,7 @@ public class UserProfileActivity extends AbstractActivity implements UserProfile @Override public void doTriggerLoginForm() { - clientFactory.getEventBus().fireEvent(new AuthenticationRequestEvent()); + clientFactory.getEventBus().fireEvent(new AuthenticationRequestEvent(false)); } @Override diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileActivityMapper.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileActivityMapper.java index 4f2f81080a5..4933a5e7e3f 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileActivityMapper.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileActivityMapper.java @@ -78,8 +78,6 @@ public class MobileActivityMapper implements ActivityMapper { return new PasswordResetActivityProxy((PasswordResetPlace) place, clientFactory); } else if (place instanceof AbstractUserProfilePlace) { return new UserProfileActivityProxy((AbstractUserProfilePlace) place, clientFactory); - } else if (place instanceof AuthenticationPlace) { - return new AuthenticationActivityProxy((AuthenticationPlace) place, clientFactory); } else if (place instanceof ConfirmationPlace) { return new ConfirmationActivityProxy((ConfirmationPlace) place, clientFactory); } else if (place instanceof PasswordResetPlace) { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobilePlacesNavigator.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobilePlacesNavigator.java index 8f2cb6f2d48..dd432367e4e 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobilePlacesNavigator.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobilePlacesNavigator.java @@ -22,8 +22,8 @@ public class MobilePlacesNavigator extends HomePlacesNavigator { return createPlaceNavigation(baseUrl, isOnRemoteServer, place); } - public PlaceNavigation getSignInNavigation(boolean registration) { - return createLocalPlaceNavigation(new AuthenticationPlace(registration)); + public PlaceNavigation getSignInNavigation(boolean registerView) { + return createLocalPlaceNavigation(new AuthenticationPlace(registerView)); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.java index dc371ab0bf1..a0677ab0f02 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.java @@ -68,7 +68,7 @@ public class Header extends Composite { signInNavigationItem = addNavigation(com.sap.sse.security.ui.client.i18n.StringMessages.INSTANCE.signIn(), new Runnable() { @Override public void run() { - placeNavigator.getSignInNavigation().goToPlace(); + placeNavigator.getSignInNavigation(false).goToPlace(); } }); userDetailsNavigationItem = addNavigation(placeNavigator.getUserProfileNavigation(), com.sap.sse.security.ui.client.i18n.StringMessages.INSTANCE.userDetails()); 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 b14f5277bfc..7a6a41453ed 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 @@ -11,13 +11,16 @@ import com.sap.sailing.gwt.home.shared.usermanagement.view.AuthenticationViewMob import com.sap.sse.security.ui.authentication.AuthenticationClientFactoryImpl; import com.sap.sse.security.ui.authentication.AuthenticationPlaceManagementController; import com.sap.sse.security.ui.authentication.WrappedPlaceManagementController; +import com.sap.sse.security.ui.authentication.create.CreateAccountPlace; import com.sap.sse.security.ui.authentication.view.AuthenticationView; public class AuthenticationActivity extends AbstractActivity { private final MobileApplicationClientFactory clientFactory; private final AuthenticationView userManagementView = new AuthenticationViewMobile(); + private boolean register; public AuthenticationActivity(AuthenticationPlace place, MobileApplicationClientFactory clientFactory) { + register = place.isRegisterView(); this.clientFactory = clientFactory; } @@ -30,6 +33,9 @@ public class AuthenticationActivity extends AbstractActivity { new SignInSuccessfulNavigationMobile()), userManagementView, eventBus); userManagementController.start(); + if(register){ + userManagementController.goTo(new CreateAccountPlace()); + } } private class SignInSuccessfulNavigationMobile implements Runnable { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/authentication/AuthenticationPlace.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/authentication/AuthenticationPlace.java index 6a547555ef0..6a80a1efa4e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/authentication/AuthenticationPlace.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/authentication/AuthenticationPlace.java @@ -9,16 +9,21 @@ import com.sap.sailing.gwt.home.shared.places.PlaceTokenPrefixes; import com.sap.sse.security.ui.client.i18n.StringMessages; public class AuthenticationPlace extends Place implements HasMobileVersion, HasLocationTitle { - private boolean register; - public AuthenticationPlace(boolean register) { - this.register = register; + private boolean registerView; + + public AuthenticationPlace(boolean registerView) { + this.registerView = registerView; } @Override public String getLocationTitle() { return StringMessages.INSTANCE.user(); } + + public boolean isRegisterView() { + return registerView; + } @Prefix(PlaceTokenPrefixes.UserAuthentication) public static class Tokenizer implements PlaceTokenizer { diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/AuthenticationManagerImpl.java b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/AuthenticationManagerImpl.java index 329986c72c3..033879b10fd 100644 --- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/AuthenticationManagerImpl.java +++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/AuthenticationManagerImpl.java @@ -157,7 +157,7 @@ public class AuthenticationManagerImpl implements AuthenticationManager { @Override public void logout() { userService.logout(); - eventBus.fireEvent(new AuthenticationRequestEvent()); + eventBus.fireEvent(new AuthenticationRequestEvent(false)); } @Override diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/AuthenticationRequestEvent.java b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/AuthenticationRequestEvent.java index a79513eef1a..4fb57fdfb9e 100644 --- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/AuthenticationRequestEvent.java +++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/AuthenticationRequestEvent.java @@ -9,10 +9,19 @@ import com.google.gwt.event.shared.GwtEvent; public class AuthenticationRequestEvent extends GwtEvent { public static final Type TYPE = new Type(); + private final boolean register; + + public AuthenticationRequestEvent(boolean register) { + this.register = register; + } + public interface Handler extends EventHandler { void onUserManagementRequestEvent(AuthenticationRequestEvent event); } - + + public boolean isRegister() { + return register; + } @Override public Type getAssociatedType() { diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/decorator/FlyoutNotLoggedInPresenter.java b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/decorator/FlyoutNotLoggedInPresenter.java index d01827a0517..c58ac94dbe4 100644 --- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/decorator/FlyoutNotLoggedInPresenter.java +++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/decorator/FlyoutNotLoggedInPresenter.java @@ -19,6 +19,6 @@ public class FlyoutNotLoggedInPresenter implements NotLoggedInPresenter { @Override public void doTriggerLoginForm() { - eventBus.fireEvent(new AuthenticationRequestEvent()); + eventBus.fireEvent(new AuthenticationRequestEvent(false)); } } diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/info/LoggedInUserInfoActivity.java b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/info/LoggedInUserInfoActivity.java index 9d691a77fcb..1ae44685e16 100644 --- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/info/LoggedInUserInfoActivity.java +++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/info/LoggedInUserInfoActivity.java @@ -45,7 +45,7 @@ public class LoggedInUserInfoActivity extends AbstractActivity implements Logged @Override public void gotoProfileUi() { - eventBus.fireEvent(new AuthenticationRequestEvent()); + eventBus.fireEvent(new AuthenticationRequestEvent(false)); callback.handleUserProfileNavigation(); } diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/view/FlyoutAuthenticationPresenter.java b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/view/FlyoutAuthenticationPresenter.java index d807290ba4a..04328c77474 100644 --- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/view/FlyoutAuthenticationPresenter.java +++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/view/FlyoutAuthenticationPresenter.java @@ -5,6 +5,7 @@ import com.sap.sse.security.ui.authentication.AuthenticationContextEvent; import com.sap.sse.security.ui.authentication.AuthenticationRequestEvent; import com.sap.sse.security.ui.authentication.WrappedPlaceManagementController; import com.sap.sse.security.ui.authentication.app.AuthenticationContext; +import com.sap.sse.security.ui.authentication.create.CreateAccountPlace; /** * Default implementation of {@link AuthenticationMenuView.Presenter} and {@link FlyoutAuthenticationView.Presenter} to @@ -47,7 +48,11 @@ public class FlyoutAuthenticationPresenter implements AuthenticationMenuView.Pre eventBus.addHandler(AuthenticationRequestEvent.TYPE, new AuthenticationRequestEvent.Handler() { @Override public void onUserManagementRequestEvent(AuthenticationRequestEvent event) { - toggleFlyout(); + if(event.isRegister()){ + showRegister(); + }else{ + toggleFlyout(); + } } }); @@ -60,6 +65,14 @@ public class FlyoutAuthenticationPresenter implements AuthenticationMenuView.Pre authenticationMenuView.setAuthenticated(initialAuthentication.isLoggedIn()); } + public void showRegister() { + if (!flyoutAuthenticationView.isShowing()) { + flyoutAuthenticationView.show(); + authenticationPlaceManagementController.start(); + authenticationPlaceManagementController.goTo(new CreateAccountPlace()); + } + } + @Override public void toggleFlyout() { if (flyoutAuthenticationView.isShowing()) { From fc80b10f4f5041e081b826e57f732de42f601ece Mon Sep 17 00:00:00 2001 From: Kai Boernert Date: Tue, 24 Oct 2017 09:36:00 +0200 Subject: [PATCH 03/12] implemented register button --- .../morelogininformation/MoreLoginInformation.ui.xml | 8 +++++++- .../home/mobile/app/MobileApplicationClientFactory.java | 2 +- .../MoreLoginInformationMobile.ui.xml | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.ui.xml index fae65c183ba..239bbfe31f7 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.ui.xml @@ -3,6 +3,7 @@ xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:login="urn:import:com.sap.sailing.gwt.home.desktop.places.morelogininformation"> + @@ -10,6 +11,11 @@ clear: both; } .register{ + margin-bottom: 0.5em; + display: block; + text-align: center; + margin-left: 20%; + margin-right: 20%; } @@ -18,6 +24,6 @@ - TODO: register + 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 a68b0f6d49e..6a62a441e4e 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 @@ -80,7 +80,7 @@ public class MobileApplicationClientFactory extends dismissCallback.run(); navigator.goToPlace(navigator.getMoreLoginInfo()); },() -> { - navigator.goToPlace(navigator.getSignInNavigation()); + navigator.goToPlace(navigator.getSignInNavigation(false)); }); root.setSubHeaderContent(content); }); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationMobile.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationMobile.ui.xml index 5186218c393..eb8a5eec5bc 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationMobile.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationMobile.ui.xml @@ -4,6 +4,7 @@ xmlns:login="urn:import:com.sap.sailing.gwt.home.mobile.places.morelogininformation" xmlns:a="urn:import:com.sap.sailing.gwt.home.mobile.partials.accordion"> + @@ -50,7 +51,7 @@ TODO: register + class="{style.register} {res.mainCss.button} {res.mainCss.buttonstrong} {res.mainCss.buttonarrowrightwhite}"> From eebd60aaf8643767b50f58aeb347b45b7c64a35f Mon Sep 17 00:00:00 2001 From: Benjamin Barth Date: Tue, 24 Oct 2017 16:33:58 +0200 Subject: [PATCH 04/12] bug4312 Added additional StringMessages for login info register buttons --- .../main/java/com/sap/sailing/gwt/ui/client/StringMessages.java | 1 + .../java/com/sap/sailing/gwt/ui/client/StringMessages.properties | 1 + .../com/sap/sailing/gwt/ui/client/StringMessages_de.properties | 1 + 3 files changed, 3 insertions(+) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java index b9d64d3d057..0cf493d0de1 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java @@ -1897,6 +1897,7 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String moreLoginInformationSectionStrategySimulatorDescription(); String moreLoginInformationSectionUserNotificationsHeading(); String moreLoginInformationSectionUserNotificationsDescription(); + String moreLoginInformationRegisterControlText(); String anniversaryUnitText(@Optional @PluralCount(DefaultRule_1_0n.class) int count); String anniversaryMajorCountdownTeaser(@PluralCount(DefaultRule_1_0n.class) int countdown, int anniversary); String anniversaryMajorCountdownDescription(int anniversary); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties index b696951d176..1c5ae14dbbb 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties @@ -1879,6 +1879,7 @@ moreLoginInformationSectionUserSettingsDescription=Many parts of the user interf moreLoginInformationSectionStrategySimulatorDescription=The simulator enables sailors to simulate strategies for legs based on configurable wind conditions. The simulator is based on all the historical data available in SAP Sailing Analytics to provide simulations on the accurate behavior of specific boat classes. moreLoginInformationSectionUserNotificationsHeading=User Notifications moreLoginInformationSectionUserNotificationsDescription=User notifications are an easy way to keep you up to date about your favorite competitor/team or boat class. You can subscribe for mail-based notifications about new results for your favorite sailor/team or boat class as well as upcoming races of specific boat classes. +moreLoginInformationRegisterControlText=Sign up now anniversaryUnitText=Races anniversaryUnitText[one]=Race anniversaryMajorCountdownTeaser=Countdown! Only {0,number,#,###} races left until the {1,number,#,###}th race. diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties index 1231950698a..954482d034a 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties @@ -1883,6 +1883,7 @@ moreLoginInformationSectionUserSettingsDescription=Viele Teile der Benutzeroberf moreLoginInformationSectionStrategySimulatorDescription=Der Simulator ermöglicht es Seglern, Strategien für die Bewältigung von Bahnschenkeln anhand einer einstellbaren Windsituation zu simulieren. Die Simulation basiert auf den historischen Daten, über welche die SAP Sailing Analytics verfügt und ermöglich damit realitätsnahe Analysen auf Basis spezifischer Bootsklassen. moreLoginInformationSectionUserNotificationsHeading=Benachrichtigungen moreLoginInformationSectionUserNotificationsDescription=Benachrichtigungen sind eine einfache Möglichkeit, über einen Teilnehmer/ein Team oder eine Bootsklasse auf dem Laufenden zu bleiben. Mail-Benachrichtigungen für neue Ergebnisse von Lieblings-Seglern oder Bootsklassen sowie demnächst startende Rennen spezifischer Bootsklassen können abonniert werden. +moreLoginInformationRegisterControlText=Jetzt registrieren anniversaryUnitText=Rennen anniversaryUnitText[one]=Rennen anniversaryMajorCountdownTeaser=Countdown! Noch {0,number,#,###} Rennen bis zum {1,number,#,###}. Rennen. From 48bbdda8adf7ef5feea45cf8d98512dd0e717988 Mon Sep 17 00:00:00 2001 From: Benjamin Barth Date: Tue, 24 Oct 2017 16:34:42 +0200 Subject: [PATCH 05/12] bug4312 Improved login info register button styling on desktop --- .../MoreLoginInformation.java | 12 +++--------- .../MoreLoginInformation.ui.xml | 18 ++++++++++-------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.java index 82cc756ca6f..380c525b02d 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.java @@ -6,7 +6,6 @@ import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Event; -import com.google.gwt.user.client.EventListener; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Widget; @@ -21,17 +20,12 @@ public class MoreLoginInformation extends Composite { } @UiField - Element register; + Element registerControl; public MoreLoginInformation(Runnable onRegisterClick) { initWidget(uiBinder.createAndBindUi(this)); - DOM.sinkEvents(register, Event.ONCLICK); - Event.setEventListener(register, new EventListener() { - @Override - public void onBrowserEvent(Event event) { - onRegisterClick.run(); - } - }); + DOM.sinkEvents(registerControl, Event.ONCLICK); + Event.setEventListener(registerControl, event -> onRegisterClick.run()); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.ui.xml index 239bbfe31f7..8f267f3705e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.ui.xml @@ -3,19 +3,17 @@ xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:login="urn:import:com.sap.sailing.gwt.home.desktop.places.morelogininformation"> - .clear { clear: both; } - .register{ - margin-bottom: 0.5em; - display: block; + .registerContainer { text-align: center; - margin-left: 20%; - margin-right: 20%; + } + .register { + cursor: pointer; } @@ -23,7 +21,11 @@

- - + +
+ + + +
From 127eb568d1c5248ee465ea72147661debfbbf4f6 Mon Sep 17 00:00:00 2001 From: Benjamin Barth Date: Tue, 24 Oct 2017 16:43:39 +0200 Subject: [PATCH 06/12] bug4312 Improved login info register button styling on mobile --- .../MoreLoginInformationMobile.java | 12 +++--------- .../MoreLoginInformationMobile.ui.xml | 11 ++++++----- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationMobile.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationMobile.java index 6afff44bff4..f8cb19663ec 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationMobile.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationMobile.java @@ -6,7 +6,6 @@ import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Event; -import com.google.gwt.user.client.EventListener; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Widget; @@ -21,17 +20,12 @@ public class MoreLoginInformationMobile extends Composite { } @UiField - public Element register; + public Element registerControl; public MoreLoginInformationMobile(Runnable onRegisterClick) { initWidget(uiBinder.createAndBindUi(this)); - DOM.sinkEvents(register, Event.ONCLICK); - Event.setEventListener(register, new EventListener() { - @Override - public void onBrowserEvent(Event event) { - onRegisterClick.run(); - } - }); + DOM.sinkEvents(registerControl, Event.ONCLICK); + Event.setEventListener(registerControl, event -> onRegisterClick.run()); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationMobile.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationMobile.ui.xml index eb8a5eec5bc..3973733f4db 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationMobile.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationMobile.ui.xml @@ -12,13 +12,12 @@ font-size: 1.5em; } .register { - border-radius: .3846154em; + border-radius: .384615384615385em; width: 100%; text-align: center; } - .buttonContainer { - padding: 1em 0.625em; + margin-top: 1em; } @@ -50,8 +49,10 @@ - + + + From cd87c1981acce536614d10dcdac4720a999157de Mon Sep 17 00:00:00 2001 From: Benjamin Barth Date: Fri, 27 Oct 2017 11:40:13 +0200 Subject: [PATCH 07/12] bug4312 Introduced abstraction for desktop and mobile version of MoreLoginInformation activity and view --- .../MoreLoginInformation.java | 31 -------------- .../MoreLoginInformationActivity.java | 35 ++-------------- .../MoreLoginInformationDesktop.java | 22 ++++++++++ ...xml => MoreLoginInformationDesktop.ui.xml} | 0 .../MoreLoginInformationActivity.java | 35 ++-------------- .../MoreLoginInformationMobile.java | 19 +++------ .../AbstractMoreLoginInformation.java | 29 +++++++++++++ .../AbstractMoreLoginInformationActivity.java | 41 +++++++++++++++++++ .../MoreLoginInformationView.java | 17 ++++++++ 9 files changed, 122 insertions(+), 107 deletions(-) delete mode 100644 java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.java create mode 100644 java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformationDesktop.java rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/{MoreLoginInformation.ui.xml => MoreLoginInformationDesktop.ui.xml} (100%) create mode 100644 java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/morelogininformation/AbstractMoreLoginInformation.java create mode 100644 java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/morelogininformation/AbstractMoreLoginInformationActivity.java create mode 100644 java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/morelogininformation/MoreLoginInformationView.java diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.java deleted file mode 100644 index 380c525b02d..00000000000 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.sap.sailing.gwt.home.desktop.places.morelogininformation; - -import com.google.gwt.core.client.GWT; -import com.google.gwt.dom.client.Element; -import com.google.gwt.uibinder.client.UiBinder; -import com.google.gwt.uibinder.client.UiField; -import com.google.gwt.user.client.DOM; -import com.google.gwt.user.client.Event; -import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.Widget; - -/** - * Desktop page that shows the benefits of logging in on sapsailing.com. - */ -public class MoreLoginInformation extends Composite { - - private static MoreLoginInformationUiBinder uiBinder = GWT.create(MoreLoginInformationUiBinder.class); - - interface MoreLoginInformationUiBinder extends UiBinder { - } - - @UiField - Element registerControl; - - public MoreLoginInformation(Runnable onRegisterClick) { - initWidget(uiBinder.createAndBindUi(this)); - DOM.sinkEvents(registerControl, Event.ONCLICK); - Event.setEventListener(registerControl, event -> onRegisterClick.run()); - } - -} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformationActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformationActivity.java index 0b37ecab955..4e8f14c5b2a 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformationActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformationActivity.java @@ -1,42 +1,15 @@ package com.sap.sailing.gwt.home.desktop.places.morelogininformation; -import com.google.gwt.activity.shared.Activity; -import com.google.gwt.event.shared.EventBus; import com.google.gwt.place.shared.Place; -import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.sap.sailing.gwt.home.desktop.app.DesktopClientFactory; +import com.sap.sailing.gwt.home.shared.places.morelogininformation.AbstractMoreLoginInformationActivity; import com.sap.sse.security.ui.authentication.AuthenticationRequestEvent; -public class MoreLoginInformationActivity implements Activity { - private DesktopClientFactory clientFactory; +public class MoreLoginInformationActivity extends AbstractMoreLoginInformationActivity { public MoreLoginInformationActivity(Place place, DesktopClientFactory clientFactory) { - this.clientFactory = clientFactory; - } - - @Override - public String mayStop() { - return null; - } - - @Override - public void onCancel() { - - } - - @Override - public void onStop() { - - } - - @Override - public void start(AcceptsOneWidget panel, EventBus eventBus) { - panel.setWidget(new MoreLoginInformation(new Runnable() { - @Override - public void run() { - clientFactory.getEventBus().fireEvent(new AuthenticationRequestEvent(true)); - } - })); + super(clientFactory, new MoreLoginInformationDesktop( + () -> clientFactory.getEventBus().fireEvent(new AuthenticationRequestEvent(true)))); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformationDesktop.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformationDesktop.java new file mode 100644 index 00000000000..757f8bc6974 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformationDesktop.java @@ -0,0 +1,22 @@ +package com.sap.sailing.gwt.home.desktop.places.morelogininformation; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.user.client.ui.Widget; +import com.sap.sailing.gwt.home.shared.places.morelogininformation.AbstractMoreLoginInformation; + +/** + * Desktop page that shows the benefits of logging in on sapsailing.com. + */ +public class MoreLoginInformationDesktop extends AbstractMoreLoginInformation { + + private static MoreLoginInformationUiBinder uiBinder = GWT.create(MoreLoginInformationUiBinder.class); + + interface MoreLoginInformationUiBinder extends UiBinder { + } + + public MoreLoginInformationDesktop(Runnable registerCallback) { + super(uiBinder, registerCallback); + } + +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformationDesktop.ui.xml similarity index 100% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformation.ui.xml rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformationDesktop.ui.xml diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationActivity.java index 6d9f3c801f7..4524074a7de 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationActivity.java @@ -1,41 +1,14 @@ package com.sap.sailing.gwt.home.mobile.places.morelogininformation; -import com.google.gwt.activity.shared.Activity; -import com.google.gwt.event.shared.EventBus; import com.google.gwt.place.shared.Place; -import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.sap.sailing.gwt.home.mobile.app.MobileApplicationClientFactory; +import com.sap.sailing.gwt.home.shared.places.morelogininformation.AbstractMoreLoginInformationActivity; -public class MoreLoginInformationActivity implements Activity { - private MobileApplicationClientFactory clientFactory; +public class MoreLoginInformationActivity extends AbstractMoreLoginInformationActivity { public MoreLoginInformationActivity(Place place, MobileApplicationClientFactory clientFactory) { - this.clientFactory = clientFactory; - } - - @Override - public String mayStop() { - return null; - } - - @Override - public void onCancel() { - - } - - @Override - public void onStop() { - - } - - @Override - public void start(AcceptsOneWidget panel, EventBus eventBus) { - panel.setWidget(new MoreLoginInformationMobile(new Runnable() { - @Override - public void run() { - clientFactory.getNavigator().getSignInNavigation(true).goToPlace(); - } - })); + super(clientFactory, new MoreLoginInformationMobile( + () -> clientFactory.getNavigator().getSignInNavigation(true).goToPlace())); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationMobile.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationMobile.java index f8cb19663ec..f8f7a098003 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationMobile.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationMobile.java @@ -1,31 +1,22 @@ package com.sap.sailing.gwt.home.mobile.places.morelogininformation; import com.google.gwt.core.client.GWT; -import com.google.gwt.dom.client.Element; import com.google.gwt.uibinder.client.UiBinder; -import com.google.gwt.uibinder.client.UiField; -import com.google.gwt.user.client.DOM; -import com.google.gwt.user.client.Event; -import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Widget; +import com.sap.sailing.gwt.home.shared.places.morelogininformation.AbstractMoreLoginInformation; /** * Mobile page that shows the benefits of logging in on sapsailing.com. */ -public class MoreLoginInformationMobile extends Composite { +public class MoreLoginInformationMobile extends AbstractMoreLoginInformation { private static MoreLoginInformationUiBinder uiBinder = GWT.create(MoreLoginInformationUiBinder.class); - interface MoreLoginInformationUiBinder extends UiBinder { + interface MoreLoginInformationUiBinder extends UiBinder { } - @UiField - public Element registerControl; - - public MoreLoginInformationMobile(Runnable onRegisterClick) { - initWidget(uiBinder.createAndBindUi(this)); - DOM.sinkEvents(registerControl, Event.ONCLICK); - Event.setEventListener(registerControl, event -> onRegisterClick.run()); + public MoreLoginInformationMobile(Runnable registerCallback) { + super(uiBinder, registerCallback); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/morelogininformation/AbstractMoreLoginInformation.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/morelogininformation/AbstractMoreLoginInformation.java new file mode 100644 index 00000000000..fd3669a7434 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/morelogininformation/AbstractMoreLoginInformation.java @@ -0,0 +1,29 @@ +package com.sap.sailing.gwt.home.shared.places.morelogininformation; + +import com.google.gwt.dom.client.Element; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.DOM; +import com.google.gwt.user.client.Event; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.UIObject; +import com.google.gwt.user.client.ui.Widget; + +public class AbstractMoreLoginInformation extends Composite implements MoreLoginInformationView { + + @UiField + public Element registerControl; + + protected AbstractMoreLoginInformation(UiBinder uiBinder, + Runnable registerCallback) { + initWidget(uiBinder.createAndBindUi(this)); + DOM.sinkEvents(registerControl, Event.ONCLICK); + Event.setEventListener(registerControl, event -> registerCallback.run()); + } + + @Override + public final void setRegisterControlVisible(boolean visible) { + UIObject.setVisible(registerControl, visible); + } + +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/morelogininformation/AbstractMoreLoginInformationActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/morelogininformation/AbstractMoreLoginInformationActivity.java new file mode 100644 index 00000000000..1e0c1e6a087 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/morelogininformation/AbstractMoreLoginInformationActivity.java @@ -0,0 +1,41 @@ +package com.sap.sailing.gwt.home.shared.places.morelogininformation; + +import java.util.Objects; + +import com.google.gwt.activity.shared.AbstractActivity; +import com.google.gwt.activity.shared.Activity; +import com.google.gwt.event.shared.EventBus; +import com.google.gwt.user.client.ui.AcceptsOneWidget; +import com.sap.sse.security.ui.authentication.WithUserService; +import com.sap.sse.security.ui.client.UserService; +import com.sap.sse.security.ui.client.UserStatusEventHandler; + +/** + * Abstract {@link Activity activity} implementation for {@link MoreLoginInformationView}s. + */ +public class AbstractMoreLoginInformationActivity extends AbstractActivity { + + private final WithUserService clientFactory; + private final MoreLoginInformationView view; + + /** + * Creates new {@link AbstractMoreLoginInformationActivity} instance for the provided view using the given factory. + * + * @param clientFactory + * {@link WithUserService client factory} providing access to the {@link UserService} + * @param view + * the {@link MoreLoginInformationView} to show + */ + protected AbstractMoreLoginInformationActivity(WithUserService clientFactory, MoreLoginInformationView view) { + this.clientFactory = clientFactory; + this.view = view; + } + + @Override + public final void start(AcceptsOneWidget panel, EventBus eventBus) { + final UserStatusEventHandler handler = user -> view.setRegisterControlVisible(Objects.isNull(user)); + this.clientFactory.getUserService().addUserStatusEventHandler(handler, true); + panel.setWidget(view); + } + +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/morelogininformation/MoreLoginInformationView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/morelogininformation/MoreLoginInformationView.java new file mode 100644 index 00000000000..4a44fa568ee --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/morelogininformation/MoreLoginInformationView.java @@ -0,0 +1,17 @@ +package com.sap.sailing.gwt.home.shared.places.morelogininformation; + +import com.google.gwt.user.client.ui.IsWidget; + +/** + * Interface for views containing information about benefits of signing in on SAP Sailing Analytics. + */ +public interface MoreLoginInformationView extends IsWidget { + + /** + * Show or hide the control leading to register form (usually based on login state). + * + * @param visible + * true to show register control, false to hide + */ + void setRegisterControlVisible(boolean visible); +} From 0b80381d2b0b7797d033dceef5697714f6e78e24 Mon Sep 17 00:00:00 2001 From: Benjamin Barth Date: Fri, 27 Oct 2017 16:58:58 +0200 Subject: [PATCH 08/12] bug4312 Replaced boolean auth nav param with enum for more flexibility --- ...letAndDesktopApplicationClientFactory.java | 3 +- .../MoreLoginInformationActivity.java | 5 +-- .../user/profile/UserProfileActivity.java | 3 +- .../app/MobileApplicationClientFactory.java | 2 +- .../mobile/app/MobilePlacesNavigator.java | 9 ++++-- .../home/mobile/partials/header/Header.java | 2 +- .../MoreLoginInformationActivity.java | 2 +- .../AuthenticationActivity.java | 24 ++++---------- .../authentication/AuthenticationPlace.java | 13 ++++---- .../profile/AbstractUserProfileActivity.java | 2 +- .../AuthenticationManagerImpl.java | 2 +- ...thenticationPlaceManagementController.java | 27 +++++++++++----- .../authentication/AuthenticationPlaces.java | 31 +++++++++++++++++++ .../AuthenticationRequestEvent.java | 10 +++--- .../decorator/FlyoutNotLoggedInPresenter.java | 3 +- .../info/LoggedInUserInfoActivity.java | 3 +- .../view/FlyoutAuthenticationPresenter.java | 15 +++------ 17 files changed, 96 insertions(+), 60 deletions(-) create mode 100644 java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/AuthenticationPlaces.java 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 88c9af0a6dc..40b4f95cf4b 100644 --- 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 @@ -35,7 +35,6 @@ import com.sap.sse.security.ui.authentication.AuthenticationClientFactoryImpl; import com.sap.sse.security.ui.authentication.AuthenticationManager; import com.sap.sse.security.ui.authentication.AuthenticationManagerImpl; import com.sap.sse.security.ui.authentication.AuthenticationPlaceManagementController; -import com.sap.sse.security.ui.authentication.WrappedPlaceManagementController; import com.sap.sse.security.ui.authentication.info.LoggedInUserInfoPlace; import com.sap.sse.security.ui.authentication.view.FlyoutAuthenticationPresenter; import com.sap.sse.security.ui.client.i18n.StringMessages; @@ -43,7 +42,7 @@ import com.sap.sse.security.ui.client.i18n.StringMessages; public class TabletAndDesktopApplicationClientFactory extends AbstractApplicationClientFactory implements DesktopClientFactory { private final SailingDispatchSystem dispatch = new SailingDispatchSystemImpl(); - private final WrappedPlaceManagementController userManagementWizardController; + private final AuthenticationPlaceManagementController userManagementWizardController; private final AuthenticationManager authenticationManager; public TabletAndDesktopApplicationClientFactory(boolean isStandaloneServer) { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformationActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformationActivity.java index 4e8f14c5b2a..34ee83f77c0 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformationActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/morelogininformation/MoreLoginInformationActivity.java @@ -3,13 +3,14 @@ package com.sap.sailing.gwt.home.desktop.places.morelogininformation; import com.google.gwt.place.shared.Place; import com.sap.sailing.gwt.home.desktop.app.DesktopClientFactory; import com.sap.sailing.gwt.home.shared.places.morelogininformation.AbstractMoreLoginInformationActivity; +import com.sap.sse.security.ui.authentication.AuthenticationPlaces; import com.sap.sse.security.ui.authentication.AuthenticationRequestEvent; public class MoreLoginInformationActivity extends AbstractMoreLoginInformationActivity { public MoreLoginInformationActivity(Place place, DesktopClientFactory clientFactory) { - super(clientFactory, new MoreLoginInformationDesktop( - () -> clientFactory.getEventBus().fireEvent(new AuthenticationRequestEvent(true)))); + super(clientFactory, new MoreLoginInformationDesktop(() -> clientFactory.getEventBus() + .fireEvent(new AuthenticationRequestEvent(AuthenticationPlaces.CREATE_ACCOUNT)))); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivity.java index db66cbbbaa8..4e862c97c4a 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/UserProfileActivity.java @@ -17,6 +17,7 @@ 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.sse.security.ui.authentication.AuthenticationContextEvent; +import com.sap.sse.security.ui.authentication.AuthenticationPlaces; import com.sap.sse.security.ui.authentication.AuthenticationRequestEvent; import com.sap.sse.security.ui.client.i18n.StringMessages; @@ -91,7 +92,7 @@ public class UserProfileActivity extends AbstractActivity implements UserProfile @Override public void doTriggerLoginForm() { - clientFactory.getEventBus().fireEvent(new AuthenticationRequestEvent(false)); + clientFactory.getEventBus().fireEvent(new AuthenticationRequestEvent(AuthenticationPlaces.SIGN_IN)); } @Override 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 6a62a441e4e..a68b0f6d49e 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 @@ -80,7 +80,7 @@ public class MobileApplicationClientFactory extends dismissCallback.run(); navigator.goToPlace(navigator.getMoreLoginInfo()); },() -> { - navigator.goToPlace(navigator.getSignInNavigation(false)); + navigator.goToPlace(navigator.getSignInNavigation()); }); root.setSubHeaderContent(content); }); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobilePlacesNavigator.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobilePlacesNavigator.java index dd432367e4e..b01aa5da44c 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobilePlacesNavigator.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobilePlacesNavigator.java @@ -9,6 +9,7 @@ import com.sap.sailing.gwt.home.mobile.places.user.authentication.Authentication import com.sap.sailing.gwt.home.shared.app.HomePlacesNavigator; import com.sap.sailing.gwt.home.shared.app.PlaceNavigation; import com.sap.sailing.gwt.home.shared.places.event.EventContext; +import com.sap.sse.security.ui.authentication.AuthenticationPlaces; public class MobilePlacesNavigator extends HomePlacesNavigator { @@ -22,8 +23,12 @@ public class MobilePlacesNavigator extends HomePlacesNavigator { return createPlaceNavigation(baseUrl, isOnRemoteServer, place); } - public PlaceNavigation getSignInNavigation(boolean registerView) { - return createLocalPlaceNavigation(new AuthenticationPlace(registerView)); + public PlaceNavigation getSignInNavigation() { + return createLocalPlaceNavigation(new AuthenticationPlace(AuthenticationPlaces.SIGN_IN)); + } + + public PlaceNavigation getCreateAccountNavigation() { + return createLocalPlaceNavigation(new AuthenticationPlace(AuthenticationPlaces.CREATE_ACCOUNT)); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.java index a0677ab0f02..ddc857dfd93 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/header/Header.java @@ -68,7 +68,7 @@ public class Header extends Composite { signInNavigationItem = addNavigation(com.sap.sse.security.ui.client.i18n.StringMessages.INSTANCE.signIn(), new Runnable() { @Override public void run() { - placeNavigator.getSignInNavigation(false).goToPlace(); + placeNavigator.getSignInNavigation().goToPlace(); } }); userDetailsNavigationItem = addNavigation(placeNavigator.getUserProfileNavigation(), com.sap.sse.security.ui.client.i18n.StringMessages.INSTANCE.userDetails()); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationActivity.java index 4524074a7de..6d51fa10a4e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/morelogininformation/MoreLoginInformationActivity.java @@ -8,7 +8,7 @@ public class MoreLoginInformationActivity extends AbstractMoreLoginInformationAc public MoreLoginInformationActivity(Place place, MobileApplicationClientFactory clientFactory) { super(clientFactory, new MoreLoginInformationMobile( - () -> clientFactory.getNavigator().getSignInNavigation(true).goToPlace())); + () -> clientFactory.getNavigator().getCreateAccountNavigation().goToPlace())); } } 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 7a6a41453ed..23525bd7b18 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 @@ -10,39 +10,27 @@ import com.sap.sailing.gwt.home.shared.usermanagement.AuthenticationCallbackImpl import com.sap.sailing.gwt.home.shared.usermanagement.view.AuthenticationViewMobile; import com.sap.sse.security.ui.authentication.AuthenticationClientFactoryImpl; import com.sap.sse.security.ui.authentication.AuthenticationPlaceManagementController; -import com.sap.sse.security.ui.authentication.WrappedPlaceManagementController; -import com.sap.sse.security.ui.authentication.create.CreateAccountPlace; import com.sap.sse.security.ui.authentication.view.AuthenticationView; public class AuthenticationActivity extends AbstractActivity { private final MobileApplicationClientFactory clientFactory; private final AuthenticationView userManagementView = new AuthenticationViewMobile(); - private boolean register; + private final AuthenticationPlace place; public AuthenticationActivity(AuthenticationPlace place, MobileApplicationClientFactory clientFactory) { - register = place.isRegisterView(); this.clientFactory = clientFactory; + this.place = place; } @Override public void start(final AcceptsOneWidget panel, EventBus eventBus) { panel.setWidget(userManagementView); - WrappedPlaceManagementController userManagementController = new AuthenticationPlaceManagementController( + final AuthenticationPlaceManagementController userManagementController = new AuthenticationPlaceManagementController( new AuthenticationClientFactoryImpl(clientFactory.getAuthenticationManager(), SharedResources.INSTANCE), new AuthenticationCallbackImpl(clientFactory.getNavigator().getUserProfileNavigation(), - new SignInSuccessfulNavigationMobile()), + () -> History.back()), userManagementView, eventBus); - userManagementController.start(); - if(register){ - userManagementController.goTo(new CreateAccountPlace()); - } + userManagementController.goTo(place.getRequestedPlace()); } - - private class SignInSuccessfulNavigationMobile implements Runnable { - @Override - public void run() { - History.back(); - } - } - + } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/authentication/AuthenticationPlace.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/authentication/AuthenticationPlace.java index 6a80a1efa4e..71989b3a899 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/authentication/AuthenticationPlace.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/authentication/AuthenticationPlace.java @@ -6,14 +6,15 @@ import com.google.gwt.place.shared.Prefix; import com.sap.sailing.gwt.home.shared.app.HasLocationTitle; import com.sap.sailing.gwt.home.shared.app.HasMobileVersion; import com.sap.sailing.gwt.home.shared.places.PlaceTokenPrefixes; +import com.sap.sse.security.ui.authentication.AuthenticationPlaces; import com.sap.sse.security.ui.client.i18n.StringMessages; public class AuthenticationPlace extends Place implements HasMobileVersion, HasLocationTitle { - private boolean registerView; + private final AuthenticationPlaces requestedPlace; - public AuthenticationPlace(boolean registerView) { - this.registerView = registerView; + public AuthenticationPlace(AuthenticationPlaces requestedPlace) { + this.requestedPlace = requestedPlace; } @Override @@ -21,8 +22,8 @@ public class AuthenticationPlace extends Place implements HasMobileVersion, HasL return StringMessages.INSTANCE.user(); } - public boolean isRegisterView() { - return registerView; + public AuthenticationPlaces getRequestedPlace() { + return requestedPlace; } @Prefix(PlaceTokenPrefixes.UserAuthentication) @@ -34,7 +35,7 @@ public class AuthenticationPlace extends Place implements HasMobileVersion, HasL @Override public AuthenticationPlace getPlace(String token) { - return new AuthenticationPlace(false); + return new AuthenticationPlace(AuthenticationPlaces.SIGN_IN); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/AbstractUserProfileActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/AbstractUserProfileActivity.java index 27f6010996b..c7aba5a97b4 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/AbstractUserProfileActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/AbstractUserProfileActivity.java @@ -15,7 +15,7 @@ public abstract class AbstractUserProfileActivity extends AbstractActivity imple @Override public void doTriggerLoginForm() { - clientFactory.getNavigator().getSignInNavigation(false).goToPlace(); + clientFactory.getNavigator().getSignInNavigation().goToPlace(); } @Override diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/AuthenticationManagerImpl.java b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/AuthenticationManagerImpl.java index 4239b404c64..7cb6d13da23 100644 --- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/AuthenticationManagerImpl.java +++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/AuthenticationManagerImpl.java @@ -159,7 +159,7 @@ public class AuthenticationManagerImpl implements AuthenticationManager { @Override public void logout() { userService.logout(); - eventBus.fireEvent(new AuthenticationRequestEvent(false)); + eventBus.fireEvent(new AuthenticationRequestEvent(AuthenticationPlaces.SIGN_IN)); } @Override diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/AuthenticationPlaceManagementController.java b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/AuthenticationPlaceManagementController.java index 9b0cc73506d..977c0cb813d 100644 --- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/AuthenticationPlaceManagementController.java +++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/AuthenticationPlaceManagementController.java @@ -24,6 +24,8 @@ import com.sap.sse.security.ui.authentication.view.AuthenticationView; */ public class AuthenticationPlaceManagementController extends WrappedPlaceManagementController { + private final AuthenticationClientFactory clientFactory; + /** * Creates a new {@link AuthenticationPlaceManagementController} instance with the given parameters. * @@ -35,14 +37,25 @@ public class AuthenticationPlaceManagementController extends WrappedPlaceManagem public AuthenticationPlaceManagementController(AuthenticationClientFactory clientFactory, AuthenticationCallback callback, AuthenticationView authenticationView, EventBus globalEventBus) { super(new Configuration(clientFactory, callback, authenticationView)); - globalEventBus.addHandler(AuthenticationContextEvent.TYPE, new AuthenticationContextEvent.Handler() { - @Override - public void onUserChangeEvent(AuthenticationContextEvent event) { - AuthenticationPlaceManagementController.this.fireEvent(event); - } - }); + this.clientFactory = clientFactory; + globalEventBus.addHandler(AuthenticationContextEvent.TYPE, this::fireEvent); } - + + /** + * Tells the wrapped framework to go to the {@link Place} represented by the given {@link AuthenticationPlaces} + * instance is no user is logged in. Otherwise the wrapped framework will go to the {@link LoggedInUserInfoPlace + * user info} page. + * + * @param authPlace + * {@link AuthenticationPlaces} instance representing a {@link Place} instance to go to + * + * @see #goTo(Place) + */ + public void goTo(AuthenticationPlaces authPlace) { + final boolean isLoggedIn = clientFactory.getAuthenticationManager().getAuthenticationContext().isLoggedIn(); + super.goTo(isLoggedIn ? new LoggedInUserInfoPlace() : authPlace.getPlace()); + } + private static class Configuration implements PlaceManagementConfiguration { private final AuthenticationClientFactory clientFactory; private final AuthenticationCallback callback; diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/AuthenticationPlaces.java b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/AuthenticationPlaces.java new file mode 100644 index 00000000000..f6f0ef00f70 --- /dev/null +++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/AuthenticationPlaces.java @@ -0,0 +1,31 @@ +package com.sap.sse.security.ui.authentication; + +import java.util.function.Supplier; + +import com.sap.sse.security.ui.authentication.create.CreateAccountPlace; +import com.sap.sse.security.ui.authentication.signin.SignInPlace; + +/** + * Enumeration to specify a requested {@link AbstractAuthenticationPlace authentication places}. + */ +public enum AuthenticationPlaces { + + /** {@link AuthenticationPlaces} representation for {@link SignInPlace} */ + SIGN_IN(SignInPlace::new), + /** {@link AuthenticationPlaces} representation for {@link CreateAccountPlace} */ + CREATE_ACCOUNT(CreateAccountPlace::new); + + private final Supplier placeSupplier; + + private AuthenticationPlaces(Supplier placeSupplier) { + this.placeSupplier = placeSupplier; + } + + /** + * @return new instance of the {@link AbstractAuthenticationPlace} represented by this {@link AuthenticationPlaces} + */ + public AbstractAuthenticationPlace getPlace() { + return this.placeSupplier.get(); + } + +} diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/AuthenticationRequestEvent.java b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/AuthenticationRequestEvent.java index 4fb57fdfb9e..f520caf2cd7 100644 --- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/AuthenticationRequestEvent.java +++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/AuthenticationRequestEvent.java @@ -9,18 +9,18 @@ import com.google.gwt.event.shared.GwtEvent; public class AuthenticationRequestEvent extends GwtEvent { public static final Type TYPE = new Type(); - private final boolean register; + private final AuthenticationPlaces requestedPlace; - public AuthenticationRequestEvent(boolean register) { - this.register = register; + public AuthenticationRequestEvent(AuthenticationPlaces requestedPlace) { + this.requestedPlace = requestedPlace; } public interface Handler extends EventHandler { void onUserManagementRequestEvent(AuthenticationRequestEvent event); } - public boolean isRegister() { - return register; + public AuthenticationPlaces getRequestedPlace() { + return requestedPlace; } @Override diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/decorator/FlyoutNotLoggedInPresenter.java b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/decorator/FlyoutNotLoggedInPresenter.java index c58ac94dbe4..a5f3f23f0b5 100644 --- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/decorator/FlyoutNotLoggedInPresenter.java +++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/decorator/FlyoutNotLoggedInPresenter.java @@ -1,6 +1,7 @@ package com.sap.sse.security.ui.authentication.decorator; import com.google.web.bindery.event.shared.EventBus; +import com.sap.sse.security.ui.authentication.AuthenticationPlaces; import com.sap.sse.security.ui.authentication.AuthenticationRequestEvent; /** @@ -19,6 +20,6 @@ public class FlyoutNotLoggedInPresenter implements NotLoggedInPresenter { @Override public void doTriggerLoginForm() { - eventBus.fireEvent(new AuthenticationRequestEvent(false)); + eventBus.fireEvent(new AuthenticationRequestEvent(AuthenticationPlaces.SIGN_IN)); } } diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/info/LoggedInUserInfoActivity.java b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/info/LoggedInUserInfoActivity.java index 1ae44685e16..4ba1d321c69 100644 --- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/info/LoggedInUserInfoActivity.java +++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/info/LoggedInUserInfoActivity.java @@ -7,6 +7,7 @@ import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.sap.sse.security.ui.authentication.AuthenticationCallback; import com.sap.sse.security.ui.authentication.AuthenticationClientFactory; import com.sap.sse.security.ui.authentication.AuthenticationContextEvent; +import com.sap.sse.security.ui.authentication.AuthenticationPlaces; import com.sap.sse.security.ui.authentication.AuthenticationRequestEvent; import com.sap.sse.security.ui.authentication.signin.SignInPlace; @@ -45,7 +46,7 @@ public class LoggedInUserInfoActivity extends AbstractActivity implements Logged @Override public void gotoProfileUi() { - eventBus.fireEvent(new AuthenticationRequestEvent(false)); + eventBus.fireEvent(new AuthenticationRequestEvent(AuthenticationPlaces.SIGN_IN)); callback.handleUserProfileNavigation(); } diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/view/FlyoutAuthenticationPresenter.java b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/view/FlyoutAuthenticationPresenter.java index 04328c77474..48f8b9298da 100644 --- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/view/FlyoutAuthenticationPresenter.java +++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/authentication/view/FlyoutAuthenticationPresenter.java @@ -2,6 +2,7 @@ package com.sap.sse.security.ui.authentication.view; import com.google.web.bindery.event.shared.EventBus; import com.sap.sse.security.ui.authentication.AuthenticationContextEvent; +import com.sap.sse.security.ui.authentication.AuthenticationPlaceManagementController; import com.sap.sse.security.ui.authentication.AuthenticationRequestEvent; import com.sap.sse.security.ui.authentication.WrappedPlaceManagementController; import com.sap.sse.security.ui.authentication.app.AuthenticationContext; @@ -34,7 +35,7 @@ public class FlyoutAuthenticationPresenter implements AuthenticationMenuView.Pre */ public FlyoutAuthenticationPresenter(final FlyoutAuthenticationView flyoutAuthenticationView, final AuthenticationMenuView authenticationMenuView, - WrappedPlaceManagementController authenticationPlaceManagementController, + AuthenticationPlaceManagementController authenticationPlaceManagementController, EventBus eventBus, AuthenticationContext initialAuthentication) { this.flyoutAuthenticationView = flyoutAuthenticationView; this.authenticationMenuView = authenticationMenuView; @@ -45,15 +46,9 @@ public class FlyoutAuthenticationPresenter implements AuthenticationMenuView.Pre authenticationMenuView.setPresenter(this); flyoutAuthenticationView.setAutoHidePartner(authenticationMenuView); - eventBus.addHandler(AuthenticationRequestEvent.TYPE, new AuthenticationRequestEvent.Handler() { - @Override - public void onUserManagementRequestEvent(AuthenticationRequestEvent event) { - if(event.isRegister()){ - showRegister(); - }else{ - toggleFlyout(); - } - } + eventBus.addHandler(AuthenticationRequestEvent.TYPE, event -> { + flyoutAuthenticationView.show(); + authenticationPlaceManagementController.goTo(event.getRequestedPlace()); }); eventBus.addHandler(AuthenticationContextEvent.TYPE, new AuthenticationContextEvent.Handler() { From 332e16897edcefbdbcfb0925d86e146541b3d1e2 Mon Sep 17 00:00:00 2001 From: Benjamin Barth Date: Mon, 6 Nov 2017 11:52:30 +0100 Subject: [PATCH 09/12] bug4320 Added styling for anchors on FullscreenContainer toolbar --- .../partials/fullscreen/FullscreenContainer.ui.xml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/fullscreen/FullscreenContainer.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/fullscreen/FullscreenContainer.ui.xml index 04990195aec..9e72e0da75c 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/fullscreen/FullscreenContainer.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/fullscreen/FullscreenContainer.ui.xml @@ -50,11 +50,19 @@ padding: 10px; vertical-align: top; } - button.toolbarAction { - background-color: transparent; + a.toolbarAction, button.toolbarAction { border-radius: initial; font-size: 1.25em; } + a.toolbarAction { + color: #fff; + text-decoration: none; + outline: none; + padding-top: 0.666666666666667em + } + button.toolbarAction { + background-color: transparent; + } .toolbarBusyIndicator { display: inline-block; height: 50px; From 4f755ad91c7a0240007312f9dc58e7d00e149b35 Mon Sep 17 00:00:00 2001 From: Benjamin Barth Date: Mon, 6 Nov 2017 11:54:35 +0100 Subject: [PATCH 10/12] bug4320 Enabled middle-clickability for event link in image gallery --- .../media/SailingFullscreenViewer.java | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/media/SailingFullscreenViewer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/media/SailingFullscreenViewer.java index 4ee433da454..4c924b69abf 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/media/SailingFullscreenViewer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/media/SailingFullscreenViewer.java @@ -5,7 +5,7 @@ import java.util.Collection; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.Window; -import com.google.gwt.user.client.ui.Button; +import com.google.gwt.user.client.ui.Anchor; import com.google.gwt.user.client.ui.Image; import com.google.gwt.view.client.SelectionChangeEvent; import com.sap.sailing.gwt.common.client.SharedResources; @@ -28,7 +28,8 @@ public class SailingFullscreenViewer extends FullscreenContainer SailingFullscreenViewer.this.toggleAutoplay()); addToolbarAction(autoRefreshControl); } @@ -94,10 +90,11 @@ public class SailingFullscreenViewer extends FullscreenContainer Date: Tue, 7 Nov 2017 14:17:19 +0100 Subject: [PATCH 11/12] Bug 4320: Removed commented/unused code --- .../gwt/home/desktop/partials/media/SailingFullscreenViewer.java | 1 - 1 file changed, 1 deletion(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/media/SailingFullscreenViewer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/media/SailingFullscreenViewer.java index 4c924b69abf..d68fa1042c9 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/media/SailingFullscreenViewer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/media/SailingFullscreenViewer.java @@ -28,7 +28,6 @@ public class SailingFullscreenViewer extends FullscreenContainer Date: Tue, 7 Nov 2017 14:56:38 +0100 Subject: [PATCH 12/12] Bug 3212: Removed Eclipse config file that should not have been committed --- .../.settings/com.google.appengine.eclipse.core.prefs | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 java/com.sap.sailing.dashboards.gwt/.settings/com.google.appengine.eclipse.core.prefs diff --git a/java/com.sap.sailing.dashboards.gwt/.settings/com.google.appengine.eclipse.core.prefs b/java/com.sap.sailing.dashboards.gwt/.settings/com.google.appengine.eclipse.core.prefs deleted file mode 100644 index bbc4057855b..00000000000 --- a/java/com.sap.sailing.dashboards.gwt/.settings/com.google.appengine.eclipse.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -googleCloudSqlEnabled=false -localDevMySqlEnabled=true