diff --git a/deliverables/Javadocs/allclasses-index.html b/deliverables/Javadocs/allclasses-index.html
index 0f6e8a6..4323b2e 100644
--- a/deliverables/Javadocs/allclasses-index.html
+++ b/deliverables/Javadocs/allclasses-index.html
@@ -2,7 +2,7 @@
-
+
All Classes
diff --git a/deliverables/Javadocs/allpackages-index.html b/deliverables/Javadocs/allpackages-index.html
index bc94b4f..cc44e68 100644
--- a/deliverables/Javadocs/allpackages-index.html
+++ b/deliverables/Javadocs/allpackages-index.html
@@ -2,7 +2,7 @@
-
+
All Packages
diff --git a/deliverables/Javadocs/constant-values.html b/deliverables/Javadocs/constant-values.html
index 75b10c3..04b63aa 100644
--- a/deliverables/Javadocs/constant-values.html
+++ b/deliverables/Javadocs/constant-values.html
@@ -2,7 +2,7 @@
-
+
Constant Field Values
diff --git a/deliverables/Javadocs/help-doc.html b/deliverables/Javadocs/help-doc.html
index f2f561e..be5ec97 100644
--- a/deliverables/Javadocs/help-doc.html
+++ b/deliverables/Javadocs/help-doc.html
@@ -2,7 +2,7 @@
-
+
API Help
diff --git a/deliverables/Javadocs/index-files/index-1.html b/deliverables/Javadocs/index-files/index-1.html
index c71741c..e43a880 100644
--- a/deliverables/Javadocs/index-files/index-1.html
+++ b/deliverables/Javadocs/index-files/index-1.html
@@ -2,7 +2,7 @@
-
+
A-Index
diff --git a/deliverables/Javadocs/index-files/index-10.html b/deliverables/Javadocs/index-files/index-10.html
index af06131..8d93e1a 100644
--- a/deliverables/Javadocs/index-files/index-10.html
+++ b/deliverables/Javadocs/index-files/index-10.html
@@ -2,7 +2,7 @@
-
+
L-Index
diff --git a/deliverables/Javadocs/index-files/index-11.html b/deliverables/Javadocs/index-files/index-11.html
index 8a5ae74..25f536b 100644
--- a/deliverables/Javadocs/index-files/index-11.html
+++ b/deliverables/Javadocs/index-files/index-11.html
@@ -2,7 +2,7 @@
-
+
M-Index
diff --git a/deliverables/Javadocs/index-files/index-12.html b/deliverables/Javadocs/index-files/index-12.html
index ad5e972..8d2dee9 100644
--- a/deliverables/Javadocs/index-files/index-12.html
+++ b/deliverables/Javadocs/index-files/index-12.html
@@ -2,7 +2,7 @@
-
+
N-Index
diff --git a/deliverables/Javadocs/index-files/index-13.html b/deliverables/Javadocs/index-files/index-13.html
index 97980db..631131a 100644
--- a/deliverables/Javadocs/index-files/index-13.html
+++ b/deliverables/Javadocs/index-files/index-13.html
@@ -2,7 +2,7 @@
-
+
P-Index
diff --git a/deliverables/Javadocs/index-files/index-14.html b/deliverables/Javadocs/index-files/index-14.html
index 00de791..a91d8fb 100644
--- a/deliverables/Javadocs/index-files/index-14.html
+++ b/deliverables/Javadocs/index-files/index-14.html
@@ -2,7 +2,7 @@
-
+
R-Index
diff --git a/deliverables/Javadocs/index-files/index-15.html b/deliverables/Javadocs/index-files/index-15.html
index effa5aa..28413e2 100644
--- a/deliverables/Javadocs/index-files/index-15.html
+++ b/deliverables/Javadocs/index-files/index-15.html
@@ -2,7 +2,7 @@
-
+
S-Index
diff --git a/deliverables/Javadocs/index-files/index-16.html b/deliverables/Javadocs/index-files/index-16.html
index 2a64a9c..68e76e2 100644
--- a/deliverables/Javadocs/index-files/index-16.html
+++ b/deliverables/Javadocs/index-files/index-16.html
@@ -2,7 +2,7 @@
-
+
T-Index
diff --git a/deliverables/Javadocs/index-files/index-17.html b/deliverables/Javadocs/index-files/index-17.html
index d557a85..9a3332d 100644
--- a/deliverables/Javadocs/index-files/index-17.html
+++ b/deliverables/Javadocs/index-files/index-17.html
@@ -2,7 +2,7 @@
-
+
U-Index
diff --git a/deliverables/Javadocs/index-files/index-18.html b/deliverables/Javadocs/index-files/index-18.html
index dc59f82..01cbe86 100644
--- a/deliverables/Javadocs/index-files/index-18.html
+++ b/deliverables/Javadocs/index-files/index-18.html
@@ -2,7 +2,7 @@
-
+
V-Index
diff --git a/deliverables/Javadocs/index-files/index-19.html b/deliverables/Javadocs/index-files/index-19.html
index c0c0c7a..38ec355 100644
--- a/deliverables/Javadocs/index-files/index-19.html
+++ b/deliverables/Javadocs/index-files/index-19.html
@@ -2,7 +2,7 @@
-
+
W-Index
diff --git a/deliverables/Javadocs/index-files/index-2.html b/deliverables/Javadocs/index-files/index-2.html
index 99306fb..94f565f 100644
--- a/deliverables/Javadocs/index-files/index-2.html
+++ b/deliverables/Javadocs/index-files/index-2.html
@@ -2,7 +2,7 @@
-
+
B-Index
diff --git a/deliverables/Javadocs/index-files/index-20.html b/deliverables/Javadocs/index-files/index-20.html
index 50da7b5..646c453 100644
--- a/deliverables/Javadocs/index-files/index-20.html
+++ b/deliverables/Javadocs/index-files/index-20.html
@@ -2,7 +2,7 @@
-
+
Y-Index
diff --git a/deliverables/Javadocs/index-files/index-3.html b/deliverables/Javadocs/index-files/index-3.html
index 3e527e9..cef6cef 100644
--- a/deliverables/Javadocs/index-files/index-3.html
+++ b/deliverables/Javadocs/index-files/index-3.html
@@ -2,7 +2,7 @@
-
+
C-Index
diff --git a/deliverables/Javadocs/index-files/index-4.html b/deliverables/Javadocs/index-files/index-4.html
index 055dd11..c09f270 100644
--- a/deliverables/Javadocs/index-files/index-4.html
+++ b/deliverables/Javadocs/index-files/index-4.html
@@ -2,7 +2,7 @@
-
+
D-Index
diff --git a/deliverables/Javadocs/index-files/index-5.html b/deliverables/Javadocs/index-files/index-5.html
index 0095c96..d2eb1aa 100644
--- a/deliverables/Javadocs/index-files/index-5.html
+++ b/deliverables/Javadocs/index-files/index-5.html
@@ -2,7 +2,7 @@
-
+
E-Index
diff --git a/deliverables/Javadocs/index-files/index-6.html b/deliverables/Javadocs/index-files/index-6.html
index e479e84..43d90c7 100644
--- a/deliverables/Javadocs/index-files/index-6.html
+++ b/deliverables/Javadocs/index-files/index-6.html
@@ -2,7 +2,7 @@
-
+
F-Index
diff --git a/deliverables/Javadocs/index-files/index-7.html b/deliverables/Javadocs/index-files/index-7.html
index 39e1bc8..2e70df5 100644
--- a/deliverables/Javadocs/index-files/index-7.html
+++ b/deliverables/Javadocs/index-files/index-7.html
@@ -2,7 +2,7 @@
-
+
G-Index
diff --git a/deliverables/Javadocs/index-files/index-8.html b/deliverables/Javadocs/index-files/index-8.html
index 4e26bc9..bcd867a 100644
--- a/deliverables/Javadocs/index-files/index-8.html
+++ b/deliverables/Javadocs/index-files/index-8.html
@@ -2,7 +2,7 @@
-
+
H-Index
@@ -63,7 +63,12 @@ H
handleEvent(ActivatedProductionEvent) - Method in interface it.polimi.ingsw.controller.Events.ClientEventHandler
handleEvent(ActivatedProductionEvent) - Method in class it.polimi.ingsw.controller.VirtualView
-
+
+ActivateProductionEvent from the client
+ checks if an action has already been done:
+ if not, it sends the event to the controller which will then edit the model;
+ if yes, it adds a new IllegalAction to communicate that an action has already been done
+
handleEvent(ActivatedProductionEventS2C) - Method in class it.polimi.ingsw.client.EventsHandler
receives an event and handles it
@@ -77,13 +82,24 @@ H
receives an event and updates the scene based on the event type
handleEvent(ActivatedProductionEventS2C) - Method in interface it.polimi.ingsw.controller.Events.ServerEventObserver
-
+
+ActivateProductionEvent from the server
+ sends the event to every client
+
handleEvent(ActivatedProductionEventS2C) - Method in class it.polimi.ingsw.controller.VirtualView
-
+
+ActivateProductionEvent from the server
+ sends the event to every client
+
handleEvent(BoughtCardEvent) - Method in interface it.polimi.ingsw.controller.Events.ClientEventHandler
handleEvent(BoughtCardEvent) - Method in class it.polimi.ingsw.controller.VirtualView
-
+
+BoughCardEvent from the client
+ checks if an action has already been done:
+ if not, it sends the event to the controller which will then edit the model;
+ if yes, it adds a new IllegalAction to communicate that an action has already been done
+
handleEvent(BoughtCardEventS2C) - Method in class it.polimi.ingsw.client.EventsHandler
receives an event and handles it
@@ -97,9 +113,15 @@ H
receives an event and updates the scene based on the event type
handleEvent(BoughtCardEventS2C) - Method in interface it.polimi.ingsw.controller.Events.ServerEventObserver
-
+
+BoughtCardEvent from the server
+ sends the event to every client
+
handleEvent(BoughtCardEventS2C) - Method in class it.polimi.ingsw.controller.VirtualView
-
+
+BoughtCardEvent from the server
+ sends the event to every client
+
handleEvent(EndGameEventS2C) - Method in class it.polimi.ingsw.client.EventsHandler
receives an event and handles it
@@ -113,9 +135,15 @@ H
receives an event and updates the scene based on the event type
handleEvent(EndGameEventS2C) - Method in interface it.polimi.ingsw.controller.Events.ServerEventObserver
-
+
+EndGameEvent from the server
+ sends the event to every client
+
handleEvent(EndGameEventS2C) - Method in class it.polimi.ingsw.controller.VirtualView
-
+
+EndGameEvent from the server
+ sends the event to every client
+
handleEvent(EndPreparationEventS2C) - Method in class it.polimi.ingsw.client.EventsHandler
receives an event and handles it
@@ -129,13 +157,24 @@ H
receives an event and updates the scene based on the event type
handleEvent(EndPreparationEventS2C) - Method in interface it.polimi.ingsw.controller.Events.ServerEventObserver
-
+
+EndPreparationEvent from the server
+ sends the event to every client
+
handleEvent(EndPreparationEventS2C) - Method in class it.polimi.ingsw.controller.VirtualView
-
+
+EndPreparationEvent from the server
+ sends the event to every client
+
handleEvent(EndTurnEvent) - Method in interface it.polimi.ingsw.controller.Events.ClientEventHandler
handleEvent(EndTurnEvent) - Method in class it.polimi.ingsw.controller.VirtualView
-
+
+boughCardEvent from the client
+ checks if an action has already been done:
+ if not, it adds a new IllegalAction to communicate that an action has already been done;
+ if yes, it sends the event to the controller which will then edit the model;
+
handleEvent(GameStarterEventS2C) - Method in class it.polimi.ingsw.client.EventsHandler
receives an event and handles it
@@ -149,9 +188,15 @@ H
receives an event and updates the scene based on the event type
handleEvent(GameStarterEventS2C) - Method in interface it.polimi.ingsw.controller.Events.ServerEventObserver
-
+
+LeaderActionEvent from the server
+ sends the event to the specific player
+
handleEvent(GameStarterEventS2C) - Method in class it.polimi.ingsw.controller.VirtualView
-
+
+LeaderActionEvent from the server
+ sends the event to the specific player
+
handleEvent(IllegalActionEventS2C) - Method in class it.polimi.ingsw.client.EventsHandler
receives an event and handles it
@@ -165,9 +210,15 @@ H
receives an event and updates the scene based on the event type
handleEvent(IllegalActionEventS2C) - Method in interface it.polimi.ingsw.controller.Events.ServerEventObserver
-
+
+IllegalActionEvent from the server
+ sends the event to the specific player who has done it
+
handleEvent(IllegalActionEventS2C) - Method in class it.polimi.ingsw.controller.VirtualView
-
+
+IllegalActionEvent from the server
+ sends the event to the specific player who has done it
+
handleEvent(IncrementPositionEventS2C) - Method in class it.polimi.ingsw.client.EventsHandler
receives an event and handles it
@@ -181,17 +232,31 @@ H
receives an event and updates the scene based on the event type
handleEvent(IncrementPositionEventS2C) - Method in interface it.polimi.ingsw.controller.Events.ServerEventObserver
-
+
+IncrementPosition from the server
+ sends the event to every client
+
handleEvent(IncrementPositionEventS2C) - Method in class it.polimi.ingsw.controller.VirtualView
-
+
+IncrementPosition from the server
+ sends the event to every client
+
handleEvent(InitialChoiceEvent) - Method in interface it.polimi.ingsw.controller.Events.ClientEventHandler
handleEvent(InitialChoiceEvent) - Method in class it.polimi.ingsw.controller.VirtualView
-
+
+InitialChoiceEvent from the client
+ sends the event to the controller which will then edit the model
+
handleEvent(LeaderCardActionEvent) - Method in interface it.polimi.ingsw.controller.Events.ClientEventHandler
handleEvent(LeaderCardActionEvent) - Method in class it.polimi.ingsw.controller.VirtualView
-
+
+LeaderCardActionEvent from the client
+ action could be discard ("d") or activate "a")
+ it sends the event to the controller, which will then edit the model
+ if yes, it adds a new IllegalAction to communicate that an action has already been done
+
handleEvent(LeaderCardActionEventS2C) - Method in class it.polimi.ingsw.client.EventsHandler
receives an event and handles it
@@ -205,9 +270,15 @@ H
receives an event and updates the scene based on the event type
handleEvent(LeaderCardActionEventS2C) - Method in interface it.polimi.ingsw.controller.Events.ServerEventObserver
-
+
+LeaderActionEvent from the server
+ sends the event to every client
+
handleEvent(LeaderCardActionEventS2C) - Method in class it.polimi.ingsw.controller.VirtualView
-
+
+LeaderActionEvent from the server
+ sends the event to every client
+
handleEvent(LorenzoTurnEventS2C) - Method in class it.polimi.ingsw.client.EventsHandler
receives an event and handles it
@@ -221,13 +292,21 @@ H
receives an event and updates the scene based on the event type
handleEvent(LorenzoTurnEventS2C) - Method in interface it.polimi.ingsw.controller.Events.ServerEventObserver
-
+
+LorenzoTurnEvent from the server
+ sends the event to every client
+
handleEvent(LorenzoTurnEventS2C) - Method in class it.polimi.ingsw.controller.VirtualView
-
+
+LorenzoTurnEvent from the server
+ sends the event to every client
+
handleEvent(NewConnectionEvent) - Method in interface it.polimi.ingsw.controller.Events.ClientEventHandler
handleEvent(NewConnectionEvent) - Method in class it.polimi.ingsw.controller.VirtualView
-
+
+NewConnectionEvent from the client
+
handleEvent(NewConnectionEventS2C) - Method in class it.polimi.ingsw.client.EventsHandler
receives an event and handles it
@@ -241,9 +320,13 @@ H
receives an event and updates the scene based on the event type
handleEvent(NewConnectionEventS2C) - Method in interface it.polimi.ingsw.controller.Events.ServerEventObserver
-
+
+LeaderActionEvent from the server
+
handleEvent(NewConnectionEventS2C) - Method in class it.polimi.ingsw.controller.VirtualView
-
+
+LeaderActionEvent from the server
+
handleEvent(NewTurnEventS2C) - Method in class it.polimi.ingsw.client.EventsHandler
receives an event and handles it
@@ -257,17 +340,30 @@ H
receives an event and updates the scene based on the event type
handleEvent(NewTurnEventS2C) - Method in interface it.polimi.ingsw.controller.Events.ServerEventObserver
-
+
+NewTurnEvent from the server
+ sends the event to every client
+
handleEvent(NewTurnEventS2C) - Method in class it.polimi.ingsw.controller.VirtualView
-
+
+NewTurnEvent from the server
+ sends the event to every client
+
handleEvent(NumPlayerEvent) - Method in interface it.polimi.ingsw.controller.Events.ClientEventHandler
handleEvent(NumPlayerEvent) - Method in class it.polimi.ingsw.controller.VirtualView
-
+
+NumPlayerEvent from the client, sent to the controller which will then edit the model
+
handleEvent(UseMarketEvent) - Method in interface it.polimi.ingsw.controller.Events.ClientEventHandler
handleEvent(UseMarketEvent) - Method in class it.polimi.ingsw.controller.VirtualView
-
+
+UseMarketEvent from the client
+ checks if an action has already been done:
+ if not, it sends the event to the controller which will then edit the model;
+ if yes, it adds a new IllegalAction to communicate that an action has already been done
+
handleEvent(UseMarketEventS2C) - Method in class it.polimi.ingsw.client.EventsHandler
receives an event and handles it
@@ -281,9 +377,15 @@ H
receives an event and updates the scene based on the event type
handleEvent(UseMarketEventS2C) - Method in interface it.polimi.ingsw.controller.Events.ServerEventObserver
-
+
+UseMarketEvent from the server
+ sends the event to every client
+
handleEvent(UseMarketEventS2C) - Method in class it.polimi.ingsw.controller.VirtualView
-
+
+UseMarketEvent from the server
+ sends the event to every client
+
handleEvent(VaticanReportEventS2C) - Method in class it.polimi.ingsw.client.EventsHandler
receives an event and handles it
@@ -297,9 +399,15 @@ H
receives an event and updates the scene based on the event type
handleEvent(VaticanReportEventS2C) - Method in interface it.polimi.ingsw.controller.Events.ServerEventObserver
-
+
+VaticanReportEvent from the server
+ sends the event to every client
+
handleEvent(VaticanReportEventS2C) - Method in class it.polimi.ingsw.controller.VirtualView
-
+
+VaticanReportEvent from the server
+ sends the event to every client
+
hasDoneAction() - Method in class it.polimi.ingsw.model.Game
hasGameEnded() - Method in class it.polimi.ingsw.client.ClientModel
diff --git a/deliverables/Javadocs/index-files/index-9.html b/deliverables/Javadocs/index-files/index-9.html
index eac0a54..e830f86 100644
--- a/deliverables/Javadocs/index-files/index-9.html
+++ b/deliverables/Javadocs/index-files/index-9.html
@@ -2,7 +2,7 @@
-
+
I-Index
diff --git a/deliverables/Javadocs/index.html b/deliverables/Javadocs/index.html
index 2bfa6df..e39e463 100644
--- a/deliverables/Javadocs/index.html
+++ b/deliverables/Javadocs/index.html
@@ -2,7 +2,7 @@
-
+
Overview
diff --git a/deliverables/Javadocs/it/polimi/ingsw/MastersOfRenaissance.html b/deliverables/Javadocs/it/polimi/ingsw/MastersOfRenaissance.html
index 2053e10..7806c67 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/MastersOfRenaissance.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/MastersOfRenaissance.html
@@ -2,7 +2,7 @@
-
+
MastersOfRenaissance
diff --git a/deliverables/Javadocs/it/polimi/ingsw/client/ActionHandler.html b/deliverables/Javadocs/it/polimi/ingsw/client/ActionHandler.html
index a5ea6f4..3495129 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/client/ActionHandler.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/client/ActionHandler.html
@@ -2,7 +2,7 @@
-
+
ActionHandler
diff --git a/deliverables/Javadocs/it/polimi/ingsw/client/CliView.html b/deliverables/Javadocs/it/polimi/ingsw/client/CliView.html
index ecc612f..15ba802 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/client/CliView.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/client/CliView.html
@@ -2,7 +2,7 @@
-
+
CliView
diff --git a/deliverables/Javadocs/it/polimi/ingsw/client/ClientModel.html b/deliverables/Javadocs/it/polimi/ingsw/client/ClientModel.html
index c807f6a..312d54f 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/client/ClientModel.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/client/ClientModel.html
@@ -2,7 +2,7 @@
-
+
ClientModel
diff --git a/deliverables/Javadocs/it/polimi/ingsw/client/Color.html b/deliverables/Javadocs/it/polimi/ingsw/client/Color.html
index a0889ad..b91e225 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/client/Color.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/client/Color.html
@@ -2,7 +2,7 @@
-
+
Color
diff --git a/deliverables/Javadocs/it/polimi/ingsw/client/EventsHandler.html b/deliverables/Javadocs/it/polimi/ingsw/client/EventsHandler.html
index 4bfce19..dd649e7 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/client/EventsHandler.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/client/EventsHandler.html
@@ -2,7 +2,7 @@
-
+
EventsHandler
diff --git a/deliverables/Javadocs/it/polimi/ingsw/client/EventsHandlerCLI.html b/deliverables/Javadocs/it/polimi/ingsw/client/EventsHandlerCLI.html
index d14d7ff..0978d7d 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/client/EventsHandlerCLI.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/client/EventsHandlerCLI.html
@@ -2,7 +2,7 @@
-
+
EventsHandlerCLI
diff --git a/deliverables/Javadocs/it/polimi/ingsw/client/GUI/ActivateProductionSceneController.html b/deliverables/Javadocs/it/polimi/ingsw/client/GUI/ActivateProductionSceneController.html
index d7965ac..7416d3b 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/client/GUI/ActivateProductionSceneController.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/client/GUI/ActivateProductionSceneController.html
@@ -2,7 +2,7 @@
-
+
ActivateProductionSceneController
diff --git a/deliverables/Javadocs/it/polimi/ingsw/client/GUI/BuyCardSceneController.html b/deliverables/Javadocs/it/polimi/ingsw/client/GUI/BuyCardSceneController.html
index c6188a8..4295c3c 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/client/GUI/BuyCardSceneController.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/client/GUI/BuyCardSceneController.html
@@ -2,7 +2,7 @@
-
+
BuyCardSceneController
diff --git a/deliverables/Javadocs/it/polimi/ingsw/client/GUI/EndGameSceneController.html b/deliverables/Javadocs/it/polimi/ingsw/client/GUI/EndGameSceneController.html
index 2786a38..b8764ad 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/client/GUI/EndGameSceneController.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/client/GUI/EndGameSceneController.html
@@ -2,7 +2,7 @@
-
+
EndGameSceneController
diff --git a/deliverables/Javadocs/it/polimi/ingsw/client/GUI/EventsHandlerGUI.html b/deliverables/Javadocs/it/polimi/ingsw/client/GUI/EventsHandlerGUI.html
index 0dd1a31..f086132 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/client/GUI/EventsHandlerGUI.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/client/GUI/EventsHandlerGUI.html
@@ -2,7 +2,7 @@
-
+
EventsHandlerGUI
diff --git a/deliverables/Javadocs/it/polimi/ingsw/client/GUI/FXMLController.html b/deliverables/Javadocs/it/polimi/ingsw/client/GUI/FXMLController.html
index 9df9367..41f5731 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/client/GUI/FXMLController.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/client/GUI/FXMLController.html
@@ -2,7 +2,7 @@
-
+
FXMLController
diff --git a/deliverables/Javadocs/it/polimi/ingsw/client/GUI/GameSceneController.html b/deliverables/Javadocs/it/polimi/ingsw/client/GUI/GameSceneController.html
index 8ea4715..e7b3db1 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/client/GUI/GameSceneController.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/client/GUI/GameSceneController.html
@@ -2,7 +2,7 @@
-
+
GameSceneController
diff --git a/deliverables/Javadocs/it/polimi/ingsw/client/GUI/GuiView.html b/deliverables/Javadocs/it/polimi/ingsw/client/GUI/GuiView.html
index b706d83..67b49bd 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/client/GUI/GuiView.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/client/GUI/GuiView.html
@@ -2,7 +2,7 @@
-
+
GuiView
diff --git a/deliverables/Javadocs/it/polimi/ingsw/client/GUI/InitialSceneController.html b/deliverables/Javadocs/it/polimi/ingsw/client/GUI/InitialSceneController.html
index 32e8a6b..222c2ea 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/client/GUI/InitialSceneController.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/client/GUI/InitialSceneController.html
@@ -2,7 +2,7 @@
-
+
InitialSceneController
diff --git a/deliverables/Javadocs/it/polimi/ingsw/client/GUI/LeaderActionSceneController.html b/deliverables/Javadocs/it/polimi/ingsw/client/GUI/LeaderActionSceneController.html
index 59e4f62..fe8e397 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/client/GUI/LeaderActionSceneController.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/client/GUI/LeaderActionSceneController.html
@@ -2,7 +2,7 @@
-
+
LeaderActionSceneController
diff --git a/deliverables/Javadocs/it/polimi/ingsw/client/GUI/PregameSceneController.html b/deliverables/Javadocs/it/polimi/ingsw/client/GUI/PregameSceneController.html
index 7eedef2..38ba1ee 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/client/GUI/PregameSceneController.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/client/GUI/PregameSceneController.html
@@ -2,7 +2,7 @@
-
+
PregameSceneController
diff --git a/deliverables/Javadocs/it/polimi/ingsw/client/GUI/UseMarketSceneController.html b/deliverables/Javadocs/it/polimi/ingsw/client/GUI/UseMarketSceneController.html
index 8921308..6157c8a 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/client/GUI/UseMarketSceneController.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/client/GUI/UseMarketSceneController.html
@@ -2,7 +2,7 @@
-
+
UseMarketSceneController
diff --git a/deliverables/Javadocs/it/polimi/ingsw/client/GUI/package-summary.html b/deliverables/Javadocs/it/polimi/ingsw/client/GUI/package-summary.html
index d180cb9..35e2ee9 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/client/GUI/package-summary.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/client/GUI/package-summary.html
@@ -2,7 +2,7 @@
-
+
it.polimi.ingsw.client.GUI
diff --git a/deliverables/Javadocs/it/polimi/ingsw/client/GUI/package-tree.html b/deliverables/Javadocs/it/polimi/ingsw/client/GUI/package-tree.html
index 67cc01e..9d019c8 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/client/GUI/package-tree.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/client/GUI/package-tree.html
@@ -2,7 +2,7 @@
-
+
it.polimi.ingsw.client.GUI Class Hierarchy
diff --git a/deliverables/Javadocs/it/polimi/ingsw/client/ServerHandler.html b/deliverables/Javadocs/it/polimi/ingsw/client/ServerHandler.html
index cac9072..429fd60 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/client/ServerHandler.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/client/ServerHandler.html
@@ -2,7 +2,7 @@
-
+
ServerHandler
diff --git a/deliverables/Javadocs/it/polimi/ingsw/client/package-summary.html b/deliverables/Javadocs/it/polimi/ingsw/client/package-summary.html
index e4fbf4a..c880578 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/client/package-summary.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/client/package-summary.html
@@ -2,7 +2,7 @@
-
+
it.polimi.ingsw.client
diff --git a/deliverables/Javadocs/it/polimi/ingsw/client/package-tree.html b/deliverables/Javadocs/it/polimi/ingsw/client/package-tree.html
index 6d6f3e2..686ec0f 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/client/package-tree.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/client/package-tree.html
@@ -2,7 +2,7 @@
-
+
it.polimi.ingsw.client Class Hierarchy
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/ClientHandler.html b/deliverables/Javadocs/it/polimi/ingsw/controller/ClientHandler.html
index 75efdbd..a6ad87a 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/ClientHandler.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/ClientHandler.html
@@ -2,7 +2,7 @@
-
+
ClientHandler
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Configs.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Configs.html
index 551f96b..1b0f776 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Configs.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Configs.html
@@ -2,7 +2,7 @@
-
+
Configs
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Controller.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Controller.html
index aaec0b7..31d6ea3 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Controller.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Controller.html
@@ -2,7 +2,7 @@
-
+
Controller
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ActivatedProductionEvent.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ActivatedProductionEvent.html
index 2ba7a4c..15e2c47 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ActivatedProductionEvent.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ActivatedProductionEvent.html
@@ -2,7 +2,7 @@
-
+
ActivatedProductionEvent
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ActivatedProductionEventS2C.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ActivatedProductionEventS2C.html
index 8930e88..23b911d 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ActivatedProductionEventS2C.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ActivatedProductionEventS2C.html
@@ -2,7 +2,7 @@
-
+
ActivatedProductionEventS2C
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/BoughtCardEvent.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/BoughtCardEvent.html
index 9bf3231..0c0f0db 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/BoughtCardEvent.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/BoughtCardEvent.html
@@ -2,7 +2,7 @@
-
+
BoughtCardEvent
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/BoughtCardEventS2C.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/BoughtCardEventS2C.html
index e0f9bae..9c1f61e 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/BoughtCardEventS2C.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/BoughtCardEventS2C.html
@@ -2,7 +2,7 @@
-
+
BoughtCardEventS2C
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ClientEvent.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ClientEvent.html
index 6972315..c83e4ca 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ClientEvent.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ClientEvent.html
@@ -2,7 +2,7 @@
-
+
ClientEvent
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ClientEventHandler.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ClientEventHandler.html
index ea300ac..57f870d 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ClientEventHandler.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ClientEventHandler.html
@@ -2,7 +2,7 @@
-
+
ClientEventHandler
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/EndGameEventS2C.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/EndGameEventS2C.html
index 92f3125..a6bca64 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/EndGameEventS2C.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/EndGameEventS2C.html
@@ -2,7 +2,7 @@
-
+
EndGameEventS2C
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/EndPreparationEventS2C.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/EndPreparationEventS2C.html
index 22b263f..80e7721 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/EndPreparationEventS2C.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/EndPreparationEventS2C.html
@@ -2,7 +2,7 @@
-
+
EndPreparationEventS2C
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/EndTurnEvent.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/EndTurnEvent.html
index 1143346..a1c41b7 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/EndTurnEvent.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/EndTurnEvent.html
@@ -2,7 +2,7 @@
-
+
EndTurnEvent
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/GameStarterEventS2C.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/GameStarterEventS2C.html
index eb14766..4cd29e4 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/GameStarterEventS2C.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/GameStarterEventS2C.html
@@ -2,7 +2,7 @@
-
+
GameStarterEventS2C
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/IllegalActionEventS2C.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/IllegalActionEventS2C.html
index d9b5d28..9106fe9 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/IllegalActionEventS2C.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/IllegalActionEventS2C.html
@@ -2,7 +2,7 @@
-
+
IllegalActionEventS2C
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/IncrementPositionEventS2C.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/IncrementPositionEventS2C.html
index 81cf4e0..a81f658 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/IncrementPositionEventS2C.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/IncrementPositionEventS2C.html
@@ -2,7 +2,7 @@
-
+
IncrementPositionEventS2C
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/InitialChoiceEvent.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/InitialChoiceEvent.html
index 2a25bf4..dea688e 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/InitialChoiceEvent.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/InitialChoiceEvent.html
@@ -2,7 +2,7 @@
-
+
InitialChoiceEvent
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/LeaderCardActionEvent.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/LeaderCardActionEvent.html
index dcc9bde..0851568 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/LeaderCardActionEvent.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/LeaderCardActionEvent.html
@@ -2,7 +2,7 @@
-
+
LeaderCardActionEvent
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/LeaderCardActionEventS2C.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/LeaderCardActionEventS2C.html
index 1aa5dc4..132eafa 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/LeaderCardActionEventS2C.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/LeaderCardActionEventS2C.html
@@ -2,7 +2,7 @@
-
+
LeaderCardActionEventS2C
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/LorenzoTurnEventS2C.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/LorenzoTurnEventS2C.html
index d902847..cc88560 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/LorenzoTurnEventS2C.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/LorenzoTurnEventS2C.html
@@ -2,7 +2,7 @@
-
+
LorenzoTurnEventS2C
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/NewConnectionEvent.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/NewConnectionEvent.html
index 7ef2195..805f9b9 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/NewConnectionEvent.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/NewConnectionEvent.html
@@ -2,7 +2,7 @@
-
+
NewConnectionEvent
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/NewConnectionEventS2C.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/NewConnectionEventS2C.html
index 4931fef..1a4acce 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/NewConnectionEventS2C.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/NewConnectionEventS2C.html
@@ -2,7 +2,7 @@
-
+
NewConnectionEventS2C
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/NewTurnEventS2C.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/NewTurnEventS2C.html
index 66752c1..7dd212b 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/NewTurnEventS2C.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/NewTurnEventS2C.html
@@ -2,7 +2,7 @@
-
+
NewTurnEventS2C
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/NumPlayerEvent.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/NumPlayerEvent.html
index 20953ca..1235bec 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/NumPlayerEvent.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/NumPlayerEvent.html
@@ -2,7 +2,7 @@
-
+
NumPlayerEvent
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/PingEventC2S.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/PingEventC2S.html
index a41b76c..9c7abce 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/PingEventC2S.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/PingEventC2S.html
@@ -2,7 +2,7 @@
-
+
PingEventC2S
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/PingEventS2C.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/PingEventS2C.html
index 3d9ef6d..27afc33 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/PingEventS2C.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/PingEventS2C.html
@@ -2,7 +2,7 @@
-
+
PingEventS2C
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ServerEvent.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ServerEvent.html
index aa55632..adf7366 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ServerEvent.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ServerEvent.html
@@ -2,7 +2,7 @@
-
+
ServerEvent
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ServerEventCreator.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ServerEventCreator.html
index 929f8f5..a29c575 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ServerEventCreator.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ServerEventCreator.html
@@ -2,7 +2,7 @@
-
+
ServerEventCreator
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ServerEventObserver.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ServerEventObserver.html
index dff92ed..f00e44d 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ServerEventObserver.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ServerEventObserver.html
@@ -2,7 +2,7 @@
-
+
ServerEventObserver
@@ -99,43 +99,81 @@ Method Summary
void
-
+
+
ActivateProductionEvent from the server
+ sends the event to every client
+
void
-
+
+
BoughtCardEvent from the server
+ sends the event to every client
+
void
-
+
+
EndGameEvent from the server
+ sends the event to every client
+
void
-
+
+
EndPreparationEvent from the server
+ sends the event to every client
+
void
-
+
+
LeaderActionEvent from the server
+ sends the event to the specific player
+
void
-
+
+
IllegalActionEvent from the server
+ sends the event to the specific player who has done it
+
void
-
+
+
IncrementPosition from the server
+ sends the event to every client
+
void
-
+
+
LeaderActionEvent from the server
+ sends the event to every client
+
void
-
+
+
LorenzoTurnEvent from the server
+ sends the event to every client
+
void
-
+
+
LeaderActionEvent from the server
+
void
-
+
+
NewTurnEvent from the server
+ sends the event to every client
+
void
-
+
+
UseMarketEvent from the server
+ sends the event to every client
+
void
-
+
+
VaticanReportEvent from the server
+ sends the event to every client
+
@@ -154,78 +192,155 @@ Method Details
handleEvent
+LeaderActionEvent from the server
+ sends the event to every client
+
+- Parameters:
+event
- is the event received from the server
+
handleEvent
+BoughtCardEvent from the server
+ sends the event to every client
+
+- Parameters:
+event
- is the event received from the server
+
handleEvent
+ActivateProductionEvent from the server
+ sends the event to every client
+
+- Parameters:
+event
- is the event received from the server
+
handleEvent
+IncrementPosition from the server
+ sends the event to every client
+
+- Parameters:
+event
- is the event received from the server
+
handleEvent
+VaticanReportEvent from the server
+ sends the event to every client
+
+- Parameters:
+event
- is the event received from the server
+
handleEvent
+UseMarketEvent from the server
+ sends the event to every client
+
+- Parameters:
+event
- is the event received from the server
+
handleEvent
+NewTurnEvent from the server
+ sends the event to every client
+
+- Parameters:
+event
- is the event received from the server
+
handleEvent
+IllegalActionEvent from the server
+ sends the event to the specific player who has done it
+
+- Parameters:
+event
- is the event received from the server
+
handleEvent
+LeaderActionEvent from the server
+ sends the event to the specific player
+
+- Parameters:
+event
- is the event received from the server
+
handleEvent
+EndGameEvent from the server
+ sends the event to every client
+
+- Parameters:
+event
- is the event received from the server
+
handleEvent
+LorenzoTurnEvent from the server
+ sends the event to every client
+
+- Parameters:
+event
- is the event received from the server
+
handleEvent
+EndPreparationEvent from the server
+ sends the event to every client
+
+- Parameters:
+event
- is the event received from the server
+
handleEvent
+LeaderActionEvent from the server
+
+- Parameters:
+event
- is the event received from the server
+
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ServerObservable.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ServerObservable.html
index e1b187a..698945b 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ServerObservable.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ServerObservable.html
@@ -2,7 +2,7 @@
-
+
ServerObservable
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/UseMarketEvent.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/UseMarketEvent.html
index fa84a0f..b85a342 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/UseMarketEvent.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/UseMarketEvent.html
@@ -2,7 +2,7 @@
-
+
UseMarketEvent
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/UseMarketEventS2C.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/UseMarketEventS2C.html
index 7216fb9..672cb98 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/UseMarketEventS2C.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/UseMarketEventS2C.html
@@ -2,7 +2,7 @@
-
+
UseMarketEventS2C
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/VaticanReportEventS2C.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/VaticanReportEventS2C.html
index afac3df..2fd39e6 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/VaticanReportEventS2C.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/VaticanReportEventS2C.html
@@ -2,7 +2,7 @@
-
+
VaticanReportEventS2C
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/package-summary.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/package-summary.html
index 7d2dd61..810ec62 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/package-summary.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/package-summary.html
@@ -2,7 +2,7 @@
-
+
it.polimi.ingsw.controller.Events
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/package-tree.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/package-tree.html
index ad649cb..a5c8671 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/package-tree.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/package-tree.html
@@ -2,7 +2,7 @@
-
+
it.polimi.ingsw.controller.Events Class Hierarchy
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Server.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Server.html
index e9a54c6..c4e0948 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/Server.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/Server.html
@@ -2,7 +2,7 @@
-
+
Server
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/View.html b/deliverables/Javadocs/it/polimi/ingsw/controller/View.html
index 3b5683c..65ed3f1 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/View.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/View.html
@@ -2,7 +2,7 @@
-
+
View
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/VirtualView.html b/deliverables/Javadocs/it/polimi/ingsw/controller/VirtualView.html
index 694b7c5..34fe23f 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/VirtualView.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/VirtualView.html
@@ -2,7 +2,7 @@
-
+
VirtualView
@@ -129,67 +129,137 @@ Method Summary
void
-
+
+
ActivateProductionEvent from the client
+ checks if an action has already been done:
+ if not, it sends the event to the controller which will then edit the model;
+ if yes, it adds a new IllegalAction to communicate that an action has already been done
+
void
-
+
+
ActivateProductionEvent from the server
+ sends the event to every client
+
void
-
+
+
BoughCardEvent from the client
+ checks if an action has already been done:
+ if not, it sends the event to the controller which will then edit the model;
+ if yes, it adds a new IllegalAction to communicate that an action has already been done
+
void
-
+
+
BoughtCardEvent from the server
+ sends the event to every client
+
void
-
+
+
EndGameEvent from the server
+ sends the event to every client
+
void
-
+
+
EndPreparationEvent from the server
+ sends the event to every client
+
void
-
+
+
boughCardEvent from the client
+ checks if an action has already been done:
+ if not, it adds a new IllegalAction to communicate that an action has already been done;
+ if yes, it sends the event to the controller which will then edit the model;
+
void
-
+
+
LeaderActionEvent from the server
+ sends the event to the specific player
+
void
-
+
+
IllegalActionEvent from the server
+ sends the event to the specific player who has done it
+
void
-
+
+
IncrementPosition from the server
+ sends the event to every client
+
void
-
+
+
InitialChoiceEvent from the client
+ sends the event to the controller which will then edit the model
+
void
-
+
+
LeaderCardActionEvent from the client
+ action could be discard ("d") or activate "a")
+ it sends the event to the controller, which will then edit the model
+ if yes, it adds a new IllegalAction to communicate that an action has already been done
+
void
-
+
+
LeaderActionEvent from the server
+ sends the event to every client
+
void
-
+
+
LorenzoTurnEvent from the server
+ sends the event to every client
+
void
-
+
+
NewConnectionEvent from the client
+
void
-
+
+
LeaderActionEvent from the server
+
void
-
+
+
NewTurnEvent from the server
+ sends the event to every client
+
void
-
+
+
NumPlayerEvent from the client, sent to the controller which will then edit the model
+
void
-
+
+
UseMarketEvent from the client
+ checks if an action has already been done:
+ if not, it sends the event to the controller which will then edit the model;
+ if yes, it adds a new IllegalAction to communicate that an action has already been done
+
void
-
+
+
UseMarketEvent from the server
+ sends the event to every client
+
void
-
+
+
VaticanReportEvent from the server
+ sends the event to every client
+
void
@@ -285,9 +355,15 @@ closeAll
handleEvent
+BoughCardEvent from the client
+ checks if an action has already been done:
+ if not, it sends the event to the controller which will then edit the model;
+ if yes, it adds a new IllegalAction to communicate that an action has already been done
- Specified by:
handleEvent
in interface ClientEventHandler
+- Parameters:
+event
- is the event received from the client
@@ -295,9 +371,12 @@ handleEvent
handleEvent
+NumPlayerEvent from the client, sent to the controller which will then edit the model
- Specified by:
handleEvent
in interface ClientEventHandler
+- Parameters:
+event
- is the event received from the client
@@ -305,9 +384,15 @@ handleEvent
handleEvent
+LeaderCardActionEvent from the client
+ action could be discard ("d") or activate "a")
+ it sends the event to the controller, which will then edit the model
+ if yes, it adds a new IllegalAction to communicate that an action has already been done
- Specified by:
handleEvent
in interface ClientEventHandler
+- Parameters:
+event
- is the event received from the client
@@ -315,9 +400,15 @@ handleEvent
handleEvent
+ActivateProductionEvent from the client
+ checks if an action has already been done:
+ if not, it sends the event to the controller which will then edit the model;
+ if yes, it adds a new IllegalAction to communicate that an action has already been done
- Specified by:
handleEvent
in interface ClientEventHandler
+- Parameters:
+event
- is the event received from the client
@@ -325,9 +416,15 @@ handleEvent
handleEvent
+UseMarketEvent from the client
+ checks if an action has already been done:
+ if not, it sends the event to the controller which will then edit the model;
+ if yes, it adds a new IllegalAction to communicate that an action has already been done
- Specified by:
handleEvent
in interface ClientEventHandler
+- Parameters:
+event
- is the event received from the client
@@ -335,9 +432,15 @@ handleEvent
handleEvent
+boughCardEvent from the client
+ checks if an action has already been done:
+ if not, it adds a new IllegalAction to communicate that an action has already been done;
+ if yes, it sends the event to the controller which will then edit the model;
- Specified by:
handleEvent
in interface ClientEventHandler
+- Parameters:
+event
- is the event received from the client
@@ -345,9 +448,12 @@ handleEvent
handleEvent
+NewConnectionEvent from the client
- Specified by:
handleEvent
in interface ClientEventHandler
+- Parameters:
+event
- is the event received from the client
@@ -355,9 +461,13 @@ handleEvent
handleEvent
+InitialChoiceEvent from the client
+ sends the event to the controller which will then edit the model
- Specified by:
handleEvent
in interface ClientEventHandler
+- Parameters:
+event
- is the event received from the client
@@ -365,9 +475,13 @@ handleEvent
handleEvent
+LeaderActionEvent from the server
+ sends the event to every client
- Specified by:
handleEvent
in interface ServerEventObserver
+- Parameters:
+event
- is the event received from the server
@@ -375,9 +489,13 @@ handleEvent
handleEvent
+BoughtCardEvent from the server
+ sends the event to every client
- Specified by:
handleEvent
in interface ServerEventObserver
+- Parameters:
+event
- is the event received from the server
@@ -385,9 +503,13 @@ handleEvent
handleEvent
+ActivateProductionEvent from the server
+ sends the event to every client
- Specified by:
handleEvent
in interface ServerEventObserver
+- Parameters:
+event
- is the event received from the server
@@ -395,9 +517,13 @@ handleEvent
handleEvent
+IncrementPosition from the server
+ sends the event to every client
- Specified by:
handleEvent
in interface ServerEventObserver
+- Parameters:
+event
- is the event received from the server
@@ -405,9 +531,13 @@ handleEvent
handleEvent
+VaticanReportEvent from the server
+ sends the event to every client
- Specified by:
handleEvent
in interface ServerEventObserver
+- Parameters:
+event
- is the event received from the server
@@ -415,9 +545,13 @@ handleEvent
handleEvent
+UseMarketEvent from the server
+ sends the event to every client
- Specified by:
handleEvent
in interface ServerEventObserver
+- Parameters:
+event
- is the event received from the server
@@ -425,9 +559,13 @@ handleEvent
handleEvent
+NewTurnEvent from the server
+ sends the event to every client
- Specified by:
handleEvent
in interface ServerEventObserver
+- Parameters:
+event
- is the event received from the server
@@ -435,9 +573,13 @@ handleEvent
handleEvent
+IllegalActionEvent from the server
+ sends the event to the specific player who has done it
- Specified by:
handleEvent
in interface ServerEventObserver
+- Parameters:
+event
- is the event received from the server
@@ -445,9 +587,13 @@ handleEvent
handleEvent
+LeaderActionEvent from the server
+ sends the event to the specific player
- Specified by:
handleEvent
in interface ServerEventObserver
+- Parameters:
+event
- is the event received from the server
@@ -455,9 +601,13 @@ handleEvent
handleEvent
+EndGameEvent from the server
+ sends the event to every client
- Specified by:
handleEvent
in interface ServerEventObserver
+- Parameters:
+event
- is the event received from the server
@@ -465,9 +615,13 @@ handleEvent
handleEvent
+LorenzoTurnEvent from the server
+ sends the event to every client
- Specified by:
handleEvent
in interface ServerEventObserver
+- Parameters:
+event
- is the event received from the server
@@ -475,9 +629,13 @@ handleEvent
handleEvent
+EndPreparationEvent from the server
+ sends the event to every client
- Specified by:
handleEvent
in interface ServerEventObserver
+- Parameters:
+event
- is the event received from the server
@@ -485,9 +643,12 @@ handleEvent
handleEvent
+LeaderActionEvent from the server
- Specified by:
handleEvent
in interface ServerEventObserver
+- Parameters:
+event
- is the event received from the server
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/controllerExceptions/DisconnectionException.html b/deliverables/Javadocs/it/polimi/ingsw/controller/controllerExceptions/DisconnectionException.html
index 664b079..a9f20b0 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/controllerExceptions/DisconnectionException.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/controllerExceptions/DisconnectionException.html
@@ -2,7 +2,7 @@
-
+
DisconnectionException
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/controllerExceptions/package-summary.html b/deliverables/Javadocs/it/polimi/ingsw/controller/controllerExceptions/package-summary.html
index 97c2967..6dae1c4 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/controllerExceptions/package-summary.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/controllerExceptions/package-summary.html
@@ -2,7 +2,7 @@
-
+
it.polimi.ingsw.controller.controllerExceptions
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/controllerExceptions/package-tree.html b/deliverables/Javadocs/it/polimi/ingsw/controller/controllerExceptions/package-tree.html
index 6905153..27420c3 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/controllerExceptions/package-tree.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/controllerExceptions/package-tree.html
@@ -2,7 +2,7 @@
-
+
it.polimi.ingsw.controller.controllerExceptions Class Hierarchy
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/package-summary.html b/deliverables/Javadocs/it/polimi/ingsw/controller/package-summary.html
index d569354..4bd8281 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/package-summary.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/package-summary.html
@@ -2,7 +2,7 @@
-
+
it.polimi.ingsw.controller
diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/package-tree.html b/deliverables/Javadocs/it/polimi/ingsw/controller/package-tree.html
index 0aa1c34..8431ae4 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/controller/package-tree.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/controller/package-tree.html
@@ -2,7 +2,7 @@
-
+
it.polimi.ingsw.controller Class Hierarchy
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/Board.html b/deliverables/Javadocs/it/polimi/ingsw/model/Board.html
index d6da614..988c62c 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/Board.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/Board.html
@@ -2,7 +2,7 @@
-
+
Board
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/CardType.html b/deliverables/Javadocs/it/polimi/ingsw/model/CardType.html
index 725f8ec..e8d959d 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/CardType.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/CardType.html
@@ -2,7 +2,7 @@
-
+
CardType
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/DevelopmentCard.html b/deliverables/Javadocs/it/polimi/ingsw/model/DevelopmentCard.html
index 11098bf..3ed0c30 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/DevelopmentCard.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/DevelopmentCard.html
@@ -2,7 +2,7 @@
-
+
DevelopmentCard
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/DevelopmentCardBoard.html b/deliverables/Javadocs/it/polimi/ingsw/model/DevelopmentCardBoard.html
index 068ce2b..affb350 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/DevelopmentCardBoard.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/DevelopmentCardBoard.html
@@ -2,7 +2,7 @@
-
+
DevelopmentCardBoard
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/Game.html b/deliverables/Javadocs/it/polimi/ingsw/model/Game.html
index f579129..f975ae3 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/Game.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/Game.html
@@ -2,7 +2,7 @@
-
+
Game
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/IllegalAction.html b/deliverables/Javadocs/it/polimi/ingsw/model/IllegalAction.html
index 646aa8b..3e6f09d 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/IllegalAction.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/IllegalAction.html
@@ -2,7 +2,7 @@
-
+
IllegalAction
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/LeaderCard.html b/deliverables/Javadocs/it/polimi/ingsw/model/LeaderCard.html
index 8d7ae2c..238c85d 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/LeaderCard.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/LeaderCard.html
@@ -2,7 +2,7 @@
-
+
LeaderCard
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/LeaderCardDiscount.html b/deliverables/Javadocs/it/polimi/ingsw/model/LeaderCardDiscount.html
index 88a51de..4dcaa1b 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/LeaderCardDiscount.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/LeaderCardDiscount.html
@@ -2,7 +2,7 @@
-
+
LeaderCardDiscount
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/LeaderCardProduction.html b/deliverables/Javadocs/it/polimi/ingsw/model/LeaderCardProduction.html
index 05ad723..a163c98 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/LeaderCardProduction.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/LeaderCardProduction.html
@@ -2,7 +2,7 @@
-
+
LeaderCardProduction
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/LeaderCardSlots.html b/deliverables/Javadocs/it/polimi/ingsw/model/LeaderCardSlots.html
index fa081f8..4b8260e 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/LeaderCardSlots.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/LeaderCardSlots.html
@@ -2,7 +2,7 @@
-
+
LeaderCardSlots
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/LeaderCardType.html b/deliverables/Javadocs/it/polimi/ingsw/model/LeaderCardType.html
index 2aa8561..b5a8e4e 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/LeaderCardType.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/LeaderCardType.html
@@ -2,7 +2,7 @@
-
+
LeaderCardType
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/LeaderCardWhiteMarble.html b/deliverables/Javadocs/it/polimi/ingsw/model/LeaderCardWhiteMarble.html
index 6630c5c..c4a8b9c 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/LeaderCardWhiteMarble.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/LeaderCardWhiteMarble.html
@@ -2,7 +2,7 @@
-
+
LeaderCardWhiteMarble
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/MarbleColor.html b/deliverables/Javadocs/it/polimi/ingsw/model/MarbleColor.html
index d371c99..e1eb70c 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/MarbleColor.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/MarbleColor.html
@@ -2,7 +2,7 @@
-
+
MarbleColor
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/Market.html b/deliverables/Javadocs/it/polimi/ingsw/model/Market.html
index e3cf523..27aea61 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/Market.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/Market.html
@@ -2,7 +2,7 @@
-
+
Market
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/Pair.html b/deliverables/Javadocs/it/polimi/ingsw/model/Pair.html
index f8e2eb8..d1f16b6 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/Pair.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/Pair.html
@@ -2,7 +2,7 @@
-
+
Pair
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/PersonalCardBoard.html b/deliverables/Javadocs/it/polimi/ingsw/model/PersonalCardBoard.html
index 508cb37..2ec7f7c 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/PersonalCardBoard.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/PersonalCardBoard.html
@@ -2,7 +2,7 @@
-
+
PersonalCardBoard
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/Player.html b/deliverables/Javadocs/it/polimi/ingsw/model/Player.html
index d83e4e3..3e5416c 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/Player.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/Player.html
@@ -2,7 +2,7 @@
-
+
Player
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/PlayerWarehouse.html b/deliverables/Javadocs/it/polimi/ingsw/model/PlayerWarehouse.html
index dcda697..b367b74 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/PlayerWarehouse.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/PlayerWarehouse.html
@@ -2,7 +2,7 @@
-
+
PlayerWarehouse
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/PopeFavorTileStatus.html b/deliverables/Javadocs/it/polimi/ingsw/model/PopeFavorTileStatus.html
index 636b31d..eed4d4a 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/PopeFavorTileStatus.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/PopeFavorTileStatus.html
@@ -2,7 +2,7 @@
-
+
PopeFavorTileStatus
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/Resource.html b/deliverables/Javadocs/it/polimi/ingsw/model/Resource.html
index 7bd5d18..9792ab1 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/Resource.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/Resource.html
@@ -2,7 +2,7 @@
-
+
Resource
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/SameTypePair.html b/deliverables/Javadocs/it/polimi/ingsw/model/SameTypePair.html
index e3f31f4..f39c981 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/SameTypePair.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/SameTypePair.html
@@ -2,7 +2,7 @@
-
+
SameTypePair
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/SameTypeTriple.html b/deliverables/Javadocs/it/polimi/ingsw/model/SameTypeTriple.html
index a901c7e..c95d3dd 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/SameTypeTriple.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/SameTypeTriple.html
@@ -2,7 +2,7 @@
-
+
SameTypeTriple
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/SoloAction.html b/deliverables/Javadocs/it/polimi/ingsw/model/SoloAction.html
index fdbf005..b99af81 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/SoloAction.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/SoloAction.html
@@ -2,7 +2,7 @@
-
+
SoloAction
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/SoloActionType.html b/deliverables/Javadocs/it/polimi/ingsw/model/SoloActionType.html
index 9e3863c..c0ab550 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/SoloActionType.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/SoloActionType.html
@@ -2,7 +2,7 @@
-
+
SoloActionType
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/SonOfLeaderCard.html b/deliverables/Javadocs/it/polimi/ingsw/model/SonOfLeaderCard.html
index 7c49277..479e39a 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/SonOfLeaderCard.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/SonOfLeaderCard.html
@@ -2,7 +2,7 @@
-
+
SonOfLeaderCard
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/StatusPlayer.html b/deliverables/Javadocs/it/polimi/ingsw/model/StatusPlayer.html
index ec92106..1286615 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/StatusPlayer.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/StatusPlayer.html
@@ -2,7 +2,7 @@
-
+
StatusPlayer
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/CannotActivateProductionException.html b/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/CannotActivateProductionException.html
index a12031e..fd0ff90 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/CannotActivateProductionException.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/CannotActivateProductionException.html
@@ -2,7 +2,7 @@
-
+
CannotActivateProductionException
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/CannotBuyCardException.html b/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/CannotBuyCardException.html
index 1326634..eac4926 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/CannotBuyCardException.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/CannotBuyCardException.html
@@ -2,7 +2,7 @@
-
+
CannotBuyCardException
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/IllegalMarketUseException.html b/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/IllegalMarketUseException.html
index 1564664..fa4290c 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/IllegalMarketUseException.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/IllegalMarketUseException.html
@@ -2,7 +2,7 @@
-
+
IllegalMarketUseException
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/InvalidCardInsertionException.html b/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/InvalidCardInsertionException.html
index 3bdaf46..43e2f01 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/InvalidCardInsertionException.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/InvalidCardInsertionException.html
@@ -2,7 +2,7 @@
-
+
InvalidCardInsertionException
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/InvalidWarehouseInsertionException.html b/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/InvalidWarehouseInsertionException.html
index bfb305c..600100c 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/InvalidWarehouseInsertionException.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/InvalidWarehouseInsertionException.html
@@ -2,7 +2,7 @@
-
+
InvalidWarehouseInsertionException
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/VaticanReportException.html b/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/VaticanReportException.html
index 92f3f5f..390b8f5 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/VaticanReportException.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/VaticanReportException.html
@@ -2,7 +2,7 @@
-
+
VaticanReportException
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/package-summary.html b/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/package-summary.html
index 14e8d71..c5fa4ca 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/package-summary.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/package-summary.html
@@ -2,7 +2,7 @@
-
+
it.polimi.ingsw.model.modelExceptions
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/package-tree.html b/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/package-tree.html
index 8a2fb2a..520c138 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/package-tree.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/modelExceptions/package-tree.html
@@ -2,7 +2,7 @@
-
+
it.polimi.ingsw.model.modelExceptions Class Hierarchy
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/package-summary.html b/deliverables/Javadocs/it/polimi/ingsw/model/package-summary.html
index 1122337..efda514 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/package-summary.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/package-summary.html
@@ -2,7 +2,7 @@
-
+
it.polimi.ingsw.model
diff --git a/deliverables/Javadocs/it/polimi/ingsw/model/package-tree.html b/deliverables/Javadocs/it/polimi/ingsw/model/package-tree.html
index 6eef928..cc7ce18 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/model/package-tree.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/model/package-tree.html
@@ -2,7 +2,7 @@
-
+
it.polimi.ingsw.model Class Hierarchy
diff --git a/deliverables/Javadocs/it/polimi/ingsw/package-summary.html b/deliverables/Javadocs/it/polimi/ingsw/package-summary.html
index 61d8f25..bab4d5d 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/package-summary.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/package-summary.html
@@ -2,7 +2,7 @@
-
+
it.polimi.ingsw
diff --git a/deliverables/Javadocs/it/polimi/ingsw/package-tree.html b/deliverables/Javadocs/it/polimi/ingsw/package-tree.html
index 65f3fee..761a77a 100644
--- a/deliverables/Javadocs/it/polimi/ingsw/package-tree.html
+++ b/deliverables/Javadocs/it/polimi/ingsw/package-tree.html
@@ -2,7 +2,7 @@
-
+
it.polimi.ingsw Class Hierarchy
diff --git a/deliverables/Javadocs/it/polimi/ingswClientTests/ClientTest.html b/deliverables/Javadocs/it/polimi/ingswClientTests/ClientTest.html
index b44ccf1..37441fc 100644
--- a/deliverables/Javadocs/it/polimi/ingswClientTests/ClientTest.html
+++ b/deliverables/Javadocs/it/polimi/ingswClientTests/ClientTest.html
@@ -2,7 +2,7 @@
-
+
ClientTest
diff --git a/deliverables/Javadocs/it/polimi/ingswClientTests/package-summary.html b/deliverables/Javadocs/it/polimi/ingswClientTests/package-summary.html
index 0d828a9..c5fba89 100644
--- a/deliverables/Javadocs/it/polimi/ingswClientTests/package-summary.html
+++ b/deliverables/Javadocs/it/polimi/ingswClientTests/package-summary.html
@@ -2,7 +2,7 @@
-
+
it.polimi.ingswClientTests
diff --git a/deliverables/Javadocs/it/polimi/ingswClientTests/package-tree.html b/deliverables/Javadocs/it/polimi/ingswClientTests/package-tree.html
index 1c40488..e48355c 100644
--- a/deliverables/Javadocs/it/polimi/ingswClientTests/package-tree.html
+++ b/deliverables/Javadocs/it/polimi/ingswClientTests/package-tree.html
@@ -2,7 +2,7 @@
-
+
it.polimi.ingswClientTests Class Hierarchy
diff --git a/deliverables/Javadocs/it/polimi/ingswControllerTests/ClientServerTests.html b/deliverables/Javadocs/it/polimi/ingswControllerTests/ClientServerTests.html
index 26cecb7..2992bc8 100644
--- a/deliverables/Javadocs/it/polimi/ingswControllerTests/ClientServerTests.html
+++ b/deliverables/Javadocs/it/polimi/ingswControllerTests/ClientServerTests.html
@@ -2,7 +2,7 @@
-
+
ClientServerTests
diff --git a/deliverables/Javadocs/it/polimi/ingswControllerTests/ControllerTest.html b/deliverables/Javadocs/it/polimi/ingswControllerTests/ControllerTest.html
index e4ee5d1..5130fc7 100644
--- a/deliverables/Javadocs/it/polimi/ingswControllerTests/ControllerTest.html
+++ b/deliverables/Javadocs/it/polimi/ingswControllerTests/ControllerTest.html
@@ -2,7 +2,7 @@
-
+
ControllerTest
diff --git a/deliverables/Javadocs/it/polimi/ingswControllerTests/package-summary.html b/deliverables/Javadocs/it/polimi/ingswControllerTests/package-summary.html
index ddf2b0d..740d724 100644
--- a/deliverables/Javadocs/it/polimi/ingswControllerTests/package-summary.html
+++ b/deliverables/Javadocs/it/polimi/ingswControllerTests/package-summary.html
@@ -2,7 +2,7 @@
-
+
it.polimi.ingswControllerTests
diff --git a/deliverables/Javadocs/it/polimi/ingswControllerTests/package-tree.html b/deliverables/Javadocs/it/polimi/ingswControllerTests/package-tree.html
index 6b5fd0f..dc48519 100644
--- a/deliverables/Javadocs/it/polimi/ingswControllerTests/package-tree.html
+++ b/deliverables/Javadocs/it/polimi/ingswControllerTests/package-tree.html
@@ -2,7 +2,7 @@
-
+
it.polimi.ingswControllerTests Class Hierarchy
diff --git a/deliverables/Javadocs/it/polimi/ingswModelTests/BoardTest.html b/deliverables/Javadocs/it/polimi/ingswModelTests/BoardTest.html
index f736ac9..8250d07 100644
--- a/deliverables/Javadocs/it/polimi/ingswModelTests/BoardTest.html
+++ b/deliverables/Javadocs/it/polimi/ingswModelTests/BoardTest.html
@@ -2,7 +2,7 @@
-
+
BoardTest
diff --git a/deliverables/Javadocs/it/polimi/ingswModelTests/DevelopmentCardBoardTest.html b/deliverables/Javadocs/it/polimi/ingswModelTests/DevelopmentCardBoardTest.html
index daf8466..8ef6dbd 100644
--- a/deliverables/Javadocs/it/polimi/ingswModelTests/DevelopmentCardBoardTest.html
+++ b/deliverables/Javadocs/it/polimi/ingswModelTests/DevelopmentCardBoardTest.html
@@ -2,7 +2,7 @@
-
+
DevelopmentCardBoardTest
diff --git a/deliverables/Javadocs/it/polimi/ingswModelTests/GameTest.html b/deliverables/Javadocs/it/polimi/ingswModelTests/GameTest.html
index 191172c..521efbc 100644
--- a/deliverables/Javadocs/it/polimi/ingswModelTests/GameTest.html
+++ b/deliverables/Javadocs/it/polimi/ingswModelTests/GameTest.html
@@ -2,7 +2,7 @@
-
+
GameTest
diff --git a/deliverables/Javadocs/it/polimi/ingswModelTests/LeaderCardTest.html b/deliverables/Javadocs/it/polimi/ingswModelTests/LeaderCardTest.html
index b483ff8..a143e77 100644
--- a/deliverables/Javadocs/it/polimi/ingswModelTests/LeaderCardTest.html
+++ b/deliverables/Javadocs/it/polimi/ingswModelTests/LeaderCardTest.html
@@ -2,7 +2,7 @@
-
+
LeaderCardTest
diff --git a/deliverables/Javadocs/it/polimi/ingswModelTests/MarketTest.html b/deliverables/Javadocs/it/polimi/ingswModelTests/MarketTest.html
index 42ef0a1..70bfcf7 100644
--- a/deliverables/Javadocs/it/polimi/ingswModelTests/MarketTest.html
+++ b/deliverables/Javadocs/it/polimi/ingswModelTests/MarketTest.html
@@ -2,7 +2,7 @@
-
+
MarketTest
diff --git a/deliverables/Javadocs/it/polimi/ingswModelTests/PairTest.html b/deliverables/Javadocs/it/polimi/ingswModelTests/PairTest.html
index 55181b1..c2ea515 100644
--- a/deliverables/Javadocs/it/polimi/ingswModelTests/PairTest.html
+++ b/deliverables/Javadocs/it/polimi/ingswModelTests/PairTest.html
@@ -2,7 +2,7 @@
-
+
PairTest
diff --git a/deliverables/Javadocs/it/polimi/ingswModelTests/PersonalCardBoardTest.html b/deliverables/Javadocs/it/polimi/ingswModelTests/PersonalCardBoardTest.html
index aaf9f7b..dcb84b9 100644
--- a/deliverables/Javadocs/it/polimi/ingswModelTests/PersonalCardBoardTest.html
+++ b/deliverables/Javadocs/it/polimi/ingswModelTests/PersonalCardBoardTest.html
@@ -2,7 +2,7 @@
-
+
PersonalCardBoardTest
diff --git a/deliverables/Javadocs/it/polimi/ingswModelTests/PlayerTest.html b/deliverables/Javadocs/it/polimi/ingswModelTests/PlayerTest.html
index 63e3135..777fa71 100644
--- a/deliverables/Javadocs/it/polimi/ingswModelTests/PlayerTest.html
+++ b/deliverables/Javadocs/it/polimi/ingswModelTests/PlayerTest.html
@@ -2,7 +2,7 @@
-
+
PlayerTest
diff --git a/deliverables/Javadocs/it/polimi/ingswModelTests/PlayerWarehouseTest.html b/deliverables/Javadocs/it/polimi/ingswModelTests/PlayerWarehouseTest.html
index 984c04a..ce32a74 100644
--- a/deliverables/Javadocs/it/polimi/ingswModelTests/PlayerWarehouseTest.html
+++ b/deliverables/Javadocs/it/polimi/ingswModelTests/PlayerWarehouseTest.html
@@ -2,7 +2,7 @@
-
+
PlayerWarehouseTest
diff --git a/deliverables/Javadocs/it/polimi/ingswModelTests/SameTypePairTest.html b/deliverables/Javadocs/it/polimi/ingswModelTests/SameTypePairTest.html
index f09afc7..384337e 100644
--- a/deliverables/Javadocs/it/polimi/ingswModelTests/SameTypePairTest.html
+++ b/deliverables/Javadocs/it/polimi/ingswModelTests/SameTypePairTest.html
@@ -2,7 +2,7 @@
-
+
SameTypePairTest
diff --git a/deliverables/Javadocs/it/polimi/ingswModelTests/SameTypeTripleTest.html b/deliverables/Javadocs/it/polimi/ingswModelTests/SameTypeTripleTest.html
index 3a1e9c9..41dcaad 100644
--- a/deliverables/Javadocs/it/polimi/ingswModelTests/SameTypeTripleTest.html
+++ b/deliverables/Javadocs/it/polimi/ingswModelTests/SameTypeTripleTest.html
@@ -2,7 +2,7 @@
-
+
SameTypeTripleTest
diff --git a/deliverables/Javadocs/it/polimi/ingswModelTests/SoloActionTest.html b/deliverables/Javadocs/it/polimi/ingswModelTests/SoloActionTest.html
index 161b030..b19cc03 100644
--- a/deliverables/Javadocs/it/polimi/ingswModelTests/SoloActionTest.html
+++ b/deliverables/Javadocs/it/polimi/ingswModelTests/SoloActionTest.html
@@ -2,7 +2,7 @@
-
+
SoloActionTest
diff --git a/deliverables/Javadocs/it/polimi/ingswModelTests/StatusPlayerTest.html b/deliverables/Javadocs/it/polimi/ingswModelTests/StatusPlayerTest.html
index 5f9ec71..9a3623e 100644
--- a/deliverables/Javadocs/it/polimi/ingswModelTests/StatusPlayerTest.html
+++ b/deliverables/Javadocs/it/polimi/ingswModelTests/StatusPlayerTest.html
@@ -2,7 +2,7 @@
-
+
StatusPlayerTest
diff --git a/deliverables/Javadocs/it/polimi/ingswModelTests/package-summary.html b/deliverables/Javadocs/it/polimi/ingswModelTests/package-summary.html
index 681d11e..ef2dc0f 100644
--- a/deliverables/Javadocs/it/polimi/ingswModelTests/package-summary.html
+++ b/deliverables/Javadocs/it/polimi/ingswModelTests/package-summary.html
@@ -2,7 +2,7 @@
-
+
it.polimi.ingswModelTests
diff --git a/deliverables/Javadocs/it/polimi/ingswModelTests/package-tree.html b/deliverables/Javadocs/it/polimi/ingswModelTests/package-tree.html
index effc224..752f0b4 100644
--- a/deliverables/Javadocs/it/polimi/ingswModelTests/package-tree.html
+++ b/deliverables/Javadocs/it/polimi/ingswModelTests/package-tree.html
@@ -2,7 +2,7 @@
-
+
it.polimi.ingswModelTests Class Hierarchy
diff --git a/deliverables/Javadocs/overview-summary.html b/deliverables/Javadocs/overview-summary.html
index 0e6d5bf..6c585c4 100644
--- a/deliverables/Javadocs/overview-summary.html
+++ b/deliverables/Javadocs/overview-summary.html
@@ -2,7 +2,7 @@
-
+
Generated Documentation (Untitled)
diff --git a/deliverables/Javadocs/overview-tree.html b/deliverables/Javadocs/overview-tree.html
index e8a07d4..b3bc3a2 100644
--- a/deliverables/Javadocs/overview-tree.html
+++ b/deliverables/Javadocs/overview-tree.html
@@ -2,7 +2,7 @@
-
+
Class Hierarchy
diff --git a/deliverables/Javadocs/serialized-form.html b/deliverables/Javadocs/serialized-form.html
index 6bd0f4a..f890635 100644
--- a/deliverables/Javadocs/serialized-form.html
+++ b/deliverables/Javadocs/serialized-form.html
@@ -2,7 +2,7 @@
-
+
Serialized Form
diff --git a/src/main/java/it/polimi/ingsw/controller/Events/ServerEventObserver.java b/src/main/java/it/polimi/ingsw/controller/Events/ServerEventObserver.java
index 6cc21b2..4d829a6 100644
--- a/src/main/java/it/polimi/ingsw/controller/Events/ServerEventObserver.java
+++ b/src/main/java/it/polimi/ingsw/controller/Events/ServerEventObserver.java
@@ -6,30 +6,94 @@
* (like the virtual view, or in the client)
*/
public interface ServerEventObserver {
+ /**
+ * LeaderActionEvent from the server
+ * sends the event to every client
+ * @param event is the event received from the server
+ */
void handleEvent(LeaderCardActionEventS2C event);
+ /**
+ * BoughtCardEvent from the server
+ * sends the event to every client
+ * @param event is the event received from the server
+ */
void handleEvent(BoughtCardEventS2C event);
+ /**
+ * ActivateProductionEvent from the server
+ * sends the event to every client
+ * @param event is the event received from the server
+ */
void handleEvent(ActivatedProductionEventS2C event);
+ /**
+ * IncrementPosition from the server
+ * sends the event to every client
+ * @param event is the event received from the server
+ */
void handleEvent(IncrementPositionEventS2C event);
+ /**
+ * VaticanReportEvent from the server
+ * sends the event to every client
+ * @param event is the event received from the server
+ */
void handleEvent(VaticanReportEventS2C event);
+ /**
+ * UseMarketEvent from the server
+ * sends the event to every client
+ * @param event is the event received from the server
+ */
void handleEvent(UseMarketEventS2C event);
+ /**
+ * NewTurnEvent from the server
+ * sends the event to every client
+ * @param event is the event received from the server
+ */
void handleEvent(NewTurnEventS2C event);
+ /**
+ * IllegalActionEvent from the server
+ * sends the event to the specific player who has done it
+ * @param event is the event received from the server
+ */
void handleEvent(IllegalActionEventS2C event);
+ /**
+ * LeaderActionEvent from the server
+ * sends the event to the specific player
+ * @param event is the event received from the server
+ */
void handleEvent(GameStarterEventS2C event);
+ /**
+ * EndGameEvent from the server
+ * sends the event to every client
+ * @param event is the event received from the server
+ */
void handleEvent(EndGameEventS2C event);
+ /**
+ * LorenzoTurnEvent from the server
+ * sends the event to every client
+ * @param event is the event received from the server
+ */
void handleEvent(LorenzoTurnEventS2C event);
+ /**
+ * EndPreparationEvent from the server
+ * sends the event to every client
+ * @param event is the event received from the server
+ */
void handleEvent(EndPreparationEventS2C event);
+ /**
+ * LeaderActionEvent from the server
+ * @param event is the event received from the server
+ */
void handleEvent(NewConnectionEventS2C event);
}
diff --git a/src/main/java/it/polimi/ingsw/controller/VirtualView.java b/src/main/java/it/polimi/ingsw/controller/VirtualView.java
index e05b33e..2fb923d 100644
--- a/src/main/java/it/polimi/ingsw/controller/VirtualView.java
+++ b/src/main/java/it/polimi/ingsw/controller/VirtualView.java
@@ -68,7 +68,13 @@ public synchronized void closeAll() {
}
// ---- events from the client----
-
+ /**
+ * BoughCardEvent from the client
+ * checks if an action has already been done:
+ * if not, it sends the event to the controller which will then edit the model;
+ * if yes, it adds a new IllegalAction to communicate that an action has already been done
+ * @param event is the event received from the client
+ */
public synchronized void handleEvent(BoughtCardEvent event){
if(!controller.getGame().hasDoneAction()){
@@ -78,11 +84,22 @@ public synchronized void handleEvent(BoughtCardEvent event){
}
}
+ /**
+ * NumPlayerEvent from the client, sent to the controller which will then edit the model
+ * @param event is the event received from the client
+ */
public synchronized void handleEvent(NumPlayerEvent event) {
- logger.info("ricevuto numero di giocatori: "+ event.getNumPlayers());
+ logger.info("received the number of players: "+ event.getNumPlayers());
controller.getGame().setWantedNumPlayers(event.getNumPlayers());
}
+ /**
+ *LeaderCardActionEvent from the client
+ * action could be discard ("d") or activate "a")
+ * it sends the event to the controller, which will then edit the model
+ * if yes, it adds a new IllegalAction to communicate that an action has already been done
+ * @param event is the event received from the client
+ */
public synchronized void handleEvent(LeaderCardActionEvent event){
if(event.getDiscardOrActivate()=='d')
@@ -93,6 +110,13 @@ public synchronized void handleEvent(LeaderCardActionEvent event){
}
+ /**
+ * ActivateProductionEvent from the client
+ * checks if an action has already been done:
+ * if not, it sends the event to the controller which will then edit the model;
+ * if yes, it adds a new IllegalAction to communicate that an action has already been done
+ * @param event is the event received from the client
+ */
public synchronized void handleEvent(ActivatedProductionEvent event){
SameTypeTriple BPResources = new SameTypeTriple<>(event.getRequestedResBP1(),event.getRequestedResBP2(),event.getProducedResBP());
if(!controller.getGame().hasDoneAction()){
@@ -102,6 +126,13 @@ public synchronized void handleEvent(ActivatedProductionEvent event){
}
}
+ /**
+ * UseMarketEvent from the client
+ * checks if an action has already been done:
+ * if not, it sends the event to the controller which will then edit the model;
+ * if yes, it adds a new IllegalAction to communicate that an action has already been done
+ * @param event is the event received from the client
+ */
public synchronized void handleEvent(UseMarketEvent event){
if(!controller.getGame().hasDoneAction()){
controller.useMarket(event.getRowOrColumn(), event.getIndex(),event.getNewWarehouse(),event.getDiscardedRes(),event.getLeaderCardSlots1(),event.getLeaderCardSlots2(), event.getWhiteMarbleChoices());
@@ -110,6 +141,13 @@ public synchronized void handleEvent(UseMarketEvent event){
}
}
+ /**
+ * boughCardEvent from the client
+ * checks if an action has already been done:
+ * if not, it adds a new IllegalAction to communicate that an action has already been done;
+ * if yes, it sends the event to the controller which will then edit the model;
+ * @param event is the event received from the client
+ */
public synchronized void handleEvent(EndTurnEvent event){
if(controller.getGame().hasDoneAction()){
controller.getGame().nextTurn();
@@ -118,10 +156,19 @@ public synchronized void handleEvent(EndTurnEvent event){
}
}
+ /**
+ * NewConnectionEvent from the client
+ * @param event is the event received from the client
+ */
public synchronized void handleEvent(NewConnectionEvent event){
}
+ /**
+ * InitialChoiceEvent from the client
+ * sends the event to the controller which will then edit the model
+ * @param event is the event received from the client
+ */
public synchronized void handleEvent(InitialChoiceEvent event){
controller.initialChoiceHandler(event); //poi magari faccio in un altro modo
}
@@ -130,60 +177,110 @@ public synchronized void handleEvent(InitialChoiceEvent event){
// ---- SERVER TO CLIENT EVENTS ----
+ /**
+ * LeaderActionEvent from the server
+ * sends the event to every client
+ * @param event is the event received from the server
+ */
@Override
public void handleEvent(LeaderCardActionEventS2C event) {
//invia evento ai dovuti client
sendToEveryone(event);
}
+ /**
+ * BoughtCardEvent from the server
+ * sends the event to every client
+ * @param event is the event received from the server
+ */
@Override
public void handleEvent(BoughtCardEventS2C event) {
//invia evento ai dovuti client
sendToEveryone(event);
}
+ /**
+ * ActivateProductionEvent from the server
+ * sends the event to every client
+ * @param event is the event received from the server
+ */
@Override
public void handleEvent(ActivatedProductionEventS2C event) {
//invia evento ai dovuti client
sendToEveryone(event);
}
+ /**
+ * IncrementPosition from the server
+ * sends the event to every client
+ * @param event is the event received from the server
+ */
@Override
public void handleEvent(IncrementPositionEventS2C event) {
//invia evento ai dovuti client
sendToEveryone(event);
}
+ /**
+ * VaticanReportEvent from the server
+ * sends the event to every client
+ * @param event is the event received from the server
+ */
@Override
public void handleEvent(VaticanReportEventS2C event) {
//invia evento ai dovuti client
sendToEveryone(event);
}
+ /**
+ * UseMarketEvent from the server
+ * sends the event to every client
+ * @param event is the event received from the server
+ */
@Override
public void handleEvent(UseMarketEventS2C event) {
//invia evento ai dovuti client
sendToEveryone(event);
}
+ /**
+ * NewTurnEvent from the server
+ * sends the event to every client
+ * @param event is the event received from the server
+ */
@Override
public void handleEvent(NewTurnEventS2C event) {
//invia evento ai dovuti client
sendToEveryone(event);
}
+ /**
+ * IllegalActionEvent from the server
+ * sends the event to the specific player who has done it
+ * @param event is the event received from the server
+ */
@Override
public void handleEvent(IllegalActionEventS2C event) {
//invia evento ai dovuti client
sendTo(event, event.getIllegalAction().getPlayerNickname());
}
+ /**
+ * LeaderActionEvent from the server
+ * sends the event to the specific player
+ * @param event is the event received from the server
+ */
@Override
public void handleEvent(GameStarterEventS2C event) {
//invia evento ai dovuti client
sendTo(event, controller.getGame().getPlayerByIndex(event.getIndexPlayer()).getNickname());
}
+ /**
+ * EndGameEvent from the server
+ * sends the event to every client
+ * @param event is the event received from the server
+ */
@Override
public void handleEvent(EndGameEventS2C event) {
//invia evento ai dovuti client
@@ -192,18 +289,32 @@ public void handleEvent(EndGameEventS2C event) {
closeAll();
}
+ /**
+ * LorenzoTurnEvent from the server
+ * sends the event to every client
+ * @param event is the event received from the server
+ */
@Override
public void handleEvent(LorenzoTurnEventS2C event) {
//invia evento ai dovuti client
sendToEveryone(event);
}
+ /**
+ * EndPreparationEvent from the server
+ * sends the event to every client
+ * @param event is the event received from the server
+ */
@Override
public void handleEvent(EndPreparationEventS2C event) {
//invia evento ai dovuti client
sendToEveryone(event);
}
+ /**
+ * LeaderActionEvent from the server
+ * @param event is the event received from the server
+ */
@Override
public void handleEvent(NewConnectionEventS2C event) {