mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-17 11:18:01 +00:00
- 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:
@@ -2,8 +2,6 @@ package forge.game.card;
|
|||||||
|
|
||||||
import forge.util.collect.FCollection;
|
import forge.util.collect.FCollection;
|
||||||
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
public class CardCollection extends FCollection<Card> implements CardCollectionView {
|
public class CardCollection extends FCollection<Card> implements CardCollectionView {
|
||||||
private static final long serialVersionUID = -8133537013727100275L;
|
private static final long serialVersionUID = -8133537013727100275L;
|
||||||
|
|
||||||
@@ -64,7 +62,9 @@ public class CardCollection extends FCollection<Card> implements CardCollectionV
|
|||||||
* if {@code views} is {@code null}.
|
* if {@code views} is {@code null}.
|
||||||
*/
|
*/
|
||||||
public static CardCollectionView combine(final CardCollectionView... views) {
|
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;
|
CardCollection newCol = null;
|
||||||
CardCollectionView viewWithCards = null;
|
CardCollectionView viewWithCards = null;
|
||||||
|
|||||||
Reference in New Issue
Block a user