From 6efd631fd8daa0818a0dffc73845af9d4a8f994f Mon Sep 17 00:00:00 2001 From: Meerkov Date: Tue, 17 Apr 2018 16:48:18 -0700 Subject: [PATCH] Declares a serialVersionUID. Lots of classes here are serializable, but warn due to missing UID. Serializables are supposed to have a UID for version compatability. Fixes a bunch of compiler warnings. Also adds in "default:" branch to a few switches which were warning due to missing cases. --- .../src/main/java/forge/game/cost/Cost.java | 4 ++++ .../main/java/forge/game/cost/CostAddMana.java | 5 +++++ .../forge/game/cost/CostChooseCreatureType.java | 5 +++++ .../src/main/java/forge/game/cost/CostDamage.java | 5 +++++ .../main/java/forge/game/cost/CostDiscard.java | 5 +++++ .../src/main/java/forge/game/cost/CostDraw.java | 5 +++++ .../src/main/java/forge/game/cost/CostExert.java | 5 +++++ .../src/main/java/forge/game/cost/CostExile.java | 4 ++++ .../java/forge/game/cost/CostExileFromStack.java | 5 +++++ .../forge/game/cost/CostExiledMoveToGrave.java | 5 +++++ .../main/java/forge/game/cost/CostFlipCoin.java | 5 +++++ .../java/forge/game/cost/CostGainControl.java | 5 +++++ .../main/java/forge/game/cost/CostGainLife.java | 4 ++++ .../src/main/java/forge/game/cost/CostMill.java | 5 +++++ .../src/main/java/forge/game/cost/CostPart.java | 4 ++++ .../main/java/forge/game/cost/CostPartMana.java | 4 ++++ .../java/forge/game/cost/CostPartWithList.java | 4 ++++ .../main/java/forge/game/cost/CostPayEnergy.java | 5 +++++ .../main/java/forge/game/cost/CostPayLife.java | 4 ++++ .../java/forge/game/cost/CostPutCardToLib.java | 4 ++++ .../main/java/forge/game/cost/CostPutCounter.java | 6 +++++- .../forge/game/cost/CostRemoveAnyCounter.java | 4 ++++ .../java/forge/game/cost/CostRemoveCounter.java | 4 ++++ .../src/main/java/forge/game/cost/CostReturn.java | 6 ++++++ .../src/main/java/forge/game/cost/CostReveal.java | 5 +++++ .../main/java/forge/game/cost/CostSacrifice.java | 5 +++++ .../src/main/java/forge/game/cost/CostTap.java | 5 +++++ .../main/java/forge/game/cost/CostTapType.java | 4 ++++ .../main/java/forge/game/cost/CostUnattach.java | 6 ++++++ .../src/main/java/forge/game/cost/CostUntap.java | 5 +++++ .../main/java/forge/game/cost/CostUntapType.java | 4 ++++ .../game/spellability/OptionalCostValue.java | 4 ++++ .../main/java/forge/screens/match/CMatchUI.java | 2 +- .../src/main/java/forge/view/FView.java | 15 +++++++++++++++ forge-gui-mobile/src/forge/deck/FDeckEditor.java | 8 +++++++- .../src/main/java/forge/quest/BoosterUtils.java | 3 +++ 36 files changed, 175 insertions(+), 3 deletions(-) diff --git a/forge-game/src/main/java/forge/game/cost/Cost.java b/forge-game/src/main/java/forge/game/cost/Cost.java index de26dd2f988..c4c31aff270 100644 --- a/forge-game/src/main/java/forge/game/cost/Cost.java +++ b/forge-game/src/main/java/forge/game/cost/Cost.java @@ -47,6 +47,10 @@ import forge.util.TextUtil; * @version $Id$ */ public class Cost implements Serializable { + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; private boolean isAbility = true; private final List costParts = Lists.newArrayList(); private boolean isMandatory = false; diff --git a/forge-game/src/main/java/forge/game/cost/CostAddMana.java b/forge-game/src/main/java/forge/game/cost/CostAddMana.java index 83013724ed6..646e9c6c2ec 100644 --- a/forge-game/src/main/java/forge/game/cost/CostAddMana.java +++ b/forge-game/src/main/java/forge/game/cost/CostAddMana.java @@ -32,6 +32,11 @@ import forge.game.spellability.SpellAbility; * The Class CostAddMana. */ public class CostAddMana extends CostPart { + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; + /** * CostCostAddMana. * @param amount diff --git a/forge-game/src/main/java/forge/game/cost/CostChooseCreatureType.java b/forge-game/src/main/java/forge/game/cost/CostChooseCreatureType.java index 107eb4c951d..222a8d2550b 100644 --- a/forge-game/src/main/java/forge/game/cost/CostChooseCreatureType.java +++ b/forge-game/src/main/java/forge/game/cost/CostChooseCreatureType.java @@ -25,6 +25,11 @@ import forge.game.spellability.SpellAbility; */ public class CostChooseCreatureType extends CostPart { + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; + /** * Instantiates a new cost mill. * diff --git a/forge-game/src/main/java/forge/game/cost/CostDamage.java b/forge-game/src/main/java/forge/game/cost/CostDamage.java index 63ad0a38617..87c6d89991c 100644 --- a/forge-game/src/main/java/forge/game/cost/CostDamage.java +++ b/forge-game/src/main/java/forge/game/cost/CostDamage.java @@ -27,6 +27,11 @@ import forge.game.spellability.SpellAbility; */ public class CostDamage extends CostPart { + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; + public CostDamage(final String amount) { this.setAmount(amount); } diff --git a/forge-game/src/main/java/forge/game/cost/CostDiscard.java b/forge-game/src/main/java/forge/game/cost/CostDiscard.java index 3819ca3846f..5bf55a720ab 100644 --- a/forge-game/src/main/java/forge/game/cost/CostDiscard.java +++ b/forge-game/src/main/java/forge/game/cost/CostDiscard.java @@ -34,6 +34,11 @@ public class CostDiscard extends CostPartWithList { // Inputs + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; + /** * Instantiates a new cost discard. * diff --git a/forge-game/src/main/java/forge/game/cost/CostDraw.java b/forge-game/src/main/java/forge/game/cost/CostDraw.java index f23b88f743c..db5f33be2ce 100644 --- a/forge-game/src/main/java/forge/game/cost/CostDraw.java +++ b/forge-game/src/main/java/forge/game/cost/CostDraw.java @@ -28,6 +28,11 @@ import java.util.List; * The Class CostPayLife. */ public class CostDraw extends CostPart { + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; + /** * CostDraw. * @param amount diff --git a/forge-game/src/main/java/forge/game/cost/CostExert.java b/forge-game/src/main/java/forge/game/cost/CostExert.java index d648f3474e5..60160d0d5f3 100644 --- a/forge-game/src/main/java/forge/game/cost/CostExert.java +++ b/forge-game/src/main/java/forge/game/cost/CostExert.java @@ -29,6 +29,11 @@ import forge.game.zone.ZoneType; */ public class CostExert extends CostPartWithList { + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; + /** * Instantiates a new cost Exert. * diff --git a/forge-game/src/main/java/forge/game/cost/CostExile.java b/forge-game/src/main/java/forge/game/cost/CostExile.java index c0759600c2e..4e4f3dc8003 100644 --- a/forge-game/src/main/java/forge/game/cost/CostExile.java +++ b/forge-game/src/main/java/forge/game/cost/CostExile.java @@ -38,6 +38,10 @@ public class CostExile extends CostPartWithList { // ExileFromTop (of library) // ExileSameGrave + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; public final ZoneType from; public final boolean sameZone; diff --git a/forge-game/src/main/java/forge/game/cost/CostExileFromStack.java b/forge-game/src/main/java/forge/game/cost/CostExileFromStack.java index b16426e96ae..47c27fd245f 100644 --- a/forge-game/src/main/java/forge/game/cost/CostExileFromStack.java +++ b/forge-game/src/main/java/forge/game/cost/CostExileFromStack.java @@ -33,6 +33,11 @@ public class CostExileFromStack extends CostPart { // ExileFromStack + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; + /** * Instantiates a new cost exile. * diff --git a/forge-game/src/main/java/forge/game/cost/CostExiledMoveToGrave.java b/forge-game/src/main/java/forge/game/cost/CostExiledMoveToGrave.java index b9ba1527ef9..05edecabf7a 100644 --- a/forge-game/src/main/java/forge/game/cost/CostExiledMoveToGrave.java +++ b/forge-game/src/main/java/forge/game/cost/CostExiledMoveToGrave.java @@ -29,6 +29,11 @@ import forge.game.zone.ZoneType; * This is for the "ExiledMoveToGrave" Cost. */ public class CostExiledMoveToGrave extends CostPartWithList { + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; + // ExiledMoveToGrave public CostExiledMoveToGrave(final String amount, final String type, final String description) { super(amount, type, description); diff --git a/forge-game/src/main/java/forge/game/cost/CostFlipCoin.java b/forge-game/src/main/java/forge/game/cost/CostFlipCoin.java index ba00b3c1761..82e7941c398 100644 --- a/forge-game/src/main/java/forge/game/cost/CostFlipCoin.java +++ b/forge-game/src/main/java/forge/game/cost/CostFlipCoin.java @@ -27,6 +27,11 @@ import forge.game.spellability.SpellAbility; */ public class CostFlipCoin extends CostPartWithList { + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; + /** * Instantiates a new cost FlipCoin. * diff --git a/forge-game/src/main/java/forge/game/cost/CostGainControl.java b/forge-game/src/main/java/forge/game/cost/CostGainControl.java index 7470c2315ef..b77f91075ac 100644 --- a/forge-game/src/main/java/forge/game/cost/CostGainControl.java +++ b/forge-game/src/main/java/forge/game/cost/CostGainControl.java @@ -31,6 +31,11 @@ import forge.game.zone.ZoneType; public class CostGainControl extends CostPartWithList { // GainControl + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; + /** * Instantiates a new cost return. * diff --git a/forge-game/src/main/java/forge/game/cost/CostGainLife.java b/forge-game/src/main/java/forge/game/cost/CostGainLife.java index d2837e8ee61..bd04dd670e9 100644 --- a/forge-game/src/main/java/forge/game/cost/CostGainLife.java +++ b/forge-game/src/main/java/forge/game/cost/CostGainLife.java @@ -28,6 +28,10 @@ import java.util.List; * The Class CostGainLife. */ public class CostGainLife extends CostPart { + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; private final int cntPlayers; // MAX_VALUE means ALL/EACH PLAYERS /** diff --git a/forge-game/src/main/java/forge/game/cost/CostMill.java b/forge-game/src/main/java/forge/game/cost/CostMill.java index 78717f7e5ad..8660a212666 100644 --- a/forge-game/src/main/java/forge/game/cost/CostMill.java +++ b/forge-game/src/main/java/forge/game/cost/CostMill.java @@ -31,6 +31,11 @@ import forge.game.zone.ZoneType; */ public class CostMill extends CostPartWithList { + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; + /** * Instantiates a new cost mill. * diff --git a/forge-game/src/main/java/forge/game/cost/CostPart.java b/forge-game/src/main/java/forge/game/cost/CostPart.java index cc3dcf6e8cf..cea0bfb9ee8 100644 --- a/forge-game/src/main/java/forge/game/cost/CostPart.java +++ b/forge-game/src/main/java/forge/game/cost/CostPart.java @@ -31,6 +31,10 @@ import java.io.Serializable; * The Class CostPart. */ public abstract class CostPart implements Comparable, Cloneable, Serializable { + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; private String originalAmount; private String amount; private final String originalType, originalTypeDescription; diff --git a/forge-game/src/main/java/forge/game/cost/CostPartMana.java b/forge-game/src/main/java/forge/game/cost/CostPartMana.java index 908be0a5aee..81d94a288e2 100644 --- a/forge-game/src/main/java/forge/game/cost/CostPartMana.java +++ b/forge-game/src/main/java/forge/game/cost/CostPartMana.java @@ -26,6 +26,10 @@ import forge.game.spellability.SpellAbility; * The mana component of any spell or ability cost */ public class CostPartMana extends CostPart { + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; // "Leftover" private final ManaCost cost; private boolean xCantBe0 = false; diff --git a/forge-game/src/main/java/forge/game/cost/CostPartWithList.java b/forge-game/src/main/java/forge/game/cost/CostPartWithList.java index 55a0a38e135..cb7ac9cb074 100644 --- a/forge-game/src/main/java/forge/game/cost/CostPartWithList.java +++ b/forge-game/src/main/java/forge/game/cost/CostPartWithList.java @@ -28,6 +28,10 @@ import forge.game.spellability.SpellAbility; * The Class CostPartWithList. */ public abstract class CostPartWithList extends CostPart { + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; /** The lists: one for LKI, one for the actual cards. */ private final CardCollection lkiList = new CardCollection(); protected final CardCollection cardList = new CardCollection(); diff --git a/forge-game/src/main/java/forge/game/cost/CostPayEnergy.java b/forge-game/src/main/java/forge/game/cost/CostPayEnergy.java index 3ec3a9e6062..768a7876c15 100644 --- a/forge-game/src/main/java/forge/game/cost/CostPayEnergy.java +++ b/forge-game/src/main/java/forge/game/cost/CostPayEnergy.java @@ -27,6 +27,11 @@ import forge.game.spellability.SpellAbility; public class CostPayEnergy extends CostPart { + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; + int paidAmount = 0; /** diff --git a/forge-game/src/main/java/forge/game/cost/CostPayLife.java b/forge-game/src/main/java/forge/game/cost/CostPayLife.java index 56afbb7082b..8b462de5b48 100644 --- a/forge-game/src/main/java/forge/game/cost/CostPayLife.java +++ b/forge-game/src/main/java/forge/game/cost/CostPayLife.java @@ -26,6 +26,10 @@ import forge.game.spellability.SpellAbility; * The Class CostPayLife. */ public class CostPayLife extends CostPart { + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; int paidAmount = 0; /** diff --git a/forge-game/src/main/java/forge/game/cost/CostPutCardToLib.java b/forge-game/src/main/java/forge/game/cost/CostPutCardToLib.java index c1402adc651..f70b1c8d188 100644 --- a/forge-game/src/main/java/forge/game/cost/CostPutCardToLib.java +++ b/forge-game/src/main/java/forge/game/cost/CostPutCardToLib.java @@ -36,6 +36,10 @@ public class CostPutCardToLib extends CostPartWithList { // PutCardToLibFromSameGrave // PutCardToLibFromGrave + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; public final ZoneType from; public final boolean sameZone; private String libPosition = "0"; diff --git a/forge-game/src/main/java/forge/game/cost/CostPutCounter.java b/forge-game/src/main/java/forge/game/cost/CostPutCounter.java index 2e09446efd5..be83e5d0490 100644 --- a/forge-game/src/main/java/forge/game/cost/CostPutCounter.java +++ b/forge-game/src/main/java/forge/game/cost/CostPutCounter.java @@ -32,7 +32,11 @@ import java.util.List; * The Class CostPutCounter. */ public class CostPutCounter extends CostPartWithList { - // Put Counter doesn't really have a "Valid" portion of the cost + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; + // Put Counter doesn't really have a "Valid" portion of the cost private final CounterType counter; private int lastPaidAmount = 0; diff --git a/forge-game/src/main/java/forge/game/cost/CostRemoveAnyCounter.java b/forge-game/src/main/java/forge/game/cost/CostRemoveAnyCounter.java index 817803eca2a..329f2991bc8 100644 --- a/forge-game/src/main/java/forge/game/cost/CostRemoveAnyCounter.java +++ b/forge-game/src/main/java/forge/game/cost/CostRemoveAnyCounter.java @@ -30,6 +30,10 @@ import java.util.Map; * The Class CostRemoveAnyCounter. */ public class CostRemoveAnyCounter extends CostPartWithList { + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; // RemoveAnyCounter // Power Conduit and Chisei, Heart of Oceans // Both cards have "Remove a counter from a permanent you control" diff --git a/forge-game/src/main/java/forge/game/cost/CostRemoveCounter.java b/forge-game/src/main/java/forge/game/cost/CostRemoveCounter.java index 8109649e347..9d30526dad1 100644 --- a/forge-game/src/main/java/forge/game/cost/CostRemoveCounter.java +++ b/forge-game/src/main/java/forge/game/cost/CostRemoveCounter.java @@ -40,6 +40,10 @@ public class CostRemoveCounter extends CostPartWithList { // Quillspike, Rift Elemental, Sage of Fables, Spike Rogue + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; public final CounterType counter; public final ZoneType zone; private int cntRemoved; diff --git a/forge-game/src/main/java/forge/game/cost/CostReturn.java b/forge-game/src/main/java/forge/game/cost/CostReturn.java index dba13ec3371..11b9e8b236a 100644 --- a/forge-game/src/main/java/forge/game/cost/CostReturn.java +++ b/forge-game/src/main/java/forge/game/cost/CostReturn.java @@ -30,6 +30,12 @@ import forge.game.zone.ZoneType; public class CostReturn extends CostPartWithList { // Return + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; + + /** * Instantiates a new cost return. * diff --git a/forge-game/src/main/java/forge/game/cost/CostReveal.java b/forge-game/src/main/java/forge/game/cost/CostReveal.java index e8729f2dd25..0252203d1e6 100644 --- a/forge-game/src/main/java/forge/game/cost/CostReveal.java +++ b/forge-game/src/main/java/forge/game/cost/CostReveal.java @@ -33,6 +33,11 @@ import forge.game.zone.ZoneType; public class CostReveal extends CostPartWithList { // Reveal + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; + public CostReveal(final String amount, final String type, final String description) { super(amount, type, description); } diff --git a/forge-game/src/main/java/forge/game/cost/CostSacrifice.java b/forge-game/src/main/java/forge/game/cost/CostSacrifice.java index d39dceec372..e5cd9c1e9e3 100644 --- a/forge-game/src/main/java/forge/game/cost/CostSacrifice.java +++ b/forge-game/src/main/java/forge/game/cost/CostSacrifice.java @@ -30,6 +30,11 @@ import forge.game.zone.ZoneType; */ public class CostSacrifice extends CostPartWithList { + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; + /** * Instantiates a new cost sacrifice. * diff --git a/forge-game/src/main/java/forge/game/cost/CostTap.java b/forge-game/src/main/java/forge/game/cost/CostTap.java index 5724c04363b..479c2e444c9 100644 --- a/forge-game/src/main/java/forge/game/cost/CostTap.java +++ b/forge-game/src/main/java/forge/game/cost/CostTap.java @@ -26,6 +26,11 @@ import forge.game.spellability.SpellAbility; */ public class CostTap extends CostPart { + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; + /** * Instantiates a new cost tap. */ diff --git a/forge-game/src/main/java/forge/game/cost/CostTapType.java b/forge-game/src/main/java/forge/game/cost/CostTapType.java index 87461e1a2eb..e0e9b345f4e 100644 --- a/forge-game/src/main/java/forge/game/cost/CostTapType.java +++ b/forge-game/src/main/java/forge/game/cost/CostTapType.java @@ -32,6 +32,10 @@ import forge.util.TextUtil; */ public class CostTapType extends CostPartWithList { + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; public final boolean canTapSource; /** diff --git a/forge-game/src/main/java/forge/game/cost/CostUnattach.java b/forge-game/src/main/java/forge/game/cost/CostUnattach.java index e8a65a30cd3..a443541daa0 100644 --- a/forge-game/src/main/java/forge/game/cost/CostUnattach.java +++ b/forge-game/src/main/java/forge/game/cost/CostUnattach.java @@ -32,6 +32,12 @@ public class CostUnattach extends CostPartWithList { // Unattach if ability is on the Equipment // Unattach if equipped creature has the ability + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; + + /** * Instantiates a new cost unattach. */ diff --git a/forge-game/src/main/java/forge/game/cost/CostUntap.java b/forge-game/src/main/java/forge/game/cost/CostUntap.java index 3ee72f88102..9b908b5dfc4 100644 --- a/forge-game/src/main/java/forge/game/cost/CostUntap.java +++ b/forge-game/src/main/java/forge/game/cost/CostUntap.java @@ -26,6 +26,11 @@ import forge.game.spellability.SpellAbility; */ public class CostUntap extends CostPart { + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; + /** * Instantiates a new cost untap. */ diff --git a/forge-game/src/main/java/forge/game/cost/CostUntapType.java b/forge-game/src/main/java/forge/game/cost/CostUntapType.java index a5ee17282ee..7db801bc88f 100644 --- a/forge-game/src/main/java/forge/game/cost/CostUntapType.java +++ b/forge-game/src/main/java/forge/game/cost/CostUntapType.java @@ -29,6 +29,10 @@ import forge.game.zone.ZoneType; * The Class CostUntapType. */ public class CostUntapType extends CostPartWithList { + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; public final boolean canUntapSource; public CostUntapType(final String amount, final String type, final String description, boolean hasUntapInPrice) { diff --git a/forge-game/src/main/java/forge/game/spellability/OptionalCostValue.java b/forge-game/src/main/java/forge/game/spellability/OptionalCostValue.java index 0c54c7b547f..fdfec34cd2d 100644 --- a/forge-game/src/main/java/forge/game/spellability/OptionalCostValue.java +++ b/forge-game/src/main/java/forge/game/spellability/OptionalCostValue.java @@ -5,6 +5,10 @@ import forge.game.cost.Cost; import java.io.Serializable; public class OptionalCostValue implements Serializable { + /** + * Serializables need a version ID. + */ + private static final long serialVersionUID = 1L; private OptionalCost type; private Cost cost; diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java index 79c88aa75fb..5fa458af87d 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java @@ -932,7 +932,7 @@ public final class CMatchUI if (delayedReveal != null) { reveal(delayedReveal.getMessagePrefix(), delayedReveal.getCards()); //TODO: Merge this into search dialog } - return (List) order(title,"Selected", 0, optionList.size(), optionList, null, null, false); + return (List) order(title,"Selected", 0, optionList.size(), optionList, null, null, false); } @Override diff --git a/forge-gui-desktop/src/main/java/forge/view/FView.java b/forge-gui-desktop/src/main/java/forge/view/FView.java index 9fd94019353..24997a433e3 100644 --- a/forge-gui-desktop/src/main/java/forge/view/FView.java +++ b/forge-gui-desktop/src/main/java/forge/view/FView.java @@ -287,6 +287,11 @@ public enum FView { updateWarningOverlay.add(updateWarningContentPanel, constraints); btnRemindMeLater.setCommand(new UiCommand() { + /** + * + */ + private static final long serialVersionUID = 1L; + @Override public void run() { SOverlayUtils.hideOverlay(); @@ -294,6 +299,11 @@ public enum FView { }); btnDoNotRemindMe.setCommand(new UiCommand() { + /** + * + */ + private static final long serialVersionUID = 1L; + @Override public void run() { if (FOptionPane.showConfirmDialog("Are you sure? You can re-enable this warning in Forge's general preferences.")) { @@ -305,6 +315,11 @@ public enum FView { }); btnDownloadLatestJava.setCommand(new UiCommand() { + /** + * + */ + private static final long serialVersionUID = 1L; + @Override public void run() { try { diff --git a/forge-gui-mobile/src/forge/deck/FDeckEditor.java b/forge-gui-mobile/src/forge/deck/FDeckEditor.java index e85f01b0f8a..404021778a2 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckEditor.java +++ b/forge-gui-mobile/src/forge/deck/FDeckEditor.java @@ -925,6 +925,9 @@ public class FDeckEditor extends TabPageScreen { break; case Brawl: additionalFilter = DeckFormat.Brawl.isLegalCommanderPredicate(); + break; + default: + // Do nothing } cardManager.setCaption("Commanders"); } @@ -937,10 +940,13 @@ public class FDeckEditor extends TabPageScreen { break; case Brawl: additionalFilter = DeckFormat.Brawl.isLegalCardForCommanderOrLegalPartnerPredicate(commanders); + break; + default: + // Do nothing } cardManager.setCaption("Cards"); } - //fall through to below + // fall through to below default: if (cardManager.getWantUnique()) { cardManager.setPool(editorType.applyCardFilter(ItemPool.createFrom(FModel.getMagicDb().getCommonCards().getUniqueCards(), PaperCard.class), additionalFilter), true); diff --git a/forge-gui/src/main/java/forge/quest/BoosterUtils.java b/forge-gui/src/main/java/forge/quest/BoosterUtils.java index 014a918c268..84d6cb768bd 100644 --- a/forge-gui/src/main/java/forge/quest/BoosterUtils.java +++ b/forge-gui/src/main/java/forge/quest/BoosterUtils.java @@ -219,12 +219,15 @@ public final class BoosterUtils { preferredColors.addAll(possibleColors); } includeArtifacts = MyRandom.getRandom().nextDouble() < 0.5; + // Fall through case BALANCED: populateBalancedFilters(colorFilters, preferredColors, cardPool, includeArtifacts); break; case RANDOM: populateRandomFilters(colorFilters); break; + default: + // Do nothing }