Beau extra

pom.xml

@@ -26,6 +26,60 @@
             <artifactId>slf4j-log4j12</artifactId>
             <version>1.7.5</version>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13-beta-3</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13-beta-3</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -38,7 +92,7 @@
                     <archive>
                         <index>true</index>
                         <manifest>
-                            <mainClass>src.main.java.Init</mainClass>
+                            <mainClass>src.main.java.Main</mainClass>
                         </manifest>
                     </archive>
                 </configuration>

src/main/java/Applicatie/Applicatie.java

@@ -1,11 +1,13 @@
 package Applicatie;
 
+import Controller.AccountController;
 import Controller.LobbyController;
 import Controller.LoginController;
 import Firebase.FirebaseServiceOwn;
 import Managers.SceneManager;
 import javafx.scene.Group;
 import javafx.scene.Scene;
+import javafx.scene.layout.Pane;
 import javafx.stage.Stage;
 
 public class Applicatie {
@@ -14,39 +16,47 @@ public class Applicatie {
     private double windowAnchorX = 50;
     private double windowAnchorY= 50;
     private Stage primaryStage;
-    private Group root = new Group();
+    private Pane root = new Pane();
     private static FirebaseServiceOwn fb;
+    private AccountController accountCon;
 
     public Applicatie(Stage primaryStage) {
         SceneManager.getInstance().registerApp(this);
         this.primaryStage = primaryStage;
         loadPrimaryStage();
     }
 
-    public static FirebaseServiceOwn getFirebaseService(){
+    public void setAccount(AccountController accountCon){
+        this.accountCon = accountCon;
+    }
+
+    public FirebaseServiceOwn getFirebaseService(){
         if(fb == null) fb = new FirebaseServiceOwn();
         return fb;
     }
 
+    public AccountController getAccountCon(){
+        return accountCon;
+    }
+
     private void loadPrimaryStage() {
         Scene scene = new Scene(root, width,height);
+        SceneManager.getInstance().setPane(root);
         primaryStage.setScene(scene);
+        primaryStage.setMaximized(true);
+        primaryStage.setFullScreen(true);
         primaryStage.setTitle("Small World");
-//        primaryStage.setX(windowAnchorX);
-//        primaryStage.setY(windowAnchorY);
-//        primaryStage.setFullScreen(true);
         primaryStage.show();
 
-       //new LoginController();
-        new LobbyController();
-       /// new LobbyController();
+       new LoginController();
     }
 
-
-
-    public void changeScene(Scene scene) {
+    public void loadScene(Scene scene) {
+        System.out.println("switched!");
+        primaryStage.setFullScreen(true);
         primaryStage.setScene(scene);
-        //primaryStage.setFullScreen(true);
+
+        SceneManager.getInstance().setPane(root);
     }
 }
 

src/main/java/Controller/AccountController.java

@@ -0,0 +1,24 @@
+package Controller;
+
+import Model.AccountModel;
+
+public class AccountController {
+
+    AccountModel model;
+
+    public AccountController(String username) {
+        model = new AccountModel(username);
+    }
+
+    public String getAccountName(){
+        return model.getAccountName();
+    }
+
+    public void setPlayerId(String id){
+        model.setPlayerId(id);
+    }
+
+    public String getPlayerId(){
+        return model.getPlayerId();
+    }
+}

src/main/java/Controller/AreaController.java

@@ -1,84 +1,151 @@
 package Controller;
 
+import Enum.AreaProperty;
+import Enum.AreaType;
 import Firebase.FirebaseControllerObserver;
 import Firebase.FirebaseServiceOwn;
 import Managers.SceneManager;
 import Model.AreaModel;
 import Objects.RaceFiche;
 import Observer.AreaObserver;
 import com.google.cloud.firestore.DocumentSnapshot;
+import javafx.application.Platform;
 import javafx.scene.Group;
-import Applicatie.Applicatie;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.List;
 import java.util.Stack;
 
+/**
+ * This Controller-class handles the logic for all the functions that can be called for areas
+ *
+ * @author beau
+ * @version June 2019
+ */
+
 public class AreaController implements FirebaseControllerObserver {
+    private Map2DController map2DCon;
+    private AreaModel model;
+    private GameController gameCon;
+    private FirebaseServiceOwn fb = SceneManager.getInstance().getApp().getFirebaseService();
+
+    public AreaController(Group area, Map2DController mapCon, GameController gameCon) {
+        model = new AreaModel(area.getChildren().get(0).getId());
+        map2DCon = mapCon;
+        this.gameCon = gameCon;
+        getAreaInfo();
+        SceneManager.getInstance().createAreaView(this, area);
+        fb.AreaListener(model.getId(), this);
+    }
+
+    String getId() {
+        return model.getId();
+    }
+
+    int numbersNeeded() {
+        return model.numbersNeeded();
+    }
+
+    void attackArea(Stack<RaceFiche> fiches) {
+        model.setFiches(fiches);
+        fb.areaUpdateFiches(model.getId(), model.getNumberOfFiches());
+    }
+
+    void setPlayerOwner(PlayerController player) {
+        model.player = player;
+    }
+
+    PlayerController getOwnerPlayer() {
+        return model.player;
+    }
+
+    Stack<RaceFiche> removeFiches() {
+//        fb.areaUpdateFiches(model.getId(), 0);
+        return model.getAllFiches();
+    }
+
+    RaceFiche getOneFiche() {
+        return model.getOneFiche();
+    }
+
+    void changeActive() {
+        model.changeActive();
+    }
+
+    public void register(AreaObserver ao) {
+        model.register(ao);
+    }
+
+    public void selectActive() {
+        map2DCon.selectSingleArea(this);
+    }
+
+    public void destroyAllButOne() {
+        model.getAllButOne();
+        fb.areaUpdateFiches("fiches", model.getNumberOfFiches());
+    }
+
+    void returnAllButOne(RaceController raceController) {
+        raceController.pushFiches(model.getAllButOne());
+        fb.areaUpdateFiches("fiches", model.getNumberOfFiches());
+    }
+
+    private void getAreaInfo() {
+        DocumentSnapshot ds = fb.getAreaInfo(model.getId());
+        Platform.runLater(() -> {
+            model.setFiches((int) Math.round(ds.getDouble("fiches")));
+            model.setAreaType(ds.getString("type"));
+            model.setBorderArea(ds.getBoolean("borderArea"));
+            model.setNeighbours((List<String>) ds.get("neighbours"));
+            model.setAttackAble(ds.getBoolean("attackAble"));
+            model.notifyObserver();
+        });
+    }
+
+    @Override
+    public void update(DocumentSnapshot ds) {
+        if (gameCon.getCurrentPlayer() == gameCon.getMyPlayer()) return;
+        Platform.runLater(() -> {
+            if (model.getPlayer() == gameCon.getMyPlayer()) {
+                model.getPlayer().getActiveCombination().getRace().pushFiches(removeFiches());
+                model.player = null;
+                model.setFiches((int) Math.round(ds.getDouble("fiches")));
+            }
+            model.setFiches((int) Math.round(ds.getDouble("fiches")));
+            System.out.println(ds.getDouble("fiches"));
+        });
+    }
+
+    public AreaProperty getSpecialProp() {
+        return model.getSpecialProp();
+    }
 
-	private Map2DController map2DCon;
-	private AreaModel model;
-	private GameController gameCon;
-	private FirebaseServiceOwn fb = Applicatie.getFirebaseService();
-
-	public AreaController(Group area, Map2DController mapCon, GameController gameCon) {
-		model = new AreaModel(area.getChildren().get(0).getId());
-		map2DCon = mapCon;
-		this.gameCon = gameCon;
-		SceneManager.getInstance().createAreaView(this, area);
-		setAreaInFirebase();
-		fb.AreaListener(model.getId(), this);
-	}
-
-	String getId(){return model.getId();}
-
-	public void setAreaInFirebase(){
-		Map<String, Object> area = new HashMap<>();
-		area.put("fiches", model.getNumberOfFiches());
-		area.put("owner", null);
-		area.put("oldOwner", null);
-		area.put("oldFiches", null);
-		fb.setAreas(model.getId(), area);
-	}
-
-	int numbersNeeded(){
-		return model.numbersNeeded();
-	}
-
-	void attackArea(Stack<RaceFiche> fiches){
-		model.setFiches(fiches);
-		fb.areaUpdateFiches(model.getId(), model.getNumberOfFiches());
-	}
-
-	void setPlayerOwner(PlayerController player){
-		model.player = player;
-	}
-
-	PlayerController getOwnerPlayer(){
-		return model.player;
-	}
-
-	Stack<RaceFiche> removeFiches(){
-		fb.areaUpdateFiches(model.getId(), 0);
-		return model.getAllFiches();
-	}
-
-	void changeActive(){model.changeActive();}
-
-	public void register(AreaObserver ao){model.register(ao);}
-
-	public void selectActive(){	map2DCon.selectSingleArea(this);}
-
-    public void returnAllButOne(RaceController raceController) {
-		raceController.pushFiches(model.getAllButOne());
-    }
-
-	@Override
-	public void update(DocumentSnapshot ds) {
-		if(ds.get("oldowner") == null) return;
-
-		AttackController attCon = gameCon.getAttCon();
-		attCon.getTargetArea();
-		attCon.attackAreaLocal();
-	}
+    public boolean isNextToWater() {
+        return model.isNextToWater();
+    }
+
+    public int getFichesAmount() {
+        return model.getNumberOfFiches();
+    }
+
+    public void addFiche(RaceFiche fiche) {
+        model.addFiche(fiche);
+    }
+
+    public AreaType getAreaType() {
+        return model.getAreaType();
+    }
+
+    public boolean firstAttackArea() {
+        return model.firstAttackArea();
+    }
+
+    public boolean isAttackAble() {
+        return model.isAttackAble();
+    }
+
+    public List<String> getNeighbours() { return model.getNeigbours();}
+
+    public void highLightArea() {
+        model.highLight();
+    }
 }