]>
git.somenet.org - pub/jan/sbc.git/log
Gregor Riegler [Mon, 6 May 2013 12:13:15 +0000 (14:13 +0200)]
Merge branch 'master' of https://bitbucket.org/rgregor/sbc-ss-2013
Gregor Riegler [Mon, 6 May 2013 00:08:07 +0000 (02:08 +0200)]
Merge branch 'master' of
https://rgregor@bitbucket.org/rgregor/sbc-ss-2013.git
Conflicts:
src/main/java/at/ac/tuwien/sbc/valesriegler/group/Group.java
src/main/java/at/ac/tuwien/sbc/valesriegler/types/GroupData.java
Jan Vales [Mon, 6 May 2013 00:04:09 +0000 (02:04 +0200)]
added some not really helpful class descriptions + removed types that got duplicated. TODO remaining: fix pizzeriagui!
Gregor Riegler [Sun, 5 May 2013 23:50:20 +0000 (01:50 +0200)]
Support for space notifications for pizzeria and group agents. Change table model items type to a hash map. Replace primitive types in space class types to wrapper types.
Jan Vales [Sun, 5 May 2013 23:27:40 +0000 (01:27 +0200)]
the whole pizzeria workflow. EXCEPT cooking the pizzas.
Jan Vales [Sun, 5 May 2013 22:42:22 +0000 (00:42 +0200)]
added info to pizzeria when a püizza is done.
Gregor Riegler [Sun, 5 May 2013 20:40:15 +0000 (22:40 +0200)]
Merge branch 'master' of
https://rgregor@bitbucket.org/rgregor/sbc-ss-2013.git
Conflicts:
src/main/java/at/ac/tuwien/sbc/valesriegler/pizzeria/PizzeriaAgent.java
src/main/java/at/ac/tuwien/sbc/valesriegler/pizzeria/gui/DEP_Table.java
src/main/java/at/ac/tuwien/sbc/valesriegler/types/GroupData.java
src/main/java/at/ac/tuwien/sbc/valesriegler/xvsm/XVSMConnector.java
Gregor Riegler [Sun, 5 May 2013 20:25:58 +0000 (22:25 +0200)]
Implement handleWaitingGroup+handleOrderRequest for XVSM waiter
Jan Vales [Sun, 5 May 2013 19:57:16 +0000 (21:57 +0200)]
GroupGui should display ordered pizzas correctly again.
Jan Vales [Sun, 5 May 2013 19:41:41 +0000 (21:41 +0200)]
Cook should now correctly produce pizzas.
Jan Vales [Sun, 5 May 2013 19:39:38 +0000 (21:39 +0200)]
implemented Workflow to "ordered", where the cook has pizzas to cook and another queue waiting for completed orders.
Jan Vales [Sun, 5 May 2013 19:14:36 +0000 (21:14 +0200)]
Hopefully storing all waiters that took care of a Group.
Jan Vales [Sun, 5 May 2013 19:08:06 +0000 (21:08 +0200)]
JMSCook now cooks Pizza out of PizzaOrder.
Jan Vales [Sun, 5 May 2013 18:17:56 +0000 (20:17 +0200)]
Implemented JMS OrderRequest sent by Group.
Jan Vales [Sun, 5 May 2013 18:03:23 +0000 (20:03 +0200)]
GroupAgent now handles Group creation and run-Group-as-Thread as expected
Jan Vales [Sun, 5 May 2013 17:10:43 +0000 (19:10 +0200)]
großer Brocken an GruppenGui-Änderungen kombiniert mit ersten Teil des Bestellworkflows.
Jan Vales [Sat, 4 May 2013 15:11:50 +0000 (17:11 +0200)]
prepare merge of jms branch.
Gregor Riegler [Wed, 1 May 2013 21:27:19 +0000 (23:27 +0200)]
First running MozartSpaces communication: PizzeriaGUI writes free tables to space after creation and a waiter can read it.
Gregor Riegler [Mon, 29 Apr 2013 12:04:26 +0000 (14:04 +0200)]
UI Fix: Handle the vertical size of tables correctly
Gregor Riegler [Fri, 26 Apr 2013 13:02:10 +0000 (15:02 +0200)]
Add logging file
Jan Vales [Fri, 26 Apr 2013 10:49:35 +0000 (12:49 +0200)]
early activemq producer/consumer implementation.
Jan Vales [Fri, 26 Apr 2013 10:49:02 +0000 (12:49 +0200)]
ignore persistent activemq data
Gregor Riegler [Thu, 25 Apr 2013 09:44:19 +0000 (11:44 +0200)]
Ask for number of tables on start of the Pizzeria GUI
Gregor Riegler [Wed, 24 Apr 2013 15:26:24 +0000 (17:26 +0200)]
Pizzeria GUI implemented
Gregor Riegler [Tue, 23 Apr 2013 17:20:49 +0000 (19:20 +0200)]
Basic Group GUI implementation
Gregor Riegler [Fri, 19 Apr 2013 13:48:36 +0000 (15:48 +0200)]
Make git store the directory structure needed by maven even if folders are empty
Gregor Riegler [Fri, 19 Apr 2013 13:42:48 +0000 (15:42 +0200)]
Import Maven Skeleton Project. Make Cook and Waiter executable by Maven plugin
Jan Vales [Mon, 15 Apr 2013 21:21:37 +0000 (23:21 +0200)]
Added .gitignore
Jan Vales [Mon, 15 Apr 2013 21:20:56 +0000 (23:20 +0200)]
Initial commit