diff options
Diffstat (limited to '')
3 files changed, 22 insertions, 27 deletions
diff --git a/sandbox/travelsample/contributions/currency-servlet/src/main/java/com/tuscanyscatours/currencyconverter/servlet/CurrencyConverterServlet.java b/sandbox/travelsample/contributions/currency-servlet/src/main/java/com/tuscanyscatours/currencyconverter/servlet/CurrencyConverterServlet.java index 37987b29e7..a4b929b65d 100644 --- a/sandbox/travelsample/contributions/currency-servlet/src/main/java/com/tuscanyscatours/currencyconverter/servlet/CurrencyConverterServlet.java +++ b/sandbox/travelsample/contributions/currency-servlet/src/main/java/com/tuscanyscatours/currencyconverter/servlet/CurrencyConverterServlet.java @@ -42,8 +42,8 @@ public class CurrencyConverterServlet extends HttpServlet { // The Currency Converter reference will only be injected from the @Reference // annotation in containers supporting SCA "deep" integration. In other // environments in can be looked up from the ComponentContext. - ComponentContext context = (ComponentContext) config.getServletContext() - .getAttribute("org.osoa.sca.ComponentContext"); + ComponentContext context = + (ComponentContext)config.getServletContext().getAttribute("org.osoa.sca.ComponentContext"); currencyConverter = context.getService(CurrencyConverter.class, "currencyConverter"); } } @@ -60,11 +60,11 @@ public class CurrencyConverterServlet extends HttpServlet { out.write("</form><p>"); String dollarsStr = request.getParameter("dollars"); - if ( dollarsStr != null) { - double dollars = Double.parseDouble(dollarsStr); - double converted = currencyConverter.convert("USD", "GBP", dollars); - out.write(dollars + " US Dollars = " + converted + " GB Pounds"); - } + if (dollarsStr != null) { + double dollars = Double.parseDouble(dollarsStr); + double converted = currencyConverter.convert("USD", "GBP", dollars); + out.write(dollars + " US Dollars = " + converted + " GB Pounds"); + } out.write("</body></html>"); out.write("</body></html>"); diff --git a/sandbox/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java b/sandbox/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java index 24d945b2f4..b1f783bfba 100644 --- a/sandbox/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java +++ b/sandbox/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/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);
}
diff --git a/sandbox/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/impl/CurrencyConverterImpl.java b/sandbox/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/impl/CurrencyConverterImpl.java index 13519a4969..6ad9a957c7 100644 --- a/sandbox/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/impl/CurrencyConverterImpl.java +++ b/sandbox/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/impl/CurrencyConverterImpl.java @@ -21,35 +21,33 @@ package com.tuscanyscatours.currencyconverter.impl; import java.util.HashMap;
import java.util.Map;
-import com.tuscanyscatours.currencyconverter.CurrencyConverter;
import org.osoa.sca.annotations.Service;
+import com.tuscanyscatours.currencyconverter.CurrencyConverter;
+
/**
* An implementation of the CurrencyConverter service
*/
-@Service(interfaces={CurrencyConverter.class})
+@Service(interfaces = {CurrencyConverter.class})
public class CurrencyConverterImpl implements CurrencyConverter {
-
+
// currency index
private Map<String, Integer> currencyIndex = new HashMap<String, Integer>();
-
+
// exchange rates
- private final double rates [][] = {{ 1.00, 0.50, 0.66 },
- { 2.00, 1.00, 1.33 },
- { 1.50, 0.75, 1.00 } } ;
-
- public CurrencyConverterImpl(){
+ private final double rates[][] = { {1.00, 0.50, 0.66}, {2.00, 1.00, 1.33}, {1.50, 0.75, 1.00}};
+
+ public CurrencyConverterImpl() {
currencyIndex.put("USD", new Integer(0));
currencyIndex.put("GBP", new Integer(1));
currencyIndex.put("EUR", new Integer(2));
}
- public double getExchangeRate(String fromCurrencyCode, String toCurrencyCode){
- return rates[currencyIndex.get(fromCurrencyCode).intValue()]
- [currencyIndex.get(toCurrencyCode).intValue()];
- }
+ public double getExchangeRate(String fromCurrencyCode, String toCurrencyCode) {
+ return rates[currencyIndex.get(fromCurrencyCode).intValue()][currencyIndex.get(toCurrencyCode).intValue()];
+ }
- public double convert(String fromCurrencyCode, String toCurrencyCode, double amount){
+ public double convert(String fromCurrencyCode, String toCurrencyCode, double amount) {
return amount * getExchangeRate(fromCurrencyCode, toCurrencyCode);
}
}
|