Format the code

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

2 files changed, 13 insertions, 19 deletions

diff --git a/sandbox/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java b/sandbox/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java
index 36b907d454..2425d3f483 100644
--- a/sandbox/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java
+++ b/sandbox/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java
@@ -31,22 +31,19 @@ import scatours.currencyconverter.CurrencyConverter;
 public class CurrencyConverterWSLauncher {

 

     public static void main(String[] args) throws Exception {

-        SCAContribution currencyWSContribution = 

-            locate("currency-ws");

-        SCAContribution currencyContribution = 

-            locate("currency");

-        

-        SCANode node = SCANodeFactory.newInstance().createSCANode(

-            "currency-converter-ws.composite", currencyContribution, currencyWSContribution);

+        SCAContribution currencyWSContribution = locate("currency-ws");

+        SCAContribution currencyContribution = locate("currency");

+

+        SCANode node =

+            SCANodeFactory.newInstance().createSCANode("currency-converter-ws.composite",

+                                                       currencyContribution,

+                                                       currencyWSContribution);

         node.start();

 

         System.out.println("Quick currency converter test");

-        CurrencyConverter converter = ((SCAClient)node).getService(

-            CurrencyConverter.class, "CurrencyConverter");

-        System.out.println("USD -> GBP = " 

-            + converter.getExchangeRate("USD", "GBP"));

-        System.out.println("100 USD = " 

-            + converter.convert("USD", "GBP", 100) + "GBP");

+        CurrencyConverter converter = ((SCAClient)node).getService(CurrencyConverter.class, "CurrencyConverter");

+        System.out.println("USD -> GBP = " + converter.getExchangeRate("USD", "GBP"));

+        System.out.println("100 USD = " + converter.convert("USD", "GBP", 100) + "GBP");

 

         System.out.println("Node started - Press enter to shutdown.");

         System.in.read();

diff --git a/sandbox/travelsample/launchers/currency-converter-ws/src/main/java/scatours/currencyconverter/CurrencyConverter.java b/sandbox/travelsample/launchers/currency-converter-ws/src/main/java/scatours/currencyconverter/CurrencyConverter.java
index 6d0efc8c66..fe5c98bf02 100644
--- a/sandbox/travelsample/launchers/currency-converter-ws/src/main/java/scatours/currencyconverter/CurrencyConverter.java
+++ b/sandbox/travelsample/launchers/currency-converter-ws/src/main/java/scatours/currencyconverter/CurrencyConverter.java
@@ -26,11 +26,8 @@ import org.osoa.sca.annotations.Remotable;
 @Remotable

 public interface CurrencyConverter {

 

-    double getExchangeRate(String fromCurrencyCode, 

-                           String toCurrencyCode);

-    

-    double convert(String fromCurrencyCode, 

-                   String toCurrencyCode, 

-                   double amount);    

+    double getExchangeRate(String fromCurrencyCode, String toCurrencyCode);

+

+    double convert(String fromCurrencyCode, String toCurrencyCode, double amount);

 

 }