Move conversational behaviour into the care store component to make the front end simpler and allow removal of the SCA tours component if required. Also make payments work in the full app. Ad some more features to calendar and hotel to demonstrate interaction patterns

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@780423 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 49 deletions

diff --git a/sandbox/travelsample/contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBookingImpl.java b/sandbox/travelsample/contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBookingImpl.java
index aea855cef6..debbafda64 100644
--- a/sandbox/travelsample/contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBookingImpl.java
+++ b/sandbox/travelsample/contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBookingImpl.java
@@ -19,6 +19,7 @@
 package scatours.tripbooking;

 

 import org.osoa.sca.ComponentContext;

+import org.osoa.sca.ServiceReference;

 import org.osoa.sca.annotations.Context;

 import org.osoa.sca.annotations.Reference;

 import org.osoa.sca.annotations.Service;

@@ -79,57 +80,12 @@ public class TripBookingImpl implements TripBooking{
         }

         

         // add trip to the shopping cart

-        //ServiceReference<ShoppingCart> cart = componentContext.getServiceReference(ShoppingCart.class, 

-        //                                                                           "shoppingCart");

-        //cart.setConversationID(cartId);

-        //cart.getService().addTrip(trip);

+        ServiceReference<ShoppingCart> cart = componentContext.getServiceReference(ShoppingCart.class, 

+                                                                                   "shoppingCart");

+        cart.setConversationID(cartId);

+        cart.getService().addTrip(cartId, trip);

         

         return trip;

     }

  

-    /*

-    @ConversationID

-    protected String conversationId;

-    

-    private Map<String, TripItem> tripItems = new HashMap<String, TripItem>();

-     

-    // Trip methods

-    

-    @Init

-    public void initTrip() {

-        System.out.println("Trip init for id: " + conversationId);

-    }

-    

-    @Destroy

-    public void destroyTrip() {

-        System.out.println("Trip destroy for id: " + conversationId);

-    }

-    

-    

-    public void addTripItem(TripItem tripItem){

-        tripItems.put(tripItem.getId(), tripItem);

-    }

-    

-    public void removeTripItem(String id){

-        tripItems.remove(id);

-    }  

-    

-    public TripItem[] getTripItems() {

-        return tripItems.values().toArray(new TripItem[tripItems.size()]);

-    }

-    

-    public double getTripPrice(){ 

-        double totalPrice = 0.0;

-        

-        for (TripItem tripItem : tripItems.values()){

-            totalPrice += tripItem.getPrice();

-        }

-        

-        return totalPrice;

-    }

-    

-    public void bookTrip() {

-        // TODO

-    }

-    */

 }