Fixed the package structure

This commit is contained in:
Olof Larsson 2011-04-08 15:51:07 +02:00
parent ca16884273
commit 443fac354a
140 changed files with 366 additions and 361 deletions

View File

@ -1,4 +1,4 @@
package com.bukkit.mcteam.factions;
package org.mcteam.factions;
import java.io.*;
import java.lang.reflect.Type;
@ -11,15 +11,15 @@ import java.util.Map.Entry;
import java.util.TreeMap;
import org.bukkit.ChatColor;
import org.mcteam.factions.gson.JsonArray;
import org.mcteam.factions.gson.JsonElement;
import org.mcteam.factions.gson.JsonObject;
import org.mcteam.factions.gson.JsonParser;
import org.mcteam.factions.gson.reflect.TypeToken;
import org.mcteam.factions.util.AsciiCompass;
import org.mcteam.factions.util.DiscUtil;
import org.mcteam.factions.util.TextUtil;
import com.bukkit.mcteam.factions.util.TextUtil;
import com.bukkit.mcteam.gson.reflect.TypeToken;
import com.bukkit.mcteam.gson.JsonArray;
import com.bukkit.mcteam.gson.JsonElement;
import com.bukkit.mcteam.gson.JsonObject;
import com.bukkit.mcteam.gson.JsonParser;
import com.bukkit.mcteam.util.AsciiCompass;
import com.bukkit.mcteam.util.DiscUtil;
public class Board {
private static transient File file = new File(Factions.instance.getDataFolder(), "board.json");

View File

@ -1,13 +1,13 @@
package com.bukkit.mcteam.factions;
package org.mcteam.factions;
import java.io.File;
import java.io.IOException;
import java.util.*;
import org.bukkit.*;
import org.bukkit.entity.CreatureType;
import org.mcteam.factions.gson.JsonParseException;
import org.mcteam.factions.util.DiscUtil;
import com.bukkit.mcteam.util.DiscUtil;
import com.bukkit.mcteam.gson.JsonParseException;
public class Conf {
public static transient File file = new File(Factions.instance.getDataFolder(), "conf.json");

View File

@ -1,4 +1,4 @@
package com.bukkit.mcteam.factions;
package org.mcteam.factions;
import org.bukkit.Location;
import org.bukkit.block.Block;

View File

@ -1,4 +1,4 @@
package com.bukkit.mcteam.factions;
package org.mcteam.factions;
import java.io.*;
import java.lang.reflect.Type;
@ -8,11 +8,11 @@ import java.util.Map.Entry;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
import org.mcteam.factions.gson.reflect.TypeToken;
import org.mcteam.factions.struct.Relation;
import org.mcteam.factions.struct.Role;
import org.mcteam.factions.util.DiscUtil;
import com.bukkit.mcteam.factions.struct.Relation;
import com.bukkit.mcteam.factions.struct.Role;
import com.bukkit.mcteam.gson.reflect.TypeToken;
import com.bukkit.mcteam.util.DiscUtil;
/**
* Logged in players always have exactly one FPlayer instance.

View File

@ -1,4 +1,4 @@
package com.bukkit.mcteam.factions;
package org.mcteam.factions;
import java.io.*;
import java.lang.reflect.Type;
@ -9,12 +9,11 @@ import java.util.logging.Level;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.mcteam.factions.gson.reflect.TypeToken;
import org.mcteam.factions.struct.Relation;
import org.mcteam.factions.struct.Role;
import org.mcteam.factions.util.*;
import com.bukkit.mcteam.factions.struct.Relation;
import com.bukkit.mcteam.factions.struct.Role;
import com.bukkit.mcteam.factions.util.*;
import com.bukkit.mcteam.gson.reflect.TypeToken;
import com.bukkit.mcteam.util.DiscUtil;
public class Faction {

View File

@ -1,4 +1,4 @@
package com.bukkit.mcteam.factions;
package org.mcteam.factions;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
@ -18,40 +18,40 @@ import org.bukkit.event.Event;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin;
import org.mcteam.factions.commands.FBaseCommand;
import org.mcteam.factions.commands.FCommandAdmin;
import org.mcteam.factions.commands.FCommandBypass;
import org.mcteam.factions.commands.FCommandChat;
import org.mcteam.factions.commands.FCommandClaim;
import org.mcteam.factions.commands.FCommandCreate;
import org.mcteam.factions.commands.FCommandDeinvite;
import org.mcteam.factions.commands.FCommandDescription;
import org.mcteam.factions.commands.FCommandHelp;
import org.mcteam.factions.commands.FCommandHome;
import org.mcteam.factions.commands.FCommandInvite;
import org.mcteam.factions.commands.FCommandJoin;
import org.mcteam.factions.commands.FCommandKick;
import org.mcteam.factions.commands.FCommandLeave;
import org.mcteam.factions.commands.FCommandList;
import org.mcteam.factions.commands.FCommandMap;
import org.mcteam.factions.commands.FCommandMod;
import org.mcteam.factions.commands.FCommandOpen;
import org.mcteam.factions.commands.FCommandRelationAlly;
import org.mcteam.factions.commands.FCommandRelationEnemy;
import org.mcteam.factions.commands.FCommandRelationNeutral;
import org.mcteam.factions.commands.FCommandSafeclaim;
import org.mcteam.factions.commands.FCommandSethome;
import org.mcteam.factions.commands.FCommandShow;
import org.mcteam.factions.commands.FCommandTag;
import org.mcteam.factions.commands.FCommandTitle;
import org.mcteam.factions.commands.FCommandUnclaim;
import org.mcteam.factions.commands.FCommandVersion;
import org.mcteam.factions.gson.Gson;
import org.mcteam.factions.gson.GsonBuilder;
import org.mcteam.factions.listeners.FactionsBlockListener;
import org.mcteam.factions.listeners.FactionsEntityListener;
import org.mcteam.factions.listeners.FactionsPlayerListener;
import com.bukkit.mcteam.factions.commands.FBaseCommand;
import com.bukkit.mcteam.factions.commands.FCommandAdmin;
import com.bukkit.mcteam.factions.commands.FCommandBypass;
import com.bukkit.mcteam.factions.commands.FCommandChat;
import com.bukkit.mcteam.factions.commands.FCommandClaim;
import com.bukkit.mcteam.factions.commands.FCommandCreate;
import com.bukkit.mcteam.factions.commands.FCommandDeinvite;
import com.bukkit.mcteam.factions.commands.FCommandDescription;
import com.bukkit.mcteam.factions.commands.FCommandHelp;
import com.bukkit.mcteam.factions.commands.FCommandHome;
import com.bukkit.mcteam.factions.commands.FCommandInvite;
import com.bukkit.mcteam.factions.commands.FCommandJoin;
import com.bukkit.mcteam.factions.commands.FCommandKick;
import com.bukkit.mcteam.factions.commands.FCommandLeave;
import com.bukkit.mcteam.factions.commands.FCommandList;
import com.bukkit.mcteam.factions.commands.FCommandMap;
import com.bukkit.mcteam.factions.commands.FCommandMod;
import com.bukkit.mcteam.factions.commands.FCommandOpen;
import com.bukkit.mcteam.factions.commands.FCommandRelationAlly;
import com.bukkit.mcteam.factions.commands.FCommandRelationEnemy;
import com.bukkit.mcteam.factions.commands.FCommandRelationNeutral;
import com.bukkit.mcteam.factions.commands.FCommandSafeclaim;
import com.bukkit.mcteam.factions.commands.FCommandSethome;
import com.bukkit.mcteam.factions.commands.FCommandShow;
import com.bukkit.mcteam.factions.commands.FCommandTag;
import com.bukkit.mcteam.factions.commands.FCommandTitle;
import com.bukkit.mcteam.factions.commands.FCommandUnclaim;
import com.bukkit.mcteam.factions.commands.FCommandVersion;
import com.bukkit.mcteam.factions.listeners.FactionsBlockListener;
import com.bukkit.mcteam.factions.listeners.FactionsEntityListener;
import com.bukkit.mcteam.factions.listeners.FactionsPlayerListener;
import com.bukkit.mcteam.gson.Gson;
import com.bukkit.mcteam.gson.GsonBuilder;
import com.nijiko.permissions.PermissionHandler;
import com.nijikokun.bukkit.Permissions.Permissions;

View File

@ -1,18 +1,18 @@
package com.bukkit.mcteam.factions;
package org.mcteam.factions;
import java.lang.reflect.Type;
import java.util.logging.Level;
import org.bukkit.Location;
import org.bukkit.World;
import org.mcteam.factions.gson.JsonDeserializationContext;
import org.mcteam.factions.gson.JsonDeserializer;
import org.mcteam.factions.gson.JsonElement;
import org.mcteam.factions.gson.JsonObject;
import org.mcteam.factions.gson.JsonParseException;
import org.mcteam.factions.gson.JsonSerializationContext;
import org.mcteam.factions.gson.JsonSerializer;
import com.bukkit.mcteam.gson.JsonDeserializationContext;
import com.bukkit.mcteam.gson.JsonDeserializer;
import com.bukkit.mcteam.gson.JsonElement;
import com.bukkit.mcteam.gson.JsonObject;
import com.bukkit.mcteam.gson.JsonParseException;
import com.bukkit.mcteam.gson.JsonSerializationContext;
import com.bukkit.mcteam.gson.JsonSerializer;
public class MyLocationTypeAdapter implements JsonDeserializer<Location>, JsonSerializer<Location> {
private static final String WORLD = "world";

View File

@ -1,4 +1,4 @@
package com.bukkit.mcteam.factions;
package org.mcteam.factions;
public class SaveTask implements Runnable {

View File

@ -1,17 +1,17 @@
package com.bukkit.mcteam.factions.commands;
package org.mcteam.factions.commands;
import java.util.ArrayList;
import java.util.List;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.mcteam.factions.Conf;
import org.mcteam.factions.FPlayer;
import org.mcteam.factions.Faction;
import org.mcteam.factions.Factions;
import org.mcteam.factions.struct.Role;
import org.mcteam.factions.util.TextUtil;
import com.bukkit.mcteam.factions.Conf;
import com.bukkit.mcteam.factions.FPlayer;
import com.bukkit.mcteam.factions.Faction;
import com.bukkit.mcteam.factions.Factions;
import com.bukkit.mcteam.factions.struct.Role;
import com.bukkit.mcteam.factions.util.TextUtil;
public class FBaseCommand {
public List<String> aliases;

View File

@ -1,9 +1,9 @@
package com.bukkit.mcteam.factions.commands;
package org.mcteam.factions.commands;
import com.bukkit.mcteam.factions.Conf;
import com.bukkit.mcteam.factions.FPlayer;
import com.bukkit.mcteam.factions.Faction;
import com.bukkit.mcteam.factions.struct.Role;
import org.mcteam.factions.Conf;
import org.mcteam.factions.FPlayer;
import org.mcteam.factions.Faction;
import org.mcteam.factions.struct.Role;
public class FCommandAdmin extends FBaseCommand {

View File

@ -1,4 +1,4 @@
package com.bukkit.mcteam.factions.commands;
package org.mcteam.factions.commands;
import org.bukkit.command.CommandSender;

View File

@ -1,4 +1,4 @@
package com.bukkit.mcteam.factions.commands;
package org.mcteam.factions.commands;
public class FCommandChat extends FBaseCommand {

View File

@ -1,11 +1,11 @@
package com.bukkit.mcteam.factions.commands;
package org.mcteam.factions.commands;
import com.bukkit.mcteam.factions.Board;
import com.bukkit.mcteam.factions.Conf;
import com.bukkit.mcteam.factions.FLocation;
import com.bukkit.mcteam.factions.Faction;
import com.bukkit.mcteam.factions.struct.Relation;
import com.bukkit.mcteam.factions.struct.Role;
import org.mcteam.factions.Board;
import org.mcteam.factions.Conf;
import org.mcteam.factions.FLocation;
import org.mcteam.factions.Faction;
import org.mcteam.factions.struct.Relation;
import org.mcteam.factions.struct.Role;
public class FCommandClaim extends FBaseCommand {

View File

@ -1,14 +1,14 @@
package com.bukkit.mcteam.factions.commands;
package org.mcteam.factions.commands;
import java.util.ArrayList;
import org.bukkit.command.CommandSender;
import org.mcteam.factions.Conf;
import org.mcteam.factions.FPlayer;
import org.mcteam.factions.Faction;
import org.mcteam.factions.Factions;
import org.mcteam.factions.struct.Role;
import com.bukkit.mcteam.factions.Conf;
import com.bukkit.mcteam.factions.FPlayer;
import com.bukkit.mcteam.factions.Faction;
import com.bukkit.mcteam.factions.Factions;
import com.bukkit.mcteam.factions.struct.Role;
public class FCommandCreate extends FBaseCommand {

View File

@ -1,9 +1,9 @@
package com.bukkit.mcteam.factions.commands;
package org.mcteam.factions.commands;
import com.bukkit.mcteam.factions.Conf;
import com.bukkit.mcteam.factions.FPlayer;
import com.bukkit.mcteam.factions.Faction;
import com.bukkit.mcteam.factions.struct.Role;
import org.mcteam.factions.Conf;
import org.mcteam.factions.FPlayer;
import org.mcteam.factions.Faction;
import org.mcteam.factions.struct.Role;
public class FCommandDeinvite extends FBaseCommand {

View File

@ -1,9 +1,9 @@
package com.bukkit.mcteam.factions.commands;
package org.mcteam.factions.commands;
import com.bukkit.mcteam.factions.Conf;
import com.bukkit.mcteam.factions.FPlayer;
import com.bukkit.mcteam.factions.struct.Role;
import com.bukkit.mcteam.factions.util.TextUtil;
import org.mcteam.factions.Conf;
import org.mcteam.factions.FPlayer;
import org.mcteam.factions.struct.Role;
import org.mcteam.factions.util.TextUtil;
public class FCommandDescription extends FBaseCommand {

View File

@ -1,10 +1,10 @@
package com.bukkit.mcteam.factions.commands;
package org.mcteam.factions.commands;
import java.util.ArrayList;
import org.bukkit.command.CommandSender;
import org.mcteam.factions.util.TextUtil;
import com.bukkit.mcteam.factions.util.TextUtil;
public class FCommandHelp extends FBaseCommand {

View File

@ -1,8 +1,8 @@
package com.bukkit.mcteam.factions.commands;
package org.mcteam.factions.commands;
import com.bukkit.mcteam.factions.Conf;
import com.bukkit.mcteam.factions.Faction;
import com.bukkit.mcteam.factions.struct.Role;
import org.mcteam.factions.Conf;
import org.mcteam.factions.Faction;
import org.mcteam.factions.struct.Role;
public class FCommandHome extends FBaseCommand {

View File

@ -1,9 +1,9 @@
package com.bukkit.mcteam.factions.commands;
package org.mcteam.factions.commands;
import com.bukkit.mcteam.factions.Conf;
import com.bukkit.mcteam.factions.FPlayer;
import com.bukkit.mcteam.factions.Faction;
import com.bukkit.mcteam.factions.struct.Role;
import org.mcteam.factions.Conf;
import org.mcteam.factions.FPlayer;
import org.mcteam.factions.Faction;
import org.mcteam.factions.struct.Role;
public class FCommandInvite extends FBaseCommand {

View File

@ -1,7 +1,7 @@
package com.bukkit.mcteam.factions.commands;
package org.mcteam.factions.commands;
import com.bukkit.mcteam.factions.Conf;
import com.bukkit.mcteam.factions.Faction;
import org.mcteam.factions.Conf;
import org.mcteam.factions.Faction;
public class FCommandJoin extends FBaseCommand {

View File

@ -1,8 +1,8 @@
package com.bukkit.mcteam.factions.commands;
package org.mcteam.factions.commands;
import com.bukkit.mcteam.factions.Conf;
import com.bukkit.mcteam.factions.FPlayer;
import com.bukkit.mcteam.factions.Faction;
import org.mcteam.factions.Conf;
import org.mcteam.factions.FPlayer;
import org.mcteam.factions.Faction;
public class FCommandKick extends FBaseCommand {

View File

@ -1,4 +1,4 @@
package com.bukkit.mcteam.factions.commands;
package org.mcteam.factions.commands;
import org.bukkit.command.CommandSender;

View File

@ -1,14 +1,14 @@
package com.bukkit.mcteam.factions.commands;
package org.mcteam.factions.commands;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import org.bukkit.command.CommandSender;
import org.mcteam.factions.Conf;
import org.mcteam.factions.Faction;
import org.mcteam.factions.util.TextUtil;
import com.bukkit.mcteam.factions.Conf;
import com.bukkit.mcteam.factions.Faction;
import com.bukkit.mcteam.factions.util.TextUtil;
public class FCommandList extends FBaseCommand {

View File

@ -1,9 +1,9 @@
package com.bukkit.mcteam.factions.commands;
package org.mcteam.factions.commands;
import org.bukkit.command.CommandSender;
import org.mcteam.factions.Board;
import org.mcteam.factions.FLocation;
import com.bukkit.mcteam.factions.Board;
import com.bukkit.mcteam.factions.FLocation;
public class FCommandMap extends FBaseCommand {

View File

@ -1,9 +1,9 @@
package com.bukkit.mcteam.factions.commands;
package org.mcteam.factions.commands;
import com.bukkit.mcteam.factions.Conf;
import com.bukkit.mcteam.factions.FPlayer;
import com.bukkit.mcteam.factions.Faction;
import com.bukkit.mcteam.factions.struct.Role;
import org.mcteam.factions.Conf;
import org.mcteam.factions.FPlayer;
import org.mcteam.factions.Faction;
import org.mcteam.factions.struct.Role;
public class FCommandMod extends FBaseCommand {

View File

@ -1,8 +1,8 @@
package com.bukkit.mcteam.factions.commands;
package org.mcteam.factions.commands;
import com.bukkit.mcteam.factions.Conf;
import com.bukkit.mcteam.factions.Faction;
import com.bukkit.mcteam.factions.struct.Role;
import org.mcteam.factions.Conf;
import org.mcteam.factions.Faction;
import org.mcteam.factions.struct.Role;
public class FCommandOpen extends FBaseCommand {

View File

@ -1,6 +1,6 @@
package com.bukkit.mcteam.factions.commands;
package org.mcteam.factions.commands;
import com.bukkit.mcteam.factions.struct.Relation;
import org.mcteam.factions.struct.Relation;
public class FCommandRelationAlly extends FRelationCommand {

View File

@ -1,6 +1,6 @@
package com.bukkit.mcteam.factions.commands;
package org.mcteam.factions.commands;
import com.bukkit.mcteam.factions.struct.Relation;
import org.mcteam.factions.struct.Relation;
public class FCommandRelationEnemy extends FRelationCommand {

View File

@ -1,6 +1,6 @@
package com.bukkit.mcteam.factions.commands;
package org.mcteam.factions.commands;
import com.bukkit.mcteam.factions.struct.Relation;
import org.mcteam.factions.struct.Relation;
public class FCommandRelationNeutral extends FRelationCommand {

View File

@ -1,11 +1,11 @@
package com.bukkit.mcteam.factions.commands;
package org.mcteam.factions.commands;
import org.bukkit.command.CommandSender;
import org.mcteam.factions.Board;
import org.mcteam.factions.FLocation;
import org.mcteam.factions.Faction;
import org.mcteam.factions.Factions;
import com.bukkit.mcteam.factions.Board;
import com.bukkit.mcteam.factions.FLocation;
import com.bukkit.mcteam.factions.Faction;
import com.bukkit.mcteam.factions.Factions;
public class FCommandSafeclaim extends FBaseCommand {

View File

@ -1,8 +1,8 @@
package com.bukkit.mcteam.factions.commands;
package org.mcteam.factions.commands;
import com.bukkit.mcteam.factions.Conf;
import com.bukkit.mcteam.factions.Faction;
import com.bukkit.mcteam.factions.struct.Role;
import org.mcteam.factions.Conf;
import org.mcteam.factions.Faction;
import org.mcteam.factions.struct.Role;
public class FCommandSethome extends FBaseCommand {

View File

@ -1,15 +1,15 @@
package com.bukkit.mcteam.factions.commands;
package org.mcteam.factions.commands;
import java.util.Collection;
import org.bukkit.command.CommandSender;
import org.mcteam.factions.Conf;
import org.mcteam.factions.FPlayer;
import org.mcteam.factions.Faction;
import org.mcteam.factions.struct.Relation;
import org.mcteam.factions.struct.Role;
import org.mcteam.factions.util.TextUtil;
import com.bukkit.mcteam.factions.Conf;
import com.bukkit.mcteam.factions.FPlayer;
import com.bukkit.mcteam.factions.Faction;
import com.bukkit.mcteam.factions.struct.Relation;
import com.bukkit.mcteam.factions.struct.Role;
import com.bukkit.mcteam.factions.util.TextUtil;
public class FCommandShow extends FBaseCommand {

View File

@ -1,11 +1,12 @@
package com.bukkit.mcteam.factions.commands;
package org.mcteam.factions.commands;
import java.util.ArrayList;
import com.bukkit.mcteam.factions.Conf;
import com.bukkit.mcteam.factions.Faction;
import com.bukkit.mcteam.factions.struct.Role;
import com.bukkit.mcteam.factions.util.TextUtil;
import org.mcteam.factions.Conf;
import org.mcteam.factions.Faction;
import org.mcteam.factions.struct.Role;
import org.mcteam.factions.util.TextUtil;
public class FCommandTag extends FBaseCommand {

View File

@ -1,9 +1,9 @@
package com.bukkit.mcteam.factions.commands;
package org.mcteam.factions.commands;
import com.bukkit.mcteam.factions.Conf;
import com.bukkit.mcteam.factions.FPlayer;
import com.bukkit.mcteam.factions.Faction;
import com.bukkit.mcteam.factions.util.TextUtil;
import org.mcteam.factions.Conf;
import org.mcteam.factions.FPlayer;
import org.mcteam.factions.Faction;
import org.mcteam.factions.util.TextUtil;
public class FCommandTitle extends FBaseCommand {

View File

@ -1,11 +1,11 @@
package com.bukkit.mcteam.factions.commands;
package org.mcteam.factions.commands;
import com.bukkit.mcteam.factions.Board;
import com.bukkit.mcteam.factions.Conf;
import com.bukkit.mcteam.factions.FLocation;
import com.bukkit.mcteam.factions.Faction;
import com.bukkit.mcteam.factions.Factions;
import com.bukkit.mcteam.factions.struct.Role;
import org.mcteam.factions.Board;
import org.mcteam.factions.Conf;
import org.mcteam.factions.FLocation;
import org.mcteam.factions.Faction;
import org.mcteam.factions.Factions;
import org.mcteam.factions.struct.Role;
public class FCommandUnclaim extends FBaseCommand {

View File

@ -1,8 +1,8 @@
package com.bukkit.mcteam.factions.commands;
package org.mcteam.factions.commands;
import org.bukkit.command.CommandSender;
import org.mcteam.factions.Factions;
import com.bukkit.mcteam.factions.Factions;
public class FCommandVersion extends FBaseCommand {

View File

@ -1,12 +1,12 @@
package com.bukkit.mcteam.factions.commands;
package org.mcteam.factions.commands;
import org.bukkit.ChatColor;
import org.mcteam.factions.Conf;
import org.mcteam.factions.Faction;
import org.mcteam.factions.Factions;
import org.mcteam.factions.struct.Relation;
import org.mcteam.factions.struct.Role;
import com.bukkit.mcteam.factions.Conf;
import com.bukkit.mcteam.factions.Faction;
import com.bukkit.mcteam.factions.Factions;
import com.bukkit.mcteam.factions.struct.Relation;
import com.bukkit.mcteam.factions.struct.Role;
public class FRelationCommand extends FBaseCommand {

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
/**

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
/**
* Defines generic cache interface.

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
/**
* Exception class to indicate a circular reference error.

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.io.IOException;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.util.Collection;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.io.IOException;
import java.util.Collections;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
/**
* A strategy (or policy) definition that is used to decide whether or not a field or top-level

View File

@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import com.bukkit.mcteam.gson.annotations.Expose;
import org.mcteam.factions.gson.annotations.Expose;
/**
* Excludes fields that do not have the {@link Expose} annotation

View File

@ -14,9 +14,9 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import com.bukkit.mcteam.gson.annotations.Expose;
import org.mcteam.factions.gson.annotations.Expose;
/**
* Excludes fields that do not have the {@link Expose} annotation

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;

View File

@ -14,12 +14,12 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
/**
* An enumeration that defines a few standard naming conventions for JSON field names.
* This enumeration should be used in conjunction with {@link com.bukkit.mcteam.gson.GsonBuilder}
* to configure a {@link com.bukkit.mcteam.gson.Gson} instance to properly translate Java field
* This enumeration should be used in conjunction with {@link org.mcteam.factions.gson.GsonBuilder}
* to configure a {@link org.mcteam.factions.gson.Gson} instance to properly translate Java field
* names into the desired JSON field names.
*
* @author Inderjeet Singh

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.lang.reflect.Field;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
/**
* The new mechanism for providing custom field naming in Gson. This allows the client code

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
/**
* Adapts the old "deprecated" {@link FieldNamingStrategy} to the new {@link FieldNamingStrategy2}

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.lang.reflect.GenericArrayType;
import java.lang.reflect.Type;

View File

@ -14,13 +14,8 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import com.bukkit.mcteam.gson.stream.JsonReader;
import com.bukkit.mcteam.gson.stream.JsonToken;
import com.bukkit.mcteam.gson.stream.JsonWriter;
import com.bukkit.mcteam.gson.stream.MalformedJsonException;
import com.bukkit.mcteam.gson.JsonSerializationContextDefault;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
@ -32,6 +27,12 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import org.mcteam.factions.gson.JsonSerializationContextDefault;
import org.mcteam.factions.gson.stream.JsonReader;
import org.mcteam.factions.gson.stream.JsonToken;
import org.mcteam.factions.gson.stream.JsonWriter;
import org.mcteam.factions.gson.stream.MalformedJsonException;
/**
* This is the main class for using Gson. Gson is typically used by first constructing a
* Gson instance and then invoking {@link #toJson(Object)} or {@link #fromJson(String, Class)}
@ -69,7 +70,7 @@ import java.util.Map;
* <p>See the <a href="https://sites.google.com/site/gson/gson-user-guide">Gson User Guide</a>
* for a more complete set of examples.</p>
*
* @see com.bukkit.mcteam.gson.reflect.TypeToken
* @see org.mcteam.factions.gson.reflect.TypeToken
*
* @author Inderjeet Singh
* @author Joel Leitch
@ -136,10 +137,10 @@ public final class Gson {
* ignores the millisecond portion of the date during serialization. You can change
* this by invoking {@link GsonBuilder#setDateFormat(int)} or
* {@link GsonBuilder#setDateFormat(String)}. </li>
* <li>By default, Gson ignores the {@link com.bukkit.mcteam.gson.annotations.Expose} annotation.
* <li>By default, Gson ignores the {@link org.mcteam.factions.gson.annotations.Expose} annotation.
* You can enable Gson to serialize/deserialize only those fields marked with this annotation
* through {@link GsonBuilder#excludeFieldsWithoutExposeAnnotation()}. </li>
* <li>By default, Gson ignores the {@link com.bukkit.mcteam.gson.annotations.Since} annotation. You
* <li>By default, Gson ignores the {@link org.mcteam.factions.gson.annotations.Since} annotation. You
* can enable Gson to use this annotation through {@link GsonBuilder#setVersion(double)}.</li>
* <li>The default field naming policy for the output Json is same as in Java. So, a Java class
* field <code>versionNumber</code> will be output as <code>&quot;versionNumber@quot;</code> in
@ -217,7 +218,7 @@ public final class Gson {
*
* @param src the object for which JSON representation is to be created
* @param typeOfSrc The specific genericized type of src. You can obtain
* this type by using the {@link com.bukkit.mcteam.gson.reflect.TypeToken} class. For example,
* this type by using the {@link org.mcteam.factions.gson.reflect.TypeToken} class. For example,
* to get the type for {@code Collection<Foo>}, you should use:
* <pre>
* Type typeOfSrc = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.getType();
@ -262,7 +263,7 @@ public final class Gson {
*
* @param src the object for which JSON representation is to be created
* @param typeOfSrc The specific genericized type of src. You can obtain
* this type by using the {@link com.bukkit.mcteam.gson.reflect.TypeToken} class. For example,
* this type by using the {@link org.mcteam.factions.gson.reflect.TypeToken} class. For example,
* to get the type for {@code Collection<Foo>}, you should use:
* <pre>
* Type typeOfSrc = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.getType();
@ -308,7 +309,7 @@ public final class Gson {
*
* @param src the object for which JSON representation is to be created
* @param typeOfSrc The specific genericized type of src. You can obtain
* this type by using the {@link com.bukkit.mcteam.gson.reflect.TypeToken} class. For example,
* this type by using the {@link org.mcteam.factions.gson.reflect.TypeToken} class. For example,
* to get the type for {@code Collection<Foo>}, you should use:
* <pre>
* Type typeOfSrc = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.getType();
@ -417,7 +418,7 @@ public final class Gson {
* @param <T> the type of the desired object
* @param json the string from which the object is to be deserialized
* @param typeOfT The specific genericized type of src. You can obtain this type by using the
* {@link com.bukkit.mcteam.gson.reflect.TypeToken} class. For example, to get the type for
* {@link org.mcteam.factions.gson.reflect.TypeToken} class. For example, to get the type for
* {@code Collection<Foo>}, you should use:
* <pre>
* Type typeOfT = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.getType();
@ -470,7 +471,7 @@ public final class Gson {
* @param <T> the type of the desired object
* @param json the reader producing Json from which the object is to be deserialized
* @param typeOfT The specific genericized type of src. You can obtain this type by using the
* {@link com.bukkit.mcteam.gson.reflect.TypeToken} class. For example, to get the type for
* {@link org.mcteam.factions.gson.reflect.TypeToken} class. For example, to get the type for
* {@code Collection<Foo>}, you should use:
* <pre>
* Type typeOfT = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.getType();
@ -549,7 +550,7 @@ public final class Gson {
* @param json the root of the parse tree of {@link JsonElement}s from which the object is to
* be deserialized
* @param typeOfT The specific genericized type of src. You can obtain this type by using the
* {@link com.bukkit.mcteam.gson.reflect.TypeToken} class. For example, to get the type for
* {@link org.mcteam.factions.gson.reflect.TypeToken} class. For example, to get the type for
* {@code Collection<Foo>}, you should use:
* <pre>
* Type typeOfT = new TypeToken&lt;Collection&lt;Foo&gt;&gt;(){}.getType();

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.lang.reflect.Type;
import java.text.DateFormat;
@ -24,7 +24,8 @@ import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import com.bukkit.mcteam.gson.DefaultTypeAdapters.DefaultDateTypeAdapter;
import org.mcteam.factions.gson.DefaultTypeAdapters.DefaultDateTypeAdapter;
/**
* <p>Use this builder to construct a {@link Gson} instance when you need to set configuration
@ -156,7 +157,7 @@ public final class GsonBuilder {
/**
* Configures Gson to exclude all fields from consideration for serialization or deserialization
* that do not have the {@link com.bukkit.mcteam.gson.annotations.Expose} annotation.
* that do not have the {@link org.mcteam.factions.gson.annotations.Expose} annotation.
*
* @return a reference to this {@code GsonBuilder} object to fulfill the "Builder" pattern
*/

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.lang.reflect.Modifier;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.lang.reflect.Type;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.io.IOException;
import java.math.BigDecimal;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.lang.reflect.Array;
import java.lang.reflect.Type;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.lang.reflect.Type;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.lang.reflect.Type;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.lang.reflect.Type;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.lang.reflect.Type;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.lang.reflect.Type;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.io.IOException;
import java.math.BigDecimal;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.io.IOException;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@ -23,7 +23,7 @@ import java.util.regex.Pattern;
* This class can be used to check the validity of a JSON field name.
*
* <p>The primary use of this object is to ensure that any Java fields that use the
* {@link com.bukkit.mcteam.gson.annotations.SerializedName} annotation is providing valid JSON
* {@link org.mcteam.factions.gson.annotations.SerializedName} annotation is providing valid JSON
* field names. This will make the code fail-fast rather than letting the invalid
* field name propagate to the client and it fails to parse.</p>
*

View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
/**
* This exception is raised when Gson was unable to read an input stream

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.io.IOException;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.io.IOException;
import java.util.LinkedHashMap;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.lang.reflect.Type;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
/**
* This exception is raised if there is a serious issue that occurs during parsing of a Json

View File

@ -13,16 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import com.bukkit.mcteam.gson.stream.JsonReader;
import com.bukkit.mcteam.gson.stream.JsonToken;
import com.bukkit.mcteam.gson.stream.MalformedJsonException;
import java.io.EOFException;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import org.mcteam.factions.gson.stream.JsonReader;
import org.mcteam.factions.gson.stream.JsonToken;
import org.mcteam.factions.gson.stream.MalformedJsonException;
/**
* A parser to parse Json into a parse tree of {@link JsonElement}s
*

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.io.IOException;
import java.math.BigDecimal;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.lang.reflect.Type;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.lang.reflect.Type;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.lang.reflect.Array;
import java.lang.reflect.Type;

View File

@ -14,14 +14,14 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.lang.reflect.Type;
/**
* Interface representing a custom serializer for Json. You should write a custom serializer, if
* you are not happy with the default serialization done by Gson. You will also need to register
* this serializer through {@link com.bukkit.mcteam.gson.GsonBuilder#registerTypeAdapter(Type, Object)}.
* this serializer through {@link org.mcteam.factions.gson.GsonBuilder#registerTypeAdapter(Type, Object)}.
*
* <p>Let us look at example where defining a serializer will be useful. The {@code Id} class
* defined below has two fields: {@code clazz} and {@code value}.</p>

View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.io.EOFException;
import java.io.IOException;
@ -22,9 +22,10 @@ import java.io.StringReader;
import java.util.Iterator;
import java.util.NoSuchElementException;
import com.bukkit.mcteam.gson.stream.JsonReader;
import com.bukkit.mcteam.gson.stream.JsonToken;
import com.bukkit.mcteam.gson.stream.MalformedJsonException;
import org.mcteam.factions.gson.stream.JsonReader;
import org.mcteam.factions.gson.stream.JsonToken;
import org.mcteam.factions.gson.stream.MalformedJsonException;
/**
* A streaming parser that allows reading of multiple {@link JsonElement}s from the specified reader

View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
/**
* This exception is raised when Gson attempts to read (or write) a malformed

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.io.IOException;
import java.util.Map;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
/**
* Defines the expected format for a {@code long} or {@code Long} type when its serialized.

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
/**
* A {@link FieldNamingStrategy2} that ensures the JSON field names consist of only

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.util.LinkedHashMap;
import java.util.Map;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Array;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.util.Stack;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.util.Collection;
import java.util.HashSet;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
/**

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.lang.reflect.Type;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Field;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
/**
* A factory class used to simplify {@link ObjectNavigator} creation.

View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.lang.reflect.Type;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
/**
* A simple object that holds onto a pair of object references, first and second.

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.bukkit.mcteam.gson;
package org.mcteam.factions.gson;
import java.lang.reflect.Type;
import java.util.ArrayList;

Some files were not shown because too many files have changed in this diff Show More