streamline rebased Gson into source; rebase was done to prevent conflict with other plugins (like upcoming WorldGuard release) which also use Gson; Bukkit doesn't yet handle such conflicts properly

This commit is contained in:
Brettflan
2011-03-04 10:46:41 -06:00
parent df75afef08
commit 986461a098
96 changed files with 11699 additions and 7 deletions

View File

@@ -10,7 +10,7 @@ import org.bukkit.entity.Player;
import com.bukkit.mcteam.factions.Factions;
import com.bukkit.mcteam.factions.util.*;
import com.bukkit.mcteam.util.DiscUtil;
import com.google.gson.*;
import com.bukkit.mcteam.gson.*;
/**
* This is a entity manager that persists object to json.
@@ -125,6 +125,7 @@ public class EM {
folderBoard.mkdirs();
class jsonFileFilter implements FileFilter {
@Override
public boolean accept(File file) {
return (file.getName().toLowerCase().endsWith(ext) && file.isFile());
}
@@ -204,6 +205,7 @@ public class EM {
folderFollower.mkdirs();
class jsonFileFilter implements FileFilter {
@Override
public boolean accept(File file) {
return (file.getName().toLowerCase().endsWith(ext) && file.isFile());
}
@@ -292,6 +294,7 @@ public class EM {
class jsonFileFilter implements FileFilter
{
@Override
public boolean accept(File file) {
return (file.getName().toLowerCase().endsWith(ext) && file.isFile());
}