diff --git a/deliverables/Javadocs/allclasses-index.html b/deliverables/Javadocs/allclasses-index.html index 59d412d..0f6e8a6 100644 --- a/deliverables/Javadocs/allclasses-index.html +++ b/deliverables/Javadocs/allclasses-index.html @@ -2,7 +2,7 @@ - + All Classes @@ -220,7 +220,9 @@

All Classes

Unit tests.
GuiView
-
 
+
+
implementation of the View interface for the GUI
+
IllegalAction
LeaderCardDiscount class contains the illegal actions of the players
diff --git a/deliverables/Javadocs/allpackages-index.html b/deliverables/Javadocs/allpackages-index.html index 3c91229..bc94b4f 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 7750221..75b10c3 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 d49b10a..f2f561e 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 a6ca529..c71741c 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 3b888e8..af06131 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 e898498..8a5ae74 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 2512adc..ad5e972 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 f712b71..97980db 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 da780f6..00de791 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 ed0093b..effa5aa 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 46a49a3..2a64a9c 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 4106f00..d557a85 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 ec20451..dc59f82 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 a353c0b..c0c0c7a 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 700b325..99306fb 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 5437dd4..50da7b5 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 4bbf1c4..3e527e9 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 89b0ff6..055dd11 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 bde9c00..0095c96 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 4c4f187..e479e84 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 90b0853..39e1bc8 100644 --- a/deliverables/Javadocs/index-files/index-7.html +++ b/deliverables/Javadocs/index-files/index-7.html @@ -2,7 +2,7 @@ - + G-Index @@ -651,7 +651,9 @@

G

guiView - Variable in class it.polimi.ingsw.client.GUI.FXMLController
 
GuiView - Class in it.polimi.ingsw.client.GUI
-
 
+
+
implementation of the View interface for the GUI
+
GuiView() - Constructor for class it.polimi.ingsw.client.GUI.GuiView
 
diff --git a/deliverables/Javadocs/index-files/index-8.html b/deliverables/Javadocs/index-files/index-8.html index 01a8291..4e26bc9 100644 --- a/deliverables/Javadocs/index-files/index-8.html +++ b/deliverables/Javadocs/index-files/index-8.html @@ -2,7 +2,7 @@ - + H-Index diff --git a/deliverables/Javadocs/index-files/index-9.html b/deliverables/Javadocs/index-files/index-9.html index 93e149f..eac0a54 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 d5f3ce5..2bfa6df 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 08213d7..2053e10 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 73ffa7e..a5ea6f4 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 4e00d0f..ecc612f 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 bead1bb..c807f6a 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 59fbafe..a0889ad 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 3db1437..4bfce19 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 756d6db..d14d7ff 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 cac1304..d7965ac 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 6b30b78..c6188a8 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 6a1399b..2786a38 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 eb1ef8d..0dd1a31 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 2e01a43..9df9367 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 7fbba3a..8ea4715 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 d613cac..b706d83 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 @@ -88,6 +88,7 @@

Class GuiView

public class GuiView extends javafx.application.Application implements View
+
implementation of the View interface for the GUI
See Also:
Application
diff --git a/deliverables/Javadocs/it/polimi/ingsw/client/GUI/InitialSceneController.html b/deliverables/Javadocs/it/polimi/ingsw/client/GUI/InitialSceneController.html index bd31d93..32e8a6b 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 cd7780e..59e4f62 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 fe6bb90..7eedef2 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 45daff5..8921308 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 bd14773..d180cb9 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 @@ -87,7 +87,9 @@

Package it.polimi.ingsw.client.GUI

controller which handles the gameScene
GuiView
-
 
