|
|
@@ -2,6 +2,8 @@ package de.Linus122.TimeIsMoney;
|
|
|
|
|
|
import org.bukkit.Bukkit;
|
|
|
import org.bukkit.configuration.file.YamlConfiguration;
|
|
|
+import org.bukkit.entity.Player;
|
|
|
+import org.bukkit.plugin.RegisteredServiceProvider;
|
|
|
import org.bukkit.plugin.ServicePriority;
|
|
|
import org.bukkit.plugin.java.JavaPlugin;
|
|
|
import org.json.simple.JSONArray;
|
|
|
@@ -13,15 +15,16 @@ import java.io.DataOutputStream;
|
|
|
import java.io.File;
|
|
|
import java.io.IOException;
|
|
|
import java.lang.reflect.InvocationTargetException;
|
|
|
+import java.lang.reflect.Method;
|
|
|
import java.net.URL;
|
|
|
import java.util.ArrayList;
|
|
|
-import java.util.HashMap;
|
|
|
+import java.util.Collection;
|
|
|
import java.util.List;
|
|
|
-import java.util.Locale;
|
|
|
import java.util.Map;
|
|
|
import java.util.Timer;
|
|
|
import java.util.TimerTask;
|
|
|
import java.util.UUID;
|
|
|
+import java.util.concurrent.Callable;
|
|
|
import java.util.logging.Level;
|
|
|
import java.util.zip.GZIPOutputStream;
|
|
|
|
|
|
@@ -29,16 +32,21 @@ import java.util.zip.GZIPOutputStream;
|
|
|
* bStats collects some data for plugin authors.
|
|
|
*
|
|
|
* Check out https://bStats.org/ to learn more about bStats!
|
|
|
+ * @link https://github.com/BtoBastian/bStats-Metrics/blob/master/bstats-bukkit/src/main/java/org/bstats/bukkit/Metrics.java
|
|
|
*/
|
|
|
public class Metrics {
|
|
|
|
|
|
static {
|
|
|
- // Maven's Relocate is clever and changes strings, too. So we have to use this little "trick" ... :D
|
|
|
- final String defaultPackage = new String(new byte[] { 'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's' });
|
|
|
- final String examplePackage = new String(new byte[] { 'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e' });
|
|
|
- // We want to make sure nobody just copy & pastes the example and use the wrong package names
|
|
|
- if (Metrics.class.getPackage().getName().equals(defaultPackage) || Metrics.class.getPackage().getName().equals(examplePackage)) {
|
|
|
- throw new IllegalStateException("bStats Metrics class has not been relocated correctly!");
|
|
|
+ // You can use the property to disable the check in your test environment
|
|
|
+ if (System.getProperty("bstats.relocatecheck") == null || !System.getProperty("bstats.relocatecheck").equals("false")) {
|
|
|
+ // Maven's Relocate is clever and changes strings, too. So we have to use this little "trick" ... :D
|
|
|
+ final String defaultPackage = new String(
|
|
|
+ new byte[]{'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's', '.', 'b', 'u', 'k', 'k', 'i', 't'});
|
|
|
+ final String examplePackage = new String(new byte[]{'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e'});
|
|
|
+ // We want to make sure nobody just copy & pastes the example and use the wrong package names
|
|
|
+ if (Metrics.class.getPackage().getName().equals(defaultPackage) || Metrics.class.getPackage().getName().equals(examplePackage)) {
|
|
|
+ throw new IllegalStateException("bStats Metrics class has not been relocated correctly!");
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -194,7 +202,17 @@ public class Metrics {
|
|
|
*/
|
|
|
private JSONObject getServerData() {
|
|
|
// Minecraft specific data
|
|
|
- int playerAmount = Bukkit.getOnlinePlayers().size();
|
|
|
+ int playerAmount;
|
|
|
+ try {
|
|
|
+ // Around MC 1.8 the return type was changed to a collection from an array,
|
|
|
+ // This fixes java.lang.NoSuchMethodError: org.bukkit.Bukkit.getOnlinePlayers()Ljava/util/Collection;
|
|
|
+ Method onlinePlayersMethod = Class.forName("org.bukkit.Server").getMethod("getOnlinePlayers");
|
|
|
+ playerAmount = onlinePlayersMethod.getReturnType().equals(Collection.class)
|
|
|
+ ? ((Collection<?>) onlinePlayersMethod.invoke(Bukkit.getServer())).size()
|
|
|
+ : ((Player[]) onlinePlayersMethod.invoke(Bukkit.getServer())).length;
|
|
|
+ } catch (Exception e) {
|
|
|
+ playerAmount = Bukkit.getOnlinePlayers().size(); // Just use the new method if the Reflection failed
|
|
|
+ }
|
|
|
int onlineMode = Bukkit.getOnlineMode() ? 1 : 0;
|
|
|
String bukkitVersion = org.bukkit.Bukkit.getVersion();
|
|
|
bukkitVersion = bukkitVersion.substring(bukkitVersion.indexOf("MC: ") + 4, bukkitVersion.length() - 1);
|
|
|
@@ -234,13 +252,13 @@ public class Metrics {
|
|
|
for (Class<?> service : Bukkit.getServicesManager().getKnownServices()) {
|
|
|
try {
|
|
|
service.getField("B_STATS_VERSION"); // Our identifier :)
|
|
|
- } catch (NoSuchFieldException ignored) {
|
|
|
- continue; // Continue "searching"
|
|
|
- }
|
|
|
- // Found one!
|
|
|
- try {
|
|
|
- pluginData.add(service.getMethod("getPluginData").invoke(Bukkit.getServicesManager().load(service)));
|
|
|
- } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { }
|
|
|
+
|
|
|
+ for (RegisteredServiceProvider<?> provider : Bukkit.getServicesManager().getRegistrations(service)) {
|
|
|
+ try {
|
|
|
+ pluginData.add(provider.getService().getMethod("getPluginData").invoke(provider.getProvider()));
|
|
|
+ } catch (NullPointerException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { }
|
|
|
+ }
|
|
|
+ } catch (NoSuchFieldException ignored) { }
|
|
|
}
|
|
|
|
|
|
data.put("plugins", pluginData);
|
|
|
@@ -323,21 +341,21 @@ public class Metrics {
|
|
|
public static abstract class CustomChart {
|
|
|
|
|
|
// The id of the chart
|
|
|
- protected final String chartId;
|
|
|
+ final String chartId;
|
|
|
|
|
|
/**
|
|
|
* Class constructor.
|
|
|
*
|
|
|
* @param chartId The id of the chart.
|
|
|
*/
|
|
|
- public CustomChart(String chartId) {
|
|
|
+ CustomChart(String chartId) {
|
|
|
if (chartId == null || chartId.isEmpty()) {
|
|
|
throw new IllegalArgumentException("ChartId cannot be null or empty!");
|
|
|
}
|
|
|
this.chartId = chartId;
|
|
|
}
|
|
|
|
|
|
- protected JSONObject getRequestJsonObject() {
|
|
|
+ private JSONObject getRequestJsonObject() {
|
|
|
JSONObject chart = new JSONObject();
|
|
|
chart.put("chartId", chartId);
|
|
|
try {
|
|
|
@@ -356,35 +374,32 @@ public class Metrics {
|
|
|
return chart;
|
|
|
}
|
|
|
|
|
|
- protected abstract JSONObject getChartData();
|
|
|
+ protected abstract JSONObject getChartData() throws Exception;
|
|
|
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* Represents a custom simple pie.
|
|
|
*/
|
|
|
- public static abstract class SimplePie extends CustomChart {
|
|
|
+ public static class SimplePie extends CustomChart {
|
|
|
+
|
|
|
+ private final Callable<String> callable;
|
|
|
|
|
|
/**
|
|
|
* Class constructor.
|
|
|
*
|
|
|
* @param chartId The id of the chart.
|
|
|
+ * @param callable The callable which is used to request the chart data.
|
|
|
*/
|
|
|
- public SimplePie(String chartId) {
|
|
|
+ public SimplePie(String chartId, Callable<String> callable) {
|
|
|
super(chartId);
|
|
|
+ this.callable = callable;
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * Gets the value of the pie.
|
|
|
- *
|
|
|
- * @return The value of the pie.
|
|
|
- */
|
|
|
- public abstract String getValue();
|
|
|
-
|
|
|
@Override
|
|
|
- protected JSONObject getChartData() {
|
|
|
+ protected JSONObject getChartData() throws Exception {
|
|
|
JSONObject data = new JSONObject();
|
|
|
- String value = getValue();
|
|
|
+ String value = callable.call();
|
|
|
if (value == null || value.isEmpty()) {
|
|
|
// Null = skip the chart
|
|
|
return null;
|
|
|
@@ -397,31 +412,26 @@ public class Metrics {
|
|
|
/**
|
|
|
* Represents a custom advanced pie.
|
|
|
*/
|
|
|
- public static abstract class AdvancedPie extends CustomChart {
|
|
|
+ public static class AdvancedPie extends CustomChart {
|
|
|
+
|
|
|
+ private final Callable<Map<String, Integer>> callable;
|
|
|
|
|
|
/**
|
|
|
* Class constructor.
|
|
|
*
|
|
|
* @param chartId The id of the chart.
|
|
|
+ * @param callable The callable which is used to request the chart data.
|
|
|
*/
|
|
|
- public AdvancedPie(String chartId) {
|
|
|
+ public AdvancedPie(String chartId, Callable<Map<String, Integer>> callable) {
|
|
|
super(chartId);
|
|
|
+ this.callable = callable;
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * Gets the values of the pie.
|
|
|
- *
|
|
|
- * @param valueMap Just an empty map. The only reason it exists is to make your life easier.
|
|
|
- * You don't have to create a map yourself!
|
|
|
- * @return The values of the pie.
|
|
|
- */
|
|
|
- public abstract HashMap<String, Integer> getValues(HashMap<String, Integer> valueMap);
|
|
|
-
|
|
|
@Override
|
|
|
- protected JSONObject getChartData() {
|
|
|
+ protected JSONObject getChartData() throws Exception {
|
|
|
JSONObject data = new JSONObject();
|
|
|
JSONObject values = new JSONObject();
|
|
|
- HashMap<String, Integer> map = getValues(new HashMap<String, Integer>());
|
|
|
+ Map<String, Integer> map = callable.call();
|
|
|
if (map == null || map.isEmpty()) {
|
|
|
// Null = skip the chart
|
|
|
return null;
|
|
|
@@ -444,176 +454,120 @@ public class Metrics {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * Represents a custom single line chart.
|
|
|
+ * Represents a custom drilldown pie.
|
|
|
*/
|
|
|
- public static abstract class SingleLineChart extends CustomChart {
|
|
|
+ public static class DrilldownPie extends CustomChart {
|
|
|
|
|
|
- /**
|
|
|
- * Class constructor.
|
|
|
- *
|
|
|
- * @param chartId The id of the chart.
|
|
|
- */
|
|
|
- public SingleLineChart(String chartId) {
|
|
|
- super(chartId);
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * Gets the value of the chart.
|
|
|
- *
|
|
|
- * @return The value of the chart.
|
|
|
- */
|
|
|
- public abstract int getValue();
|
|
|
-
|
|
|
- @Override
|
|
|
- protected JSONObject getChartData() {
|
|
|
- JSONObject data = new JSONObject();
|
|
|
- int value = getValue();
|
|
|
- if (value == 0) {
|
|
|
- // Null = skip the chart
|
|
|
- return null;
|
|
|
- }
|
|
|
- data.put("value", value);
|
|
|
- return data;
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * Represents a custom multi line chart.
|
|
|
- */
|
|
|
- public static abstract class MultiLineChart extends CustomChart {
|
|
|
+ private final Callable<Map<String, Map<String, Integer>>> callable;
|
|
|
|
|
|
/**
|
|
|
* Class constructor.
|
|
|
*
|
|
|
* @param chartId The id of the chart.
|
|
|
+ * @param callable The callable which is used to request the chart data.
|
|
|
*/
|
|
|
- public MultiLineChart(String chartId) {
|
|
|
+ public DrilldownPie(String chartId, Callable<Map<String, Map<String, Integer>>> callable) {
|
|
|
super(chartId);
|
|
|
+ this.callable = callable;
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * Gets the values of the chart.
|
|
|
- *
|
|
|
- * @param valueMap Just an empty map. The only reason it exists is to make your life easier.
|
|
|
- * You don't have to create a map yourself!
|
|
|
- * @return The values of the chart.
|
|
|
- */
|
|
|
- public abstract HashMap<String, Integer> getValues(HashMap<String, Integer> valueMap);
|
|
|
-
|
|
|
@Override
|
|
|
- protected JSONObject getChartData() {
|
|
|
+ public JSONObject getChartData() throws Exception {
|
|
|
JSONObject data = new JSONObject();
|
|
|
JSONObject values = new JSONObject();
|
|
|
- HashMap<String, Integer> map = getValues(new HashMap<String, Integer>());
|
|
|
+ Map<String, Map<String, Integer>> map = callable.call();
|
|
|
if (map == null || map.isEmpty()) {
|
|
|
// Null = skip the chart
|
|
|
return null;
|
|
|
}
|
|
|
- boolean allSkipped = true;
|
|
|
- for (Map.Entry<String, Integer> entry : map.entrySet()) {
|
|
|
- if (entry.getValue() == 0) {
|
|
|
- continue; // Skip this invalid
|
|
|
+ boolean reallyAllSkipped = true;
|
|
|
+ for (Map.Entry<String, Map<String, Integer>> entryValues : map.entrySet()) {
|
|
|
+ JSONObject value = new JSONObject();
|
|
|
+ boolean allSkipped = true;
|
|
|
+ for (Map.Entry<String, Integer> valueEntry : map.get(entryValues.getKey()).entrySet()) {
|
|
|
+ value.put(valueEntry.getKey(), valueEntry.getValue());
|
|
|
+ allSkipped = false;
|
|
|
+ }
|
|
|
+ if (!allSkipped) {
|
|
|
+ reallyAllSkipped = false;
|
|
|
+ values.put(entryValues.getKey(), value);
|
|
|
}
|
|
|
- allSkipped = false;
|
|
|
- values.put(entry.getKey(), entry.getValue());
|
|
|
}
|
|
|
- if (allSkipped) {
|
|
|
+ if (reallyAllSkipped) {
|
|
|
// Null = skip the chart
|
|
|
return null;
|
|
|
}
|
|
|
data.put("values", values);
|
|
|
return data;
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * Represents a custom simple bar chart.
|
|
|
+ * Represents a custom single line chart.
|
|
|
*/
|
|
|
- public static abstract class SimpleBarChart extends CustomChart {
|
|
|
+ public static class SingleLineChart extends CustomChart {
|
|
|
+
|
|
|
+ private final Callable<Integer> callable;
|
|
|
|
|
|
/**
|
|
|
* Class constructor.
|
|
|
*
|
|
|
* @param chartId The id of the chart.
|
|
|
+ * @param callable The callable which is used to request the chart data.
|
|
|
*/
|
|
|
- public SimpleBarChart(String chartId) {
|
|
|
+ public SingleLineChart(String chartId, Callable<Integer> callable) {
|
|
|
super(chartId);
|
|
|
+ this.callable = callable;
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * Gets the value of the chart.
|
|
|
- *
|
|
|
- * @param valueMap Just an empty map. The only reason it exists is to make your life easier.
|
|
|
- * You don't have to create a map yourself!
|
|
|
- * @return The value of the chart.
|
|
|
- */
|
|
|
- public abstract HashMap<String, Integer> getValues(HashMap<String, Integer> valueMap);
|
|
|
-
|
|
|
@Override
|
|
|
- protected JSONObject getChartData() {
|
|
|
+ protected JSONObject getChartData() throws Exception {
|
|
|
JSONObject data = new JSONObject();
|
|
|
- JSONObject values = new JSONObject();
|
|
|
- HashMap<String, Integer> map = getValues(new HashMap<String, Integer>());
|
|
|
- if (map == null || map.isEmpty()) {
|
|
|
+ int value = callable.call();
|
|
|
+ if (value == 0) {
|
|
|
// Null = skip the chart
|
|
|
return null;
|
|
|
}
|
|
|
- for (Map.Entry<String, Integer> entry : map.entrySet()) {
|
|
|
- JSONArray categoryValues = new JSONArray();
|
|
|
- categoryValues.add(entry.getValue());
|
|
|
- values.put(entry.getKey(), categoryValues);
|
|
|
- }
|
|
|
- data.put("values", values);
|
|
|
+ data.put("value", value);
|
|
|
return data;
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * Represents a custom advanced bar chart.
|
|
|
+ * Represents a custom multi line chart.
|
|
|
*/
|
|
|
- public static abstract class AdvancedBarChart extends CustomChart {
|
|
|
+ public static class MultiLineChart extends CustomChart {
|
|
|
+
|
|
|
+ private final Callable<Map<String, Integer>> callable;
|
|
|
|
|
|
/**
|
|
|
* Class constructor.
|
|
|
*
|
|
|
* @param chartId The id of the chart.
|
|
|
+ * @param callable The callable which is used to request the chart data.
|
|
|
*/
|
|
|
- public AdvancedBarChart(String chartId) {
|
|
|
+ public MultiLineChart(String chartId, Callable<Map<String, Integer>> callable) {
|
|
|
super(chartId);
|
|
|
+ this.callable = callable;
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * Gets the value of the chart.
|
|
|
- *
|
|
|
- * @param valueMap Just an empty map. The only reason it exists is to make your life easier.
|
|
|
- * You don't have to create a map yourself!
|
|
|
- * @return The value of the chart.
|
|
|
- */
|
|
|
- public abstract HashMap<String, int[]> getValues(HashMap<String, int[]> valueMap);
|
|
|
-
|
|
|
@Override
|
|
|
- protected JSONObject getChartData() {
|
|
|
+ protected JSONObject getChartData() throws Exception {
|
|
|
JSONObject data = new JSONObject();
|
|
|
JSONObject values = new JSONObject();
|
|
|
- HashMap<String, int[]> map = getValues(new HashMap<String, int[]>());
|
|
|
+ Map<String, Integer> map = callable.call();
|
|
|
if (map == null || map.isEmpty()) {
|
|
|
// Null = skip the chart
|
|
|
return null;
|
|
|
}
|
|
|
boolean allSkipped = true;
|
|
|
- for (Map.Entry<String, int[]> entry : map.entrySet()) {
|
|
|
- if (entry.getValue().length == 0) {
|
|
|
+ for (Map.Entry<String, Integer> entry : map.entrySet()) {
|
|
|
+ if (entry.getValue() == 0) {
|
|
|
continue; // Skip this invalid
|
|
|
}
|
|
|
allSkipped = false;
|
|
|
- JSONArray categoryValues = new JSONArray();
|
|
|
- for (int categoryValue : entry.getValue()) {
|
|
|
- categoryValues.add(categoryValue);
|
|
|
- }
|
|
|
- values.put(entry.getKey(), categoryValues);
|
|
|
+ values.put(entry.getKey(), entry.getValue());
|
|
|
}
|
|
|
if (allSkipped) {
|
|
|
// Null = skip the chart
|
|
|
@@ -626,80 +580,81 @@ public class Metrics {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * Represents a custom simple map chart.
|
|
|
+ * Represents a custom simple bar chart.
|
|
|
*/
|
|
|
- public static abstract class SimpleMapChart extends CustomChart {
|
|
|
+ public static class SimpleBarChart extends CustomChart {
|
|
|
+
|
|
|
+ private final Callable<Map<String, Integer>> callable;
|
|
|
|
|
|
/**
|
|
|
* Class constructor.
|
|
|
*
|
|
|
* @param chartId The id of the chart.
|
|
|
+ * @param callable The callable which is used to request the chart data.
|
|
|
*/
|
|
|
- public SimpleMapChart(String chartId) {
|
|
|
+ public SimpleBarChart(String chartId, Callable<Map<String, Integer>> callable) {
|
|
|
super(chartId);
|
|
|
+ this.callable = callable;
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * Gets the value of the chart.
|
|
|
- *
|
|
|
- * @return The value of the chart.
|
|
|
- */
|
|
|
- public abstract Country getValue();
|
|
|
-
|
|
|
@Override
|
|
|
- protected JSONObject getChartData() {
|
|
|
+ protected JSONObject getChartData() throws Exception {
|
|
|
JSONObject data = new JSONObject();
|
|
|
- Country value = getValue();
|
|
|
-
|
|
|
- if (value == null) {
|
|
|
+ JSONObject values = new JSONObject();
|
|
|
+ Map<String, Integer> map = callable.call();
|
|
|
+ if (map == null || map.isEmpty()) {
|
|
|
// Null = skip the chart
|
|
|
return null;
|
|
|
}
|
|
|
- data.put("value", value.getCountryIsoTag());
|
|
|
+ for (Map.Entry<String, Integer> entry : map.entrySet()) {
|
|
|
+ JSONArray categoryValues = new JSONArray();
|
|
|
+ categoryValues.add(entry.getValue());
|
|
|
+ values.put(entry.getKey(), categoryValues);
|
|
|
+ }
|
|
|
+ data.put("values", values);
|
|
|
return data;
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * Represents a custom advanced map chart.
|
|
|
+ * Represents a custom advanced bar chart.
|
|
|
*/
|
|
|
- public static abstract class AdvancedMapChart extends CustomChart {
|
|
|
+ public static class AdvancedBarChart extends CustomChart {
|
|
|
+
|
|
|
+ private final Callable<Map<String, int[]>> callable;
|
|
|
|
|
|
/**
|
|
|
* Class constructor.
|
|
|
*
|
|
|
* @param chartId The id of the chart.
|
|
|
+ * @param callable The callable which is used to request the chart data.
|
|
|
*/
|
|
|
- public AdvancedMapChart(String chartId) {
|
|
|
+ public AdvancedBarChart(String chartId, Callable<Map<String, int[]>> callable) {
|
|
|
super(chartId);
|
|
|
+ this.callable = callable;
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * Gets the value of the chart.
|
|
|
- *
|
|
|
- * @param valueMap Just an empty map. The only reason it exists is to make your life easier.
|
|
|
- * You don't have to create a map yourself!
|
|
|
- * @return The value of the chart.
|
|
|
- */
|
|
|
- public abstract HashMap<Country, Integer> getValues(HashMap<Country, Integer> valueMap);
|
|
|
-
|
|
|
@Override
|
|
|
- protected JSONObject getChartData() {
|
|
|
+ protected JSONObject getChartData() throws Exception {
|
|
|
JSONObject data = new JSONObject();
|
|
|
JSONObject values = new JSONObject();
|
|
|
- HashMap<Country, Integer> map = getValues(new HashMap<Country, Integer>());
|
|
|
+ Map<String, int[]> map = callable.call();
|
|
|
if (map == null || map.isEmpty()) {
|
|
|
// Null = skip the chart
|
|
|
return null;
|
|
|
}
|
|
|
boolean allSkipped = true;
|
|
|
- for (Map.Entry<Country, Integer> entry : map.entrySet()) {
|
|
|
- if (entry.getValue() == 0) {
|
|
|
+ for (Map.Entry<String, int[]> entry : map.entrySet()) {
|
|
|
+ if (entry.getValue().length == 0) {
|
|
|
continue; // Skip this invalid
|
|
|
}
|
|
|
allSkipped = false;
|
|
|
- values.put(entry.getKey().getCountryIsoTag(), entry.getValue());
|
|
|
+ JSONArray categoryValues = new JSONArray();
|
|
|
+ for (int categoryValue : entry.getValue()) {
|
|
|
+ categoryValues.add(categoryValue);
|
|
|
+ }
|
|
|
+ values.put(entry.getKey(), categoryValues);
|
|
|
}
|
|
|
if (allSkipped) {
|
|
|
// Null = skip the chart
|
|
|
@@ -710,320 +665,4 @@ public class Metrics {
|
|
|
}
|
|
|
|
|
|
}
|
|
|
-
|
|
|
- /**
|
|
|
- * A enum which is used for custom maps.
|
|
|
- */
|
|
|
- public enum Country {
|
|
|
-
|
|
|
- /**
|
|
|
- * bStats will use the country of the server.
|
|
|
- */
|
|
|
- AUTO_DETECT("AUTO", "Auto Detected"),
|
|
|
-
|
|
|
- ANDORRA("AD", "Andorra"),
|
|
|
- UNITED_ARAB_EMIRATES("AE", "United Arab Emirates"),
|
|
|
- AFGHANISTAN("AF", "Afghanistan"),
|
|
|
- ANTIGUA_AND_BARBUDA("AG", "Antigua and Barbuda"),
|
|
|
- ANGUILLA("AI", "Anguilla"),
|
|
|
- ALBANIA("AL", "Albania"),
|
|
|
- ARMENIA("AM", "Armenia"),
|
|
|
- NETHERLANDS_ANTILLES("AN", "Netherlands Antilles"),
|
|
|
- ANGOLA("AO", "Angola"),
|
|
|
- ANTARCTICA("AQ", "Antarctica"),
|
|
|
- ARGENTINA("AR", "Argentina"),
|
|
|
- AMERICAN_SAMOA("AS", "American Samoa"),
|
|
|
- AUSTRIA("AT", "Austria"),
|
|
|
- AUSTRALIA("AU", "Australia"),
|
|
|
- ARUBA("AW", "Aruba"),
|
|
|
- ALAND_ISLANDS("AX", "Åland Islands"),
|
|
|
- AZERBAIJAN("AZ", "Azerbaijan"),
|
|
|
- BOSNIA_AND_HERZEGOVINA("BA", "Bosnia and Herzegovina"),
|
|
|
- BARBADOS("BB", "Barbados"),
|
|
|
- BANGLADESH("BD", "Bangladesh"),
|
|
|
- BELGIUM("BE", "Belgium"),
|
|
|
- BURKINA_FASO("BF", "Burkina Faso"),
|
|
|
- BULGARIA("BG", "Bulgaria"),
|
|
|
- BAHRAIN("BH", "Bahrain"),
|
|
|
- BURUNDI("BI", "Burundi"),
|
|
|
- BENIN("BJ", "Benin"),
|
|
|
- SAINT_BARTHELEMY("BL", "Saint Barthélemy"),
|
|
|
- BERMUDA("BM", "Bermuda"),
|
|
|
- BRUNEI("BN", "Brunei"),
|
|
|
- BOLIVIA("BO", "Bolivia"),
|
|
|
- BONAIRE_SINT_EUSTATIUS_AND_SABA("BQ", "Bonaire, Sint Eustatius and Saba"),
|
|
|
- BRAZIL("BR", "Brazil"),
|
|
|
- BAHAMAS("BS", "Bahamas"),
|
|
|
- BHUTAN("BT", "Bhutan"),
|
|
|
- BOUVET_ISLAND("BV", "Bouvet Island"),
|
|
|
- BOTSWANA("BW", "Botswana"),
|
|
|
- BELARUS("BY", "Belarus"),
|
|
|
- BELIZE("BZ", "Belize"),
|
|
|
- CANADA("CA", "Canada"),
|
|
|
- COCOS_ISLANDS("CC", "Cocos Islands"),
|
|
|
- THE_DEMOCRATIC_REPUBLIC_OF_CONGO("CD", "The Democratic Republic Of Congo"),
|
|
|
- CENTRAL_AFRICAN_REPUBLIC("CF", "Central African Republic"),
|
|
|
- CONGO("CG", "Congo"),
|
|
|
- SWITZERLAND("CH", "Switzerland"),
|
|
|
- COTE_D_IVOIRE("CI", "Côte d'Ivoire"),
|
|
|
- COOK_ISLANDS("CK", "Cook Islands"),
|
|
|
- CHILE("CL", "Chile"),
|
|
|
- CAMEROON("CM", "Cameroon"),
|
|
|
- CHINA("CN", "China"),
|
|
|
- COLOMBIA("CO", "Colombia"),
|
|
|
- COSTA_RICA("CR", "Costa Rica"),
|
|
|
- CUBA("CU", "Cuba"),
|
|
|
- CAPE_VERDE("CV", "Cape Verde"),
|
|
|
- CURACAO("CW", "Curaçao"),
|
|
|
- CHRISTMAS_ISLAND("CX", "Christmas Island"),
|
|
|
- CYPRUS("CY", "Cyprus"),
|
|
|
- CZECH_REPUBLIC("CZ", "Czech Republic"),
|
|
|
- GERMANY("DE", "Germany"),
|
|
|
- DJIBOUTI("DJ", "Djibouti"),
|
|
|
- DENMARK("DK", "Denmark"),
|
|
|
- DOMINICA("DM", "Dominica"),
|
|
|
- DOMINICAN_REPUBLIC("DO", "Dominican Republic"),
|
|
|
- ALGERIA("DZ", "Algeria"),
|
|
|
- ECUADOR("EC", "Ecuador"),
|
|
|
- ESTONIA("EE", "Estonia"),
|
|
|
- EGYPT("EG", "Egypt"),
|
|
|
- WESTERN_SAHARA("EH", "Western Sahara"),
|
|
|
- ERITREA("ER", "Eritrea"),
|
|
|
- SPAIN("ES", "Spain"),
|
|
|
- ETHIOPIA("ET", "Ethiopia"),
|
|
|
- FINLAND("FI", "Finland"),
|
|
|
- FIJI("FJ", "Fiji"),
|
|
|
- FALKLAND_ISLANDS("FK", "Falkland Islands"),
|
|
|
- MICRONESIA("FM", "Micronesia"),
|
|
|
- FAROE_ISLANDS("FO", "Faroe Islands"),
|
|
|
- FRANCE("FR", "France"),
|
|
|
- GABON("GA", "Gabon"),
|
|
|
- UNITED_KINGDOM("GB", "United Kingdom"),
|
|
|
- GRENADA("GD", "Grenada"),
|
|
|
- GEORGIA("GE", "Georgia"),
|
|
|
- FRENCH_GUIANA("GF", "French Guiana"),
|
|
|
- GUERNSEY("GG", "Guernsey"),
|
|
|
- GHANA("GH", "Ghana"),
|
|
|
- GIBRALTAR("GI", "Gibraltar"),
|
|
|
- GREENLAND("GL", "Greenland"),
|
|
|
- GAMBIA("GM", "Gambia"),
|
|
|
- GUINEA("GN", "Guinea"),
|
|
|
- GUADELOUPE("GP", "Guadeloupe"),
|
|
|
- EQUATORIAL_GUINEA("GQ", "Equatorial Guinea"),
|
|
|
- GREECE("GR", "Greece"),
|
|
|
- SOUTH_GEORGIA_AND_THE_SOUTH_SANDWICH_ISLANDS("GS", "South Georgia And The South Sandwich Islands"),
|
|
|
- GUATEMALA("GT", "Guatemala"),
|
|
|
- GUAM("GU", "Guam"),
|
|
|
- GUINEA_BISSAU("GW", "Guinea-Bissau"),
|
|
|
- GUYANA("GY", "Guyana"),
|
|
|
- HONG_KONG("HK", "Hong Kong"),
|
|
|
- HEARD_ISLAND_AND_MCDONALD_ISLANDS("HM", "Heard Island And McDonald Islands"),
|
|
|
- HONDURAS("HN", "Honduras"),
|
|
|
- CROATIA("HR", "Croatia"),
|
|
|
- HAITI("HT", "Haiti"),
|
|
|
- HUNGARY("HU", "Hungary"),
|
|
|
- INDONESIA("ID", "Indonesia"),
|
|
|
- IRELAND("IE", "Ireland"),
|
|
|
- ISRAEL("IL", "Israel"),
|
|
|
- ISLE_OF_MAN("IM", "Isle Of Man"),
|
|
|
- INDIA("IN", "India"),
|
|
|
- BRITISH_INDIAN_OCEAN_TERRITORY("IO", "British Indian Ocean Territory"),
|
|
|
- IRAQ("IQ", "Iraq"),
|
|
|
- IRAN("IR", "Iran"),
|
|
|
- ICELAND("IS", "Iceland"),
|
|
|
- ITALY("IT", "Italy"),
|
|
|
- JERSEY("JE", "Jersey"),
|
|
|
- JAMAICA("JM", "Jamaica"),
|
|
|
- JORDAN("JO", "Jordan"),
|
|
|
- JAPAN("JP", "Japan"),
|
|
|
- KENYA("KE", "Kenya"),
|
|
|
- KYRGYZSTAN("KG", "Kyrgyzstan"),
|
|
|
- CAMBODIA("KH", "Cambodia"),
|
|
|
- KIRIBATI("KI", "Kiribati"),
|
|
|
- COMOROS("KM", "Comoros"),
|
|
|
- SAINT_KITTS_AND_NEVIS("KN", "Saint Kitts And Nevis"),
|
|
|
- NORTH_KOREA("KP", "North Korea"),
|
|
|
- SOUTH_KOREA("KR", "South Korea"),
|
|
|
- KUWAIT("KW", "Kuwait"),
|
|
|
- CAYMAN_ISLANDS("KY", "Cayman Islands"),
|
|
|
- KAZAKHSTAN("KZ", "Kazakhstan"),
|
|
|
- LAOS("LA", "Laos"),
|
|
|
- LEBANON("LB", "Lebanon"),
|
|
|
- SAINT_LUCIA("LC", "Saint Lucia"),
|
|
|
- LIECHTENSTEIN("LI", "Liechtenstein"),
|
|
|
- SRI_LANKA("LK", "Sri Lanka"),
|
|
|
- LIBERIA("LR", "Liberia"),
|
|
|
- LESOTHO("LS", "Lesotho"),
|
|
|
- LITHUANIA("LT", "Lithuania"),
|
|
|
- LUXEMBOURG("LU", "Luxembourg"),
|
|
|
- LATVIA("LV", "Latvia"),
|
|
|
- LIBYA("LY", "Libya"),
|
|
|
- MOROCCO("MA", "Morocco"),
|
|
|
- MONACO("MC", "Monaco"),
|
|
|
- MOLDOVA("MD", "Moldova"),
|
|
|
- MONTENEGRO("ME", "Montenegro"),
|
|
|
- SAINT_MARTIN("MF", "Saint Martin"),
|
|
|
- MADAGASCAR("MG", "Madagascar"),
|
|
|
- MARSHALL_ISLANDS("MH", "Marshall Islands"),
|
|
|
- MACEDONIA("MK", "Macedonia"),
|
|
|
- MALI("ML", "Mali"),
|
|
|
- MYANMAR("MM", "Myanmar"),
|
|
|
- MONGOLIA("MN", "Mongolia"),
|
|
|
- MACAO("MO", "Macao"),
|
|
|
- NORTHERN_MARIANA_ISLANDS("MP", "Northern Mariana Islands"),
|
|
|
- MARTINIQUE("MQ", "Martinique"),
|
|
|
- MAURITANIA("MR", "Mauritania"),
|
|
|
- MONTSERRAT("MS", "Montserrat"),
|
|
|
- MALTA("MT", "Malta"),
|
|
|
- MAURITIUS("MU", "Mauritius"),
|
|
|
- MALDIVES("MV", "Maldives"),
|
|
|
- MALAWI("MW", "Malawi"),
|
|
|
- MEXICO("MX", "Mexico"),
|
|
|
- MALAYSIA("MY", "Malaysia"),
|
|
|
- MOZAMBIQUE("MZ", "Mozambique"),
|
|
|
- NAMIBIA("NA", "Namibia"),
|
|
|
- NEW_CALEDONIA("NC", "New Caledonia"),
|
|
|
- NIGER("NE", "Niger"),
|
|
|
- NORFOLK_ISLAND("NF", "Norfolk Island"),
|
|
|
- NIGERIA("NG", "Nigeria"),
|
|
|
- NICARAGUA("NI", "Nicaragua"),
|
|
|
- NETHERLANDS("NL", "Netherlands"),
|
|
|
- NORWAY("NO", "Norway"),
|
|
|
- NEPAL("NP", "Nepal"),
|
|
|
- NAURU("NR", "Nauru"),
|
|
|
- NIUE("NU", "Niue"),
|
|
|
- NEW_ZEALAND("NZ", "New Zealand"),
|
|
|
- OMAN("OM", "Oman"),
|
|
|
- PANAMA("PA", "Panama"),
|
|
|
- PERU("PE", "Peru"),
|
|
|
- FRENCH_POLYNESIA("PF", "French Polynesia"),
|
|
|
- PAPUA_NEW_GUINEA("PG", "Papua New Guinea"),
|
|
|
- PHILIPPINES("PH", "Philippines"),
|
|
|
- PAKISTAN("PK", "Pakistan"),
|
|
|
- POLAND("PL", "Poland"),
|
|
|
- SAINT_PIERRE_AND_MIQUELON("PM", "Saint Pierre And Miquelon"),
|
|
|
- PITCAIRN("PN", "Pitcairn"),
|
|
|
- PUERTO_RICO("PR", "Puerto Rico"),
|
|
|
- PALESTINE("PS", "Palestine"),
|
|
|
- PORTUGAL("PT", "Portugal"),
|
|
|
- PALAU("PW", "Palau"),
|
|
|
- PARAGUAY("PY", "Paraguay"),
|
|
|
- QATAR("QA", "Qatar"),
|
|
|
- REUNION("RE", "Reunion"),
|
|
|
- ROMANIA("RO", "Romania"),
|
|
|
- SERBIA("RS", "Serbia"),
|
|
|
- RUSSIA("RU", "Russia"),
|
|
|
- RWANDA("RW", "Rwanda"),
|
|
|
- SAUDI_ARABIA("SA", "Saudi Arabia"),
|
|
|
- SOLOMON_ISLANDS("SB", "Solomon Islands"),
|
|
|
- SEYCHELLES("SC", "Seychelles"),
|
|
|
- SUDAN("SD", "Sudan"),
|
|
|
- SWEDEN("SE", "Sweden"),
|
|
|
- SINGAPORE("SG", "Singapore"),
|
|
|
- SAINT_HELENA("SH", "Saint Helena"),
|
|
|
- SLOVENIA("SI", "Slovenia"),
|
|
|
- SVALBARD_AND_JAN_MAYEN("SJ", "Svalbard And Jan Mayen"),
|
|
|
- SLOVAKIA("SK", "Slovakia"),
|
|
|
- SIERRA_LEONE("SL", "Sierra Leone"),
|
|
|
- SAN_MARINO("SM", "San Marino"),
|
|
|
- SENEGAL("SN", "Senegal"),
|
|
|
- SOMALIA("SO", "Somalia"),
|
|
|
- SURINAME("SR", "Suriname"),
|
|
|
- SOUTH_SUDAN("SS", "South Sudan"),
|
|
|
- SAO_TOME_AND_PRINCIPE("ST", "Sao Tome And Principe"),
|
|
|
- EL_SALVADOR("SV", "El Salvador"),
|
|
|
- SINT_MAARTEN_DUTCH_PART("SX", "Sint Maarten (Dutch part)"),
|
|
|
- SYRIA("SY", "Syria"),
|
|
|
- SWAZILAND("SZ", "Swaziland"),
|
|
|
- TURKS_AND_CAICOS_ISLANDS("TC", "Turks And Caicos Islands"),
|
|
|
- CHAD("TD", "Chad"),
|
|
|
- FRENCH_SOUTHERN_TERRITORIES("TF", "French Southern Territories"),
|
|
|
- TOGO("TG", "Togo"),
|
|
|
- THAILAND("TH", "Thailand"),
|
|
|
- TAJIKISTAN("TJ", "Tajikistan"),
|
|
|
- TOKELAU("TK", "Tokelau"),
|
|
|
- TIMOR_LESTE("TL", "Timor-Leste"),
|
|
|
- TURKMENISTAN("TM", "Turkmenistan"),
|
|
|
- TUNISIA("TN", "Tunisia"),
|
|
|
- TONGA("TO", "Tonga"),
|
|
|
- TURKEY("TR", "Turkey"),
|
|
|
- TRINIDAD_AND_TOBAGO("TT", "Trinidad and Tobago"),
|
|
|
- TUVALU("TV", "Tuvalu"),
|
|
|
- TAIWAN("TW", "Taiwan"),
|
|
|
- TANZANIA("TZ", "Tanzania"),
|
|
|
- UKRAINE("UA", "Ukraine"),
|
|
|
- UGANDA("UG", "Uganda"),
|
|
|
- UNITED_STATES_MINOR_OUTLYING_ISLANDS("UM", "United States Minor Outlying Islands"),
|
|
|
- UNITED_STATES("US", "United States"),
|
|
|
- URUGUAY("UY", "Uruguay"),
|
|
|
- UZBEKISTAN("UZ", "Uzbekistan"),
|
|
|
- VATICAN("VA", "Vatican"),
|
|
|
- SAINT_VINCENT_AND_THE_GRENADINES("VC", "Saint Vincent And The Grenadines"),
|
|
|
- VENEZUELA("VE", "Venezuela"),
|
|
|
- BRITISH_VIRGIN_ISLANDS("VG", "British Virgin Islands"),
|
|
|
- U_S__VIRGIN_ISLANDS("VI", "U.S. Virgin Islands"),
|
|
|
- VIETNAM("VN", "Vietnam"),
|
|
|
- VANUATU("VU", "Vanuatu"),
|
|
|
- WALLIS_AND_FUTUNA("WF", "Wallis And Futuna"),
|
|
|
- SAMOA("WS", "Samoa"),
|
|
|
- YEMEN("YE", "Yemen"),
|
|
|
- MAYOTTE("YT", "Mayotte"),
|
|
|
- SOUTH_AFRICA("ZA", "South Africa"),
|
|
|
- ZAMBIA("ZM", "Zambia"),
|
|
|
- ZIMBABWE("ZW", "Zimbabwe");
|
|
|
-
|
|
|
- private String isoTag;
|
|
|
- private String name;
|
|
|
-
|
|
|
- Country(String isoTag, String name) {
|
|
|
- this.isoTag = isoTag;
|
|
|
- this.name = name;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * Gets the name of the country.
|
|
|
- *
|
|
|
- * @return The name of the country.
|
|
|
- */
|
|
|
- public String getCountryName() {
|
|
|
- return name;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * Gets the iso tag of the country.
|
|
|
- *
|
|
|
- * @return The iso tag of the country.
|
|
|
- */
|
|
|
- public String getCountryIsoTag() {
|
|
|
- return isoTag;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * Gets a country by it's iso tag.
|
|
|
- *
|
|
|
- * @param isoTag The iso tag of the county.
|
|
|
- * @return The country with the given iso tag or <code>null</code> if unknown.
|
|
|
- */
|
|
|
- public static Country byIsoTag(String isoTag) {
|
|
|
- for (Country country : Country.values()) {
|
|
|
- if (country.getCountryIsoTag().equals(isoTag)) {
|
|
|
- return country;
|
|
|
- }
|
|
|
- }
|
|
|
- return null;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * Gets a country by a locale.
|
|
|
- *
|
|
|
- * @param locale The locale.
|
|
|
- * @return The country from the giben locale or <code>null</code> if unknown country or
|
|
|
- * if the locale does not contain a country.
|
|
|
- */
|
|
|
- public static Country byLocale(Locale locale) {
|
|
|
- return byIsoTag(locale.getCountry());
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
}
|
Linus