Selaa lähdekoodia

BETA: Log classes rearranging and formatting.

Zoey76 13 vuotta sitten
vanhempi
sitoutus
814d60cf0f
31 muutettua tiedostoa jossa 106 lisäystä ja 112 poistoa
  1. 2 3
      L2J_Server_BETA/java/com/l2jserver/log/filter/AuditFilter.java
  2. 1 1
      L2J_Server_BETA/java/com/l2jserver/log/filter/ChatFilter.java
  3. 1 1
      L2J_Server_BETA/java/com/l2jserver/log/filter/EnchantItemFilter.java
  4. 1 1
      L2J_Server_BETA/java/com/l2jserver/log/filter/EnchantSkillFilter.java
  5. 1 1
      L2J_Server_BETA/java/com/l2jserver/log/filter/ErrorFilter.java
  6. 1 1
      L2J_Server_BETA/java/com/l2jserver/log/filter/GMAuditFilter.java
  7. 22 15
      L2J_Server_BETA/java/com/l2jserver/log/filter/ItemFilter.java
  8. 1 1
      L2J_Server_BETA/java/com/l2jserver/log/filter/MDamageFilter.java
  9. 1 1
      L2J_Server_BETA/java/com/l2jserver/log/filter/PDamageFilter.java
  10. 1 1
      L2J_Server_BETA/java/com/l2jserver/log/formatter/AccountingFormatter.java
  11. 6 7
      L2J_Server_BETA/java/com/l2jserver/log/formatter/AuditFormatter.java
  12. 3 5
      L2J_Server_BETA/java/com/l2jserver/log/formatter/ChatLogFormatter.java
  13. 1 2
      L2J_Server_BETA/java/com/l2jserver/log/formatter/ConsoleLogFormatter.java
  14. 18 19
      L2J_Server_BETA/java/com/l2jserver/log/formatter/DamageFormatter.java
  15. 16 15
      L2J_Server_BETA/java/com/l2jserver/log/formatter/EnchantFormatter.java
  16. 3 6
      L2J_Server_BETA/java/com/l2jserver/log/formatter/FileLogFormatter.java
  17. 2 5
      L2J_Server_BETA/java/com/l2jserver/log/formatter/GMAuditFormatter.java
  18. 7 6
      L2J_Server_BETA/java/com/l2jserver/log/formatter/ItemLogFormatter.java
  19. 5 5
      L2J_Server_BETA/java/com/l2jserver/log/formatter/OlympiadFormatter.java
  20. 1 1
      L2J_Server_BETA/java/com/l2jserver/log/handler/AccountingLogHandler.java
  21. 1 1
      L2J_Server_BETA/java/com/l2jserver/log/handler/AllDamageLogHandler.java
  22. 2 3
      L2J_Server_BETA/java/com/l2jserver/log/handler/AuditLogHandler.java
  23. 1 1
      L2J_Server_BETA/java/com/l2jserver/log/handler/ChatLogHandler.java
  24. 1 1
      L2J_Server_BETA/java/com/l2jserver/log/handler/EnchantItemLogHandler.java
  25. 1 1
      L2J_Server_BETA/java/com/l2jserver/log/handler/EnchantSkillLogHandler.java
  26. 1 1
      L2J_Server_BETA/java/com/l2jserver/log/handler/ErrorLogHandler.java
  27. 1 2
      L2J_Server_BETA/java/com/l2jserver/log/handler/GMAuditLogHandler.java
  28. 1 2
      L2J_Server_BETA/java/com/l2jserver/log/handler/ItemLogHandler.java
  29. 1 1
      L2J_Server_BETA/java/com/l2jserver/log/handler/MDamageLogHandler.java
  30. 1 1
      L2J_Server_BETA/java/com/l2jserver/log/handler/OlympiadLogHandler.java
  31. 1 1
      L2J_Server_BETA/java/com/l2jserver/log/handler/PDamageLogHandler.java

+ 2 - 3
L2J_Server_BETA/java/com/l2jserver/log/AuditFilter.java → L2J_Server_BETA/java/com/l2jserver/log/filter/AuditFilter.java

