Adding in a preprocessor to avoid using the SerializedName annotation.

This commit is contained in:
Olof Larsson
2013-04-25 09:49:39 +02:00
parent 8e59017cb1
commit c10b6f5edc
6 changed files with 71 additions and 8 deletions

View File

@ -57,6 +57,7 @@ public class BoardColls extends XColls<BoardColl, Board> implements BoardInterfa
this.migrate();
}
// This method is for the 1.8.X --> 2.0.0 migration
public void migrate()
{
// Create file objects

View File

@ -22,7 +22,6 @@ import com.massivecraft.mcore.ps.PS;
import com.massivecraft.mcore.store.Entity;
import com.massivecraft.mcore.util.MUtil;
import com.massivecraft.mcore.util.SenderUtil;
import com.massivecraft.mcore.xlib.gson.annotations.SerializedName;
public class Faction extends Entity<Faction> implements EconomyParticipator
@ -65,7 +64,6 @@ public class Faction extends Entity<Faction> implements EconomyParticipator
// The actual faction id looks something like "54947df8-0e9e-4471-a2f9-9af509fb5889" and that is not too easy to remember for humans.
// Thus we make use of a name. Since the id is used in all foreign key situations changing the name is fine.
// Null should never happen. The name must not be null.
@SerializedName("tag")
private String name = null;
// Factions can optionally set a description for themselves.
@ -92,22 +90,18 @@ public class Faction extends Entity<Faction> implements EconomyParticipator
// This is the ids of the invited players.
// They are actually "senderIds" since you can invite "@console" to your faction.
// Null means no one is invited
@SerializedName("invites")
private Set<String> invitedPlayerIds = null;
// The keys in this map are factionIds.
// Null means no special relation whishes.
@SerializedName("relationWish")
private Map<String, Rel> relationWishes = null;
// The flag overrides are modifications to the default values.
// Null means default for the universe.
@SerializedName("flagOverrides")
private Map<FFlag, Boolean> flags = null;
// The perm overrides are modifications to the default values.
// Null means default for the universe.
@SerializedName("permOverrides")
private Map<FPerm, Set<Rel>> perms = null;
// -------------------------------------------- //

View File

@ -51,6 +51,7 @@ public class FactionColls extends XColls<FactionColl, Faction>
this.migrate();
}
// This method is for the 1.8.X --> 2.0.0 migration
public void migrate()
{
// Create file objects

View File

@ -51,6 +51,7 @@ public class UPlayerColls extends XColls<UPlayerColl, UPlayer>
this.migrate();
}
// This method is for the 1.8.X --> 2.0.0 migration
public void migrate()
{
// Create file objects