Merge branch 'master' of https://github.com/Dougnkong/DrinkAutomat

Dougnkong · Dec 20, 2020 · d12de99 · d12de99
2 parents 6999cfe + 2d3e1c3
commit d12de99
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 25 deletions.
diff --git a/out/production/drinkAutomat/drinkAutomat/common/Automat.class b/out/production/drinkAutomat/drinkAutomat/common/Automat.class
diff --git a/out/production/drinkAutomat/drinkAutomat/common/CoinValue.class b/out/production/drinkAutomat/drinkAutomat/common/CoinValue.class
diff --git a/out/production/drinkAutomat/drinkAutomat/common/Drink.class b/out/production/drinkAutomat/drinkAutomat/common/Drink.class
diff --git a/out/production/drinkAutomat/drinkAutomat/common/ErrorMessage.class b/out/production/drinkAutomat/drinkAutomat/common/ErrorMessage.class
diff --git a/out/production/drinkAutomat/drinkAutomat/common/ProductType.class b/out/production/drinkAutomat/drinkAutomat/common/ProductType.class
diff --git a/out/production/drinkAutomat/drinkAutomat/model/Coin.class b/out/production/drinkAutomat/drinkAutomat/model/Coin.class
diff --git a/out/production/drinkAutomat/drinkAutomat/model/CoinAndQuantity.class b/out/production/drinkAutomat/drinkAutomat/model/CoinAndQuantity.class
diff --git a/out/production/drinkAutomat/drinkAutomat/model/Compartment.class b/out/production/drinkAutomat/drinkAutomat/model/Compartment.class
diff --git a/out/production/drinkAutomat/drinkAutomat/model/DrinkAndChange.class b/out/production/drinkAutomat/drinkAutomat/model/DrinkAndChange.class
diff --git a/out/production/drinkAutomat/drinkAutomat/model/DrinkAutomat.class b/out/production/drinkAutomat/drinkAutomat/model/DrinkAutomat.class
diff --git a/out/production/drinkAutomat/drinkAutomatTest/testAutomate.class b/out/production/drinkAutomat/drinkAutomatTest/testAutomate.class
diff --git a/src/main/java/common/CoinValue.java b/src/main/java/common/CoinValue.java
@@ -12,12 +12,11 @@ public enum CoinValue {
 
     private final int coinValue;
 
-    CoinValue(int value) {
-        this.coinValue = value;
-    }
-
     public int getValue() {
         return this.coinValue;
     }
 
+    CoinValue(int value) {
+        this.coinValue = value;
+    }
 }
diff --git a/src/main/java/model/DrinkMachine.java b/src/main/java/model/DrinkMachine.java
@@ -31,27 +31,6 @@ public DrinkMachine(HashMap<String, Compartment> compartments) {
         this.compartments = compartments;
     }
 
-    private int getCoinSum(final List<Coin> coins) {
-        int sumCoin = 0;
-
-        for (Coin coin : coins) {
-            sumCoin += coin.getCoinValue().getValue();
-        }
-
-        return sumCoin;
-    }
-
-    /**
-     * @param drink
-     * @param coins
-     * @return Price bigger than given coins (=true) false else.
-     */
-    private boolean isNotEnoughCoinsGiven(Drink drink, final List<Coin> coins) {
-
-        return drink.getPrice() * 100 > getCoinSum(coins);
-
-    }
-
     /**
      * This method manages the purchase process and in the best case returns
      * an object containing the order and the exchange coin.
@@ -284,4 +263,25 @@ private CoinAndQuantity getCoinAndQuantityByType(final CoinValue coinValue) {
         }
         return null;
     }
+
+    private int getCoinSum(final List<Coin> coins) {
+        int sumCoin = 0;
+
+        for (Coin coin : coins) {
+            sumCoin += coin.getCoinValue().getValue();
+        }
+
+        return sumCoin;
+    }
+
+    /**
+     * @param drink
+     * @param coins
+     * @return Price bigger than given coins (=true) false else.
+     */
+    private boolean isNotEnoughCoinsGiven(Drink drink, final List<Coin> coins) {
+
+        return drink.getPrice() * 100 > getCoinSum(coins);
+
+    }
 }