Browse Source

clean up

master
GAM 4 years ago
parent
commit
3fc033ac7c
13 changed files with 9 additions and 20 deletions
  1. +3
    -3
      src/main/java/app/data/service/PlayerService.java
  2. +1
    -0
      src/main/java/app/navigation/NavigationService.java
  3. +0
    -1
      src/main/java/app/navigation/NavigationUtils.java
  4. +2
    -2
      src/main/java/app/navigation/match/MatchNavigation.java
  5. +2
    -4
      src/main/java/app/navigation/matchday/MatchdayNavigation.java
  6. +0
    -1
      src/main/java/app/navigation/matchday/MatchdayNavigationService.java
  7. +0
    -1
      src/main/java/app/navigation/matchday/components/button/NextMatchdayButton.java
  8. +0
    -1
      src/main/java/app/navigation/matchday/components/button/PrevMatchdayButton.java
  9. +0
    -2
      src/main/java/app/views/match/MatchView.java
  10. +0
    -1
      src/main/java/app/views/matchday/MatchdayView.java
  11. +1
    -2
      src/main/java/app/views/matchday/components/MatchdayCard.java
  12. +0
    -1
      src/main/java/app/views/table/TableView.java
  13. +0
    -1
      src/main/java/app/views/table/components/TableCard.java

+ 3
- 3
src/main/java/app/data/service/PlayerService.java View File

