From 86619275992b4b29bfac91897986b10f2ef863cb Mon Sep 17 00:00:00 2001
From: KHobbits <rob@khobbits.co.uk>
Date: Mon, 31 Dec 2012 02:28:52 +0000
Subject: Merge gravy's pull and reformat code

---
 .../net/ess3/update/chat/AbstractFileCommand.java  |  4 +---
 .../src/net/ess3/update/chat/IrcBot.java           | 25 +++++++++-------------
 2 files changed, 11 insertions(+), 18 deletions(-)

(limited to 'EssentialsUpdate/src/net/ess3/update/chat')

diff --git a/EssentialsUpdate/src/net/ess3/update/chat/AbstractFileCommand.java b/EssentialsUpdate/src/net/ess3/update/chat/AbstractFileCommand.java
index 2e6d44f20..d01d0790f 100644
--- a/EssentialsUpdate/src/net/ess3/update/chat/AbstractFileCommand.java
+++ b/EssentialsUpdate/src/net/ess3/update/chat/AbstractFileCommand.java
@@ -1,11 +1,9 @@
 package net.ess3.update.chat;
 
-import net.ess3.update.PastieUpload;
 import java.io.*;
 import java.nio.charset.Charset;
-
-import net.ess3.update.PastieUpload;
 import org.bukkit.plugin.Plugin;
+import net.ess3.update.PastieUpload;
 
 
 public abstract class AbstractFileCommand implements Command
diff --git a/EssentialsUpdate/src/net/ess3/update/chat/IrcBot.java b/EssentialsUpdate/src/net/ess3/update/chat/IrcBot.java
index 10ce9ad8a..348a9ae44 100644
--- a/EssentialsUpdate/src/net/ess3/update/chat/IrcBot.java
+++ b/EssentialsUpdate/src/net/ess3/update/chat/IrcBot.java
@@ -94,9 +94,8 @@ public class IrcBot extends PircBot
 	}
 
 	@Override
-	protected void onKick(final String channel, final String kickerNick,
-						  final String kickerLogin, final String kickerHostname,
-						  final String recipientNick, final String reason)
+	protected void onKick(
+			final String channel, final String kickerNick, final String kickerLogin, final String kickerHostname, final String recipientNick, final String reason)
 	{
 		if (recipientNick.equals(getNick()))
 		{
@@ -112,33 +111,29 @@ public class IrcBot extends PircBot
 	}
 
 	@Override
-	protected void onMessage(final String channel, final String sender,
-							 final String login, final String hostname,
-							 final String message)
+	protected void onMessage(
+			final String channel, final String sender, final String login, final String hostname, final String message)
 	{
 		player.sendMessage(formatChatMessage(sender, message, false));
 	}
 
 	@Override
-	protected void onAction(final String sender, final String login,
-							final String hostname, final String target,
-							final String action)
+	protected void onAction(
+			final String sender, final String login, final String hostname, final String target, final String action)
 	{
 		player.sendMessage(formatChatMessage(sender, action, true));
 	}
 
 	@Override
-	protected void onNotice(final String sourceNick, final String sourceLogin,
-							final String sourceHostname, final String target,
-							final String notice)
+	protected void onNotice(
+			final String sourceNick, final String sourceLogin, final String sourceHostname, final String target, final String notice)
 	{
 		player.sendMessage(formatChatMessage(sourceNick, notice, false));
 	}
 
 	@Override
-	protected void onTopic(final String channel, final String topic,
-						   final String setBy, final long date,
-						   final boolean changed)
+	protected void onTopic(
+			final String channel, final String topic, final String setBy, final long date, final boolean changed)
 	{
 		player.sendMessage(formatChatMessage(channel, topic, false));
 	}
-- 
cgit v1.2.3