From e8ee7478a07e8848a19702a7b6760ddba92e7404 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Wed, 2 Jan 2019 17:16:16 -0800 Subject: [PATCH 1/2] reportbutton: Make time formatting methods static where possible --- .../plugins/reportbutton/ReportButtonPlugin.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/ReportButtonPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/ReportButtonPlugin.java index 0223534f94..be8609d03b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/ReportButtonPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/ReportButtonPlugin.java @@ -158,11 +158,6 @@ public class ReportButtonPlugin extends Plugin } } - private String getLocalTime() - { - return LocalTime.now().format(DATE_TIME_FORMAT); - } - private String getLoginTime() { if (loginTime == null) @@ -175,13 +170,18 @@ public class ReportButtonPlugin extends Plugin return time.format(DateTimeFormatter.ofPattern("HH:mm:ss")); } - private String getUTCTime() + private static String getLocalTime() + { + return LocalTime.now().format(DATE_TIME_FORMAT); + } + + private static String getUTCTime() { LocalTime time = LocalTime.now(UTC); return time.format(DATE_TIME_FORMAT); } - private String getJagexTime() + private static String getJagexTime() { LocalTime time = LocalTime.now(JAGEX); return time.format(DATE_TIME_FORMAT); From f8c445a0856389a1d783a1902b6e1a0e0cb3c4cb Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Wed, 2 Jan 2019 17:16:41 -0800 Subject: [PATCH 2/2] reportbutton: Add date time format This matches the screenshot plugin's date formatter. Closes runelite/runelite#1228 --- .../plugins/reportbutton/ReportButtonPlugin.java | 12 ++++++++++++ .../client/plugins/reportbutton/TimeStyle.java | 1 + 2 files changed, 13 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/ReportButtonPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/ReportButtonPlugin.java index be8609d03b..b633a89b10 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/ReportButtonPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/ReportButtonPlugin.java @@ -25,6 +25,8 @@ package net.runelite.client.plugins.reportbutton; import com.google.inject.Provides; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.time.Duration; import java.time.Instant; import java.time.LocalTime; @@ -32,6 +34,7 @@ import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.time.format.FormatStyle; import java.time.temporal.ChronoUnit; +import java.util.Date; import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.GameState; @@ -56,6 +59,7 @@ public class ReportButtonPlugin extends Plugin private static final ZoneId JAGEX = ZoneId.of("Europe/London"); private static final DateTimeFormatter DATE_TIME_FORMAT = DateTimeFormatter.ofLocalizedTime(FormatStyle.MEDIUM); + private static final DateFormat DATE_FORMAT = new SimpleDateFormat("MMM. dd, yyyy"); private Instant loginTime; private boolean ready; @@ -152,6 +156,9 @@ public class ReportButtonPlugin extends Plugin case LOGIN_TIME: reportButton.setText(getLoginTime()); break; + case DATE: + reportButton.setText(getDate()); + break; case OFF: reportButton.setText("Report"); break; @@ -186,4 +193,9 @@ public class ReportButtonPlugin extends Plugin LocalTime time = LocalTime.now(JAGEX); return time.format(DATE_TIME_FORMAT); } + + private static String getDate() + { + return DATE_FORMAT.format(new Date()); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/TimeStyle.java b/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/TimeStyle.java index 97aa419247..40095b9a4f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/TimeStyle.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/TimeStyle.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.reportbutton; public enum TimeStyle { OFF("Off"), + DATE("Date"), LOGIN_TIME("Login Timer"), UTC("UTC Time"), JAGEX("Jagex HQ Time"),