From f9e987e933c6d1f63c6573eb11201ccc6d873c18 Mon Sep 17 00:00:00 2001 From: Agetian Date: Tue, 25 Jul 2017 03:12:04 +0000 Subject: [PATCH] - Reverted several Java 8 functions to their Java 7 counterparts for Android compatibility. --- .../src/main/java/forge/game/ability/AbilityUtils.java | 6 +++--- forge-gui/src/main/java/forge/limited/BoosterDraft.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java index b04fc542fa4..703e402403b 100644 --- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java +++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java @@ -359,7 +359,7 @@ public class AbilityUtils { if (StringUtils.isNumeric(amount)) { int val = Integer.parseInt(amount); if (maxto) { - val = Integer.max(val, 0); + val = Math.max(val, 0); } return val * multiplier; } @@ -399,7 +399,7 @@ public class AbilityUtils { if (StringUtils.isNumeric(svarval)) { int val = Integer.parseInt(svarval); if (maxto) { - val = Integer.max(val, 0); + val = Math.max(val, 0); } return val * multiplier; } @@ -472,7 +472,7 @@ public class AbilityUtils { if (val != null) { if (maxto) { - val = Integer.max(val, 0); + val = Math.max(val, 0); } return val * multiplier; } diff --git a/forge-gui/src/main/java/forge/limited/BoosterDraft.java b/forge-gui/src/main/java/forge/limited/BoosterDraft.java index 2a0317a4bdd..724459e8aea 100644 --- a/forge-gui/src/main/java/forge/limited/BoosterDraft.java +++ b/forge-gui/src/main/java/forge/limited/BoosterDraft.java @@ -151,7 +151,7 @@ public class BoosterDraft implements IBoosterDraft { if (myDrafts.isEmpty()) { SOptionPane.showMessageDialog("No custom draft files found."); } else { - myDrafts.sort(new Comparator() { + Collections.sort(myDrafts, new Comparator() { @Override public int compare(CustomLimited o1, CustomLimited o2) { return o1.getName().compareTo(o2.getName());