[LIB-10] Date and Timezone format constants from snooker.properties

[snooker-score-api.git] / src / main / java / org / hedgecode / snooker / SnookerDateUtils.java

diff --git a/src/main/java/org/hedgecode/snooker/SnookerDateUtils.java b/src/main/java/org/hedgecode/snooker/SnookerDateUtils.java
index 69da93b..126ab5a 100644 (file)
--- a/src/main/java/org/hedgecode/snooker/SnookerDateUtils.java
+++ b/src/main/java/org/hedgecode/snooker/SnookerDateUtils.java
@@ -30,11 +30,13 @@ public final class SnookerDateUtils {
 

     private static SnookerDateUtils _instance;

 

-    public static final String DATE_PATTERN = "dd.MM.yyyy";

-    public static final String TIME_PATTERN = "HH:mm";

-    public static final String DATETIME_PATTERN = String.format("%s %s", TIME_PATTERN , DATE_PATTERN);

+    private static final String DATE_PATTERN = SnookerScoreProperties.get("snooker.date.format");

+    private static final String TIME_PATTERN = SnookerScoreProperties.get("snooker.time.format");

+    private static final String DATETIME_PATTERN = String.format("%s %s", TIME_PATTERN , DATE_PATTERN);

 

-    private static final TimeZone SNOOKER_TIMEZONE = TimeZone.getTimeZone("CET");

+    private static final TimeZone SNOOKER_TIMEZONE = TimeZone.getTimeZone(

+            SnookerScoreProperties.get("snooker.timezone")

+    );

     private static final TimeZone LOCAL_TIMEZONE = TimeZone.getDefault();

 

     private final DateFormat dateFormat;