From 845b8add38123f7db2b0852cb1d4289f04dcd69d Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Sat, 1 Dec 2018 13:19:40 +0200 Subject: [PATCH] Improved tps related stat display when not avialable --- .../plan/utilities/html/pages/AnalysisPage.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/AnalysisPage.java b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/AnalysisPage.java index ff90de39b..22a5fb79f 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/AnalysisPage.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/AnalysisPage.java @@ -156,19 +156,20 @@ public class AnalysisPage implements Page { private void performanceNumbers(PlaceholderReplacer placeholderReplacer) { timings.start(CHANNEL + " Performance Numbers"); placeholderReplacer.addAllPlaceholdersFrom(analysisContainer, - TPS_SPIKE_MONTH, TPS_SPIKE_WEEK, TPS_SPIKE_DAY, + TPS_SPIKE_MONTH, TPS_SPIKE_WEEK, TPS_SPIKE_DAY + ); + placeholderReplacer.addAllPlaceholdersFrom(analysisContainer, + value -> value != -1L ? Long.toString(value) : "Unavailable", MAX_FREE_DISK_MONTH, MAX_FREE_DISK_WEEK, MAX_FREE_DISK_DAY, MIN_FREE_DISK_MONTH, MIN_FREE_DISK_WEEK, MIN_FREE_DISK_DAY ); - placeholderReplacer.addAllPlaceholdersFrom(analysisContainer, decimalFormatter, + placeholderReplacer.addAllPlaceholdersFrom(analysisContainer, + value -> value != -1 ? decimalFormatter.apply(value) : "Unavailable", AVG_TPS_MONTH, AVG_TPS_WEEK, AVG_TPS_DAY, AVG_RAM_MONTH, AVG_RAM_WEEK, AVG_RAM_DAY, AVG_ENTITY_MONTH, AVG_ENTITY_WEEK, AVG_ENTITY_DAY, AVG_CHUNK_MONTH, AVG_CHUNK_WEEK, AVG_CHUNK_DAY, - AVG_FREE_DISK_MONTH, AVG_FREE_DISK_WEEK, AVG_FREE_DISK_DAY - ); - placeholderReplacer.addAllPlaceholdersFrom(analysisContainer, - value -> value != -1 ? decimalFormatter.apply(value) : "Unavailable", + AVG_FREE_DISK_MONTH, AVG_FREE_DISK_WEEK, AVG_FREE_DISK_DAY, AVG_CPU_MONTH, AVG_CPU_WEEK, AVG_CPU_DAY ); timings.end(CHANNEL, CHANNEL + " Performance Numbers");