Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename adapter classes.

Browse Source
This commit is contained in:
Olof Larsson 2013-04-10 09:54:42 +02:00
parent 3ef3492c68
commit 14715d1cfc
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/massivecraft/factions/Factions.java
View File

@ -4,10 +4,10 @@ import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Arrays;
import com.massivecraft.factions.adapters.FFlagTypeAdapter;
import com.massivecraft.factions.adapters.FPermTypeAdapter;
import com.massivecraft.factions.adapters.LocationTypeAdapter;
import com.massivecraft.factions.adapters.RelTypeAdapter;
import com.massivecraft.factions.adapters.FFlagAdapter;
import com.massivecraft.factions.adapters.FPermAdapter;
import com.massivecraft.factions.adapters.LazyLocationAdapter;
import com.massivecraft.factions.adapters.RelAdapter;
import com.massivecraft.factions.adapters.TerritoryAccessAdapter;
import com.massivecraft.factions.cmd.*;
import com.massivecraft.factions.integration.herochat.HerochatFeatures;
@ -137,11 +137,11 @@ public class Factions extends MPlugin
.setPrettyPrinting()
.disableHtmlEscaping()
.excludeFieldsWithModifiers(Modifier.TRANSIENT, Modifier.VOLATILE)
.registerTypeAdapter(LazyLocation.class, new LocationTypeAdapter())
.registerTypeAdapter(LazyLocation.class, new LazyLocationAdapter())
.registerTypeAdapter(TerritoryAccess.class, TerritoryAccessAdapter.get())
.registerTypeAdapter(Rel.class, new RelTypeAdapter())
.registerTypeAdapter(FPerm.class, new FPermTypeAdapter())
.registerTypeAdapter(FFlag.class, new FFlagTypeAdapter());
.registerTypeAdapter(Rel.class, new RelAdapter())
.registerTypeAdapter(FPerm.class, new FPermAdapter())
.registerTypeAdapter(FFlag.class, new FFlagAdapter());
}
@Override

2
src/com/massivecraft/factions/adapters/FFlagTypeAdapter.java → src/com/massivecraft/factions/adapters/FFlagAdapter.java
View File

@ -9,7 +9,7 @@ import org.bukkit.craftbukkit.libs.com.google.gson.JsonParseException;
import com.massivecraft.factions.FFlag;
public class FFlagTypeAdapter implements JsonDeserializer<FFlag>
public class FFlagAdapter implements JsonDeserializer<FFlag>
{
@Override
public FFlag deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException

2
src/com/massivecraft/factions/adapters/FPermTypeAdapter.java → src/com/massivecraft/factions/adapters/FPermAdapter.java
View File

@ -9,7 +9,7 @@ import org.bukkit.craftbukkit.libs.com.google.gson.JsonParseException;
import com.massivecraft.factions.FPerm;
public class FPermTypeAdapter implements JsonDeserializer<FPerm>
public class FPermAdapter implements JsonDeserializer<FPerm>
{
@Override
public FPerm deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException

2
src/com/massivecraft/factions/adapters/LocationTypeAdapter.java → src/com/massivecraft/factions/adapters/LazyLocationAdapter.java
View File

@ -15,7 +15,7 @@ import org.bukkit.craftbukkit.libs.com.google.gson.JsonSerializationContext;
import org.bukkit.craftbukkit.libs.com.google.gson.JsonSerializer;
public class LocationTypeAdapter implements JsonDeserializer<LazyLocation>, JsonSerializer<LazyLocation>
public class LazyLocationAdapter implements JsonDeserializer<LazyLocation>, JsonSerializer<LazyLocation>
{
private static final String WORLD = "world";
private static final String X = "x";

2
src/com/massivecraft/factions/adapters/RelTypeAdapter.java → src/com/massivecraft/factions/adapters/RelAdapter.java
View File

@ -9,7 +9,7 @@ import org.bukkit.craftbukkit.libs.com.google.gson.JsonParseException;
import com.massivecraft.factions.Rel;
public class RelTypeAdapter implements JsonDeserializer<Rel>
public class RelAdapter implements JsonDeserializer<Rel>
{
@Override
public Rel deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException