From bea2acbf2994b2d6db624aa6cfd1d504bbad16b5 Mon Sep 17 00:00:00 2001 From: Agetian Date: Wed, 7 Jun 2017 06:24:30 +0000 Subject: [PATCH] - "Index out of bounds" error prevention in Gauntlet mode. --- .../forge/screens/match/GauntletWinLose.java | 27 ++++++++++--------- .../match/winlose/GauntletWinLose.java | 15 ++++++----- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/GauntletWinLose.java b/forge-gui-desktop/src/main/java/forge/screens/match/GauntletWinLose.java index 371120f8264..7c25da7aa52 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/GauntletWinLose.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/GauntletWinLose.java @@ -58,21 +58,22 @@ public class GauntletWinLose extends ControlWinLose { pnlResults.setLayout(new MigLayout("insets 0, gap 0, wrap " + (int) Math.ceil(len / 2d) + ", flowy")); - JLabel lblTemp; - for (int i = 0; i < len; i++) { - lblTemp = new FLabel.Builder().fontSize(14).build(); + if (!lstEventNames.isEmpty()) { + JLabel lblTemp; + for (int i = 0; i < len; i++) { + lblTemp = new FLabel.Builder().fontSize(14).build(); - if (i <= num) { - lblTemp.setForeground(Color.green.darker()); - lblTemp.setText((i + 1) + ". " + lstEventNames.get(i) - + " (" + lstEventRecords.get(i) + ")"); - } - else { - lblTemp.setForeground(Color.red); - lblTemp.setText((i + 1) + ". ??????"); - } + if (i <= num) { + lblTemp.setForeground(Color.green.darker()); + lblTemp.setText((i + 1) + ". " + lstEventNames.get(i) + + " (" + lstEventRecords.get(i) + ")"); + } else { + lblTemp.setForeground(Color.red); + lblTemp.setText((i + 1) + ". ??????"); + } - pnlResults.add(lblTemp, "w 50%!, h 25px!, gap 0 0 5px 0"); + pnlResults.add(lblTemp, "w 50%!, h 25px!, gap 0 0 5px 0"); + } } final SkinnedPanel pnl = view0.getPnlCustom(); diff --git a/forge-gui-mobile/src/forge/screens/match/winlose/GauntletWinLose.java b/forge-gui-mobile/src/forge/screens/match/winlose/GauntletWinLose.java index 70c4024e2ed..4c8d4260819 100644 --- a/forge-gui-mobile/src/forge/screens/match/winlose/GauntletWinLose.java +++ b/forge-gui-mobile/src/forge/screens/match/winlose/GauntletWinLose.java @@ -49,13 +49,14 @@ public class GauntletWinLose extends ControlWinLose { @Override public void run() { StringBuilder sb = new StringBuilder(); - for (int i = 0; i < len; i++) { - if (i <= num) { - sb.append((i + 1) + ". " + lstEventNames.get(i) - + " (" + lstEventRecords.get(i) + ")\n"); - } - else { - sb.append((i + 1) + ". ??????\n"); + if (!lstEventNames.isEmpty()) { + for (int i = 0; i < len; i++) { + if (i <= num) { + sb.append((i + 1) + ". " + lstEventNames.get(i) + + " (" + lstEventRecords.get(i) + ")\n"); + } else { + sb.append((i + 1) + ". ??????\n"); + } } }