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

Removed some rollback/redo messages to reduce spamming

Browse Source
This commit is contained in:
Robin Kupper
2011-06-12 22:24:52 +02:00
parent a9f4bb071b
commit 437e7a9f34
1 changed files with 20 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/de/diddiz/LogBlock/CommandsHandler.java
View File

@@ -4,7 +4,6 @@ import static de.diddiz.util.BukkitUtils.giveTool;
import java.io.Closeable; import java.io.Closeable;
import java.io.File; import java.io.File;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException;
import java.sql.Connection; import java.sql.Connection;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
@@ -25,7 +24,6 @@ import org.bukkit.scheduler.BukkitScheduler;
import de.diddiz.LogBlock.QueryParams.BlockChangeType; import de.diddiz.LogBlock.QueryParams.BlockChangeType;
import de.diddiz.LogBlock.QueryParams.Order; import de.diddiz.LogBlock.QueryParams.Order;
import de.diddiz.LogBlock.QueryParams.SummarizationMode; import de.diddiz.LogBlock.QueryParams.SummarizationMode;
import de.diddiz.LogBlock.WorldEditor.WorldEditorException;
import de.diddiz.LogBlockQuestioner.LogBlockQuestioner; import de.diddiz.LogBlockQuestioner.LogBlockQuestioner;
public class CommandsHandler implements CommandExecutor public class CommandsHandler implements CommandExecutor
@@ -322,7 +320,7 @@ public class CommandsHandler implements CommandExecutor
protected Statement state = null; protected Statement state = null;
protected ResultSet rs = null; protected ResultSet rs = null;
LBCommand(CommandSender sender, QueryParams params) throws Exception { protected LBCommand(CommandSender sender, QueryParams params) throws Exception {
this.sender = sender; this.sender = sender;
this.params = params; this.params = params;
conn = logblock.getConnection(); conn = logblock.getConnection();
@@ -341,7 +339,7 @@ public class CommandsHandler implements CommandExecutor
if (rs != null) if (rs != null)
rs.close(); rs.close();
} catch (final SQLException ex) { } catch (final SQLException ex) {
log.log(Level.SEVERE, "[LogBlock CommandHandler] SQL exception on close", ex); log.log(Level.SEVERE, "[LogBlock CommandsHandler] SQL exception on close", ex);
} }
} }
} }
@@ -369,9 +367,9 @@ public class CommandsHandler implements CommandExecutor
sender.sendMessage(ChatColor.GOLD + histformatter.format(rs, params.coords)); sender.sendMessage(ChatColor.GOLD + histformatter.format(rs, params.coords));
} else } else
sender.sendMessage(ChatColor.DARK_AQUA + "No results found."); sender.sendMessage(ChatColor.DARK_AQUA + "No results found.");
} catch (final SQLException ex) { } catch (final Exception ex) {
sender.sendMessage(ChatColor.RED + "SQL exception"); sender.sendMessage(ChatColor.RED + "Exception, check error log");
log.log(Level.SEVERE, "[LogBlock Lookup] SQL exception", ex); log.log(Level.SEVERE, "[LogBlock Lookup] Exception: ", ex);
} finally { } finally {
close(); close();
} }
@@ -404,12 +402,9 @@ public class CommandsHandler implements CommandExecutor
writer.write(histformatter.format(rs, params.coords) + newline); writer.write(histformatter.format(rs, params.coords) + newline);
writer.close(); writer.close();
sender.sendMessage(ChatColor.GREEN + "Done"); sender.sendMessage(ChatColor.GREEN + "Done");
} catch (final SQLException ex) { } catch (final Exception ex) {
sender.sendMessage(ChatColor.RED + "SQL exception"); sender.sendMessage(ChatColor.RED + "Exception, check error log");
log.log(Level.SEVERE, ChatColor.RED + "[LogBlock WriteLogFile] SQL exception", ex); log.log(Level.SEVERE, "[LogBlock WriteLogFile] Exception (file was " + file.getAbsolutePath() + "): ", ex);
} catch (final IOException ex) {
sender.sendMessage(ChatColor.RED + "IO exception at file '" + file.getPath() + "'");
log.log(Level.SEVERE, ChatColor.RED + "[LogBlock WriteLogFile] IO exception", ex);
} finally { } finally {
close(); close();
} }
@@ -449,9 +444,9 @@ public class CommandsHandler implements CommandExecutor
player.teleport(new Location(params.world, x + 0.5, player.getWorld().getHighestBlockYAt(x, z), z + 0.5, player.getLocation().getYaw(), 90)); player.teleport(new Location(params.world, x + 0.5, player.getWorld().getHighestBlockYAt(x, z), z + 0.5, player.getLocation().getYaw(), 90));
} else } else
sender.sendMessage(ChatColor.RED + "Query returned no result"); sender.sendMessage(ChatColor.RED + "Query returned no result");
} catch (final SQLException ex) { } catch (final Exception ex) {
sender.sendMessage(ChatColor.RED + "SQL exception"); sender.sendMessage(ChatColor.RED + "Exception, check error log");
log.log(Level.SEVERE, "[LogBlock Teleport] SQL exception", ex); log.log(Level.SEVERE, "[LogBlock Teleport] Exception: ", ex);
} finally { } finally {
close(); close();
} }
@@ -491,12 +486,9 @@ public class CommandsHandler implements CommandExecutor
} }
editor.start(); editor.start();
sender.sendMessage(ChatColor.GREEN + "Rollback finished successfully (" + editor.getElapsedTime() + " ms, " + editor.getSuccesses() + "/" + changes + " blocks" + (editor.getErrors() > 0 ? ChatColor.RED + ", " + editor.getErrors() + " errors" + ChatColor.GREEN : "") + (editor.getBlacklistCollisions() > 0 ? ", " + editor.getBlacklistCollisions() + " blacklist collisions" : "") + ")"); sender.sendMessage(ChatColor.GREEN + "Rollback finished successfully (" + editor.getElapsedTime() + " ms, " + editor.getSuccesses() + "/" + changes + " blocks" + (editor.getErrors() > 0 ? ChatColor.RED + ", " + editor.getErrors() + " errors" + ChatColor.GREEN : "") + (editor.getBlacklistCollisions() > 0 ? ", " + editor.getBlacklistCollisions() + " blacklist collisions" : "") + ")");
} catch (final SQLException ex) { } catch (final Exception ex) {
sender.sendMessage(ChatColor.RED + "SQL exception"); sender.sendMessage(ChatColor.RED + "Exception, check error log");
log.log(Level.SEVERE, "[LogBlock Rollback] SQL exception", ex); log.log(Level.SEVERE, "[LogBlock Rollback] Exception: ", ex);
} catch (final WorldEditorException ex) {
sender.sendMessage(ChatColor.RED + "WorldEditor exception");
log.log(Level.SEVERE, "[LogBlock Rollback] WorldEditor exception", ex);
} finally { } finally {
close(); close();
} }
@@ -529,12 +521,9 @@ public class CommandsHandler implements CommandExecutor
} }
editor.start(); editor.start();
sender.sendMessage(ChatColor.GREEN + "Redo finished successfully (" + editor.getElapsedTime() + " ms, " + editor.getSuccesses() + "/" + changes + " blocks" + (editor.getErrors() > 0 ? ChatColor.RED + ", " + editor.getErrors() + " errors" + ChatColor.GREEN : "") + (editor.getBlacklistCollisions() > 0 ? ", " + editor.getBlacklistCollisions() + " blacklist collisions" : "") + ")"); sender.sendMessage(ChatColor.GREEN + "Redo finished successfully (" + editor.getElapsedTime() + " ms, " + editor.getSuccesses() + "/" + changes + " blocks" + (editor.getErrors() > 0 ? ChatColor.RED + ", " + editor.getErrors() + " errors" + ChatColor.GREEN : "") + (editor.getBlacklistCollisions() > 0 ? ", " + editor.getBlacklistCollisions() + " blacklist collisions" : "") + ")");
} catch (final SQLException ex) { } catch (final Exception ex) {
sender.sendMessage(ChatColor.RED + "SQL exception"); sender.sendMessage(ChatColor.RED + "Exception, check error log");
log.log(Level.SEVERE, "[LogBlock Redo] SQL exception", ex); log.log(Level.SEVERE, "[LogBlock Redo] Exception: ", ex);
} catch (final WorldEditorException ex) {
sender.sendMessage(ChatColor.RED + "WorldEditor exception");
log.log(Level.SEVERE, "[LogBlock Redo] WorldEditor exception", ex);
} finally { } finally {
close(); close();
} }
@@ -597,9 +586,9 @@ public class CommandsHandler implements CommandExecutor
state.execute("DELETE `" + table + "-chest` FROM `" + table + "-chest` LEFT JOIN `" + table + "` USING (id) WHERE `" + table + "`.id IS NULL;"); state.execute("DELETE `" + table + "-chest` FROM `" + table + "-chest` LEFT JOIN `" + table + "` USING (id) WHERE `" + table + "`.id IS NULL;");
sender.sendMessage(ChatColor.GREEN + "Cleared out table " + table + "-chest. Deleted " + deleted + " entries."); sender.sendMessage(ChatColor.GREEN + "Cleared out table " + table + "-chest. Deleted " + deleted + " entries.");
} }
} catch (final SQLException ex) { } catch (final Exception ex) {
sender.sendMessage(ChatColor.RED + "SQL exception"); sender.sendMessage(ChatColor.RED + "Exception, check error log");
log.log(Level.SEVERE, "[LogBlock ClearLog] SQL exception", ex); log.log(Level.SEVERE, "[LogBlock ClearLog] Exception: ", ex);
} finally { } finally {
close(); close();
} }