- Minor refactoring

AStA-Wedel · Mar 27, 2013 · 12a45a6 · 12a45a6
1 parent 7efaac4
commit 12a45a6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/src/main/java/org/fhw/asta/kasse/client/controller/BasketController.java b/src/main/java/org/fhw/asta/kasse/client/controller/BasketController.java
@@ -100,7 +100,8 @@ public void addBasketPosition(BasketItem basketItem) {
 
 			this.basketDataProvider.getList().remove(bi);
 
-			basketItem = basketItem.addAmount(bi.getAmount()).updateDiscount(
+			basketItem = basketItem.updateAmount(
+					bi.getAmount() + basketItem.getAmount()).updateDiscount(
 					bi.getDiscount());
 		}
 
@@ -176,16 +177,11 @@ private class AmountUpdater implements FieldUpdater<BasketItem, String> {
 		@Override
 		public void update(int index, BasketItem object, String value) {
 			BasketItem toUpdate;
-			if (value.matches("[1-9][0-9]*")) {
-				toUpdate = new BasketItem(object.getItemName(),
-						object.getItemPrice(), object.getArticleId(),
-						Integer.valueOf(value), object.getDiscount());
-
-			} else {
-				toUpdate = new BasketItem(object.getItemName(),
-						object.getItemPrice(), object.getArticleId(), 1,
-						object.getDiscount());
-			}
+
+			int amountVal = value.matches("[1-9][0-9]*") ? Integer
+					.valueOf(value) : 1;
+
+			toUpdate = object.updateAmount(amountVal);
 
 			BasketController.this.basketDataProvider.getList().remove(object);
 			BasketController.this.basketDataProvider.getList().add(toUpdate);
@@ -212,9 +208,7 @@ public void update(int index, BasketItem object, String value) {
 			int discountVal = value.matches("[0-9]+") ? Integer.valueOf(value)
 					: 0;
 
-			toUpdate = new BasketItem(object.getItemName(),
-					object.getItemPrice(), object.getArticleId(),
-					object.getAmount(), discountVal);
+			toUpdate = object.updateDiscount(discountVal);
 
 			BasketController.this.basketDataProvider.getList().remove(object);
 			BasketController.this.basketDataProvider.getList().add(toUpdate);

diff --git a/src/main/java/org/fhw/asta/kasse/shared/basket/BasketItem.java b/src/main/java/org/fhw/asta/kasse/shared/basket/BasketItem.java
@@ -58,8 +58,8 @@ public EuroAmount totalWithDiscount() {
 	  return total().withDiscount(discount);
   }
 
-  public BasketItem addAmount(int amount) {
-	  return new BasketItem(itemName, itemPrice, articleId, amount + this.amount, discount);
+  public BasketItem updateAmount(int amount) {
+	  return new BasketItem(itemName, itemPrice, articleId, amount, discount);
   }
 
   public BasketItem updateDiscount(int discount) {