Format the code

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

3 files changed, 30 insertions, 29 deletions

diff --git a/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursBooking.java b/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursBooking.java
index 605745e0c8..a1e0d6c91f 100644
--- a/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursBooking.java
+++ b/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursBooking.java
@@ -18,7 +18,6 @@
  */

 package com.tuscanyscatours;

 

-

 import org.osoa.sca.annotations.Remotable;

 

 import com.tuscanyscatours.common.TripItem;

diff --git a/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursCart.java b/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursCart.java
index 67764e1c0d..f9554342e9 100644
--- a/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursCart.java
+++ b/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursCart.java
@@ -26,8 +26,10 @@ import com.tuscanyscatours.common.TripItem;
  * The ShoppingCart service interface

  */

 @Remotable

-public interface SCAToursCart{

+public interface SCAToursCart {

     String newCart();

+

     TripItem[] getTrips(String cartId);

-    void checkout(String cartId);  

+

+    void checkout(String cartId);

 }

diff --git a/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/impl/SCAToursImpl.java b/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/impl/SCAToursImpl.java
index e84d0b3191..7a7f6b460d 100644
--- a/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/impl/SCAToursImpl.java
+++ b/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/impl/SCAToursImpl.java
@@ -37,48 +37,48 @@ import com.tuscanyscatours.tripbooking.TripBooking;
  * the outward facing bindings to be changed without changing the individual contributions

  */

 @Scope("COMPOSITE")

-@Service(interfaces={SCAToursSearch.class, SCAToursBooking.class, SCAToursCart.class})

-public class SCAToursImpl implements SCAToursSearch, SCAToursBooking, SCAToursCart{

-    

+@Service(interfaces = {SCAToursSearch.class, SCAToursBooking.class, SCAToursCart.class})

+public class SCAToursImpl implements SCAToursSearch, SCAToursBooking, SCAToursCart {

+

     @Reference

     protected TravelCatalogSearch travelCatalogSearch;

-    

-    @Reference 

+

+    @Reference

     protected TripBooking tripBooking;

-    

-    @Reference 

-    protected CartInitialize cartInitialize; 

-    

-    @Reference 

-    protected CartCheckout cartCheckout; 

-        

+

+    @Reference

+    protected CartInitialize cartInitialize;

+

+    @Reference

+    protected CartCheckout cartCheckout;

+

     // SCAToursSearch methods

-    

+

     public TripItem[] search(TripLeg tripLeg) {

         return travelCatalogSearch.search(tripLeg);

-    } 

+    }

 

     // SCAToursBooking methods

-    

-    public String bookTrip(String cartId, TripItem trip){

+

+    public String bookTrip(String cartId, TripItem trip) {

         TripItem bookedTrip = tripBooking.bookTrip(cartId, trip);

         return bookedTrip.getBookingCode();

     }

-    

+

     // SCAToursCart methods

-    

-    public String newCart(){

+

+    public String newCart() {

         String cartId = cartInitialize.newCart();

         return cartId;

-    }  

-    

-    public TripItem[] getTrips(String cartId){

+    }

+

+    public TripItem[] getTrips(String cartId) {

         return cartInitialize.getTrips(cartId);

     }

-    

-    public void checkout(String cartId){

+

+    public void checkout(String cartId) {

         // need to get the user id from the context here but

-    	// just make one up for the time being

+        // just make one up for the time being

         cartCheckout.checkout(cartId, "c-0");

-    }   

+    }

 }