external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Declares a serialVersionUID.

Browse Source 
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.
This commit is contained in:
Meerkov
2018-04-17 16:48:18 -07:00
parent 0aea9ce153
commit 6efd631fd8
36 changed files with 175 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/cost/Cost.java
View File

@@ -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<CostPart> costParts = Lists.newArrayList();
private boolean isMandatory = false;

5
forge-game/src/main/java/forge/game/cost/CostAddMana.java
View File

@@ -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

5
forge-game/src/main/java/forge/game/cost/CostChooseCreatureType.java
View File

@@ -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.
*

5
forge-game/src/main/java/forge/game/cost/CostDamage.java
View File

@@ -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);
}

5
forge-game/src/main/java/forge/game/cost/CostDiscard.java
View File

@@ -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.
*

5
forge-game/src/main/java/forge/game/cost/CostDraw.java
View File

@@ -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

5
forge-game/src/main/java/forge/game/cost/CostExert.java
View File

@@ -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.
*

4
forge-game/src/main/java/forge/game/cost/CostExile.java
View File

@@ -38,6 +38,10 @@ public class CostExile extends CostPartWithList {
// ExileFromTop<Num/Type{/TypeDescription}> (of library)
// ExileSameGrave<Num/Type{/TypeDescription}>
/**
* Serializables need a version ID.
*/
private static final long serialVersionUID = 1L;
public final ZoneType from;
public final boolean sameZone;

5
forge-game/src/main/java/forge/game/cost/CostExileFromStack.java
View File

@@ -33,6 +33,11 @@ public class CostExileFromStack extends CostPart {
// ExileFromStack<Num/Type{/TypeDescription}>
/**
* Serializables need a version ID.
*/
private static final long serialVersionUID = 1L;
/**
* Instantiates a new cost exile.
*

5
forge-game/src/main/java/forge/game/cost/CostExiledMoveToGrave.java
View File

@@ -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<Num/Type{/TypeDescription}>
public CostExiledMoveToGrave(final String amount, final String type, final String description) {
super(amount, type, description);

5
forge-game/src/main/java/forge/game/cost/CostFlipCoin.java
View File

@@ -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.
*

5
forge-game/src/main/java/forge/game/cost/CostGainControl.java
View File

@@ -31,6 +31,11 @@ import forge.game.zone.ZoneType;
public class CostGainControl extends CostPartWithList {
// GainControl<Num/Type{/TypeDescription}>
/**
* Serializables need a version ID.
*/
private static final long serialVersionUID = 1L;
/**
* Instantiates a new cost return.
*

4
forge-game/src/main/java/forge/game/cost/CostGainLife.java
View File

@@ -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
/**

5
forge-game/src/main/java/forge/game/cost/CostMill.java
View File

@@ -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.
*

4
forge-game/src/main/java/forge/game/cost/CostPart.java
View File

@@ -31,6 +31,10 @@ import java.io.Serializable;
* The Class CostPart.
*/
public abstract class CostPart implements Comparable<CostPart>, Cloneable, Serializable {
/**
* Serializables need a version ID.
*/
private static final long serialVersionUID = 1L;
private String originalAmount;
private String amount;
private final String originalType, originalTypeDescription;

4
forge-game/src/main/java/forge/game/cost/CostPartMana.java
View File

@@ -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;

4
forge-game/src/main/java/forge/game/cost/CostPartWithList.java
View File

@@ -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();

5
forge-game/src/main/java/forge/game/cost/CostPayEnergy.java
View File

@@ -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;
/**

4
forge-game/src/main/java/forge/game/cost/CostPayLife.java
View File

@@ -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;
/**

4
forge-game/src/main/java/forge/game/cost/CostPutCardToLib.java
View File

@@ -36,6 +36,10 @@ public class CostPutCardToLib extends CostPartWithList {
// PutCardToLibFromSameGrave<Num/LibPos/Type{/TypeDescription}>
// PutCardToLibFromGrave<Num/LibPos/Type{/TypeDescription}>
/**
* Serializables need a version ID.
*/
private static final long serialVersionUID = 1L;
public final ZoneType from;
public final boolean sameZone;
private String libPosition = "0";

6
forge-game/src/main/java/forge/game/cost/CostPutCounter.java
View File

@@ -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;

4
forge-game/src/main/java/forge/game/cost/CostRemoveAnyCounter.java
View File

@@ -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<Num/Type/{TypeDescription}>
// Power Conduit and Chisei, Heart of Oceans
// Both cards have "Remove a counter from a permanent you control"

4
forge-game/src/main/java/forge/game/cost/CostRemoveCounter.java
View File

@@ -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;

6
forge-game/src/main/java/forge/game/cost/CostReturn.java
View File

@@ -30,6 +30,12 @@ import forge.game.zone.ZoneType;
public class CostReturn extends CostPartWithList {
// Return<Num/Type{/TypeDescription}>
/**
* Serializables need a version ID.
*/
private static final long serialVersionUID = 1L;
/**
* Instantiates a new cost return.
*

5
forge-game/src/main/java/forge/game/cost/CostReveal.java
View File

@@ -33,6 +33,11 @@ import forge.game.zone.ZoneType;
public class CostReveal extends CostPartWithList {
// Reveal<Num/Type/TypeDescription>
/**
* 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);
}

5
forge-game/src/main/java/forge/game/cost/CostSacrifice.java
View File

@@ -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.
*

5
forge-game/src/main/java/forge/game/cost/CostTap.java
View File

@@ -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.
*/

4
forge-game/src/main/java/forge/game/cost/CostTapType.java
View File

@@ -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;
/**

6
forge-game/src/main/java/forge/game/cost/CostUnattach.java
View File

@@ -32,6 +32,12 @@ public class CostUnattach extends CostPartWithList {
// Unattach<CARDNAME> if ability is on the Equipment
// Unattach<Card.Attached+namedHeartseeker/Equipped Heartseeker> if equipped creature has the ability
/**
* Serializables need a version ID.
*/
private static final long serialVersionUID = 1L;
/**
* Instantiates a new cost unattach.
*/

5
forge-game/src/main/java/forge/game/cost/CostUntap.java
View File

@@ -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.
*/

4
forge-game/src/main/java/forge/game/cost/CostUntapType.java
View File

@@ -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) {

4
forge-game/src/main/java/forge/game/spellability/OptionalCostValue.java
View File

@@ -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;

2
forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
View File

@@ -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<GameEntityView>) order(title,"Selected", 0, optionList.size(), optionList, null, null, false);
}
@Override

15
forge-gui-desktop/src/main/java/forge/view/FView.java
View File

@@ -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 {

8
forge-gui-mobile/src/forge/deck/FDeckEditor.java
View File

@@ -925,6 +925,9 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
break;
case Brawl:
additionalFilter = DeckFormat.Brawl.isLegalCommanderPredicate();
break;
default:
// Do nothing
}
cardManager.setCaption("Commanders");
}
@@ -937,10 +940,13 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
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);

3
forge-gui/src/main/java/forge/quest/BoosterUtils.java
View File

@@ -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
}