Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-03-12 14:49:56 +01:00
Code Issues Projects Releases Wiki Activity

Extract nested ternary operations into independent statements

Browse Source
This commit is contained in:
Fuzzlemann 2017-08-16 18:07:10 +02:00
parent a060182e49
commit 023b3f666f
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Plan/src/main/java/com/djrapitops/plan/ui/html/tables/PlayersTableCreator.java
View File

@ -43,16 +43,15 @@ public class PlayersTableCreator {
boolean isUnknown = uData.getLoginTimes() == 1; boolean isUnknown = uData.getLoginTimes() == 1;
boolean isActive = AnalysisUtils.isActive(now, uData.getLastPlayed(), uData.getPlayTime(), uData.getLoginTimes()); boolean isActive = AnalysisUtils.isActive(now, uData.getLastPlayed(), uData.getPlayTime(), uData.getLoginTimes());
String activityString = isBanned ? "Banned" String activityString = isActive ? "Active" : "Inactive";
: isUnknown ? "Unknown" String unknownString = isUnknown ? "Unknown" : activityString;
: isActive ? "Active" String combinedString = isBanned ? "Banned" : unknownString;
: "Inactive";
String img = showImages ? Html.MINOTAR_SMALL_IMG.parse(uData.getName()) : ""; String img = showImages ? Html.MINOTAR_SMALL_IMG.parse(uData.getName()) : "";
html.append(Html.TABLELINE_PLAYERS.parse( html.append(Html.TABLELINE_PLAYERS.parse(
img + Html.LINK.parse(HtmlUtils.getInspectUrl(uData.getName()), uData.getName()), img + Html.LINK.parse(HtmlUtils.getInspectUrl(uData.getName()), uData.getName()),
activityString, combinedString,
String.valueOf(uData.getPlayTime()), FormatUtils.formatTimeAmount(uData.getPlayTime()), String.valueOf(uData.getPlayTime()), FormatUtils.formatTimeAmount(uData.getPlayTime()),
String.valueOf(uData.getLoginTimes()), String.valueOf(uData.getLoginTimes()),
String.valueOf(uData.getRegistered()), FormatUtils.formatTimeStampYear(uData.getRegistered()), String.valueOf(uData.getRegistered()), FormatUtils.formatTimeStampYear(uData.getRegistered()),

6
Plan/src/main/java/com/djrapitops/plan/ui/text/TextUI.java
View File

@ -52,8 +52,12 @@ public class TextUI {
boolean online = d.isOnline(); boolean online = d.isOnline();
String ball = sec + " " + DefaultMessages.BALL + main; 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[]{ 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 + " Registered: " + sec + FormatUtils.formatTimeStampYear(d.getRegistered()),
ball + " Last seen: " + sec + FormatUtils.formatTimeStamp(d.getLastPlayed()), ball + " Last seen: " + sec + FormatUtils.formatTimeStamp(d.getLastPlayed()),
ball + " Playtime: " + sec + FormatUtils.formatTimeAmount(d.getPlayTime()), ball + " Playtime: " + sec + FormatUtils.formatTimeAmount(d.getPlayTime()),