@ -44,9 +44,9 @@ public class PlayerService extends CrudService<Player, Integer> {
}
private class PlayerForTableProvider {
List<Matchday> matchdays = new ArrayList<>();
List<CalculatedMatch> calculatedMatches = new ArrayList<>();
List<Player> players = repository.findAll();
private final List<Matchday> matchdays = new ArrayList<>();
private final List<CalculatedMatch> calculatedMatches = new ArrayList<>();
private final List<Player> players = repository.findAll();
public PlayerForTableProvider(Matchday matchday) {
matchdays.addAll(matchdayService.getMatchdaysSorted(matchday.getSeason()).stream()


+ 1
- 0
src/main/java/app/navigation/NavigationService.java View File

@ -2,5 +2,6 @@ package app.navigation;
public interface NavigationService<T extends Navigation> {
T getNewNavigation();
AbstractNavigationHeader<T> getNewNavigationHeader(T navigation);
}

+ 0
- 1
src/main/java/app/navigation/NavigationUtils.java View File

@ -1,7 +1,6 @@
package app.navigation;
import app.utils.EntityStringUtils;
import com.vaadin.flow.router.WildcardParameter;
import org.springframework.lang.NonNull;
import java.util.List;


+ 2
- 2
src/main/java/app/navigation/match/MatchNavigation.java View File

@ -31,7 +31,7 @@ public class MatchNavigation extends Navigation {
}
@Override
@SuppressWarnings("unchecked")
@SuppressWarnings({"unchecked", "DuplicatedCode"}) // TODO: get rid of duplications
protected <PARENT extends Navigable, CHILD extends Navigable> List<CHILD> getChildren(@Nullable PARENT parent, @NonNull Class<CHILD> childClass) {
if (childClass.equals(Season.class)) {
return (List<CHILD>) getSeasonService().getAllSeasonsSorted();
@ -50,7 +50,7 @@ public class MatchNavigation extends Navigation {
}
@Override
@SuppressWarnings("unchecked")
@SuppressWarnings({"unchecked", "DuplicatedCode"}) // TODO: get rid of duplications
protected <T extends Navigable> T getDefaultValue(Class<T> clazz) {
if (clazz.equals(Season.class)) {
assert !getSeasonList().isEmpty();


+ 2
- 4
src/main/java/app/navigation/matchday/MatchdayNavigation.java View File

@ -1,9 +1,7 @@
package app.navigation.matchday;
import app.data.entity.Match;
import app.data.entity.Matchday;
import app.data.entity.Season;
import app.data.service.MatchService;
import app.data.service.MatchdayService;
import app.data.service.SeasonService;
import app.navigation.Navigable;
@ -30,7 +28,7 @@ public class MatchdayNavigation extends Navigation {
}
@Override
@SuppressWarnings({"unchecked", "DuplicatedCode"})
@SuppressWarnings({"unchecked", "DuplicatedCode"}) // TODO: get rid of duplications
protected <PARENT extends Navigable, CHILD extends Navigable> List<CHILD> getChildren(@Nullable PARENT parent, @NonNull Class<CHILD> childClass) {
if (childClass.equals(Season.class)) {
return (List<CHILD>) getSeasonService().getAllSeasonsSorted();
@ -45,7 +43,7 @@ public class MatchdayNavigation extends Navigation {
}
@Override
@SuppressWarnings({"unchecked", "DuplicatedCode"})
@SuppressWarnings({"unchecked", "DuplicatedCode"}) // TODO: get rid of duplications
protected <T extends Navigable> T getDefaultValue(Class<T> clazz) {
if (clazz.equals(Season.class)) {
assert !getSeasonList().isEmpty();


+ 0
- 1
src/main/java/app/navigation/matchday/MatchdayNavigationService.java View File

@ -1,6 +1,5 @@
package app.navigation.matchday;
import app.data.service.MatchService;
import app.data.service.MatchdayService;
import app.data.service.SeasonService;
import app.navigation.AbstractNavigationHeader;


+ 0
- 1
src/main/java/app/navigation/matchday/components/button/NextMatchdayButton.java View File

@ -1,7 +1,6 @@
package app.navigation.matchday.components.button;
import app.data.entity.Matchday;
import app.navigation.match.MatchNavigation;
import app.navigation.matchday.MatchdayNavigation;
import com.vaadin.flow.component.button.Button;
import com.vaadin.flow.component.icon.VaadinIcon;


+ 0
- 1
src/main/java/app/navigation/matchday/components/button/PrevMatchdayButton.java View File

@ -1,7 +1,6 @@
package app.navigation.matchday.components.button;
import app.data.entity.Matchday;
import app.navigation.match.MatchNavigation;
import app.navigation.matchday.MatchdayNavigation;
import com.vaadin.flow.component.button.Button;
import com.vaadin.flow.component.icon.VaadinIcon;


+ 0
- 2
src/main/java/app/views/match/MatchView.java View File

@ -1,8 +1,6 @@
package app.views.match;
import app.data.service.ChessComService;
import app.data.service.GameInfoService;
import app.data.service.GameService;
import app.gameimage.GameImageService;
import app.navigation.match.MatchNavigation;
import app.navigation.match.MatchNavigationService;


+ 0
- 1
src/main/java/app/views/matchday/MatchdayView.java View File

@ -1,6 +1,5 @@
package app.views.matchday;
import app.navigation.match.MatchNavigation;
import app.navigation.matchday.MatchdayNavigation;
import app.navigation.matchday.MatchdayNavigationService;
import app.views.main.MainView;


+ 1
- 2
src/main/java/app/views/matchday/components/MatchdayCard.java View File

@ -2,7 +2,6 @@ package app.views.matchday.components;
import app.data.bean.CalculatedMatch;
import app.data.entity.Matchday;
import app.navigation.match.MatchNavigation;
import app.navigation.matchday.MatchdayNavigation;
import app.navigation.matchday.components.button.NextMatchdayButton;
import app.navigation.matchday.components.button.PrevMatchdayButton;
@ -32,7 +31,7 @@ public class MatchdayCard extends Div implements ContentConfigurable {
private final MatchdayNavigation matchdayNavigation;
private final Calendar calendar = Calendar.getInstance();
SimpleDateFormat dateFormat = new SimpleDateFormat("dd.MM.");
private final SimpleDateFormat dateFormat = new SimpleDateFormat("dd.MM.");
private final HorizontalLayout header = new HorizontalLayout();
private final HorizontalLayout headerLabelLayout = new HorizontalLayout();


+ 0
- 1
src/main/java/app/views/table/TableView.java View File

@ -1,7 +1,6 @@
package app.views.table;
import app.data.service.PlayerService;
import app.navigation.match.MatchNavigationService;
import app.navigation.matchday.MatchdayNavigation;
import app.navigation.matchday.MatchdayNavigationService;
import app.views.main.MainView;


+ 0
- 1
src/main/java/app/views/table/components/TableCard.java View File

@ -3,7 +3,6 @@ package app.views.table.components;
import app.data.bean.PlayerForTable;
import app.data.entity.Matchday;
import app.data.service.PlayerService;
import app.navigation.match.MatchNavigation;
import app.navigation.matchday.MatchdayNavigation;
import app.navigation.matchday.components.button.NextMatchdayButton;
import app.navigation.matchday.components.button.PrevMatchdayButton;


Loading…
Cancel
Save