a bit refactoring

AStA-Wedel · Oct 28, 2012 · 8bbf0e8 · 8bbf0e8
1 parent b44fcf0
commit 8bbf0e8
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 27 deletions.
diff --git a/src/main/java/org/fhw/asta/kasse/client/widget/basket/BasketWidget.java b/src/main/java/org/fhw/asta/kasse/client/widget/basket/BasketWidget.java
@@ -11,4 +11,6 @@ public interface BasketWidget extends IsWidget {
 	HasData<BasketItem> getBasketTable();
 
 	Column<BasketItem, String> getDeleteColumn();
+
+	Column<BasketItem, String> getAmountColumn();
 }
diff --git a/src/main/java/org/fhw/asta/kasse/client/widget/basket/BasketWidgetImpl.java b/src/main/java/org/fhw/asta/kasse/client/widget/basket/BasketWidgetImpl.java
@@ -27,42 +27,33 @@ public class BasketWidgetImpl extends Composite implements BasketWidget {
 	CellTable<BasketItem> basketTable;
 
 	private Column<BasketItem,String> deleteColumn;
+	private Column<BasketItem,String> priceColumn;
+	private Column<BasketItem,String> amountColumn;
+	private Column<BasketItem,String> nameColumn;
 
 	private void initializeCellTable() {
 		basketTable = new CellTable<BasketItem>();
 
 		EditTextCell amountCell = new EditTextCell();
+		amountColumn = new AmountColumn(amountCell);
+		basketTable.addColumn(amountColumn, "Menge");
 
-		basketTable.addColumn(new Column<BasketItem, String>(amountCell) {
-
-			@Override
-			public String getValue(BasketItem object) {
-				return Integer.toString(object.getAmount());
-			}
-		}, "Menge");
-
-		basketTable.addColumn(new TextColumn<BasketItem>() {
-
-			@Override
-			public String getValue(BasketItem object) {
-				return object.getItemName();
-			}
-
-		}, "Name");
-
-		basketTable.addColumn(new PriceTextColumn(), "Preis");
+		nameColumn = new NameColumn();
+		basketTable.addColumn(nameColumn, "Name");
 
+		priceColumn = new PriceTextColumn();
+		basketTable.addColumn(priceColumn, "Preis");
 		basketTable.getHeader(2).setHeaderStyleNames(
 				basketTable.getHeader(2).getHeaderStyleNames() + " tblleft");
 
 		ButtonCell deleteButton = new DeleteButtonCell();
 		deleteColumn = new DeleteColumn(deleteButton);
-
 		basketTable.addColumn(deleteColumn);
-		basketTable.setColumnWidth(basketTable.getColumn(0),"10%");
-		basketTable.setColumnWidth(basketTable.getColumn(1),"60%");
-		basketTable.setColumnWidth(basketTable.getColumn(2),"20%");
-		basketTable.setColumnWidth(basketTable.getColumn(3),"10%");
+
+		basketTable.setColumnWidth(amountColumn,"10%");
+		basketTable.setColumnWidth(nameColumn,"60%");
+		basketTable.setColumnWidth(priceColumn,"20%");
+		basketTable.setColumnWidth(deleteColumn,"10%");
 
 	}
 
@@ -79,6 +70,16 @@ public HasData<BasketItem> getBasketTable() {
 		return basketTable;
 	}
 
+	@Override
+	public Column<BasketItem, String> getDeleteColumn() {
+		return deleteColumn;
+	}
+
+	@Override
+	public Column<BasketItem, String> getAmountColumn() {
+		return amountColumn;
+	}
+
 	static private class DeleteColumn extends Column<BasketItem,String>
 	{
 		public DeleteColumn(Cell<String> cell) {
@@ -102,7 +103,29 @@ public String getValue(BasketItem object) {
 			return EuroFormatter.format(object.getItemPrice());
 		}
 	}
+
+	static private class NameColumn extends TextColumn<BasketItem> {
+		public NameColumn() {
+			super();
+		}
+
+		@Override
+		public String getValue(BasketItem object) {
+			return object.getItemName();
+		}
+	}
 
+	static private class AmountColumn extends Column<BasketItem,String> {
+		public AmountColumn(Cell<String> cell) {
+			super(cell);
+		}
+
+		@Override
+		public String getValue(BasketItem object) {
+			return Integer.toString(object.getAmount());
+		}
+	}
+
 	static private class DeleteButtonCell extends ButtonCell {
 		/**
 		 * Constructor.
@@ -129,9 +152,8 @@ public void render(final Context context, final SafeHtml data,
 
 	}
 
-	@Override
-	public Column<BasketItem, String> getDeleteColumn() {
-		return deleteColumn;
-	}
+
+
+
 
 }