From 70d56a080bf9b759ed26adf1eb9e470ba164831b Mon Sep 17 00:00:00 2001 From: Agetian Date: Thu, 29 Jun 2017 18:33:36 +0000 Subject: [PATCH] - Temporarily reverting the Java 8 stream commit (does not compile for Android, pending investigation). --- .../main/java/forge/planarconquest/ConquestData.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java index a24fd87890d..5aa09093ce5 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java @@ -44,7 +44,6 @@ import java.util.Map; import java.util.Map.Entry; import com.google.common.base.Function; -import com.google.common.collect.Lists; public final class ConquestData { private static final String XML_FILE = "data.xml"; @@ -199,9 +198,14 @@ public final class ConquestData { } public int getAccessiblePlaneCount() { - return Lists.newArrayList(FModel.getPlanes()).stream() - .filter((ConquestPlane c) -> { return !c.isUnreachable(); } ) - .toArray().length; + // TODO: Java 8 stream implementation of filtering + int i = 0; + for (ConquestPlane plane : FModel.getPlanes()) { + if (!plane.isUnreachable()) { + i++; + } + } + return i; } public void unlockPlane(ConquestPlane plane) {