bug5260 follow-up: broke up reference from com.sap.sailing.gwt.ui.client.subscription to ...home.shared.places

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}
      */

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);
+}

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);
 }

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<PrepareCheckoutDTO>() {
             @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<SubscriptionDTO>() {