+
+
implementation of the View interface for the GUI
+
InitialSceneController
controller which handles the initialScene
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 4dfe528..67cc01e 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 8130e83..cac9072 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 cb32af7..e4fbf4a 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 6989d2f..6d6f3e2 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 6b0924c..75efdbd 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 f70d437..551f96b 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 4d0b2cf..aaec0b7 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 9715371..2ba7a4c 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 4f890f8..8930e88 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 8683115..9bf3231 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 a3cd8fe..e0f9bae 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 f80756a..6972315 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 64eb32d..ea300ac 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 c72ca46..92f3125 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 f3063e0..22b263f 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 e08cf84..1143346 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 32a204e..eb14766 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 8992ed7..d9b5d28 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 d4cd461..81cf4e0 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 6c80c63..2a25bf4 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 db5db4e..dcc9bde 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 f1a8667..1aa5dc4 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 e60ad12..d902847 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 3658ab7..7ef2195 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 b0a9300..4931fef 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 6bbcf37..66752c1 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 c8a7a77..20953ca 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 8a38a07..a41b76c 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 89d40f0..3d9ef6d 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 22613cc..aa55632 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 e6e281f..929f8f5 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 de51d86..dff92ed 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 diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ServerObservable.html b/deliverables/Javadocs/it/polimi/ingsw/controller/Events/ServerObservable.html index 01d105f..e1b187a 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 dc965fc..fa84a0f 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 8ec36fd..7216fb9 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 8bd2941..afac3df 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 fa68468..7d2dd61 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 da94cc7..ad649cb 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 1f16dbc..e9a54c6 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 f425940..3b5683c 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 bd024c1..694b7c5 100644 --- a/deliverables/Javadocs/it/polimi/ingsw/controller/VirtualView.html +++ b/deliverables/Javadocs/it/polimi/ingsw/controller/VirtualView.html @@ -2,7 +2,7 @@ - + VirtualView diff --git a/deliverables/Javadocs/it/polimi/ingsw/controller/controllerExceptions/DisconnectionException.html b/deliverables/Javadocs/it/polimi/ingsw/controller/controllerExceptions/DisconnectionException.html index e30f1fc..664b079 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 6593f73..97c2967 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 e34d7be..6905153 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 c1af5a3..d569354 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 a1529ca..0aa1c34 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 db095d5..d6da614 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 83e3009..725f8ec 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 6cadbfe..11098bf 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 5082c65..068ce2b 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 b9d67bb..f579129 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 e7b0818..646aa8b 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 65ae5d9..8d7ae2c 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 e1fb433..88a51de 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 7446494..05ad723 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 d53af21..fa081f8 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 aeb3dc6..2aa8561 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 25fd738..6630c5c 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 4ea886d..d371c99 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 328561e..e3cf523 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 4a39546..f8e2eb8 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 ebf6046..508cb37 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 c148c51..d83e4e3 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 e69b45a..dcda697 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 caee5ad..636b31d 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 24b8e5a..7bd5d18 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 b240d80..e3f31f4 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 f93515f..a901c7e 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 3dccf7d..fdbf005 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 14d9553..9e3863c 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 09a540a..7c49277 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 06ce513..ec92106 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 ccf435f..a12031e 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 47bf334..1326634 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 8b39064..1564664 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 7cb1871..3bdaf46 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 6217c09..bfb305c 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 561fdf4..92f3f5f 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 25f7022..14e8d71 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 4aa1813..8a2fb2a 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 f8ddbc9..1122337 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 7ead9e7..6eef928 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 f7ed121..61d8f25 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 1b397d1..65f3fee 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 e8fb8bd..b44ccf1 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 ba5852e..0d828a9 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 4a3d7f2..1c40488 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 07bfd01..26cecb7 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 2d4a1d8..e4ee5d1 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 d782aec..ddf2b0d 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 ce8a447..6b5fd0f 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 dc04ea6..f736ac9 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 18f19a2..daf8466 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 2a01b15..191172c 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 ba2ffa9..b483ff8 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 368bfb0..42ef0a1 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 fa37f97..55181b1 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 19ba68b..aaf9f7b 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 ad87fd8..63e3135 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 e8e1b49..984c04a 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 1f97a6f..f09afc7 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 df6e155..3a1e9c9 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 f5e7386..161b030 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 e0c724b..5f9ec71 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 720e78d..681d11e 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 c856552..effc224 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 8e51212..0e6d5bf 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 a655861..e8a07d4 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 cd43023..6bd0f4a 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/client/GUI/GuiView.java b/src/main/java/it/polimi/ingsw/client/GUI/GuiView.java index 2d8c099..6244194 100644 --- a/src/main/java/it/polimi/ingsw/client/GUI/GuiView.java +++ b/src/main/java/it/polimi/ingsw/client/GUI/GuiView.java @@ -24,11 +24,8 @@ import java.util.Optional; import java.util.logging.Logger; -//to change game font /** * implementation of the View interface for the GUI - */ -/** * @see javafx.application.Application */ public class GuiView extends Application implements View {