From da365a82a6d78c39559c4ab01dc7bcc2ae35c823 Mon Sep 17 00:00:00 2001
From: JKetelaar <jeroen@ketelaar.me>
Date: Sun, 3 Jan 2016 15:02:02 +0100
Subject: [PATCH] [TASK] Added filters for bugsnag

---
 src/main/java/org/parabot/core/Core.java         | 16 ++++++++++++++--
 src/main/java/org/parabot/core/Directories.java  |  3 ++-
 .../org/parabot/environment/scripts/Script.java  |  2 ++
 .../servers/executers/ServerExecuter.java        |  3 +++
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/parabot/core/Core.java b/src/main/java/org/parabot/core/Core.java
index e1e976d..5bf73a8 100644
--- a/src/main/java/org/parabot/core/Core.java
+++ b/src/main/java/org/parabot/core/Core.java
@@ -1,6 +1,8 @@
 package org.parabot.core;
 
+import com.bugsnag.BeforeNotify;
 import com.bugsnag.Client;
+import com.bugsnag.Error;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.ParseException;
 import org.parabot.Landing;
@@ -301,11 +303,21 @@ public class Core {
     }
 
     public static void setBugsnagVersion(){
-        Core.bugsnagInstance.setReleaseStage(currentVersion.compareTo(latestVersion) >= 0 ? "development" : "production");
+        Core.bugsnagInstance.setReleaseStage(currentVersion != latestVersion ? "development" : "production");
     }
 
     public static void setBugsnagUser(String id, String email, String username){
-        Core.bugsnagInstance.setUser(id, email, username);
+        // TODO Check order of parameters
+        Core.bugsnagInstance.setUser(username, email, id);
+    }
+
+    public static void setBugsnagServer(String server){
+        Core.setBugsnagInformation("Server", "Server", server);
+    }
+
+    public static void setBugsnagInformation(String tab, String key, String value){
+        // TODO Should be checked if correct
+        Core.bugsnagInstance.addToTab(tab, key, value);
     }
 
     public static void debug(int i) {
diff --git a/src/main/java/org/parabot/core/Directories.java b/src/main/java/org/parabot/core/Directories.java
index d8223b1..4c0f89e 100644
--- a/src/main/java/org/parabot/core/Directories.java
+++ b/src/main/java/org/parabot/core/Directories.java
@@ -11,9 +11,10 @@ import java.io.*;
 import java.util.*;
 
 /**
- * Holds parabot's used directories
+ * Holds and manages Parabot's used directories
  *
  * @author Everel
+ * @author JKetelaar
  * @author Matt
  */
 public class Directories {
diff --git a/src/main/java/org/parabot/environment/scripts/Script.java b/src/main/java/org/parabot/environment/scripts/Script.java
index 971d296..732e5c0 100644
--- a/src/main/java/org/parabot/environment/scripts/Script.java
+++ b/src/main/java/org/parabot/environment/scripts/Script.java
@@ -156,6 +156,7 @@ public class Script implements Runnable {
 		if(state < 0 || state > 2) {
 			throw new IllegalArgumentException("Illegal state");
 		}
+		Core.setBugsnagInformation("Script", "State", String.valueOf(state));
 		this.state = state;
 	}
 
@@ -180,5 +181,6 @@ public class Script implements Runnable {
 
 	public void setScriptID(int scriptID){
 		this.scriptID = scriptID;
+		Core.setBugsnagInformation("Script", "State", String.valueOf(scriptID));
 	}
 }
diff --git a/src/main/java/org/parabot/environment/servers/executers/ServerExecuter.java b/src/main/java/org/parabot/environment/servers/executers/ServerExecuter.java
index 7f84fe6..f2ac865 100644
--- a/src/main/java/org/parabot/environment/servers/executers/ServerExecuter.java
+++ b/src/main/java/org/parabot/environment/servers/executers/ServerExecuter.java
@@ -1,6 +1,7 @@
 package org.parabot.environment.servers.executers;
 
 import org.parabot.core.Context;
+import org.parabot.core.Core;
 import org.parabot.core.parsers.randoms.RandomParser;
 import org.parabot.core.ui.components.PaintComponent;
 import org.parabot.environment.servers.ServerProvider;
@@ -23,6 +24,8 @@ public abstract class ServerExecuter {
 			@Override
 			public void run() {
 				try {
+					Core.setBugsnagServer(serverName);
+
 					Context context = Context.getInstance(provider);
 					context.load();
 					PaintComponent.getInstance().startPainting(context);