From 14715d1cfc6e388c4abf23fa69a7b944d739b90f Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Wed, 10 Apr 2013 09:54:42 +0200 Subject: [PATCH] Rename adapter classes. --- src/com/massivecraft/factions/Factions.java | 16 ++++++++-------- .../{FFlagTypeAdapter.java => FFlagAdapter.java} | 2 +- .../{FPermTypeAdapter.java => FPermAdapter.java} | 2 +- ...TypeAdapter.java => LazyLocationAdapter.java} | 2 +- .../{RelTypeAdapter.java => RelAdapter.java} | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) rename src/com/massivecraft/factions/adapters/{FFlagTypeAdapter.java => FFlagAdapter.java} (90%) rename src/com/massivecraft/factions/adapters/{FPermTypeAdapter.java => FPermAdapter.java} (90%) rename src/com/massivecraft/factions/adapters/{LocationTypeAdapter.java => LazyLocationAdapter.java} (97%) rename src/com/massivecraft/factions/adapters/{RelTypeAdapter.java => RelAdapter.java} (90%) diff --git a/src/com/massivecraft/factions/Factions.java b/src/com/massivecraft/factions/Factions.java index 3aa51582..c2447ebf 100644 --- a/src/com/massivecraft/factions/Factions.java +++ b/src/com/massivecraft/factions/Factions.java @@ -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 diff --git a/src/com/massivecraft/factions/adapters/FFlagTypeAdapter.java b/src/com/massivecraft/factions/adapters/FFlagAdapter.java similarity index 90% rename from src/com/massivecraft/factions/adapters/FFlagTypeAdapter.java rename to src/com/massivecraft/factions/adapters/FFlagAdapter.java index 64faabfb..35757af8 100644 --- a/src/com/massivecraft/factions/adapters/FFlagTypeAdapter.java +++ b/src/com/massivecraft/factions/adapters/FFlagAdapter.java @@ -9,7 +9,7 @@ import org.bukkit.craftbukkit.libs.com.google.gson.JsonParseException; import com.massivecraft.factions.FFlag; -public class FFlagTypeAdapter implements JsonDeserializer +public class FFlagAdapter implements JsonDeserializer { @Override public FFlag deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException diff --git a/src/com/massivecraft/factions/adapters/FPermTypeAdapter.java b/src/com/massivecraft/factions/adapters/FPermAdapter.java similarity index 90% rename from src/com/massivecraft/factions/adapters/FPermTypeAdapter.java rename to src/com/massivecraft/factions/adapters/FPermAdapter.java index de636c04..98db9708 100644 --- a/src/com/massivecraft/factions/adapters/FPermTypeAdapter.java +++ b/src/com/massivecraft/factions/adapters/FPermAdapter.java @@ -9,7 +9,7 @@ import org.bukkit.craftbukkit.libs.com.google.gson.JsonParseException; import com.massivecraft.factions.FPerm; -public class FPermTypeAdapter implements JsonDeserializer +public class FPermAdapter implements JsonDeserializer { @Override public FPerm deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException diff --git a/src/com/massivecraft/factions/adapters/LocationTypeAdapter.java b/src/com/massivecraft/factions/adapters/LazyLocationAdapter.java similarity index 97% rename from src/com/massivecraft/factions/adapters/LocationTypeAdapter.java rename to src/com/massivecraft/factions/adapters/LazyLocationAdapter.java index bb3b52b8..9211ffea 100644 --- a/src/com/massivecraft/factions/adapters/LocationTypeAdapter.java +++ b/src/com/massivecraft/factions/adapters/LazyLocationAdapter.java @@ -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, JsonSerializer +public class LazyLocationAdapter implements JsonDeserializer, JsonSerializer { private static final String WORLD = "world"; private static final String X = "x"; diff --git a/src/com/massivecraft/factions/adapters/RelTypeAdapter.java b/src/com/massivecraft/factions/adapters/RelAdapter.java similarity index 90% rename from src/com/massivecraft/factions/adapters/RelTypeAdapter.java rename to src/com/massivecraft/factions/adapters/RelAdapter.java index aecb1b1e..70214fb6 100644 --- a/src/com/massivecraft/factions/adapters/RelTypeAdapter.java +++ b/src/com/massivecraft/factions/adapters/RelAdapter.java @@ -9,7 +9,7 @@ import org.bukkit.craftbukkit.libs.com.google.gson.JsonParseException; import com.massivecraft.factions.Rel; -public class RelTypeAdapter implements JsonDeserializer +public class RelAdapter implements JsonDeserializer { @Override public Rel deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException