diff --git a/src/main/java/de/diddiz/LogBlock/BlockChange.java b/src/main/java/de/diddiz/LogBlock/BlockChange.java index 8bb553f..f3ed2c2 100644 --- a/src/main/java/de/diddiz/LogBlock/BlockChange.java +++ b/src/main/java/de/diddiz/LogBlock/BlockChange.java @@ -3,12 +3,12 @@ package de.diddiz.LogBlock; import static de.diddiz.util.MaterialName.materialName; import java.sql.ResultSet; import java.sql.SQLException; -import java.text.SimpleDateFormat; import org.bukkit.Location; +import de.diddiz.LogBlock.config.Config; + public class BlockChange implements LookupCacheElement { - private final static SimpleDateFormat formatter = new SimpleDateFormat("MM-dd HH:mm:ss"); public final long id, date; public final Location loc; public final String playerName; @@ -45,7 +45,7 @@ public class BlockChange implements LookupCacheElement public String toString() { final StringBuilder msg = new StringBuilder(); if (date > 0) - msg.append(formatter.format(date)).append(" "); + msg.append(Config.formatter.format(date)).append(" "); if (playerName != null) msg.append(playerName).append(" "); if (signtext != null) { diff --git a/src/main/java/de/diddiz/LogBlock/config/Config.java b/src/main/java/de/diddiz/LogBlock/config/Config.java index 51a98f4..80da7eb 100644 --- a/src/main/java/de/diddiz/LogBlock/config/Config.java +++ b/src/main/java/de/diddiz/LogBlock/config/Config.java @@ -7,6 +7,7 @@ import static org.bukkit.Bukkit.getLogger; import static org.bukkit.Bukkit.getWorlds; import java.io.File; import java.io.IOException; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -53,6 +54,7 @@ public class Config public static Set hiddenBlocks; public static Set hiddenPlayers; public static Set ignoredChat; + public static SimpleDateFormat formatter; public static enum LogKillsLevel { @@ -99,6 +101,12 @@ public class Config def.put("lookup.defaultTime", "30 minutes"); def.put("lookup.linesPerPage", 15); def.put("lookup.linesLimit", 1500); + try { + formatter = new SimpleDateFormat(config.getString("lookup.dateFormat", "MM-dd HH:mm:ss")); + } catch (IllegalArgumentException e) { + throw new DataFormatException("Invalid specification for date format, please see http://docs.oracle.com/javase/1.4.2/docs/api/java/text/SimpleDateFormat.html : " + e.getMessage()); + } + def.put("lookup.dateFormat", "MM-dd HH:mm:ss"); def.put("questioner.askRollbacks", true); def.put("questioner.askRedos", true); def.put("questioner.askClearLogs", true);