feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

Merge pull request #241 from ammaraskar/date

Browse Source 
Allow customizable formats for dates. Fixes #201. Fine ammar can have his silly way.
This commit is contained in:
md-5
2012-09-21 22:57:35 -07:00
parent a350db23be 1c7f037fc4
commit 2fc32e6f3c
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/de/diddiz/LogBlock/BlockChange.java
View File

@@ -3,12 +3,12 @@ package de.diddiz.LogBlock;
import static de.diddiz.util.MaterialName.materialName; import static de.diddiz.util.MaterialName.materialName;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.text.SimpleDateFormat;
import org.bukkit.Location; import org.bukkit.Location;
import de.diddiz.LogBlock.config.Config;
public class BlockChange implements LookupCacheElement public class BlockChange implements LookupCacheElement
{ {
private final static SimpleDateFormat formatter = new SimpleDateFormat("MM-dd HH:mm:ss");
public final long id, date; public final long id, date;
public final Location loc; public final Location loc;
public final String playerName; public final String playerName;
@@ -45,7 +45,7 @@ public class BlockChange implements LookupCacheElement
public String toString() { public String toString() {
final StringBuilder msg = new StringBuilder(); final StringBuilder msg = new StringBuilder();
if (date > 0) if (date > 0)
msg.append(formatter.format(date)).append(" "); msg.append(Config.formatter.format(date)).append(" ");
if (playerName != null) if (playerName != null)
msg.append(playerName).append(" "); msg.append(playerName).append(" ");
if (signtext != null) { if (signtext != null) {

8
src/main/java/de/diddiz/LogBlock/config/Config.java
View File

@@ -7,6 +7,7 @@ import static org.bukkit.Bukkit.getLogger;
import static org.bukkit.Bukkit.getWorlds; import static org.bukkit.Bukkit.getWorlds;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
@@ -53,6 +54,7 @@ public class Config
public static Set<Integer> hiddenBlocks; public static Set<Integer> hiddenBlocks;
public static Set<String> hiddenPlayers; public static Set<String> hiddenPlayers;
public static Set<String> ignoredChat; public static Set<String> ignoredChat;
public static SimpleDateFormat formatter;
public static enum LogKillsLevel public static enum LogKillsLevel
{ {
@@ -99,6 +101,12 @@ public class Config
def.put("lookup.defaultTime", "30 minutes"); def.put("lookup.defaultTime", "30 minutes");
def.put("lookup.linesPerPage", 15); def.put("lookup.linesPerPage", 15);
def.put("lookup.linesLimit", 1500); 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.askRollbacks", true);
def.put("questioner.askRedos", true); def.put("questioner.askRedos", true);
def.put("questioner.askClearLogs", true); def.put("questioner.askClearLogs", true);