Switch json library.

UltimateGames · Aug 8, 2013 · 2de7f90 · 2de7f90
1 parent 01143f4
commit 2de7f90
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 22 deletions.
diff --git a/pom.xml b/pom.xml
@@ -86,9 +86,9 @@
 			<version>8.1.7.v20120910</version>
 		</dependency>
 		<dependency>
-			<groupId>org.json</groupId>
-			<artifactId>json</artifactId>
-			<version>20090211</version>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>2.2.4</version>
 		</dependency>
 
 	</dependencies>
@@ -141,8 +141,8 @@
 									<shadedPattern>me.ampayne2.ultimategames.jetty</shadedPattern>
 								</relocation>
 								<relocation>
-									<pattern>org.json</pattern>
-									<shadedPattern>me.ampayne2.ultimategames.json</shadedPattern>
+									<pattern>com.google.gson</pattern>
+									<shadedPattern>me.ampayne2.ultimategames.gson</shadedPattern>
 								</relocation>
 							</relocations>
 							<artifactSet>

diff --git a/src/main/java/me/ampayne2/ultimategames/arenas/Arena.java b/src/main/java/me/ampayne2/ultimategames/arenas/Arena.java
@@ -299,7 +299,10 @@ public void setStatus(ArenaStatus status) {
         FileConfiguration arenaConfig = ultimateGames.getConfigManager().getArenaConfig().getConfig();
         arenaConfig.set("Arenas." + game.getGameDescription().getName() + "." + arenaName + ".Status", status.toString());
         ultimateGames.getConfigManager().getArenaConfig().saveConfig();
-        ultimateGames.getUGSignManager().updateLobbySignsOfArena(this);
+        if (ultimateGames.getUGSignManager() != null) {
+            ultimateGames.getUGSignManager().updateLobbySignsOfArena(this);
+        }
+
     }
 
     /**

diff --git a/src/main/java/me/ampayne2/ultimategames/webapi/handlers/GeneralInformationHandler.java b/src/main/java/me/ampayne2/ultimategames/webapi/handlers/GeneralInformationHandler.java
@@ -18,12 +18,16 @@
  */
 package me.ampayne2.ultimategames.webapi.handlers;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.google.gson.Gson;
+
 import me.ampayne2.ultimategames.UltimateGames;
 import me.ampayne2.ultimategames.arenas.Arena;
 import me.ampayne2.ultimategames.webapi.WebHandler;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
 
 public class GeneralInformationHandler implements WebHandler {
 
@@ -34,20 +38,18 @@ public GeneralInformationHandler(UltimateGames ug) {
 
     @Override
     public String sendResult() {
-        JSONArray jsonArray = new JSONArray();
+        Gson gson = new Gson();
+        List<Map> list = new ArrayList<Map>();
         for (Arena arena : plugin.getArenaManager().getArenas()) {
-            JSONObject jsonEntry = new JSONObject();
-            try {
-                jsonEntry.append("arenaName", arena.getName());
-                jsonEntry.append("gameName", arena.getGame().getGameDescription().getName());
-                jsonEntry.append("currentPlayers", arena.getPlayers().size());
-                jsonEntry.append("maxPlayers", arena.getMaxPlayers());
-                jsonEntry.append("status", arena.getStatus().name());
-            } catch (JSONException e) {
-                e.printStackTrace();
-            }
-            jsonArray.put(jsonEntry);
+            Map<String, String> map = new HashMap<String, String>();
+            map.put("arenaName", arena.getName());
+            map.put("gameName", arena.getGame().getGameDescription().getName());
+            map.put("currentPlayers", arena.getPlayers().size() + "");
+            map.put("maxPlayers", arena.getMaxPlayers() + "");
+            map.put("status", arena.getStatus().name());
+            list.add(map);
+
         }
-        return jsonArray.toString();
+        return gson.toJson(list);
     }
 }