small refactor - WIP

cbicsabi · Apr 20, 2018 · f5241b1 · f5241b1
1 parent dce4b75
commit f5241b1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/JavaBasicsLab/S04_05/Homework/Main.java b/src/JavaBasicsLab/S04_05/Homework/Main.java
@@ -15,7 +15,7 @@ public static void main(String[] args) {
  magazin1.addToStock(ouaDePrepelita, -3);
  magazin1.addToStock(ouaDePrepelita, 6);
  magazin1.printStock();
- //magazin1.purgeFromStock(ouaDePrepelita);
+ magazin1.purgeFromStock(ouaDePrepelita);
  magazin1.addToStock(carneDeVita, 10);
  magazin1.addToStock(zahar, 23);
  System.out.println(magazin1.isInStock(ouaDePrepelita));

diff --git a/src/JavaBasicsLab/S04_05/Homework/ShoppingCart.java b/src/JavaBasicsLab/S04_05/Homework/ShoppingCart.java
@@ -1,7 +1,11 @@
 package JavaBasicsLab.S04_05.Homework;
 
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
 import java.util.Map;
 
+import static java.lang.Math.round;
+
 public class ShoppingCart extends Inventory {
  private Inventory inventory;
  private CashRegister cashRegister;
@@ -17,7 +21,11 @@ public double returnTotalPrice(){
  for (Map.Entry<ShopItem, Integer> entry : stock.entrySet()) {
  pretTotal += entry.getKey().getPrice() * entry.getValue();
  }
- return pretTotal;
+ //TODO why doesn't it return rounded value to the second decimal???
+ DecimalFormat df = new DecimalFormat("#.##");
+ df.setRoundingMode(RoundingMode.CEILING);
+ double rounded = Double.parseDouble(df.format(pretTotal));
+ return rounded;
  }
 
  public void buyShoppingCart(){