From 8c049462ff6387d8c3f69f4e42a4c4b36e38a90c Mon Sep 17 00:00:00 2001 From: rfeng Date: Thu, 5 Nov 2009 21:14:49 +0000 Subject: Format the code git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@833174 13f79535-47bb-0310-9956-ffa450edef68 --- .../com/tuscanyscatours/trip/impl/TripImpl.java | 89 ++++++++-------------- .../com/tuscanyscatours/trip/impl/TripInfo.java | 66 ++++++++-------- .../src/test/java/scatours/trip/TripTestCase.java | 32 +++----- 3 files changed, 77 insertions(+), 110 deletions(-) (limited to 'sandbox/travelsample/contributions/trip') diff --git a/sandbox/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripImpl.java b/sandbox/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripImpl.java index c4fd0df05d..ec90524518 100644 --- a/sandbox/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripImpl.java +++ b/sandbox/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripImpl.java @@ -36,82 +36,59 @@ import com.tuscanyscatours.common.TripLeg; * An implementation of the Trip service */ @Scope("STATELESS") -@Service(interfaces={Search.class, Book.class}) +@Service(interfaces = {Search.class, Book.class}) public class TripImpl implements Search, Book { - + private List trips = new ArrayList(); - + @Callback - protected SearchCallback searchCallback; + protected SearchCallback searchCallback; @Init public void init() { - trips.add(new TripInfo("FS1DEC06", - "Florence and Siena pre-packaged tour", - "LGW", - "FLR", - "06/12/09", - "13/12/09", - "27", - 450, - "EUR", - "http://localhost:8085/tbd" )); - trips.add(new TripInfo("FS1DEC13", - "Florence and Siena pre-packaged tour 2", - "LGW", - "FLR", - "13/12/09", - "20/12/09", - "27", - 550, - "EUR", - "http://localhost:8085/tbd" )); + trips.add(new TripInfo("FS1DEC06", "Florence and Siena pre-packaged tour", "LGW", "FLR", "06/12/09", + "13/12/09", "27", 450, "EUR", "http://localhost:8085/tbd")); + trips.add(new TripInfo("FS1DEC13", "Florence and Siena pre-packaged tour 2", "LGW", "FLR", "13/12/09", + "20/12/09", "27", 550, "EUR", "http://localhost:8085/tbd")); } - + public TripItem[] searchSynch(TripLeg tripLeg) { List items = new ArrayList(); - + // find the pre-package trip - for(TripInfo trip : trips){ - if ((trip.getFromLocation().equals(tripLeg.getFromLocation())) && - (trip.getToLocation().equals(tripLeg.getToLocation())) && - (trip.getFromDate().equals(tripLeg.getFromDate()))){ - TripItem item = new TripItem("", - "", - TripItem.TRIP, - trip.getName(), - trip.getDescription(), - trip.getFromLocation() + " - " + trip.getToLocation(), - trip.getFromDate(), - trip.getToDate(), - trip.getPricePerPerson(), - trip.getCurrency(), - trip.getLink()); + for (TripInfo trip : trips) { + if ((trip.getFromLocation().equals(tripLeg.getFromLocation())) && (trip.getToLocation().equals(tripLeg + .getToLocation())) + && (trip.getFromDate().equals(tripLeg.getFromDate()))) { + TripItem item = + new TripItem("", "", TripItem.TRIP, trip.getName(), trip.getDescription(), + trip.getFromLocation() + " - " + trip.getToLocation(), trip.getFromDate(), trip + .getToDate(), trip.getPricePerPerson(), trip.getCurrency(), trip.getLink()); items.add(item); } - } - + } + return items.toArray(new TripItem[items.size()]); } - + public void searchAsynch(TripLeg tripLeg) { - System.out.println("Starting trip search"); - - try { - Thread.sleep(2000); - } catch(Exception ex){ - // do nothing + System.out.println("Starting trip search"); + + try { + Thread.sleep(2000); + } catch (Exception ex) { + // do nothing } - + // return available hotels - searchCallback.searchResults(searchSynch(tripLeg)); + searchCallback.searchResults(searchSynch(tripLeg)); } - - public int getPercentComplete(){ + + public int getPercentComplete() { return 100; } - + public String book(TripItem tripItem) { return "trip1"; - } + } } diff --git a/sandbox/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripInfo.java b/sandbox/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripInfo.java index d236c1243f..d8809e1325 100644 --- a/sandbox/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripInfo.java +++ b/sandbox/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripInfo.java @@ -19,9 +19,8 @@ package com.tuscanyscatours.trip.impl; - public class TripInfo { - + private String name; private String description; private String fromLocation; @@ -32,12 +31,12 @@ public class TripInfo { private double pricePerPerson; private String currency; private String link; - + public TripInfo() { - } - - public TripInfo(String name, - String description, + } + + public TripInfo(String name, + String description, String fromLocation, String toLocation, String fromDate, @@ -47,7 +46,6 @@ public class TripInfo { String currency, String link) { - this.name = name; this.description = description; this.fromLocation = fromLocation; @@ -58,85 +56,85 @@ public class TripInfo { this.pricePerPerson = pricePerPerson; this.currency = currency; this.link = link; - } - + } + public String getName() { return name; } - + public void setName(String name) { this.name = name; - } - + } + public String getDescription() { return description; } - + public void setDescription(String description) { - this.description = description; - } - + this.description = description; + } + public String getFromLocation() { return fromLocation; } - + public void setFromLocation(String fromLocation) { this.fromLocation = fromLocation; } - + public String getToLocation() { return toLocation; - } - + } + public void setToLocation(String toLocation) { this.toLocation = toLocation; } - + public String getFromDate() { return fromDate; } - + public void setFromDate(String fromDate) { this.fromDate = fromDate; } - + public String getToDate() { return toDate; } - + public void setToDate(String toDate) { this.toDate = toDate; } - + public String getSpaces() { return spaces; } - + public void setSpaces(String spaces) { this.spaces = spaces; } - + public double getPricePerPerson() { return pricePerPerson; } - + public void setPricePerPerson(double pricePerPerson) { this.pricePerPerson = pricePerPerson; } - + public String getCurrency() { return currency; } - + public void setCurrency(String currency) { this.currency = currency; } - + public String getLink() { return link; } - + public void setLink(String link) { this.link = link; } -} \ No newline at end of file +} diff --git a/sandbox/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java b/sandbox/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java index 88df6f4c2e..fd2cc073ec 100644 --- a/sandbox/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java +++ b/sandbox/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java @@ -34,37 +34,29 @@ import com.tuscanyscatours.common.TripItem; * */ public class TripTestCase { - private static SCANode tripNode; + private static SCANode tripNode; @BeforeClass - public static void setUpBeforeClass() throws Exception { - try { - tripNode = SCANodeFactory.newInstance().createSCANode("trip.composite", - new SCAContribution("trip", "./target/classes"), - new SCAContribution("trip-test", "./target/test-classes")); - + public static void setUpBeforeClass() throws Exception { + try { + tripNode = + SCANodeFactory.newInstance().createSCANode("trip.composite", + new SCAContribution("trip", "./target/classes"), + new SCAContribution("trip-test", "./target/test-classes")); tripNode.start(); } catch (Exception ex) { ex.printStackTrace(); } } - + @Test public void testPayment() { - SCAClient client = (SCAClient) tripNode; + SCAClient client = (SCAClient)tripNode; Book booking = client.getService(Book.class, "Trip/Book"); - TripItem tripItem = new TripItem("1234", - "5678", - TripItem.TRIP, - "FS1DEC06", - "Florence and Siena pre-packaged tour", - "FLR", - "06/12/09", - "13/12/09", - 450, - "EUR", - "http://localhost:8085/tbd"); + TripItem tripItem = + new TripItem("1234", "5678", TripItem.TRIP, "FS1DEC06", "Florence and Siena pre-packaged tour", "FLR", + "06/12/09", "13/12/09", 450, "EUR", "http://localhost:8085/tbd"); System.out.println("Result = " + booking.book(tripItem) + "\n"); } -- cgit v1.2.3