@@ -12,14 +12,13 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.filter;
 
 import java.util.logging.Filter;
 import java.util.logging.LogRecord;
 
 /**
- * @author zabbix
- * Lets drink to code!
+ * @author zabbix Lets drink to code!
  */
 public class AuditFilter implements Filter
 {

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/log/ChatFilter.java → L2J_Server_BETA/java/com/l2jserver/log/filter/ChatFilter.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.filter;
 
 import java.util.logging.Filter;
 import java.util.logging.LogRecord;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/log/EnchantItemFilter.java → L2J_Server_BETA/java/com/l2jserver/log/filter/EnchantItemFilter.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.filter;
 
 import java.util.logging.Filter;
 import java.util.logging.LogRecord;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/log/EnchantSkillFilter.java → L2J_Server_BETA/java/com/l2jserver/log/filter/EnchantSkillFilter.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.filter;
 
 import java.util.logging.Filter;
 import java.util.logging.LogRecord;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/log/ErrorFilter.java → L2J_Server_BETA/java/com/l2jserver/log/filter/ErrorFilter.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.filter;
 
 import java.util.logging.Filter;
 import java.util.logging.LogRecord;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/log/GMAuditFilter.java → L2J_Server_BETA/java/com/l2jserver/log/filter/GMAuditFilter.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.filter;
 
 import java.util.logging.Filter;
 import java.util.logging.LogRecord;

+ 22 - 15
L2J_Server_BETA/java/com/l2jserver/log/ItemFilter.java → L2J_Server_BETA/java/com/l2jserver/log/filter/ItemFilter.java

@@ -12,43 +12,50 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.filter;
 
 import java.util.logging.Filter;
 import java.util.logging.LogRecord;
 
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 
-
 /**
  * @author Advi
- *
  */
 public class ItemFilter implements Filter
 {
-	//	private String _excludeProcess;
-	//	private String _excludeItemType;
+	// private String _excludeProcess;
+	// private String _excludeItemType;
 	
-	//	This is an example how to exclude consuming of shots and arrows from logging
-	private String _excludeProcess = "Consume";
-	private String _excludeItemType = "Arrow, Shot, Herb";
+	// This is an example how to exclude consuming of shots and arrows from logging
+	private final String _excludeProcess = "Consume";
+	private final String _excludeItemType = "Arrow, Shot, Herb";
 	
 	@Override
 	public boolean isLoggable(LogRecord record)
 	{
-		if (!"item".equals(record.getLoggerName())) return false;
+		if (!"item".equals(record.getLoggerName()))
+		{
+			return false;
+		}
 		if (_excludeProcess != null)
 		{
-			//			if (record.getMessage() == null) return true;
+			// if (record.getMessage() == null) return true;
 			String[] messageList = record.getMessage().split(":");
-			if (messageList.length < 2 || !_excludeProcess.contains(messageList[1])) return true;
+			if ((messageList.length < 2) || !_excludeProcess.contains(messageList[1]))
+			{
+				return true;
+			}
 		}
 		if (_excludeItemType != null)
 		{
-			//			if (record.getParameters() == null || record.getParameters().length == 0 || !(record.getParameters()[0] instanceof L2ItemInstance)) return true;
-			L2ItemInstance item = ((L2ItemInstance)record.getParameters()[0]);
-			if (!_excludeItemType.contains(item.getItemType().toString())) return true;
+			// if (record.getParameters() == null || record.getParameters().length == 0 || !(record.getParameters()[0] instanceof L2ItemInstance)) return true;
+			L2ItemInstance item = ((L2ItemInstance) record.getParameters()[0]);
+			if (!_excludeItemType.contains(item.getItemType().toString()))
+			{
+				return true;
+			}
 		}
-		return (_excludeProcess == null && _excludeItemType == null);
+		return ((_excludeProcess == null) && (_excludeItemType == null));
 	}
 }

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/log/MDamageFilter.java → L2J_Server_BETA/java/com/l2jserver/log/filter/MDamageFilter.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.filter;
 
 import java.util.logging.Filter;
 import java.util.logging.LogRecord;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/log/PDamageFilter.java → L2J_Server_BETA/java/com/l2jserver/log/filter/PDamageFilter.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.filter;
 
 import java.util.logging.Filter;
 import java.util.logging.LogRecord;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/log/AccountingFormatter.java → L2J_Server_BETA/java/com/l2jserver/log/formatter/AccountingFormatter.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.formatter;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

+ 6 - 7
L2J_Server_BETA/java/com/l2jserver/log/AuditFormatter.java → L2J_Server_BETA/java/com/l2jserver/log/formatter/AuditFormatter.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.formatter;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -22,28 +22,27 @@ import java.util.logging.LogRecord;
 import com.l2jserver.util.StringUtil;
 
 /**
- * @author zabbix
- * Lets drink to code!
+ * @author zabbix Lets drink to code!
  */
 public class AuditFormatter extends Formatter
 {
 	private static final String CRLF = "\r\n";
-	private SimpleDateFormat dateFmt = new SimpleDateFormat("dd MMM H:mm:ss");
+	private final SimpleDateFormat dateFmt = new SimpleDateFormat("dd MMM H:mm:ss");
 	
 	@Override
 	public String format(LogRecord record)
 	{
 		final Object[] params = record.getParameters();
-		final StringBuilder output = StringUtil.startAppend(30
-				+ record.getMessage().length()
-				+ (params == null ? 0 : params.length * 10), "[", dateFmt.format(new Date(record.getMillis())), "] ", record.getMessage());
+		final StringBuilder output = StringUtil.startAppend(30 + record.getMessage().length() + (params == null ? 0 : params.length * 10), "[", dateFmt.format(new Date(record.getMillis())), "] ", record.getMessage());
 		
 		if (params != null)
 		{
 			for (Object p : params)
 			{
 				if (p == null)
+				{
 					continue;
+				}
 				StringUtil.append(output, ", ", p.toString());
 			}
 		}

+ 3 - 5
L2J_Server_BETA/java/com/l2jserver/log/ChatLogFormatter.java → L2J_Server_BETA/java/com/l2jserver/log/formatter/ChatLogFormatter.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.formatter;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -23,7 +23,6 @@ import com.l2jserver.util.StringUtil;
 
 /**
  * This class ...
- * 
  * @version $Revision: 1.1.4.1 $ $Date: 2005/02/06 16:14:46 $
  */
 
@@ -31,14 +30,13 @@ public class ChatLogFormatter extends Formatter
 {
 	private static final String CRLF = "\r\n";
 	
-	private SimpleDateFormat dateFmt = new SimpleDateFormat("dd MMM H:mm:ss");
+	private final SimpleDateFormat dateFmt = new SimpleDateFormat("dd MMM H:mm:ss");
 	
 	@Override
 	public String format(LogRecord record)
 	{
 		Object[] params = record.getParameters();
-		final StringBuilder output = StringUtil.startAppend(30 + record.getMessage().length()
-				+ (params != null ? 10 * params.length : 0), "[", dateFmt.format(new Date(record.getMillis())), "] ");
+		final StringBuilder output = StringUtil.startAppend(30 + record.getMessage().length() + (params != null ? 10 * params.length : 0), "[", dateFmt.format(new Date(record.getMillis())), "] ");
 		
 		if (params != null)
 		{

+ 1 - 2
L2J_Server_BETA/java/com/l2jserver/log/ConsoleLogFormatter.java → L2J_Server_BETA/java/com/l2jserver/log/formatter/ConsoleLogFormatter.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.formatter;
 
 import java.util.logging.Formatter;
 import java.util.logging.LogRecord;
@@ -22,7 +22,6 @@ import com.l2jserver.util.Util;
 
 /**
  * This class ...
- * 
  * @version $Revision: 1.1.4.2 $ $Date: 2005/03/27 15:30:08 $
  */
 public class ConsoleLogFormatter extends Formatter

+ 18 - 19
L2J_Server_BETA/java/com/l2jserver/log/DamageFormatter.java → L2J_Server_BETA/java/com/l2jserver/log/formatter/DamageFormatter.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.formatter;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -26,57 +26,56 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.util.StringUtil;
 
-
 public class DamageFormatter extends Formatter
 {
 	private static final String CRLF = "\r\n";
-	private SimpleDateFormat dateFmt = new SimpleDateFormat("yy.MM.dd H:mm:ss");
+	private final SimpleDateFormat dateFmt = new SimpleDateFormat("yy.MM.dd H:mm:ss");
 	
 	@Override
 	public String format(LogRecord record)
 	{
 		final Object[] params = record.getParameters();
-		final StringBuilder output = StringUtil.startAppend(30
-				+ record.getMessage().length()
-				+ (params == null ? 0 : params.length * 10), "[",
-				dateFmt.format(new Date(record.getMillis())), "] '---': ",
-				record.getMessage());
+		final StringBuilder output = StringUtil.startAppend(30 + record.getMessage().length() + (params == null ? 0 : params.length * 10), "[", dateFmt.format(new Date(record.getMillis())), "] '---': ", record.getMessage());
 		
 		if (params != null)
 		{
 			for (Object p : params)
 			{
 				if (p == null)
+				{
 					continue;
+				}
 				
 				if (p instanceof L2Character)
 				{
-					if (p instanceof L2Attackable && ((L2Attackable)p).isRaid())
+					if ((p instanceof L2Attackable) && ((L2Attackable) p).isRaid())
+					{
 						StringUtil.append(output, "RaidBoss ");
+					}
 					
-					StringUtil.append(output, ((L2Character)p).getName(),
-							"(", String.valueOf(((L2Character)p).getObjectId()), ") ");
-					StringUtil.append(output, String.valueOf(((L2Character)p).getLevel()),
-					" lvl");
+					StringUtil.append(output, ((L2Character) p).getName(), "(", String.valueOf(((L2Character) p).getObjectId()), ") ");
+					StringUtil.append(output, String.valueOf(((L2Character) p).getLevel()), " lvl");
 					
 					if (p instanceof L2Summon)
 					{
-						L2PcInstance owner = ((L2Summon)p).getOwner();
+						L2PcInstance owner = ((L2Summon) p).getOwner();
 						if (owner != null)
-							StringUtil.append(output, " Owner:", owner.getName(),
-									"(", String.valueOf(owner.getObjectId()), ")");
+						{
+							StringUtil.append(output, " Owner:", owner.getName(), "(", String.valueOf(owner.getObjectId()), ")");
+						}
 					}
 				}
 				else if (p instanceof L2Skill)
 				{
-					StringUtil.append(output, " with skill ",((L2Skill)p).getName(),
-							"(", String.valueOf(((L2Skill)p).getId()), ")");
+					StringUtil.append(output, " with skill ", ((L2Skill) p).getName(), "(", String.valueOf(((L2Skill) p).getId()), ")");
 				}
 				else
+				{
 					StringUtil.append(output, p.toString());
+				}
 			}
 		}
-
+		
 		output.append(CRLF);
 		return output.toString();
 	}

+ 16 - 15
L2J_Server_BETA/java/com/l2jserver/log/EnchantFormatter.java → L2J_Server_BETA/java/com/l2jserver/log/formatter/EnchantFormatter.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.formatter;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -24,41 +24,40 @@ import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.util.StringUtil;
 
-
 public class EnchantFormatter extends Formatter
 {
 	private static final String CRLF = "\r\n";
-	private SimpleDateFormat dateFmt = new SimpleDateFormat("dd MMM H:mm:ss");
+	private final SimpleDateFormat dateFmt = new SimpleDateFormat("dd MMM H:mm:ss");
 	
 	@Override
 	public String format(LogRecord record)
 	{
 		final Object[] params = record.getParameters();
-		final StringBuilder output = StringUtil.startAppend(30
-				+ record.getMessage().length()
-				+ (params == null ? 0 : params.length * 10), "[", dateFmt.format(new Date(record.getMillis())), "] ", record.getMessage());
+		final StringBuilder output = StringUtil.startAppend(30 + record.getMessage().length() + (params == null ? 0 : params.length * 10), "[", dateFmt.format(new Date(record.getMillis())), "] ", record.getMessage());
 		
 		if (params != null)
 		{
 			for (Object p : params)
 			{
 				if (p == null)
+				{
 					continue;
+				}
 				
 				StringUtil.append(output, ", ");
 				
 				if (p instanceof L2PcInstance)
 				{
-					L2PcInstance player = (L2PcInstance)p;
-					StringUtil.append(output, "Character:", player.getName(),
-							" ["+String.valueOf(player.getObjectId())+"] Account:",
-							player.getAccountName());
-					if (player.getClient() != null && !player.getClient().isDetached())
+					L2PcInstance player = (L2PcInstance) p;
+					StringUtil.append(output, "Character:", player.getName(), " [" + String.valueOf(player.getObjectId()) + "] Account:", player.getAccountName());
+					if ((player.getClient() != null) && !player.getClient().isDetached())
+					{
 						StringUtil.append(output, " IP:", player.getClient().getConnection().getInetAddress().getHostAddress());
+					}
 				}
 				else if (p instanceof L2ItemInstance)
 				{
-					L2ItemInstance item = (L2ItemInstance)p;
+					L2ItemInstance item = (L2ItemInstance) p;
 					if (item.getEnchantLevel() > 0)
 					{
 						StringUtil.append(output, "+", String.valueOf(item.getEnchantLevel()), " ");
@@ -68,18 +67,20 @@ public class EnchantFormatter extends Formatter
 				}
 				else if (p instanceof L2Skill)
 				{
-					L2Skill skill = (L2Skill)p;
+					L2Skill skill = (L2Skill) p;
 					if (skill.getLevel() > 100)
 					{
 						StringUtil.append(output, "+", String.valueOf(skill.getLevel() % 100), " ");
 					}
-					StringUtil.append(output, skill.getName(), "(", String.valueOf(skill.getId())," ", String.valueOf(skill.getLevel()), ")");
+					StringUtil.append(output, skill.getName(), "(", String.valueOf(skill.getId()), " ", String.valueOf(skill.getLevel()), ")");
 				}
 				else
+				{
 					StringUtil.append(output, p.toString());
+				}
 			}
 		}
-
+		
 		output.append(CRLF);
 		return output.toString();
 	}

+ 3 - 6
L2J_Server_BETA/java/com/l2jserver/log/FileLogFormatter.java → L2J_Server_BETA/java/com/l2jserver/log/formatter/FileLogFormatter.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.formatter;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -23,20 +23,17 @@ import com.l2jserver.util.StringUtil;
 
 /**
  * This class ...
- * 
  * @version $Revision: 1.1.4.1 $ $Date: 2005/03/27 15:30:08 $
  */
 public class FileLogFormatter extends Formatter
 {
 	private static final String CRLF = "\r\n";
 	private static final String _ = "\t";
-	private SimpleDateFormat dateFmt = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss,SSS");
+	private final SimpleDateFormat dateFmt = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss,SSS");
 	
 	@Override
 	public String format(LogRecord record)
 	{
-		return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), _,
-				record.getLevel().getName(), _, String.valueOf(record.getThreadID()), _,
-				record.getLoggerName(), _, record.getMessage(), CRLF);
+		return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), _, record.getLevel().getName(), _, String.valueOf(record.getThreadID()), _, record.getLoggerName(), _, record.getMessage(), CRLF);
 	}
 }

+ 2 - 5
L2J_Server_BETA/java/com/l2jserver/log/GMAuditFormatter.java → L2J_Server_BETA/java/com/l2jserver/log/formatter/GMAuditFormatter.java

@@ -12,19 +12,16 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
-package com.l2jserver.log;
+package com.l2jserver.log.formatter;
 
 import java.util.logging.Formatter;
 import java.util.logging.LogRecord;
 
 public class GMAuditFormatter extends Formatter
 {
-	
 	@Override
 	public String format(LogRecord record)
 	{
-		return record.getMessage()+"\r\n";
+		return record.getMessage() + "\r\n";
 	}
-	
 }

+ 7 - 6
L2J_Server_BETA/java/com/l2jserver/log/ItemLogFormatter.java → L2J_Server_BETA/java/com/l2jserver/log/formatter/ItemLogFormatter.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.formatter;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -22,27 +22,26 @@ import java.util.logging.LogRecord;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.util.StringUtil;
 
-
 /**
  * @author Advi
- * 
  */
 public class ItemLogFormatter extends Formatter
 {
 	private static final String CRLF = "\r\n";
-	private SimpleDateFormat dateFmt = new SimpleDateFormat("dd MMM H:mm:ss");
+	private final SimpleDateFormat dateFmt = new SimpleDateFormat("dd MMM H:mm:ss");
 	
 	@Override
 	public String format(LogRecord record)
 	{
 		final Object[] params = record.getParameters();
-		final StringBuilder output = StringUtil.startAppend(30 + record.getMessage().length()
-				+ params.length * 50, "[", dateFmt.format(new Date(record.getMillis())), "] ", record.getMessage());
+		final StringBuilder output = StringUtil.startAppend(30 + record.getMessage().length() + (params.length * 50), "[", dateFmt.format(new Date(record.getMillis())), "] ", record.getMessage());
 		
 		for (Object p : record.getParameters())
 		{
 			if (p == null)
+			{
 				continue;
+			}
 			output.append(", ");
 			if (p instanceof L2ItemInstance)
 			{
@@ -58,7 +57,9 @@ public class ItemLogFormatter extends Formatter
 			// else if (p instanceof L2PcInstance)
 			// output.append(((L2PcInstance)p).getName());
 			else
+			{
 				output.append(p.toString()/* + ":" + ((L2Object)p).getObjectId() */);
+			}
 		}
 		output.append(CRLF);
 		

+ 5 - 5
L2J_Server_BETA/java/com/l2jserver/log/OlympiadFormatter.java → L2J_Server_BETA/java/com/l2jserver/log/formatter/OlympiadFormatter.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.formatter;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -24,21 +24,21 @@ import com.l2jserver.util.StringUtil;
 public class OlympiadFormatter extends Formatter
 {
 	private static final String CRLF = "\r\n";
-	private SimpleDateFormat dateFmt = new SimpleDateFormat("dd/MM/yyyy H:mm:ss");
+	private final SimpleDateFormat dateFmt = new SimpleDateFormat("dd/MM/yyyy H:mm:ss");
 	
 	@Override
 	public String format(LogRecord record)
 	{
 		final Object[] params = record.getParameters();
-		final StringBuilder output = StringUtil.startAppend(30
-				+ record.getMessage().length()
-				+ (params == null ? 0 : params.length * 10), dateFmt.format(new Date(record.getMillis())), ",", record.getMessage());
+		final StringBuilder output = StringUtil.startAppend(30 + record.getMessage().length() + (params == null ? 0 : params.length * 10), dateFmt.format(new Date(record.getMillis())), ",", record.getMessage());
 		if (params != null)
 		{
 			for (Object p : params)
 			{
 				if (p == null)
+				{
 					continue;
+				}
 				StringUtil.append(output, ",", p.toString());
 			}
 		}

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/log/AccountingLogHandler.java → L2J_Server_BETA/java/com/l2jserver/log/handler/AccountingLogHandler.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.handler;
 
 import java.io.IOException;
 import java.util.logging.FileHandler;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/log/AllDamageLogHandler.java → L2J_Server_BETA/java/com/l2jserver/log/handler/AllDamageLogHandler.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.handler;
 
 import java.io.IOException;
 import java.util.logging.FileHandler;

+ 2 - 3
L2J_Server_BETA/java/com/l2jserver/log/AuditLogHandler.java → L2J_Server_BETA/java/com/l2jserver/log/handler/AuditLogHandler.java

@@ -12,14 +12,13 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.handler;
 
 import java.io.IOException;
 import java.util.logging.FileHandler;
 
 /**
- * @author zabbix
- * Lets drink to code!
+ * @author zabbix Lets drink to code!
  */
 public class AuditLogHandler extends FileHandler
 {

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/log/ChatLogHandler.java → L2J_Server_BETA/java/com/l2jserver/log/handler/ChatLogHandler.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.handler;
 
 import java.io.IOException;
 import java.util.logging.FileHandler;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/log/EnchantItemLogHandler.java → L2J_Server_BETA/java/com/l2jserver/log/handler/EnchantItemLogHandler.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.handler;
 
 import java.io.IOException;
 import java.util.logging.FileHandler;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/log/EnchantSkillLogHandler.java → L2J_Server_BETA/java/com/l2jserver/log/handler/EnchantSkillLogHandler.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.handler;
 
 import java.io.IOException;
 import java.util.logging.FileHandler;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/log/ErrorLogHandler.java → L2J_Server_BETA/java/com/l2jserver/log/handler/ErrorLogHandler.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.handler;
 
 import java.io.IOException;
 import java.util.logging.FileHandler;

+ 1 - 2
L2J_Server_BETA/java/com/l2jserver/log/GMAuditLogHandler.java → L2J_Server_BETA/java/com/l2jserver/log/handler/GMAuditLogHandler.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.handler;
 
 import java.io.IOException;
 import java.util.logging.FileHandler;
@@ -25,4 +25,3 @@ public class GMAuditLogHandler extends FileHandler
 		super();
 	}
 }
-

+ 1 - 2
L2J_Server_BETA/java/com/l2jserver/log/ItemLogHandler.java → L2J_Server_BETA/java/com/l2jserver/log/handler/ItemLogHandler.java

@@ -12,14 +12,13 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.handler;
 
 import java.io.IOException;
 import java.util.logging.FileHandler;
 
 /**
  * @author Advi
- *
  */
 public class ItemLogHandler extends FileHandler
 {

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/log/MDamageLogHandler.java → L2J_Server_BETA/java/com/l2jserver/log/handler/MDamageLogHandler.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.handler;
 
 import java.io.IOException;
 import java.util.logging.FileHandler;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/log/OlympiadLogHandler.java → L2J_Server_BETA/java/com/l2jserver/log/handler/OlympiadLogHandler.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.handler;
 
 import java.io.IOException;
 import java.util.logging.FileHandler;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/log/PDamageLogHandler.java → L2J_Server_BETA/java/com/l2jserver/log/handler/PDamageLogHandler.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.log;
+package com.l2jserver.log.handler;
 
 import java.io.IOException;
 import java.util.logging.FileHandler;