From e1fa610ad247cf86ace036b16fbbb5f0ef29a849 Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Thu, 7 Dec 2017 18:51:19 +0200 Subject: [PATCH] renamed GraphCreators --- .../djrapitops/plan/data/AnalysisData.java | 32 +++++++-------- .../info/parsing/InspectPageParser.java | 12 +++--- .../info/parsing/NetworkPageParser.java | 4 +- .../plan/utilities/html/HtmlStructure.java | 4 +- ...phCreator.java => ActivityStackGraph.java} | 8 ++-- ...dGraphCreator.java => PunchCardGraph.java} | 10 ++--- .../{WorldMapCreator.java => WorldMap.java} | 6 +-- .../{CPUGraphCreator.java => CPUGraph.java} | 8 ++-- .../{SeriesCreator.java => LineSeries.java} | 14 ++++--- ...hCreator.java => PlayerActivityGraph.java} | 8 ++-- .../{RamGraphCreator.java => RamGraph.java} | 8 ++-- ...eCreator.java => ServerPreferencePie.java} | 6 +-- .../{TPSGraphCreator.java => TPSGraph.java} | 15 ++----- ...dGraphCreator.java => WorldLoadGraph.java} | 12 +++--- ...tivityPieCreator.java => ActivityPie.java} | 8 ++-- .../{PieSeriesCreator.java => PieSeries.java} | 6 +-- .../{WorldPieCreator.java => WorldPie.java} | 16 ++++---- .../structure/ServerAccordionCreator.java | 4 +- .../structure/SessionTabStructureCreator.java | 4 +- .../html/tables/SessionsTableCreator.java | 4 +- .../djrapitops/plan/ui/graphs/GraphTest.java | 40 +++++++++---------- 21 files changed, 112 insertions(+), 117 deletions(-) rename Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/{ActivityStackGraphCreator.java => ActivityStackGraph.java} (93%) rename Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/{PunchCardGraphCreator.java => PunchCardGraph.java} (92%) rename Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/{WorldMapCreator.java => WorldMap.java} (97%) rename Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/{CPUGraphCreator.java => CPUGraph.java} (74%) rename Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/{SeriesCreator.java => LineSeries.java} (73%) rename Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/{PlayerActivityGraphCreator.java => PlayerActivityGraph.java} (73%) rename Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/{RamGraphCreator.java => RamGraph.java} (84%) rename Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/{ServerPreferencePieCreator.java => ServerPreferencePie.java} (81%) rename Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/{TPSGraphCreator.java => TPSGraph.java} (58%) rename Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/{WorldLoadGraphCreator.java => WorldLoadGraph.java} (80%) rename Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/{ActivityPieCreator.java => ActivityPie.java} (84%) rename Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/{PieSeriesCreator.java => PieSeries.java} (85%) rename Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/{WorldPieCreator.java => WorldPie.java} (92%) diff --git a/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java b/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java index f93b87b3d..e43ba532c 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java @@ -18,12 +18,12 @@ import main.java.com.djrapitops.plan.utilities.analysis.MathUtils; import main.java.com.djrapitops.plan.utilities.comparators.SessionStartComparator; import main.java.com.djrapitops.plan.utilities.html.Html; import main.java.com.djrapitops.plan.utilities.html.HtmlUtils; -import main.java.com.djrapitops.plan.utilities.html.graphs.ActivityStackGraphCreator; -import main.java.com.djrapitops.plan.utilities.html.graphs.PunchCardGraphCreator; -import main.java.com.djrapitops.plan.utilities.html.graphs.WorldMapCreator; +import main.java.com.djrapitops.plan.utilities.html.graphs.ActivityStackGraph; +import main.java.com.djrapitops.plan.utilities.html.graphs.PunchCardGraph; +import main.java.com.djrapitops.plan.utilities.html.graphs.WorldMap; import main.java.com.djrapitops.plan.utilities.html.graphs.line.*; -import main.java.com.djrapitops.plan.utilities.html.graphs.pie.ActivityPieCreator; -import main.java.com.djrapitops.plan.utilities.html.graphs.pie.WorldPieCreator; +import main.java.com.djrapitops.plan.utilities.html.graphs.pie.ActivityPie; +import main.java.com.djrapitops.plan.utilities.html.graphs.pie.WorldPie; import main.java.com.djrapitops.plan.utilities.html.structure.AnalysisPluginsTabContentCreator; import main.java.com.djrapitops.plan.utilities.html.structure.SessionTabStructureCreator; import main.java.com.djrapitops.plan.utilities.html.tables.CommandUseTableCreator; @@ -143,8 +143,8 @@ public class AnalysisData extends RawData { Map> activityNow = activityData.getOrDefault(now, new HashMap<>()); - String[] activityStackSeries = ActivityStackGraphCreator.createSeries(activityData); - String activityPieSeries = ActivityPieCreator.createSeriesData(activityNow); + String[] activityStackSeries = ActivityStackGraph.createSeries(activityData); + String activityPieSeries = ActivityPie.createSeries(activityNow); addValue("activityStackCategories", activityStackSeries[0]); addValue("activityStackSeries", activityStackSeries[1]); @@ -170,7 +170,7 @@ public class AnalysisData extends RawData { } private void geolocationsTab(List geoLocations) { - addValue("geoMapSeries", WorldMapCreator.createDataSeries(geoLocations)); + addValue("geoMapSeries", WorldMap.createSeries(geoLocations)); } private void onlineActivityNumbers(ServerProfile profile, Map> sessions, List players) { @@ -285,7 +285,7 @@ public class AnalysisData extends RawData { addValue("tableBodySessions", tables[0]); addValue("listRecentLogins", tables[1]); addValue("sessionAverage", FormatUtils.formatTimeAmount(MathUtils.averageLong(allSessions.stream().map(Session::getLength)))); - addValue("punchCardSeries", PunchCardGraphCreator.createDataSeries(sessionsMonth)); + addValue("punchCardSeries", PunchCardGraph.createSeries(sessionsMonth)); addValue("deaths", ServerProfile.getDeathCount(allSessions)); addValue("mobKillCount", ServerProfile.getMobKillCount(allSessions)); @@ -302,7 +302,7 @@ public class AnalysisData extends RawData { Html.TABLE_PLAYERS_FOOTER.parse(playersTableBody) : Html.TABLE_PLAYERS.parse(playersTableBody)); addValue("worldTotal", FormatUtils.formatTimeAmount(worldTimes.getTotal())); - String[] seriesData = WorldPieCreator.createSeriesData(worldTimes); + String[] seriesData = WorldPie.createSeries(worldTimes); addValue("worldSeries", seriesData[0]); addValue("gmSeries", seriesData[1]); addValue("lastPeakTime", lastPeak != -1 ? FormatUtils.formatTimeStampYear(lastPeak) : "No Data"); @@ -319,12 +319,12 @@ public class AnalysisData extends RawData { addValue("tpsSpikeWeek", value("tpsSpikeWeek")); addValue("tpsSpikeDay", value("tpsSpikeDay")); - addValue("playersOnlineSeries", PlayerActivityGraphCreator.buildSeriesDataString(tpsData)); - addValue("tpsSeries", TPSGraphCreator.buildSeriesDataString(tpsData)); - addValue("cpuSeries", CPUGraphCreator.buildSeriesDataString(tpsData)); - addValue("ramSeries", RamGraphCreator.buildSeriesDataString(tpsData)); - addValue("entitySeries", WorldLoadGraphCreator.buildSeriesDataStringEntities(tpsData)); - addValue("chunkSeries", WorldLoadGraphCreator.buildSeriesDataStringChunks(tpsData)); + addValue("playersOnlineSeries", PlayerActivityGraph.createSeries(tpsData)); + addValue("tpsSeries", TPSGraph.createSeries(tpsData)); + addValue("cpuSeries", CPUGraph.createSeries(tpsData)); + addValue("ramSeries", RamGraph.createSeries(tpsData)); + addValue("entitySeries", WorldLoadGraph.createSeriesEntities(tpsData)); + addValue("chunkSeries", WorldLoadGraph.createSeriesChunks(tpsData)); double averageCPUMonth = MathUtils.averageDouble(tpsDataMonth.stream().map(TPS::getCPUUsage).filter(i -> i != 0)); double averageCPUWeek = MathUtils.averageDouble(tpsDataWeek.stream().map(TPS::getCPUUsage).filter(i -> i != 0)); diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/InspectPageParser.java b/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/InspectPageParser.java index e78a9eb36..e834d198a 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/InspectPageParser.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/InspectPageParser.java @@ -26,9 +26,9 @@ import main.java.com.djrapitops.plan.utilities.comparators.SessionStartComparato import main.java.com.djrapitops.plan.utilities.file.FileUtil; import main.java.com.djrapitops.plan.utilities.html.HtmlStructure; import main.java.com.djrapitops.plan.utilities.html.HtmlUtils; -import main.java.com.djrapitops.plan.utilities.html.graphs.PunchCardGraphCreator; -import main.java.com.djrapitops.plan.utilities.html.graphs.line.ServerPreferencePieCreator; -import main.java.com.djrapitops.plan.utilities.html.graphs.pie.WorldPieCreator; +import main.java.com.djrapitops.plan.utilities.html.graphs.PunchCardGraph; +import main.java.com.djrapitops.plan.utilities.html.graphs.line.ServerPreferencePie; +import main.java.com.djrapitops.plan.utilities.html.graphs.pie.WorldPie; import main.java.com.djrapitops.plan.utilities.html.structure.ServerAccordionCreator; import main.java.com.djrapitops.plan.utilities.html.tables.ActionsTableCreator; import main.java.com.djrapitops.plan.utilities.html.tables.IpTableCreator; @@ -108,7 +108,7 @@ public class InspectPageParser extends PageParser { } Map worldTimesPerServer = profile.getWorldTimesPerServer(); - addValue("serverPieSeries", ServerPreferencePieCreator.createSeriesData(serverNames, worldTimesPerServer)); + addValue("serverPieSeries", ServerPreferencePie.createSeries(serverNames, worldTimesPerServer)); addValue("worldPieColors", Theme.getValue(ThemeVal.GRAPH_WORLD_PIE)); addValue("gmPieColors", Theme.getValue(ThemeVal.GRAPH_GM_PIE)); addValue("serverPieColors", Theme.getValue(ThemeVal.GRAPH_SERVER_PREF_PIE)); @@ -195,11 +195,11 @@ public class InspectPageParser extends PageParser { List actions = profile.getAllActions(); addValue("tableBodyActions", ActionsTableCreator.createTable(actions)); - String punchCardData = PunchCardGraphCreator.createDataSeries(allSessions); + String punchCardData = PunchCardGraph.createSeries(allSessions); WorldTimes worldTimes = profile.getWorldTimes(); AnalysisUtils.addMissingWorlds(worldTimes); - String[] worldPieData = WorldPieCreator.createSeriesData(worldTimes); + String[] worldPieData = WorldPie.createSeries(worldTimes); addValue("worldPieSeries", worldPieData[0]); addValue("gmSeries", worldPieData[1]); diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/NetworkPageParser.java b/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/NetworkPageParser.java index 5b9a6c9fe..a81060b19 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/NetworkPageParser.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/NetworkPageParser.java @@ -20,7 +20,7 @@ import main.java.com.djrapitops.plan.utilities.analysis.AnalysisUtils; import main.java.com.djrapitops.plan.utilities.file.FileUtil; import main.java.com.djrapitops.plan.utilities.html.HtmlStructure; import main.java.com.djrapitops.plan.utilities.html.HtmlUtils; -import main.java.com.djrapitops.plan.utilities.html.graphs.line.PlayerActivityGraphCreator; +import main.java.com.djrapitops.plan.utilities.html.graphs.line.PlayerActivityGraph; import java.sql.SQLException; import java.util.List; @@ -56,7 +56,7 @@ public class NetworkPageParser extends PageParser { addValue("timeZone", MiscUtils.getTimeZoneOffsetHours()); addValue("networkName", Settings.BUNGEE_NETWORK_NAME.toString()); addValue("version", plugin.getVersion()); - addValue("playersOnlineSeries", PlayerActivityGraphCreator.buildSeriesDataString(networkOnlineData)); + addValue("playersOnlineSeries", PlayerActivityGraph.createSeries(networkOnlineData)); addValue("playersGraphColor", Theme.getValue(ThemeVal.GRAPH_PLAYERS_ONLINE)); addValue("playersOnline", plugin.getProxy().getOnlineCount()); diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/HtmlStructure.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/HtmlStructure.java index 5c9c7fd93..8cc2f622c 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/HtmlStructure.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/HtmlStructure.java @@ -13,7 +13,7 @@ import main.java.com.djrapitops.plan.database.Database; import main.java.com.djrapitops.plan.settings.Settings; import main.java.com.djrapitops.plan.systems.info.BukkitInformationManager; import main.java.com.djrapitops.plan.utilities.FormatUtils; -import main.java.com.djrapitops.plan.utilities.html.graphs.line.PlayerActivityGraphCreator; +import main.java.com.djrapitops.plan.utilities.html.graphs.line.PlayerActivityGraph; import main.java.com.djrapitops.plan.utilities.html.structure.SessionTabStructureCreator; import main.java.com.djrapitops.plan.utilities.html.tables.SessionsTableCreator; @@ -125,7 +125,7 @@ public class HtmlStructure { int playerCount = db.getUserInfoTable().getServerUserCount(serverUUID); String playerData = "[]"; try { - playerData = PlayerActivityGraphCreator.buildSeriesDataString(db.getTpsTable().getTPSData(serverUUID)); + playerData = PlayerActivityGraph.createSeries(db.getTpsTable().getTPSData(serverUUID)); } catch (SQLException e) { Log.toLog(HtmlStructure.class.getClass().getName(), e); } diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/ActivityStackGraphCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/ActivityStackGraph.java similarity index 93% rename from Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/ActivityStackGraphCreator.java rename to Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/ActivityStackGraph.java index 994ab8435..e80462165 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/ActivityStackGraphCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/ActivityStackGraph.java @@ -7,7 +7,7 @@ package main.java.com.djrapitops.plan.utilities.html.graphs; import main.java.com.djrapitops.plan.settings.theme.ThemeVal; import main.java.com.djrapitops.plan.settings.theme.Theme; import main.java.com.djrapitops.plan.utilities.FormatUtils; -import main.java.com.djrapitops.plan.utilities.html.graphs.pie.ActivityPieCreator; +import main.java.com.djrapitops.plan.utilities.html.graphs.pie.ActivityPie; import java.util.Map; import java.util.Set; @@ -19,14 +19,14 @@ import java.util.UUID; * * @author Rsl1122 */ -public class ActivityStackGraphCreator { +public class ActivityStackGraph { - private ActivityStackGraphCreator() { + private ActivityStackGraph() { throw new IllegalStateException("Utility Class"); } public static String[] createSeries(TreeMap>> activityData) { - String[] sliceNames = ActivityPieCreator.getSliceNames(); + String[] sliceNames = ActivityPie.getSliceNames(); String[] colors = Theme.getValue(ThemeVal.GRAPH_ACTIVITY_PIE).split(", "); int maxCol = colors.length; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/PunchCardGraphCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/PunchCardGraph.java similarity index 92% rename from Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/PunchCardGraphCreator.java rename to Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/PunchCardGraph.java index 6360d1659..dc355f2a5 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/PunchCardGraphCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/PunchCardGraph.java @@ -19,12 +19,12 @@ import java.util.stream.Collectors; * @author Rsl1122 * @since 3.6.0 */ -public class PunchCardGraphCreator { +public class PunchCardGraph { /** * Constructor used to hide the public constructor */ - private PunchCardGraphCreator() { + private PunchCardGraph() { throw new IllegalStateException("Utility class"); } @@ -34,10 +34,10 @@ public class PunchCardGraphCreator { * @param sessions Sessions (Unique/Player) to be placed into the PunchCard. * @return Data array as a string. */ - public static String createDataSeries(Collection sessions) { + public static String createSeries(Collection sessions) { List sessionStarts = getSessionStarts(sessions); List daysAndHours = AnalysisUtils.getDaysAndHours(sessionStarts); - int[][] dataArray = createDataArray(daysAndHours); + int[][] dataArray = turnIntoArray(daysAndHours); int big = findBiggestValue(dataArray); int[][] scaled = scale(dataArray, big); StringBuilder arrayBuilder = new StringBuilder("["); @@ -62,7 +62,7 @@ public class PunchCardGraphCreator { return arrayBuilder.toString(); } - private static int[][] createDataArray(List daysAndHours) { + private static int[][] turnIntoArray(List daysAndHours) { int[][] dataArray = createEmptyArray(); for (int[] dAndH : daysAndHours) { int d = dAndH[0]; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/WorldMapCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/WorldMap.java similarity index 97% rename from Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/WorldMapCreator.java rename to Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/WorldMap.java index 7f9844ad2..59862d780 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/WorldMapCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/WorldMap.java @@ -4,12 +4,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -public class WorldMapCreator { +public class WorldMap { /** * Constructor used to hide the public constructor */ - private WorldMapCreator() { + private WorldMap() { throw new IllegalStateException("Utility class"); } @@ -19,7 +19,7 @@ public class WorldMapCreator { * @param geoLocations The country names of players * @return The created data series */ - public static String createDataSeries(List geoLocations) { + public static String createSeries(List geoLocations) { Map geoCodeCounts = new HashMap<>(); Map geoCodes = getGeoCodes(geoCodeCounts); diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/CPUGraphCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/CPUGraph.java similarity index 74% rename from Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/CPUGraphCreator.java rename to Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/CPUGraph.java index 23302c47a..aa7a8322e 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/CPUGraphCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/CPUGraph.java @@ -6,19 +6,19 @@ import main.java.com.djrapitops.plan.utilities.analysis.Point; import java.util.List; import java.util.stream.Collectors; -public class CPUGraphCreator { +public class CPUGraph { /** * Constructor used to hide the public constructor */ - private CPUGraphCreator() { + private CPUGraph() { throw new IllegalStateException("Utility class"); } - public static String buildSeriesDataString(List tpsData) { + public static String createSeries(List tpsData) { List points = tpsData.stream() .map(tps -> new Point(tps.getDate(), tps.getCPUUsage())) .collect(Collectors.toList()); - return SeriesCreator.seriesGraph(points, true); + return LineSeries.createSeries(points, true); } } diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/SeriesCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/LineSeries.java similarity index 73% rename from Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/SeriesCreator.java rename to Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/LineSeries.java index 8bc55b0f5..4dddc9ae6 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/SeriesCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/LineSeries.java @@ -5,7 +5,9 @@ */ package main.java.com.djrapitops.plan.utilities.html.graphs.line; +import main.java.com.djrapitops.plan.utilities.analysis.DouglasPeuckerAlgorithm; import main.java.com.djrapitops.plan.utilities.analysis.Point; +import main.java.com.djrapitops.plan.utilities.analysis.ReduceGapTriangles; import java.util.List; @@ -15,26 +17,26 @@ import java.util.List; * @author Rsl1122 * @since 3.5.2 */ -public class SeriesCreator { +public class LineSeries { /** * Constructor used to hide the public constructor */ - private SeriesCreator() { + private LineSeries() { throw new IllegalStateException("Utility class"); } - public static String seriesGraph(List points, boolean reduceGapTriangles) { - return seriesGraph(points, reduceGapTriangles, true); + public static String createSeries(List points, boolean reduceGapTriangles) { + return createSeries(points, reduceGapTriangles, true); } - public static String seriesGraph(List points, boolean reduceGapTriangles, boolean reducePoints) { + public static String createSeries(List points, boolean reduceGapTriangles, boolean reducePoints) { StringBuilder arrayBuilder = new StringBuilder("["); // if (reducePoints) { // points = DouglasPeuckerAlgorithm.reducePoints(points, 0); // } - +// // if (reduceGapTriangles) { // points = ReduceGapTriangles.reduce(points); // } diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/PlayerActivityGraphCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/PlayerActivityGraph.java similarity index 73% rename from Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/PlayerActivityGraphCreator.java rename to Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/PlayerActivityGraph.java index 97087a4d2..77f1833d7 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/PlayerActivityGraphCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/PlayerActivityGraph.java @@ -9,19 +9,19 @@ import java.util.stream.Collectors; /** * @author Rsl1122 */ -public class PlayerActivityGraphCreator { +public class PlayerActivityGraph { /** * Constructor used to hide the public constructor */ - private PlayerActivityGraphCreator() { + private PlayerActivityGraph() { throw new IllegalStateException("Utility class"); } - public static String buildSeriesDataString(List tpsData) { + public static String createSeries(List tpsData) { List points = tpsData.stream() .map(tps -> new Point(tps.getDate(), tps.getPlayers())) .collect(Collectors.toList()); - return SeriesCreator.seriesGraph(points, true); + return LineSeries.createSeries(points, true); } } diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/RamGraphCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/RamGraph.java similarity index 84% rename from Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/RamGraphCreator.java rename to Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/RamGraph.java index ad7249f9d..23f87a873 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/RamGraphCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/RamGraph.java @@ -14,12 +14,12 @@ import java.util.stream.Collectors; * @see TPSCountTimer * @since 3.6.0 */ -public class RamGraphCreator { +public class RamGraph { /** * Constructor used to hide the public constructor */ - private RamGraphCreator() { + private RamGraph() { throw new IllegalStateException("Utility class"); } @@ -29,10 +29,10 @@ public class RamGraphCreator { * @param tpsData TPS Data collected by TPSCountTimer, one data point for each minute. * @return Series data for HighCharts */ - public static String buildSeriesDataString(List tpsData) { + public static String createSeries(List tpsData) { List points = tpsData.stream() .map(tps -> new Point(tps.getDate(), tps.getUsedMemory())) .collect(Collectors.toList()); - return SeriesCreator.seriesGraph(points, true); + return LineSeries.createSeries(points, true); } } diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/ServerPreferencePieCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/ServerPreferencePie.java similarity index 81% rename from Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/ServerPreferencePieCreator.java rename to Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/ServerPreferencePie.java index 6caae56c6..bab0b61ad 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/ServerPreferencePieCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/ServerPreferencePie.java @@ -5,13 +5,13 @@ import main.java.com.djrapitops.plan.data.time.WorldTimes; import java.util.Map; import java.util.UUID; -public class ServerPreferencePieCreator { +public class ServerPreferencePie { - private ServerPreferencePieCreator() { + private ServerPreferencePie() { throw new IllegalStateException("Utility Class"); } - public static String createSeriesData(Map serverNames, Map serverWorldTimes) { + public static String createSeries(Map serverNames, Map serverWorldTimes) { StringBuilder seriesBuilder = new StringBuilder("["); int i = 0; int size = serverWorldTimes.size(); diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/TPSGraphCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/TPSGraph.java similarity index 58% rename from Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/TPSGraphCreator.java rename to Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/TPSGraph.java index 929f42d15..98094f60f 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/TPSGraphCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/TPSGraph.java @@ -11,27 +11,20 @@ import java.util.stream.Collectors; * @author Rsl1122 * @since 3.5.0 */ -public class TPSGraphCreator { +public class TPSGraph { /** * Constructor used to hide the public constructor */ - private TPSGraphCreator() { + private TPSGraph() { throw new IllegalStateException("Utility class"); } - public static String buildSeriesDataString(List tpsData) { + public static String createSeries(List tpsData) { List points = tpsData.stream() .map(tps -> new Point(tps.getDate(), tps.getTicksPerSecond())) .collect(Collectors.toList()); - return SeriesCreator.seriesGraph(points, true); + return LineSeries.createSeries(points, true); } - - public static List filterTPS(List tpsData, long nowMinusScale) { - return tpsData.stream() - .filter(Objects::nonNull) - .filter(t -> t.getDate() >= nowMinusScale) - .collect(Collectors.toList()); - } } diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/WorldLoadGraphCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/WorldLoadGraph.java similarity index 80% rename from Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/WorldLoadGraphCreator.java rename to Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/WorldLoadGraph.java index 8a701014f..458f8e7ea 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/WorldLoadGraphCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/line/WorldLoadGraph.java @@ -14,12 +14,12 @@ import java.util.stream.Collectors; * @see TPSCountTimer * @since 3.6.0 */ -public class WorldLoadGraphCreator { +public class WorldLoadGraph { /** * Constructor used to hide the public constructor */ - private WorldLoadGraphCreator() { + private WorldLoadGraph() { throw new IllegalStateException("Utility class"); } @@ -29,11 +29,11 @@ public class WorldLoadGraphCreator { * @param tpsData TPS Data collected by TPSCountTimer, one data point for each minute. * @return Series data for HighCharts */ - public static String buildSeriesDataStringEntities(List tpsData) { + public static String createSeriesEntities(List tpsData) { List points = tpsData.stream() .map(tps -> new Point(tps.getDate(), tps.getEntityCount())) .collect(Collectors.toList()); - return SeriesCreator.seriesGraph(points, true); + return LineSeries.createSeries(points, true); } /** @@ -42,10 +42,10 @@ public class WorldLoadGraphCreator { * @param tpsData TPS Data collected by TPSCountTimer, one data point for each minute. * @return Series data for HighCharts */ - public static String buildSeriesDataStringChunks(List tpsData) { + public static String createSeriesChunks(List tpsData) { List points = tpsData.stream() .map(tps -> new Point(tps.getDate(), tps.getChunksLoaded())) .collect(Collectors.toList()); - return SeriesCreator.seriesGraph(points, true); + return LineSeries.createSeries(points, true); } } diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/ActivityPieCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/ActivityPie.java similarity index 84% rename from Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/ActivityPieCreator.java rename to Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/ActivityPie.java index 61b82e3f6..6ebef2a2f 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/ActivityPieCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/ActivityPie.java @@ -14,9 +14,9 @@ import java.util.*; * * @author Rsl1122 */ -public class ActivityPieCreator { +public class ActivityPie { - private ActivityPieCreator() { + private ActivityPie() { throw new IllegalStateException("Utility Class"); } @@ -24,7 +24,7 @@ public class ActivityPieCreator { return new String[]{"Very Active", "Active", "Regular", "Irregular", "Inactive"}; } - public static String createSeriesData(Map> activityData) { + public static String createSeries(Map> activityData) { String[] colors = Theme.getValue(ThemeVal.GRAPH_ACTIVITY_PIE).split(", "); int maxCol = colors.length; @@ -38,6 +38,6 @@ public class ActivityPieCreator { i++; } - return PieSeriesCreator.createSeriesData(slices); + return PieSeries.createSeries(slices); } } \ No newline at end of file diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/PieSeriesCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/PieSeries.java similarity index 85% rename from Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/PieSeriesCreator.java rename to Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/PieSeries.java index 22f33f23f..3b7405e6a 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/PieSeriesCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/PieSeries.java @@ -11,12 +11,12 @@ import java.util.List; * * @author Rsl1122 */ -public class PieSeriesCreator { - private PieSeriesCreator() { +public class PieSeries { + private PieSeries() { throw new IllegalStateException("Utility Class"); } - public static String createSeriesData(List slices) { + public static String createSeries(List slices) { StringBuilder seriesBuilder = new StringBuilder("["); int i = 0; int size = slices.size(); diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/WorldPieCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/WorldPie.java similarity index 92% rename from Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/WorldPieCreator.java rename to Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/WorldPie.java index 8de2562b3..9b008c3ef 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/WorldPieCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/pie/WorldPie.java @@ -12,9 +12,9 @@ import main.java.com.djrapitops.plan.utilities.comparators.PieSliceComparator; import java.util.*; import java.util.stream.Collectors; -public class WorldPieCreator { +public class WorldPie { - private WorldPieCreator() { + private WorldPie() { throw new IllegalStateException("Utility Class"); } @@ -24,21 +24,21 @@ public class WorldPieCreator { * @param worldTimes WorldTimes object. * @return String array, index 0: Series data, 1: drilldown data */ - public static String[] createSeriesData(WorldTimes worldTimes) { - List slices = turnToSlices(worldTimes); + public static String[] createSeries(WorldTimes worldTimes) { + List slices = turnIntoSlices(worldTimes); if (Settings.ORDER_WORLD_PIE_BY_PERC.isTrue()) { slices.sort(new PieSliceComparator()); } - String seriesData = PieSeriesCreator.createSeriesData(slices); + String seriesData = PieSeries.createSeries(slices); - String drilldownData = createDrilldownData(worldTimes); + String drilldownData = createDrilldown(worldTimes); return new String[]{seriesData, drilldownData}; } - private static List turnToSlices(WorldTimes worldTimes) { + private static List turnIntoSlices(WorldTimes worldTimes) { String[] colors = Theme.getValue(ThemeVal.GRAPH_WORLD_PIE).split(", "); int colLenght = colors.length; @@ -90,7 +90,7 @@ public class WorldPieCreator { return playtimePerAlias; } - private static String createDrilldownData(WorldTimes worldTimes) { + private static String createDrilldown(WorldTimes worldTimes) { StringBuilder drilldownBuilder = new StringBuilder(); int i = 0; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/ServerAccordionCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/ServerAccordionCreator.java index ee14d1172..e9a766022 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/ServerAccordionCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/ServerAccordionCreator.java @@ -13,7 +13,7 @@ import main.java.com.djrapitops.plan.settings.theme.ThemeVal; import main.java.com.djrapitops.plan.utilities.FormatUtils; import main.java.com.djrapitops.plan.utilities.analysis.AnalysisUtils; import main.java.com.djrapitops.plan.utilities.analysis.MathUtils; -import main.java.com.djrapitops.plan.utilities.html.graphs.pie.WorldPieCreator; +import main.java.com.djrapitops.plan.utilities.html.graphs.pie.WorldPie; import java.util.List; import java.util.Map; @@ -66,7 +66,7 @@ public class ServerAccordionCreator { String worldId = "worldPieServer" + sanitizedServerName; AnalysisUtils.addMissingWorlds(worldTimes); - String[] worldData = WorldPieCreator.createSeriesData(worldTimes); + String[] worldData = WorldPie.createSeries(worldTimes); // Accordion panel header html.append("
") diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/SessionTabStructureCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/SessionTabStructureCreator.java index e4ef71657..6eaf0d9c7 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/SessionTabStructureCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/SessionTabStructureCreator.java @@ -15,7 +15,7 @@ import main.java.com.djrapitops.plan.utilities.FormatUtils; import main.java.com.djrapitops.plan.utilities.analysis.AnalysisUtils; import main.java.com.djrapitops.plan.utilities.html.Html; import main.java.com.djrapitops.plan.utilities.html.HtmlStructure; -import main.java.com.djrapitops.plan.utilities.html.graphs.pie.WorldPieCreator; +import main.java.com.djrapitops.plan.utilities.html.graphs.pie.WorldPie; import main.java.com.djrapitops.plan.utilities.html.tables.KillsTableCreator; import main.java.com.djrapitops.plan.utilities.html.tables.SessionsTableCreator; @@ -86,7 +86,7 @@ public class SessionTabStructureCreator { WorldTimes worldTimes = session.getWorldTimes(); AnalysisUtils.addMissingWorlds(worldTimes); - String[] worldData = WorldPieCreator.createSeriesData(worldTimes); + String[] worldData = WorldPie.createSeries(worldTimes); String killTable = KillsTableCreator.createTable(session.getPlayerKills()); diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/SessionsTableCreator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/SessionsTableCreator.java index f2a403adf..330189e8b 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/SessionsTableCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/SessionsTableCreator.java @@ -14,7 +14,7 @@ import main.java.com.djrapitops.plan.systems.cache.SessionCache; import main.java.com.djrapitops.plan.utilities.FormatUtils; import main.java.com.djrapitops.plan.utilities.comparators.SessionStartComparator; import main.java.com.djrapitops.plan.utilities.html.Html; -import main.java.com.djrapitops.plan.utilities.html.graphs.pie.WorldPieCreator; +import main.java.com.djrapitops.plan.utilities.html.graphs.pie.WorldPie; import java.util.*; import java.util.stream.Collectors; @@ -113,7 +113,7 @@ public class SessionsTableCreator { Map playtimePerWorld = session.getWorldTimes().getWorldTimes().entrySet().stream() .collect(Collectors.toMap(Map.Entry::getKey, entry -> entry.getValue().getTotal())); - Map playtimePerAlias = WorldPieCreator.transformToAliases(playtimePerWorld, aliases); + Map playtimePerAlias = WorldPie.transformToAliases(playtimePerWorld, aliases); WorldTimes worldTimes = session.getWorldTimes(); long total = worldTimes.getTotal(); diff --git a/Plan/test/main/java/com/djrapitops/plan/ui/graphs/GraphTest.java b/Plan/test/main/java/com/djrapitops/plan/ui/graphs/GraphTest.java index 91edea2df..476c8632f 100644 --- a/Plan/test/main/java/com/djrapitops/plan/ui/graphs/GraphTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/ui/graphs/GraphTest.java @@ -8,7 +8,7 @@ import main.java.com.djrapitops.plan.data.container.Session; import main.java.com.djrapitops.plan.data.container.TPS; import main.java.com.djrapitops.plan.data.time.WorldTimes; import main.java.com.djrapitops.plan.utilities.analysis.Point; -import main.java.com.djrapitops.plan.utilities.html.graphs.PunchCardGraphCreator; +import main.java.com.djrapitops.plan.utilities.html.graphs.PunchCardGraph; import main.java.com.djrapitops.plan.utilities.html.graphs.line.*; import org.apache.commons.lang3.StringUtils; import org.bukkit.plugin.java.JavaPlugin; @@ -54,34 +54,34 @@ public class GraphTest { @Test public void testGraphCreators() { String expected = "[[0,0.0],[1,1.0],[2,2.0],[3,3.0],[4,4.0],[5,5.0],[6,6.0],[7,7.0],[8,8.0],[9,9.0]]"; - assertEquals(expected, CPUGraphCreator.buildSeriesDataString(tpsList)); - assertEquals(expected, PlayerActivityGraphCreator.buildSeriesDataString(tpsList)); + assertEquals(expected, CPUGraph.createSeries(tpsList)); + assertEquals(expected, PlayerActivityGraph.createSeries(tpsList)); // TODO Fix TimeZone Dependency of this test - // assertEquals("[{x:3600000, y:3, z:14, marker: { radius:14}},]", PunchCardGraphCreator.createDataSeries(sessionList)); + // assertEquals("[{x:3600000, y:3, z:14, marker: { radius:14}},]", PunchCardGraph.createSeries(sessionList)); - assertEquals(expected, RamGraphCreator.buildSeriesDataString(tpsList)); - assertEquals(expected, TPSGraphCreator.buildSeriesDataString(tpsList)); - assertEquals(expected, WorldLoadGraphCreator.buildSeriesDataStringChunks(tpsList)); - assertEquals(expected, WorldLoadGraphCreator.buildSeriesDataStringEntities(tpsList)); -// assertEquals("[{'code':'1','value':1},{'code':'2','value':2},{'code':'3','value':3},{'code':'4','value':4},{'code':'5','value':5},{'code':'6','value':6},{'code':'7','value':7},{'code':'8','value':8},{'code':'9','value':9}]", WorldMapCreator.createDataSeries(geoList)); + assertEquals(expected, RamGraph.createSeries(tpsList)); + assertEquals(expected, TPSGraph.createSeries(tpsList)); + assertEquals(expected, WorldLoadGraph.createSeriesChunks(tpsList)); + assertEquals(expected, WorldLoadGraph.createSeriesEntities(tpsList)); +// assertEquals("[{'code':'1','value':1},{'code':'2','value':2},{'code':'3','value':3},{'code':'4','value':4},{'code':'5','value':5},{'code':'6','value':6},{'code':'7','value':7},{'code':'8','value':8},{'code':'9','value':9}]", WorldMap.createSeries(geoList)); // TODO fix config mock dependency // assertEquals("[[{name:'WORLD',y:0,drilldown: 'WORLD'}], [{name:'WORLD', id:'WORLD',colors: gmPieColors,data: [['SURVIVAL',0],['SPECTATOR',0],['CREATIVE',0],['ADVENTURE',0]]}]]", -// Arrays.toString(WorldPieCreator.createSeriesData(worldTimes))); +// Arrays.toString(WorldPie.createSeries(worldTimes))); } @Test public void testGraphCreatorsForBracketMistakes() { String[] series = new String[]{ - CPUGraphCreator.buildSeriesDataString(tpsList), - PlayerActivityGraphCreator.buildSeriesDataString(tpsList), - PunchCardGraphCreator.createDataSeries(sessionList), - RamGraphCreator.buildSeriesDataString(tpsList), - TPSGraphCreator.buildSeriesDataString(tpsList), - WorldLoadGraphCreator.buildSeriesDataStringChunks(tpsList), - WorldLoadGraphCreator.buildSeriesDataStringEntities(tpsList), -// WorldMapCreator.createDataSeries(geoList), + CPUGraph.createSeries(tpsList), + PlayerActivityGraph.createSeries(tpsList), + PunchCardGraph.createSeries(sessionList), + RamGraph.createSeries(tpsList), + TPSGraph.createSeries(tpsList), + WorldLoadGraph.createSeriesChunks(tpsList), + WorldLoadGraph.createSeriesEntities(tpsList), +// WorldMap.createSeries(geoList), // TODO fix config mock dependency -// Arrays.toString(WorldPieCreator.createSeriesData(worldTimes)) +// Arrays.toString(WorldPie.createSeries(worldTimes)) }; for (String test : series) { int opened = StringUtils.countMatches(test, "{"); @@ -95,7 +95,7 @@ public class GraphTest { @Test public void testSeriesCreator() { - String result = StringUtils.removeAll(SeriesCreator.seriesGraph(points, false, false), "[\\[\\]]"); + String result = StringUtils.removeAll(LineSeries.createSeries(points, false, false), "[\\[\\]]"); String[] splittedResult = result.split(","); Map expected = new LinkedHashMap<>();