From 08bee0bdc5b3f6df66bd8ae1662020a5d4b698a3 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Thu, 4 Feb 2021 22:08:43 +0100 Subject: [PATCH] bug5260 follow-up: broke up reference from com.sap.sailing.gwt.ui.client.subscription to ...home.shared.places --- .../subscription/UserSubscriptionView.java | 19 ++------------ .../BaseUserSubscriptionView.java | 26 +++++++++++++++++++ .../SubscriptionViewPresenter.java | 4 +-- .../ChargebeeSubscriptionViewPresenter.java | 6 ++--- 4 files changed, 32 insertions(+), 23 deletions(-) create mode 100755 java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/subscription/BaseUserSubscriptionView.java diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/profile/subscription/UserSubscriptionView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/profile/subscription/UserSubscriptionView.java index 7ef8ef195d9..2949d3c0cb7 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/profile/subscription/UserSubscriptionView.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/user/profile/subscription/UserSubscriptionView.java @@ -1,7 +1,7 @@ package com.sap.sailing.gwt.home.shared.places.user.profile.subscription; import com.google.gwt.user.client.ui.IsWidget; -import com.sap.sailing.gwt.ui.shared.subscription.SubscriptionDTO; +import com.sap.sailing.gwt.ui.client.subscription.BaseUserSubscriptionView; /** * View for displaying user subscription information like plan, subscription status...In this view user is able to @@ -9,27 +9,12 @@ import com.sap.sailing.gwt.ui.shared.subscription.SubscriptionDTO; * * @author Tu Tran */ -public interface UserSubscriptionView extends IsWidget { +public interface UserSubscriptionView extends BaseUserSubscriptionView, IsWidget { /** * Called on start loading subscription data */ public void onStartLoadSubscription(); - /** - * Update the view with subscription data returned from back-end - */ - public void updateView(SubscriptionDTO subscription); - - /** - * Called on checkout modal is closed - */ - public void onCloseCheckoutModal(); - - /** - * Called on checkout modal has errors - */ - public void onOpenCheckoutError(String error); - /** * Presenter for {@link UserSubscriptionView} */ diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/subscription/BaseUserSubscriptionView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/subscription/BaseUserSubscriptionView.java new file mode 100755 index 00000000000..86ebc86deeb --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/subscription/BaseUserSubscriptionView.java @@ -0,0 +1,26 @@ +package com.sap.sailing.gwt.ui.client.subscription; + +import com.sap.sailing.gwt.ui.shared.subscription.SubscriptionDTO; + +/** + * View for displaying user subscription information like plan, subscription status...In this view user is able to + * subscribe to a plan or cancel current subscription. + * + * @author Tu Tran + */ +public interface BaseUserSubscriptionView { + /** + * Update the view with subscription data returned from back-end + */ + public void updateView(SubscriptionDTO subscription); + + /** + * Called on checkout modal is closed + */ + public void onCloseCheckoutModal(); + + /** + * Called on checkout modal has errors + */ + public void onOpenCheckoutError(String error); +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/subscription/SubscriptionViewPresenter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/subscription/SubscriptionViewPresenter.java index 23bb654bae8..2486017fa61 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/subscription/SubscriptionViewPresenter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/subscription/SubscriptionViewPresenter.java @@ -1,7 +1,5 @@ package com.sap.sailing.gwt.ui.client.subscription; -import com.sap.sailing.gwt.home.shared.places.user.profile.subscription.UserSubscriptionView; - /** * Interface for subscription service provider view presenter where a particular provider has its own implementation for * handling UI regarding subscription actions @@ -10,5 +8,5 @@ public interface SubscriptionViewPresenter { /** * Start checkout process for a plan */ - public void startCheckout(String planId, UserSubscriptionView view); + public void startCheckout(String planId, BaseUserSubscriptionView view); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/subscription/chargebee/ChargebeeSubscriptionViewPresenter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/subscription/chargebee/ChargebeeSubscriptionViewPresenter.java index 67df5befe73..a6ad8fadd8a 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/subscription/chargebee/ChargebeeSubscriptionViewPresenter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/subscription/chargebee/ChargebeeSubscriptionViewPresenter.java @@ -1,8 +1,8 @@ package com.sap.sailing.gwt.ui.client.subscription.chargebee; import com.google.gwt.user.client.rpc.AsyncCallback; -import com.sap.sailing.gwt.home.shared.places.user.profile.subscription.UserSubscriptionView; import com.sap.sailing.gwt.ui.client.StringMessages; +import com.sap.sailing.gwt.ui.client.subscription.BaseUserSubscriptionView; import com.sap.sailing.gwt.ui.client.subscription.SubscriptionViewPresenter; import com.sap.sailing.gwt.ui.shared.subscription.SubscriptionDTO; import com.sap.sailing.gwt.ui.shared.subscription.chargebee.FinishCheckoutDTO; @@ -21,7 +21,7 @@ public class ChargebeeSubscriptionViewPresenter implements SubscriptionViewPrese } @Override - public void startCheckout(String planId, UserSubscriptionView view) { + public void startCheckout(String planId, BaseUserSubscriptionView view) { service.prepareCheckout(planId, new AsyncCallback() { @Override public void onSuccess(PrepareCheckoutDTO hostedPage) { @@ -58,7 +58,7 @@ public class ChargebeeSubscriptionViewPresenter implements SubscriptionViewPrese }); } - private void requestFinishingPlanUpdating(String hostedPageId, UserSubscriptionView view) { + private void requestFinishingPlanUpdating(String hostedPageId, BaseUserSubscriptionView view) { final FinishCheckoutDTO data = new FinishCheckoutDTO(); data.setHostedPageId(hostedPageId); writeService.finishCheckout(/* planId */ null, data, new AsyncCallback() {