From 023b3f666fb94dc0b2e96380e69f23b92b227fdd Mon Sep 17 00:00:00 2001 From: Fuzzlemann Date: Wed, 16 Aug 2017 18:07:10 +0200 Subject: [PATCH] Extract nested ternary operations into independent statements --- .../plan/ui/html/tables/PlayersTableCreator.java | 9 ++++----- .../main/java/com/djrapitops/plan/ui/text/TextUI.java | 6 +++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Plan/src/main/java/com/djrapitops/plan/ui/html/tables/PlayersTableCreator.java b/Plan/src/main/java/com/djrapitops/plan/ui/html/tables/PlayersTableCreator.java index 0f07d71a1..95b41b4ea 100644 --- a/Plan/src/main/java/com/djrapitops/plan/ui/html/tables/PlayersTableCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/ui/html/tables/PlayersTableCreator.java @@ -43,16 +43,15 @@ public class PlayersTableCreator { boolean isUnknown = uData.getLoginTimes() == 1; boolean isActive = AnalysisUtils.isActive(now, uData.getLastPlayed(), uData.getPlayTime(), uData.getLoginTimes()); - String activityString = isBanned ? "Banned" - : isUnknown ? "Unknown" - : isActive ? "Active" - : "Inactive"; + String activityString = isActive ? "Active" : "Inactive"; + String unknownString = isUnknown ? "Unknown" : activityString; + String combinedString = isBanned ? "Banned" : unknownString; String img = showImages ? Html.MINOTAR_SMALL_IMG.parse(uData.getName()) : ""; html.append(Html.TABLELINE_PLAYERS.parse( img + Html.LINK.parse(HtmlUtils.getInspectUrl(uData.getName()), uData.getName()), - activityString, + combinedString, String.valueOf(uData.getPlayTime()), FormatUtils.formatTimeAmount(uData.getPlayTime()), String.valueOf(uData.getLoginTimes()), String.valueOf(uData.getRegistered()), FormatUtils.formatTimeStampYear(uData.getRegistered()), diff --git a/Plan/src/main/java/com/djrapitops/plan/ui/text/TextUI.java b/Plan/src/main/java/com/djrapitops/plan/ui/text/TextUI.java index 591c7709b..cacb75834 100644 --- a/Plan/src/main/java/com/djrapitops/plan/ui/text/TextUI.java +++ b/Plan/src/main/java/com/djrapitops/plan/ui/text/TextUI.java @@ -52,8 +52,12 @@ public class TextUI { boolean online = d.isOnline(); String ball = sec + " " + DefaultMessages.BALL + main; + String onlineString = online ? ChatColor.GREEN + " Online" : ChatColor.RED + " Offline"; + String activeString = active ? " Active" : "Inactive"; + String bannedString = banned ? ChatColor.DARK_RED + " Banned" : ter + activeString; + return new String[]{ - sec + " " + DefaultMessages.BALL + (banned ? ChatColor.DARK_RED + " Banned" : ter + (active ? " Active" : " Inactive")) + (online ? ChatColor.GREEN + " Online" : ChatColor.RED + " Offline"), + sec + " " + DefaultMessages.BALL + bannedString + onlineString, ball + " Registered: " + sec + FormatUtils.formatTimeStampYear(d.getRegistered()), ball + " Last seen: " + sec + FormatUtils.formatTimeStamp(d.getLastPlayed()), ball + " Playtime: " + sec + FormatUtils.formatTimeAmount(d.getPlayTime()),