From df7288fc8933235cd3312cbaadda4d13099a1cbe Mon Sep 17 00:00:00 2001 From: Agetian Date: Sun, 7 Jun 2015 17:55:44 +0000 Subject: [PATCH] - Replaced a call that uses the Objects class with a standard throw mechanism according to the class description (java.util.Objects doesn't work with mobile Forge and makes it crash with a ClassNotFound error, and I don't know if we should and even could introduce that as a dependency or not... input is welcome). --- .../src/main/java/forge/game/card/CardCollection.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/CardCollection.java b/forge-game/src/main/java/forge/game/card/CardCollection.java index fe1342b6280..2c05d238b10 100644 --- a/forge-game/src/main/java/forge/game/card/CardCollection.java +++ b/forge-game/src/main/java/forge/game/card/CardCollection.java @@ -2,8 +2,6 @@ package forge.game.card; import forge.util.collect.FCollection; -import java.util.Objects; - public class CardCollection extends FCollection implements CardCollectionView { private static final long serialVersionUID = -8133537013727100275L; @@ -64,7 +62,9 @@ public class CardCollection extends FCollection implements CardCollectionV * if {@code views} is {@code null}. */ public static CardCollectionView combine(final CardCollectionView... views) { - Objects.requireNonNull(views); + if (views == null) { + throw new NullPointerException("The 'views' parameter was null when CardCollection.combine was called"); + } CardCollection newCol = null; CardCollectionView viewWithCards = null;