From 617241cd3823b379f747d829c911fd67968be5a0 Mon Sep 17 00:00:00 2001 From: GAM Date: Sat, 20 Mar 2021 11:15:10 +0100 Subject: [PATCH] update TODOs, Refactoring --- .../java/app/gameimage/GameImageGenerator.java | 1 + .../java/app/views/match/components/GameCard.java | 15 ++++++++------- ...GameComponentUtils.java => GameCardUtils.java} | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) rename src/main/java/app/views/match/components/utils/{GameComponentUtils.java => GameCardUtils.java} (98%) diff --git a/src/main/java/app/gameimage/GameImageGenerator.java b/src/main/java/app/gameimage/GameImageGenerator.java index 448601e..d1e81b1 100644 --- a/src/main/java/app/gameimage/GameImageGenerator.java +++ b/src/main/java/app/gameimage/GameImageGenerator.java @@ -6,6 +6,7 @@ import java.util.Objects; import java.util.Set; public class GameImageGenerator { + // TODO: mark squares of the last move using PGN private static final int FIELD_SIZE = 150; private static final Set WHITE_PIECES = Set.of('B', 'K', 'N', 'P', 'Q', 'R'); diff --git a/src/main/java/app/views/match/components/GameCard.java b/src/main/java/app/views/match/components/GameCard.java index 23a3c13..85645f5 100644 --- a/src/main/java/app/views/match/components/GameCard.java +++ b/src/main/java/app/views/match/components/GameCard.java @@ -2,7 +2,7 @@ package app.views.match.components; import app.data.entity.Game; import app.gameimage.GameImageService; -import app.views.match.components.utils.GameComponentUtils; +import app.views.match.components.utils.GameCardUtils; import com.vaadin.flow.component.button.Button; import com.vaadin.flow.component.html.Div; import com.vaadin.flow.component.html.Image; @@ -13,6 +13,7 @@ import com.vaadin.flow.component.orderedlayout.VerticalLayout; import org.springframework.beans.factory.annotation.Autowired; public class GameCard extends Div { + // TODO: display reason for loss/draw private final GameImageService gameImageService; @@ -47,12 +48,12 @@ public class GameCard extends Div { } private void defineLeft() { - Label header = GameComponentUtils.getHeader(game); - Div timeControlDiv = GameComponentUtils.getTimeControlDiv(game); - Div blackDiv = GameComponentUtils.getPlayerDiv(game, false); - Label vsLabel = GameComponentUtils.getVsLabel(); - Div whiteDiv = GameComponentUtils.getPlayerDiv(game, true); - Button button = GameComponentUtils.getChessComButton(game); + Label header = GameCardUtils.getHeader(game); + Div timeControlDiv = GameCardUtils.getTimeControlDiv(game); + Div blackDiv = GameCardUtils.getPlayerDiv(game, false); + Label vsLabel = GameCardUtils.getVsLabel(); + Div whiteDiv = GameCardUtils.getPlayerDiv(game, true); + Button button = GameCardUtils.getChessComButton(game); left.add(header, timeControlDiv, blackDiv, vsLabel, whiteDiv, button); left.addClassName("game-info-div"); diff --git a/src/main/java/app/views/match/components/utils/GameComponentUtils.java b/src/main/java/app/views/match/components/utils/GameCardUtils.java similarity index 98% rename from src/main/java/app/views/match/components/utils/GameComponentUtils.java rename to src/main/java/app/views/match/components/utils/GameCardUtils.java index ee4a00a..cc5a554 100644 --- a/src/main/java/app/views/match/components/utils/GameComponentUtils.java +++ b/src/main/java/app/views/match/components/utils/GameCardUtils.java @@ -24,8 +24,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; -public class GameComponentUtils { - private GameComponentUtils() { +public class GameCardUtils { + private GameCardUtils() { } public static int getGameNumber(Game game) {