From ac56e18ee018923d9a574277c600d9e6ec8b2c66 Mon Sep 17 00:00:00 2001 From: Jan Vales Date: Sun, 5 May 2013 21:14:36 +0200 Subject: [PATCH] Hopefully storing all waiters that took care of a Group. --- .../sbc/valesriegler/types/GroupData.java | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/main/java/at/ac/tuwien/sbc/valesriegler/types/GroupData.java b/src/main/java/at/ac/tuwien/sbc/valesriegler/types/GroupData.java index 04891bc..03d223c 100644 --- a/src/main/java/at/ac/tuwien/sbc/valesriegler/types/GroupData.java +++ b/src/main/java/at/ac/tuwien/sbc/valesriegler/types/GroupData.java @@ -25,7 +25,8 @@ public class GroupData implements Serializable { private int tableWaiter; private Order order; private int orderWaiter; - private int pizzaWaiter; + private int servingWaiter; + private int payingWaiter; @Deprecated private List pizzas = new ArrayList(); @@ -50,8 +51,13 @@ public class GroupData implements Serializable { return pizzas; } + @Deprecated public int getPizzaWaiter() { - return pizzaWaiter; + return servingWaiter; + } + + public int getServingWaiter() { + return servingWaiter; } public int getSize() { @@ -83,8 +89,13 @@ public class GroupData implements Serializable { this.pizzas = pizzas; } + @Deprecated public void setPizzaWaiter(int pizzaWaiter) { - this.pizzaWaiter = pizzaWaiter; + servingWaiter = pizzaWaiter; + } + + public void setServingWaiter(int servingWaiter) { + this.servingWaiter = servingWaiter; } public void setSize(int size) { @@ -106,7 +117,7 @@ public class GroupData implements Serializable { @Override public String toString() { return "GroupData [id=" + id + ", state=" + state + ", size=" + size + ", table=" + table + ", tableWaiter=" - + tableWaiter + ", order=" + order + ", orderWaiter=" + orderWaiter + ", pizzaWaiter=" + pizzaWaiter - + ", pizzas=" + pizzas + "]"; + + tableWaiter + ", order=" + order + ", orderWaiter=" + orderWaiter + ", servingWaiter=" + servingWaiter + + ", payingWaiter=" + payingWaiter + ", pizzas=" + pizzas + "]"; } } -- 2.43.0