Skip to content

Commit 09f4754

Browse files
:)
1 parent 7b53822 commit 09f4754

File tree

24 files changed

+45421
-226
lines changed

24 files changed

+45421
-226
lines changed

Client/src/main/java/sample/controller/ClientManager.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ public static void send(Object input) {
2222
try {
2323
objectOutputStream.writeObject(input);
2424
objectOutputStream.flush();
25+
objectOutputStream.reset();
2526
} catch (IOException e) {
2627
e.printStackTrace();
2728
}

Client/src/main/java/sample/controller/menuController/MenuController.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ public static void getUserByToken() {
3535
jsonObject.put("method", "getUser");
3636
jsonObject.put("class", "MainMenuController");
3737
jsonObject.put("token", MainMenuController.getToken());
38-
User user = (User) ClientManager.sendAndGetResponse(jsonObject);
39-
setUser(user);
38+
setUser((User) ClientManager.sendAndGetResponse(jsonObject));
39+
System.out.println("we are getting "+user.getUserName()+" with trunk size : "+user.getAllCardsOfUser().size());
40+
4041
}
4142

4243
public static User getUser() {

Client/src/main/java/sample/view/DeckEdit.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import javafx.scene.paint.ImagePattern;
1818
import javafx.scene.shape.Rectangle;
1919
import sample.controller.menuController.DeckController;
20+
import sample.controller.menuController.MainMenuController;
2021
import sample.controller.menuController.MenuController;
2122
import sample.controller.responses.DeckMenuResponses;
2223
import sample.model.Deck;
@@ -73,7 +74,11 @@ public void start(){
7374
readyUpMainDeck();
7475
readyUpSideDeck();
7576
}
76-
77+
public void update(){
78+
MainMenuController.getUserByToken();
79+
userCards = MenuController.getUser().getAllCardsOfUser();
80+
deck = MenuController.getUser().getDeckByName(deck.getName());
81+
}
7782
public void readyUpTrunk(){
7883
GridPane pane = new GridPane();
7984
pane.setPadding(new Insets(10,10,10,20));
@@ -210,6 +215,7 @@ else if(selectedCard.getDeckViewLocation()== Card.DeckViewLocation.TRUNK)
210215
deckController.removeCardFromDeck(selectedCard,deck.getName(),type);
211216
selectedCard.setDeckViewLocation(Card.DeckViewLocation.TRUNK);
212217
new Alert(Alert.AlertType.INFORMATION,"card removed successfully").show();
218+
update();
213219
if(type== Deck.DeckType.MAIN) readyUpMainDeck();
214220
else readyUpSideDeck();
215221
readyUpTrunk();
@@ -228,6 +234,7 @@ else if(deckMenuResponses.equals(MAX_SIZE_IDENTICAL_CARDS_ALREADY_IN_DECK))
228234
new Alert(Alert.AlertType.ERROR,"there are already three cards of this type").show();
229235
else if(deckMenuResponses.equals(CARD_ADD_TO_DECK_SUCCESSFUL)) {
230236
selectedCard.setDeckViewLocation(Card.DeckViewLocation.MAIN_DECK);
237+
update();
231238
readyUpMainDeck();
232239
readyUpTrunk();
233240
new Alert(Alert.AlertType.INFORMATION, "card added to main deck successfully").show();
@@ -247,6 +254,7 @@ else if(deckMenuResponses.equals(MAX_SIZE_IDENTICAL_CARDS_ALREADY_IN_DECK))
247254
new Alert(Alert.AlertType.ERROR,"there are already three cards of this type").show();
248255
else if(deckMenuResponses.equals(CARD_ADD_TO_DECK_SUCCESSFUL)) {
249256
selectedCard.setDeckViewLocation(Card.DeckViewLocation.SIDE_DECK);
257+
update();
250258
readyUpSideDeck();
251259
readyUpTrunk();
252260
new Alert(Alert.AlertType.INFORMATION, "card added to side deck successfully").show();

Client/src/main/java/sample/view/DeckMenu.java

Lines changed: 68 additions & 217 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)