Merge remote-tracking branch 'origin/master'

src/controller/AccountController.java

@@ -1,16 +1,21 @@
 package controller;
 
-import models.Account;
-import models.ArtificialIntelligence;
-import models.Battle;
+import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.stream.JsonReader;
+import javafx.scene.Node;
+import models.*;
 import models.Enums.BattleKind;
 import models.Enums.BattleMode;
 import models.Enums.ErrorType;
-import models.Game;
 import view.AccountRequest;
 import view.RequestType;
 import view.View;
 
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+
 public class AccountController extends Thread {
     private static AccountController accountController = new AccountController();
     private Account account;
@@ -173,28 +178,60 @@ private int selectStoryModeLevel(AccountRequest request) {
 
     //-----------------------------------------------------------------
     public void save() {
+        Gson gson = new Gson();
+        JsonReader reader;
+        try {
+            reader = new JsonReader(new FileReader("src\\models\\accountSaves.json"));
+            JsonArray array = gson.fromJson(reader, JsonArray.class);
+            Account[] accounts = gson.fromJson(array, Account[].class);
+            write(gson, accounts);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void write(Gson gson, Account[] accounts) throws IOException {
+        FileWriter writer;
+        Account[] accounts2;
+        writer = new FileWriter("src/models/accountSaves.json");
+        accounts2 = getAccounts(accounts);
+        writer.write(gson.toJson(accounts2));
+        writer.flush();
+        writer.close();
+    }
+
+    private Account[] getAccounts(Account[] accounts) {
+        Account[] accounts2;
+        if (accounts != null) {
+            accounts2 = new Account[accounts.length + 1];
+            System.arraycopy(accounts, 0, accounts2, 0, accounts.length);
+            accounts2[accounts2.length - 1] = account;
+        } else {
+            accounts2 = new Account[1];
+            accounts2[0] = account;
+        }
+        return accounts2;
     }
-//    private void help() {
-//        view.printAccountMenuHelp(account.toString());
-//    }
 
     public void enterCollection() {
         CollectionController.getInstance().main(this.account.getCollection());
     }
 
     public void enterShop() {
-        ShopController.getInstance().main(account);
+        ShopController.getInstance().getShop().setAccount(account);
     }
 
     public void setAccount(Account account) {
         this.account = account;
     }
 
-    public void logout() {
+    public void logout(Node node) {
+        account = null;
+        Game.getInstance().loadPage(node, "/view/fxmls/loginPage.fxml");
     }
 
     public Account getAccount() {
         return this.account;
     }
 
-}
+}

src/controller/ShopController.java

@@ -1,6 +1,5 @@
 package controller;
 
-import models.Account;
 import models.Enums.ErrorType;
 import models.Shop;
 import view.ShopRequest;
@@ -9,61 +8,58 @@
 import static models.Enums.ErrorType.CARD_NOT_FOUND_IN_SHOP;
 import static models.Enums.ErrorType.NO_ERROR;
 
-class ShopController {
+public class ShopController {
     private static ShopController shopController = new ShopController();
     private Shop shop = Shop.getInstance();
     private View view = View.getInstance();
 
     private ShopController() {
     }
 
-    static ShopController getInstance() {
+    public static ShopController getInstance() {
         return shopController;
     }
-
-    void main(Account account) {
-        shop.setAccount(account);
-        boolean isFinish = false;
-        do {
-            ShopRequest request = new ShopRequest();
-            request.getNewCommand();
-            switch (request.getType()) {
-                case EXIT:
-                    isFinish = true;
-                    break;
-                case HELP:
-                    help();
-                    break;
-                case SHOW_SHOP_CARDS:
-                    showShopCards();
-                    break;
-                case SELL:
-                    sellCard(request);
-                    break;
-                case BUY:
-                    buyCard(request);
-                    break;
-                case SEARCH_CARD_IN_COLLECTION:
-                    searchInCollection(request);
-                    break;
-                case SEARCH_SHOP:
-                    searchInShop(request);
-                    break;
-                case SHOW_COLLECTION_ITEMS_AND_CARDS:
-                    showCollectionCards();
-                    break;
-            }
-        }
-        while (!isFinish);
-    }
-
-    public void help() {
-        view.printShopMenuHelp(shop.toString());
-    }
-
-    private void showShopCards() {
-        view.printShopCards(shop.getCards());
-    }
+//    void main(Account account) {
+//        shop.setAccount(account);
+//        boolean isFinish = false;
+//        do {
+//            ShopRequest request = new ShopRequest();
+//            request.getNewCommand();
+//            switch (request.getType()) {
+//                case EXIT:
+//                    isFinish = true;
+//                    break;
+//                case HELP:
+//                    help();
+//                    break;
+//                case SHOW_SHOP_CARDS:
+//                    showShopCards();
+//                    break;
+//                case SELL:
+//                    sellCard(request);
+//                    break;
+//                case BUY:
+//                    buyCard(request);
+//                    break;
+//                case SEARCH_CARD_IN_COLLECTION:
+//                    searchInCollection(request);
+//                    break;
+//                case SEARCH_SHOP:
+//                    searchInShop(request);
+//                    break;
+//                case SHOW_COLLECTION_ITEMS_AND_CARDS:
+//                    showCollectionCards();
+//                    break;
+//            }
+//        }
+//        while (!isFinish);
+//    }
+//    public void help() {
+//        view.printShopMenuHelp(shop.toString());
+//    }
+//    private void showShopCards() {
+//        view.printShopCards(shop.getCards());
+//    }
 
     private void sellCard(ShopRequest request) {
         int cardID = request.getCardID();
@@ -88,28 +84,30 @@ private void buyCard(ShopRequest request) {
             view.successfulBuyMessage();
         }
     }
-
-    private void searchInShop(ShopRequest request) {
-        String cardName = request.getCardName();
-        if (shop.searchInShop(cardName)) {
-            view.printCardWasFound();
-        } else {
-            view.printError(CARD_NOT_FOUND_IN_SHOP);
-        }
-    }
-
-    private void searchInCollection(ShopRequest request) {
-        String cardName = request.getCardName();
-        int state = shop.searchInCollection(cardName);
-        if (state != -1) {
-            view.printCardInCollection(cardName, state);
-        } else {
-            view.printNoCardWithThisName(cardName);
-        }
-    }
+//    private void searchInShop(ShopRequest request) {
+//        String cardName = request.getCardName();
+//        if (shop.searchInShop(cardName)) {
+//            view.printCardWasFound();
+//        } else {
+//            view.printError(CARD_NOT_FOUND_IN_SHOP);
+//        }
+//    }
+//    private void searchInCollection(ShopRequest request) {
+//        String cardName = request.getCardName();
+//        int state = shop.searchInCollection(cardName);
+//        if (state != -1) {
+//            view.printCardInCollection(cardName, state);
+//        } else {
+//            view.printNoCardWithThisName(cardName);
+//        }
+//    }
 
     private void showCollectionCards() {
         view.printCollectionItems(shop.getCards(), true);
     }
 
-}
+    public Shop getShop() {
+        return shop;
+    }
+
+}

src/controller/fxmlControllers/MainMenuController.java

@@ -44,8 +44,7 @@ private void goToCollection() {
     }
 
     private void goToShop() {
-//        accountController.enterShop();
-//        Main.getStage().getScene().setRoot(Main.getShopPage());
+        accountController.enterShop();
         Game.getInstance().loadPage(exitButton, "/view/fxmls/shop.fxml");
     }
 
@@ -62,7 +61,7 @@ private void goToBattle() {
     }
 
     private void logout() {
-        accountController.logout();
+        accountController.logout(exitButton);
     }
 
     private void showMatchHistories() {

src/controller/fxmlControllers/ShopFxmlController.java

@@ -1,5 +1,6 @@
 package controller.fxmlControllers;
 
+import controller.ShopController;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
 import javafx.scene.Node;
@@ -17,6 +18,7 @@ public class ShopFxmlController implements Initializable {
 
     public Button back;
     public FlowPane pane;
+    private ShopController shopController = ShopController.getInstance();
 
     @Override
     public void initialize(URL location, ResourceBundle resources) {
@@ -50,7 +52,7 @@ private void specifyImageAndText(Card c, AnchorPane loader) {
     }
 
     private void getImageView(ImageView view, String url) {
-        Image image = new Image("view/images/cardGifs/boss_decepticleprime_breathing.gif");
+        Image image = new Image("view/images/cardGifs/boss_grym_breathing.gif");
         view.setImage(image);
         view.setScaleX(2);
         view.setScaleY(2);

src/models/Placeable.java

@@ -1,6 +1,6 @@
 package models;
 
-public abstract class Placeable implements Comparable<Placeable> {
+public class Placeable implements Comparable<Placeable> {
     private Cell cell;
     private int neededMana;
     private int ID;

src/models/accountSaves.json

@@ -0,0 +1 @@
+[]

src/view/CollectionRequest.java

@@ -1,9 +1,6 @@
 package view;
 
-import models.Enums.ErrorType;
-
 public class CollectionRequest extends Request {
-    private View view = View.getInstance();
 
     @Override
     public RequestType getType() {
@@ -38,6 +35,9 @@ else if (command.matches("show"))
         }
     }
 
+    /**
+     * @return null when ...
+     */
     public String getDeckName() {
         switch (getType()) {
             case CREATE_DECK:
@@ -56,10 +56,12 @@ public String getDeckName() {
                 return command.split(" ")[2];
             default:
                 return null;
-            /** return null when ... */
         }
     }
 
+    /**
+     * @return -1 when ...
+     */
     public int getCardID() {
         switch (getType()) {
             case ADD_CARD_TO_DECK:
@@ -68,16 +70,17 @@ public int getCardID() {
                 return Integer.parseInt(command.split(" ")[1]);
             default:
                 return -1;
-            /** return -1 when ... */
         }
     }
 
+    /**
+     * @return null when ...
+     */
     public String getCardName() {
         if (getType() == RequestType.SEARCH_CARD_IN_COLLECTION) {
             return command.split(" ")[1];
         }
         return null;
-        /** return null when ... */
     }
 
 }