Skip to content

Commit

Permalink
enhance format
Browse files Browse the repository at this point in the history
  • Loading branch information
@akmsw
akmsw committed Jan 8, 2024
1 parent 17bec57 commit b86fcae
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 36 deletions.
28 changes: 12 additions & 16 deletions src/main/java/armameeldoparti/controllers/AnchoragesController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,23 +262,19 @@ private void updateTextArea() {
view.getTextArea()
.append("ANCLAJE " + (anchorageNumber + 1) + System.lineSeparator());

List<Player> anchoredPlayers = CommonFields.getPlayersSets()
.entrySet()
.stream()
.flatMap(
playersSet -> playersSet.getValue()
.stream()
.filter(
player -> player.getAnchorageNumber() == (anchorageNumber + 1)
)
)
.sorted(Comparator.comparing(player -> player.getPosition()
.ordinal()))
.toList();

for (Player player : anchoredPlayers) {
List<Player> anchorage = CommonFields.getPlayersSets()
.entrySet()
.stream()
.flatMap(players -> players.getValue()
.stream()
.filter(player -> player.getAnchorageNumber() == anchorageNumber + 1))
.sorted(Comparator.comparing(player -> player.getPosition()
.ordinal()))
.toList();

for (Player player : anchorage) {
view.getTextArea()
.append((anchoredPlayers.indexOf(player) + 1) + ". " + player.getName() + System.lineSeparator());
.append((anchorage.indexOf(player) + 1) + ". " + player.getName() + System.lineSeparator());
}

if ((anchorageNumber + 1) != anchoragesAmount) {
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/armameeldoparti/controllers/ResultsController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,24 +233,24 @@ private void fillTableFields() {
table.setValueAt("EQUIPO " + (teamIndex + 1), 0, teamIndex + 1);
}

for (int rowIndex = 1; rowIndex < rowCount; rowIndex++) {
for (int row = 1; row < rowCount; row++) {
table.setValueAt(
positionsMap.get(
switch (rowIndex) {
switch (row) {
case 1 -> Position.CENTRAL_DEFENDER;
case 2, 3 -> Position.LATERAL_DEFENDER;
case 4, 5 -> Position.MIDFIELDER;
default -> Position.FORWARD;
}
),
rowIndex,
row,
0
);
}

if (CommonFields.getDistribution() == Constants.MIX_BY_SKILL_POINTS) {
for (int colIndex = 0; colIndex < teams.size(); colIndex++) {
table.setValueAt(colIndex == 0 ? positionsMap.get(Position.GOALKEEPER) : "Puntuación del equipo", table.getRowCount() + colIndex - 2, 0);
for (int column = 0; column < teams.size(); column++) {
table.setValueAt(column == 0 ? positionsMap.get(Position.GOALKEEPER) : "Puntuación del equipo", table.getRowCount() + column - 2, 0);
}
} else {
table.setValueAt(positionsMap.get(Position.GOALKEEPER), table.getRowCount() - 1, 0);
Expand Down
16 changes: 7 additions & 9 deletions src/main/java/armameeldoparti/utils/mixers/BySkillPointsMixer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,10 @@ public List<Team> withoutAnchorages(List<Team> teams) {
*/
@Override
public List<Team> withAnchorages(List<Team> teams) {
List<List<Player>> anchoredPlayers = CommonFunctions.getAnchoredPlayers();

for (List<Player> anchoredPlayersSet : anchoredPlayers) {
for (List<Player> anchorage : CommonFunctions.getAnchoredPlayers()) {
teams.sort(comparingInt(Team::getTeamSkill));

for (Player player : anchoredPlayersSet) {
for (Player player : anchorage) {
player.setTeamNumber(teams.get(0)
.getTeamNumber());

Expand All @@ -123,16 +121,16 @@ public List<Team> withAnchorages(List<Team> teams) {

remainingPlayers.sort(comparingInt(List::size));

for (List<Player> playersSet : remainingPlayers) {
playersSet.sort(comparingInt(Player::getSkillPoints).reversed());
for (List<Player> players : remainingPlayers) {
players.sort(comparingInt(Player::getSkillPoints).reversed());

if (playersSet.size() == 4) {
if (players.size() == 4) {
teams.sort(comparingInt(Team::getTeamSkill));

distributeSubsets(teams, playersSet, playersSet.get(0)
distributeSubsets(teams, players, players.get(0)
.getPosition());
} else {
for (Player player : playersSet) {
for (Player player : players) {
teams.sort(comparingInt(Team::getTeamSkill));

int teamNumber = 0;
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/armameeldoparti/views/SkillPointsInputView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,13 @@ private void addSpinners() {
.get(position)), SwingConstants.CENTER),
CommonFunctions.buildMigLayoutConstraints(Constants.MIG_LAYOUT_GROW, Constants.MIG_LAYOUT_SPAN));

List<Player> playersSet = new ArrayList<>(CommonFields.getPlayersSets()
.get(position));
List<Player> players = new ArrayList<>(CommonFields.getPlayersSets()
.get(position));

playersSet.sort(Comparator.comparing(player -> player.getPosition()
.ordinal()));
players.sort(Comparator.comparing(player -> player.getPosition()
.ordinal()));

for (Player player : playersSet) {
for (Player player : players) {
spinnersMap.put(player, new CustomSpinner(new SpinnerNumberModel(Constants.SKILL_INI,
Constants.SKILL_MIN,
Constants.SKILL_MAX,
Expand All @@ -102,7 +102,7 @@ private void addSpinners() {
labelsMap.put(spinnersMap.get(player), new JLabel(player.getName()));

masterPanel.add(labelsMap.get(spinnersMap.get(player)), Constants.MIG_LAYOUT_PUSHX);
masterPanel.add(spinnersMap.get(player), playersSet.indexOf(player) % 2 != 0 ? Constants.MIG_LAYOUT_WRAP : null);
masterPanel.add(spinnersMap.get(player), players.indexOf(player) % 2 != 0 ? Constants.MIG_LAYOUT_WRAP : null);
}
}
}
Expand Down

0 comments on commit b86fcae

Please sign in to comment.