Format the code

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

6 files changed, 55 insertions, 56 deletions

diff --git a/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartCheckout.java b/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartCheckout.java
index d14da414ef..929f9895c6 100644
--- a/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartCheckout.java
+++ b/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartCheckout.java
@@ -22,5 +22,5 @@ import org.osoa.sca.annotations.Remotable;
 
 @Remotable
 public interface CartCheckout {
-    void checkout(String cartId,String name);
+    void checkout(String cartId, String name);
 }
diff --git a/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartInitialize.java b/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartInitialize.java
index 916f7f7ed0..24affc4b23 100644
--- a/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartInitialize.java
+++ b/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartInitialize.java
@@ -25,5 +25,6 @@ import com.tuscanyscatours.common.TripItem;
 @Remotable
 public interface CartInitialize {
     String newCart();
+
     TripItem[] getTrips(String cartId);
 }
diff --git a/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartStore.java b/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartStore.java
index 62e7da5a1f..c7d03d765b 100644
--- a/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartStore.java
+++ b/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartStore.java
@@ -29,13 +29,13 @@ import com.tuscanyscatours.common.TripItem;
  */
 @Remotable
 @Conversational
-public interface CartStore{
+public interface CartStore {
     void addTrip(TripItem trip);
-    
+
     void removeTrip(TripItem trip);
-    
+
     TripItem[] getTrips();
-    
+
     @EndsConversation
-    void reset();  
+    void reset();
 }
diff --git a/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartUpdates.java b/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartUpdates.java
index b3528e2ae1..f9a1272695 100644
--- a/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartUpdates.java
+++ b/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartUpdates.java
@@ -24,6 +24,7 @@ import com.tuscanyscatours.common.TripItem;
 
 @Remotable
 public interface CartUpdates {
-    void addTrip(String cartId,TripItem trip);
-    void removeTrip(String cartId,TripItem trip);
+    void addTrip(String cartId, TripItem trip);
+
+    void removeTrip(String cartId, TripItem trip);
 }
diff --git a/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/CartStoreImpl.java b/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/CartStoreImpl.java
index 855e2d8371..460b962526 100644
--- a/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/CartStoreImpl.java
+++ b/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/CartStoreImpl.java
@@ -24,49 +24,47 @@ import java.util.List;
 import org.osoa.sca.annotations.ConversationID;
 import org.osoa.sca.annotations.Destroy;
 import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Reference;
 import org.osoa.sca.annotations.Scope;
 import org.osoa.sca.annotations.Service;
 
 import com.tuscanyscatours.common.TripItem;
-import com.tuscanyscatours.payment.Payment;
 import com.tuscanyscatours.shoppingcart.CartStore;
 
 /**
  * An implementation of the CartStore service
  */
 @Scope("CONVERSATION")
-@Service(interfaces={CartStore.class})
-public class CartStoreImpl implements CartStore{
+@Service(interfaces = {CartStore.class})
+public class CartStoreImpl implements CartStore {
 
     @ConversationID
     protected String cartId;
-    
+
     private List<TripItem> trips = new ArrayList<TripItem>();
-        
+
     @Init
     public void initCart() {
         System.out.println("CartStore init for id: " + cartId);
     }
-    
+
     @Destroy
     public void destroyCart() {
         System.out.println("CartStore destroy for id: " + cartId);
     }
-    
+
     public void addTrip(TripItem trip) {
         trips.add(trip);
     }
-    
+
     public void removeTrip(TripItem trip) {
         trips.remove(trip);
     }
-    
-    public TripItem[] getTrips(){
+
+    public TripItem[] getTrips() {
         return trips.toArray(new TripItem[trips.size()]);
     }
-    
-    public void reset(){ 
+
+    public void reset() {
         trips.clear();
-    }   
+    }
 }
diff --git a/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/ShoppingCartImpl.java b/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/ShoppingCartImpl.java
index 5549d5cf7b..41c58e5266 100644
--- a/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/ShoppingCartImpl.java
+++ b/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/ShoppingCartImpl.java
@@ -30,76 +30,75 @@ import org.osoa.sca.annotations.Service;
 

 import com.tuscanyscatours.common.TripItem;

 import com.tuscanyscatours.payment.Payment;

+import com.tuscanyscatours.shoppingcart.CartCheckout;

 import com.tuscanyscatours.shoppingcart.CartInitialize;

 import com.tuscanyscatours.shoppingcart.CartStore;

-import com.tuscanyscatours.shoppingcart.CartCheckout;

 import com.tuscanyscatours.shoppingcart.CartUpdates;

 

 /**

  * An implementation of the ShoppingCart service

  */

-@Service(interfaces={CartInitialize.class, CartUpdates.class, CartCheckout.class})

-public class ShoppingCartImpl implements CartInitialize, CartUpdates, CartCheckout{

-    

+@Service(interfaces = {CartInitialize.class, CartUpdates.class, CartCheckout.class})

+public class ShoppingCartImpl implements CartInitialize, CartUpdates, CartCheckout {

+

+    @Reference

+    protected Payment payment;

+

     @Reference

-    protected Payment payment; 

-    

-    @Reference 

     protected CartStore cartStore;

-    

+

     @Context

-    protected ComponentContext componentContext;  

-    

+    protected ComponentContext componentContext;

+

     private static Map<String, CartStore> cartStores = new HashMap<String, CartStore>();

-    

-    public String newCart(){

+

+    public String newCart() {

         String cartId = UUID.randomUUID().toString();

-        ServiceReference<CartStore> cartStore = componentContext.getServiceReference(CartStore.class, 

-                                                                                           "cartStore");

+        ServiceReference<CartStore> cartStore = componentContext.getServiceReference(CartStore.class, "cartStore");

         cartStore.setConversationID(cartId);

         cartStores.put(cartId, cartStore.getService());

-        

+

         return cartId;

-    }  

-    

+    }

+

     public void addTrip(String cartId, TripItem trip) {

-    	cartStores.get(cartId).addTrip(trip);

+        cartStores.get(cartId).addTrip(trip);

     }

-    

+

     public void removeTrip(String cartId, TripItem trip) {

-    	cartStores.get(cartId).addTrip(trip);

+        cartStores.get(cartId).addTrip(trip);

     }

-    

-    public TripItem[] getTrips(String cartId){

+

+    public TripItem[] getTrips(String cartId) {

         return cartStores.get(cartId).getTrips();

     }

-    

-    public void checkout(String cartId, String customerName){ 

+

+    public void checkout(String cartId, String customerName) {

         // get users credentials. Hard coded for now but should

         // come from the security context

         String customerId = customerName;

-       

+

         // get the total for all the trips

         float amount = (float)0.0;

-        

+

         TripItem[] trips = getTrips(cartId);

-        

-        for (TripItem trip : trips){

-            if (trip.getType().equals(TripItem.TRIP)){

+

+        for (TripItem trip : trips) {

+            if (trip.getType().equals(TripItem.TRIP)) {

                 amount += trip.getPrice();

             } else {

-                for (TripItem tripItem : trip.getTripItems()){

+                for (TripItem tripItem : trip.getTripItems()) {

                     amount += tripItem.getPrice();

                 }

             }

         }

-        

+

         // Take the payment from the customer

         payment.makePaymentMember(customerId, amount);

-        

+

         // reset the cart store

         cartStores.get(cartId).reset();

         cartStores.remove(cartId);

-    }  

-    

+    }

+

 }