- 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).

This commit is contained in:
Agetian
2015-06-07 17:55:44 +00:00
parent 5eeb0a5951
commit df7288fc89

View File

@@ -2,8 +2,6 @@ package forge.game.card;
import forge.util.collect.FCollection;
import java.util.Objects;
public class CardCollection extends FCollection<Card> implements CardCollectionView {
private static final long serialVersionUID = -8133537013727100275L;
@@ -64,7 +62,9 @@ public class CardCollection extends FCollection<Card> 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;