BETA: Cleanup and format for tasks related classes.

	* Minor refactor of loggers.

L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/AttackStanceTaskManager.java

@@ -57,8 +57,12 @@ public class AttackStanceTaskManager
 		{
 			L2PcInstance player = (L2PcInstance) actor;
 			for (L2CubicInstance cubic : player.getCubics().values(new L2CubicInstance[0]))
+			{
 				if (cubic.getId() != L2CubicInstance.LIFE_CUBIC)
+				{
 					cubic.doAction();
+				}
+			}
 		}
 		_attackStanceTasks.put(actor, System.currentTimeMillis());
 	}
@@ -97,6 +101,7 @@ public class AttackStanceTaskManager
 			try
 			{
 				if (_attackStanceTasks != null)
+				{
 					synchronized (this)
 					{
 						for (L2Character actor : _attackStanceTasks.keySet())
@@ -104,18 +109,20 @@ public class AttackStanceTaskManager
 							if ((current - _attackStanceTasks.get(actor)) > 15000)
 							{
 								actor.broadcastPacket(new AutoAttackStop(actor.getObjectId()));
-								if (actor instanceof L2PcInstance && ((L2PcInstance) actor).getPet() != null)
+								if ((actor instanceof L2PcInstance) && (((L2PcInstance) actor).getPet() != null))
+								{
 									((L2PcInstance) actor).getPet().broadcastPacket(new AutoAttackStop(((L2PcInstance) actor).getPet().getObjectId()));
+								}
 								actor.getAI().setAutoAttacking(false);
 								_attackStanceTasks.remove(actor);
 							}
 						}
 					}
+				}
 			}
 			catch (Exception e)
 			{
-				// TODO: Find out the reason for exception. Unless caught here,
-				// players remain in attack positions.
+				// TODO: Find out the reason for exception. Unless caught here, players remain in attack positions.
 				_log.log(Level.WARNING, "Error in FightModeScheduler: " + e.getMessage(), e);
 			}
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/AutoAnnounceTaskManager.java

@@ -33,17 +33,11 @@ import com.l2jserver.gameserver.util.Broadcast;
  */
 public class AutoAnnounceTaskManager
 {
-	protected static final Logger _log = Logger.getLogger(AutoAnnounceTaskManager.class.getName());
-	
-	protected List<AutoAnnouncement> _announces = new FastList<AutoAnnouncement>();
+	private static final Logger _log = Logger.getLogger(AutoAnnounceTaskManager.class.getName());
 	
+	private final List<AutoAnnouncement> _announces = new FastList<>();
 	private int _nextId = 1;
 	
-	public static AutoAnnounceTaskManager getInstance()
-	{
-		return SingletonHolder._instance;
-	}
-	
 	private AutoAnnounceTaskManager()
 	{
 		restore();
@@ -106,7 +100,6 @@ public class AutoAnnounceTaskManager
 	public void addAutoAnnounce(long initial, long delay, int repeat, String memo, boolean isCritical)
 	{
 		Connection conn = null;
-		
 		try
 		{
 			conn = L2DatabaseFactory.getInstance().getConnection();
@@ -231,6 +224,11 @@ public class AutoAnnounceTaskManager
 		}
 	}
 	
+	public static AutoAnnounceTaskManager getInstance()
+	{
+		return SingletonHolder._instance;
+	}
+	
 	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{

L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/DecayTaskManager.java

@@ -35,7 +35,7 @@ public class DecayTaskManager
 	protected static final Logger _log = Logger.getLogger(DecayTaskManager.class.getName());
 	
 	protected final Map<L2Character, Long> _decayTasks = new FastMap<L2Character, Long>().shared();
-
+	
 	private DecayTaskManager()
 	{
 		ThreadPoolManager.getInstance().scheduleAiAtFixedRate(new DecayScheduler(), 10000, Config.DECAY_TIME_TASK);
@@ -48,7 +48,7 @@ public class DecayTaskManager
 	
 	public void addDecayTask(L2Character actor)
 	{
-		addDecayTask(actor, 0); 
+		addDecayTask(actor, 0);
 	}
 	
 	public void addDecayTask(L2Character actor, int interval)
@@ -84,14 +84,22 @@ public class DecayTaskManager
 					e = it.next();
 					actor = e.getKey();
 					next = e.getValue();
-					if (actor == null || next == null)
+					if ((actor == null) || (next == null))
+					{
 						continue;
+					}
 					if (actor.isRaid() && !actor.isRaidMinion())
+					{
 						delay = Config.RAID_BOSS_DECAY_TIME;
+					}
 					else if ((actor instanceof L2Attackable) && (((L2Attackable) actor).isSpoil() || ((L2Attackable) actor).isSeeded()))
+					{
 						delay = Config.SPOILED_DECAY_TIME;
+					}
 					else
+					{
 						delay = Config.NPC_DECAY_TIME;
+					}
 					if ((current - next) > delay)
 					{
 						actor.onDecay();
@@ -134,7 +142,7 @@ public class DecayTaskManager
 	
 	/**
 	 * <u><b><font color="FF0000">Read only</font></b></u>
-	 * @return 
+	 * @return
 	 */
 	public Map<L2Character, Long> getTasks()
 	{

L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/KnownListUpdateTaskManager.java

@@ -30,7 +30,6 @@ import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2GuardInstance;
 
-
 public class KnownListUpdateTaskManager
 {
 	protected static final Logger _log = Logger.getLogger(KnownListUpdateTaskManager.class.getName());
@@ -48,11 +47,6 @@ public class KnownListUpdateTaskManager
 		ThreadPoolManager.getInstance().scheduleAiAtFixedRate(new KnownListUpdate(), 1000, Config.KNOWNLIST_UPDATE_INTERVAL);
 	}
 	
-	public static KnownListUpdateTaskManager getInstance()
-	{
-		return SingletonHolder._instance;
-	}
-	
 	private class KnownListUpdate implements Runnable
 	{
 		public KnownListUpdate()
@@ -75,10 +69,12 @@ public class KnownListUpdateTaskManager
 							failed = _failedRegions.contains(r); // failed on last pass
 							if (r.isActive()) // and check only if the region is active
 							{
-								updateRegion(r, (_fullUpdateTimer == FULL_UPDATE_TIMER || failed), updatePass);
+								updateRegion(r, ((_fullUpdateTimer == FULL_UPDATE_TIMER) || failed), updatePass);
 							}
 							if (failed)
+							{
 								_failedRegions.remove(r); // if all ok, remove
+							}
 						}
 						catch (Exception e)
 						{
@@ -90,9 +86,13 @@ public class KnownListUpdateTaskManager
 				updatePass = !updatePass;
 				
 				if (_fullUpdateTimer > 0)
+				{
 					_fullUpdateTimer--;
+				}
 				else
+				{
 					_fullUpdateTimer = FULL_UPDATE_TIMER;
+				}
 			}
 			catch (Exception e)
 			{
@@ -110,12 +110,13 @@ public class KnownListUpdateTaskManager
 			{
 				for (L2Object object : vObj) // and for all members in region
 				{
-					if (object == null || !object.isVisible())
+					if ((object == null) || !object.isVisible())
+					{
 						continue; // skip dying objects
+					}
 					
 					// Some mobs need faster knownlist update
-					final boolean aggro = (Config.GUARD_ATTACK_AGGRO_MOB && object instanceof L2GuardInstance)
-					|| (object instanceof L2Attackable && ((L2Attackable)object).getEnemyClan() != null);
+					final boolean aggro = (Config.GUARD_ATTACK_AGGRO_MOB && (object instanceof L2GuardInstance)) || ((object instanceof L2Attackable) && (((L2Attackable) object).getEnemyClan() != null));
 					
 					if (forgetObjects)
 					{
@@ -124,16 +125,18 @@ public class KnownListUpdateTaskManager
 					}
 					for (L2WorldRegion regi : region.getSurroundingRegions())
 					{
-						if (object instanceof L2Playable
-								|| (aggro && regi.isActive())
-								|| fullUpdate)
+						if ((object instanceof L2Playable) || (aggro && regi.isActive()) || fullUpdate)
 						{
 							Collection<L2Object> inrObj = regi.getVisibleObjects().values();
 							// synchronized (regi.getVisibleObjects())
 							{
 								for (L2Object _object : inrObj)
+								{
 									if (_object != object)
+									{
 										object.getKnownList().addKnownObject(_object);
+									}
+								}
 							}
 						}
 						else if (object instanceof L2Character)
@@ -144,8 +147,12 @@ public class KnownListUpdateTaskManager
 								// synchronized (regi.getVisiblePlayable())
 								{
 									for (L2Object _object : inrPls)
+									{
 										if (_object != object)
+										{
 											object.getKnownList().addKnownObject(_object);
+										}
+									}
 								}
 							}
 						}
@@ -155,6 +162,11 @@ public class KnownListUpdateTaskManager
 		}
 	}
 	
+	public static KnownListUpdateTaskManager getInstance()
+	{
+		return SingletonHolder._instance;
+	}
+	
 	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{

L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/Task.java

@@ -20,19 +20,19 @@ import java.util.logging.Logger;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
 
-
 /**
  * @author Layane
- * 
  */
 public abstract class Task
 {
-	private static Logger _log = Logger.getLogger(Task.class.getName());
+	protected final Logger _log = Logger.getLogger(getClass().getName());
 	
 	public void initializate()
 	{
 		if (Config.DEBUG)
+		{
 			_log.info("Task" + getName() + " inializate");
+		}
 	}
 	
 	public ScheduledFuture<?> launchSpecial(ExecutedTask instance)
@@ -46,5 +46,6 @@ public abstract class Task
 	
 	public void onDestroy()
 	{
+		
 	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/TaskManager.java

@@ -50,21 +50,22 @@ import com.l2jserver.gameserver.taskmanager.tasks.TaskShutdown;
 
 /**
  * @author Layane
- * 
  */
 public final class TaskManager
 {
-	protected static final Logger _log = Logger.getLogger(TaskManager.class.getName());
+	private static final Logger _log = Logger.getLogger(TaskManager.class.getName());
+	
+	private final FastMap<Integer, Task> _tasks = new FastMap<>();
+	protected final FastList<ExecutedTask> _currentTasks = new FastList<>();
 	
-	protected static final String[] SQL_STATEMENTS = {
+	private static final String[] SQL_STATEMENTS =
+	{
 		"SELECT id,task,type,last_activation,param1,param2,param3 FROM global_tasks",
-		"UPDATE global_tasks SET last_activation=? WHERE id=?", "SELECT id FROM global_tasks WHERE task=?",
+		"UPDATE global_tasks SET last_activation=? WHERE id=?",
+		"SELECT id FROM global_tasks WHERE task=?",
 		"INSERT INTO global_tasks (task,type,last_activation,param1,param2,param3) VALUES(?,?,?,?,?,?)"
 	};
 	
-	private final FastMap<Integer, Task> _tasks = new FastMap<Integer, Task>();
-	protected final FastList<ExecutedTask> _currentTasks = new FastList<ExecutedTask>();
-	
 	public class ExecutedTask implements Runnable
 	{
 		int id;
@@ -80,7 +81,12 @@ public final class TaskManager
 			type = ptype;
 			id = rset.getInt("id");
 			lastActivation = rset.getLong("last_activation");
-			params = new String[] { rset.getString("param1"), rset.getString("param2"), rset.getString("param3") };
+			params = new String[]
+			{
+				rset.getString("param1"),
+				rset.getString("param2"),
+				rset.getString("param3")
+			};
 		}
 		
 		@Override
@@ -88,9 +94,7 @@ public final class TaskManager
 		{
 			task.onTimeElapsed(this);
 			lastActivation = System.currentTimeMillis();
-			
 			Connection con = null;
-			
 			try
 			{
 				con = L2DatabaseFactory.getInstance().getConnection();
@@ -109,7 +113,7 @@ public final class TaskManager
 				L2DatabaseFactory.close(con);
 			}
 			
-			if (type == TYPE_SHEDULED || type == TYPE_TIME)
+			if ((type == TYPE_SHEDULED) || (type == TYPE_TIME))
 			{
 				stopTask();
 			}
@@ -151,7 +155,9 @@ public final class TaskManager
 			task.onDestroy();
 			
 			if (scheduled != null)
+			{
 				scheduled.cancel(true);
+			}
 			
 			_currentTasks.remove(this);
 		}
@@ -171,19 +177,19 @@ public final class TaskManager
 	
 	private void initializate()
 	{
+		registerTask(new TaskBirthday());
 		registerTask(new TaskCleanUp());
-		registerTask(new TaskScript());
-		registerTask(new TaskJython());
+		registerTask(new TaskDailyQuestClean());
+		registerTask(new TaskDailySkillReuseClean());
 		registerTask(new TaskGlobalVariablesSave());
+		registerTask(new TaskJython());
 		registerTask(new TaskOlympiadSave());
 		registerTask(new TaskRaidPointsReset());
 		registerTask(new TaskRecom());
 		registerTask(new TaskRestart());
+		registerTask(new TaskScript());
 		registerTask(new TaskSevenSignsUpdate());
 		registerTask(new TaskShutdown());
-		registerTask(new TaskDailyQuestClean());
-		registerTask(new TaskDailySkillReuseClean());
-		registerTask(new TaskBirthday());
 	}
 	
 	public void registerTask(Task task)
@@ -202,30 +208,30 @@ public final class TaskManager
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement = con.prepareStatement(SQL_STATEMENTS[0]);
-			ResultSet rset = statement.executeQuery();
-			
+			final PreparedStatement statement = con.prepareStatement(SQL_STATEMENTS[0]);
+			final ResultSet rset = statement.executeQuery();
 			while (rset.next())
 			{
 				Task task = _tasks.get(rset.getString("task").trim().toLowerCase().hashCode());
 				
 				if (task == null)
+				{
 					continue;
+				}
 				
-				TaskTypes type = TaskTypes.valueOf(rset.getString("type"));
-				
+				final TaskTypes type = TaskTypes.valueOf(rset.getString("type"));
 				if (type != TYPE_NONE)
 				{
 					ExecutedTask current = new ExecutedTask(task, type, rset);
 					if (launchTask(current))
+					{
 						_currentTasks.add(current);
+					}
 				}
 				
 			}
-			
 			rset.close();
 			statement.close();
-			
 		}
 		catch (Exception e)
 		{
@@ -233,13 +239,7 @@ public final class TaskManager
 		}
 		finally
 		{
-			try
-			{
-				L2DatabaseFactory.close(con);
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
 	}
 	
@@ -248,8 +248,7 @@ public final class TaskManager
 		final ThreadPoolManager scheduler = ThreadPoolManager.getInstance();
 		final TaskTypes type = task.getType();
 		long delay, interval;
-		
-		switch(type)
+		switch (type)
 		{
 			case TYPE_STARTUP:
 				task.run();
@@ -315,19 +314,15 @@ public final class TaskManager
 				
 				delay = min.getTimeInMillis() - System.currentTimeMillis();
 				
-				if (check.after(min) || delay < 0)
+				if (check.after(min) || (delay < 0))
 				{
 					delay += interval;
 				}
-				
 				task.scheduled = scheduler.scheduleGeneralAtFixedRate(task, delay, interval);
-				
 				return true;
-				
 			default:
 				return false;
 		}
-		
 		return false;
 	}
 	
@@ -339,7 +334,6 @@ public final class TaskManager
 	public static boolean addUniqueTask(String task, TaskTypes type, String param1, String param2, String param3, long lastActivation)
 	{
 		Connection con = null;
-		
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
@@ -358,10 +352,8 @@ public final class TaskManager
 				statement.setString(6, param3);
 				statement.execute();
 			}
-			
 			rset.close();
 			statement.close();
-			
 			return true;
 		}
 		catch (SQLException e)
@@ -370,15 +362,8 @@ public final class TaskManager
 		}
 		finally
 		{
-			try
-			{
-				L2DatabaseFactory.close(con);
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
-		
 		return false;
 	}
 	
@@ -390,7 +375,6 @@ public final class TaskManager
 	public static boolean addTask(String task, TaskTypes type, String param1, String param2, String param3, long lastActivation)
 	{
 		Connection con = null;
-		
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
@@ -412,15 +396,8 @@ public final class TaskManager
 		}
 		finally
 		{
-			try
-			{
-				L2DatabaseFactory.close(con);
-			}
-			catch (Exception e)
-			{
-			}
+			L2DatabaseFactory.close(con);
 		}
-		
 		return false;
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/TaskTypes.java

@@ -16,7 +16,6 @@ package com.l2jserver.gameserver.taskmanager;
 
 /**
  * @author Layane
- * 
  */
 public enum TaskTypes
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/tasks/TaskBirthday.java

@@ -21,7 +21,6 @@ import java.sql.SQLException;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
@@ -40,13 +39,9 @@ import com.l2jserver.gameserver.util.Util;
  */
 public class TaskBirthday extends Task
 {
-	private static final Logger _log = Logger.getLogger(TaskBirthday.class.getName());
-	
 	private static final String NAME = "birthday";
-	
 	private static final String QUERY = "SELECT charId, createDate FROM characters WHERE createDate LIKE ?";
 	private static final Calendar _today = Calendar.getInstance();
-	
 	private int _count = 0;
 	
 	@Override
@@ -62,11 +57,13 @@ public class TaskBirthday extends Task
 		long lastActivation = task.getLastActivation();
 		
 		if (lastActivation > 0)
+		{
 			lastExecDate.setTimeInMillis(lastActivation);
+		}
 		
 		String rangeDate = "[" + Util.getDateString(lastExecDate.getTime()) + "] - [" + Util.getDateString(_today.getTime()) + "]";
 		
-		for(;!_today.before(lastExecDate);lastExecDate.add(Calendar.DATE, 1))
+		for (; !_today.before(lastExecDate); lastExecDate.add(Calendar.DATE, 1))
 		{
 			checkBirthday(lastExecDate.get(Calendar.YEAR), lastExecDate.get(Calendar.MONTH), lastExecDate.get(Calendar.DATE));
 		}
@@ -80,11 +77,9 @@ public class TaskBirthday extends Task
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement = con.prepareStatement(QUERY);
+			final PreparedStatement statement = con.prepareStatement(QUERY);
 			statement.setString(1, "%-" + getNum(month + 1) + "-" + getNum(day));
-			
-			ResultSet rset = statement.executeQuery();
-			
+			final ResultSet rset = statement.executeQuery();
 			while (rset.next())
 			{
 				int playerId = rset.getInt("charId");
@@ -92,16 +87,21 @@ public class TaskBirthday extends Task
 				createDate.setTime(rset.getDate("createDate"));
 				
 				int age = year - createDate.get(Calendar.YEAR);
-				
-				if (age <= 0) // Player births this year
+				if (age <= 0)
+				{
 					continue;
+				}
 				
 				String text = Config.ALT_BIRTHDAY_MAIL_TEXT;
 				
 				if (text.contains("$c1"))
+				{
 					text = text.replace("$c1", CharNameTable.getInstance().getNameById(playerId));
+				}
 				if (text.contains("$s1"))
+				{
 					text = text.replace("$s1", String.valueOf(age));
+				}
 				
 				Message msg = new Message(playerId, Config.ALT_BIRTHDAY_MAIL_SUBJECT, text, Message.SendBySystem.ALEGRIA);
 				
@@ -123,21 +123,21 @@ public class TaskBirthday extends Task
 		
 		// If character birthday is 29-Feb and year isn't leap, send gift on 28-feb
 		GregorianCalendar calendar = new GregorianCalendar();
-		if (month == Calendar.FEBRUARY && day == 28 && !calendar.isLeapYear(_today.get(Calendar.YEAR)))
+		if ((month == Calendar.FEBRUARY) && (day == 28) && !calendar.isLeapYear(_today.get(Calendar.YEAR)))
+		{
 			checkBirthday(year, Calendar.FEBRUARY, 29);
+		}
 	}
 	
+	/**
+	 * @param num the number to format.
+	 * @return the formatted number starting with a 0 if it is lower or equal than 10.
+	 */
 	private String getNum(int num)
 	{
-		if (num <= 9)
-			return "0" + num;
-		
-		return String.valueOf(num);
+		return (num <= 9) ? "0" + num : String.valueOf(num);
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.taskmanager.Task#initializate()
-	 */
 	@Override
 	public void initializate()
 	{
@@ -145,4 +145,3 @@ public class TaskBirthday extends Task
 		TaskManager.addUniqueTask(NAME, TaskTypes.TYPE_GLOBAL_TASK, "1", "06:30:00", "");
 	}
 }
-

L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/tasks/TaskCleanUp.java

@@ -19,26 +19,17 @@ import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
 
 /**
  * @author Tempy
- * 
  */
 public final class TaskCleanUp extends Task
 {
 	public static final String NAME = "clean_up";
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.taskmanager.Task#getName()
-	 */
 	@Override
 	public String getName()
 	{
 		return NAME;
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.taskmanager.Task#onTimeElapsed(com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask)
-	 */
 	@Override
 	public void onTimeElapsed(ExecutedTask task)
 	{

L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/tasks/TaskDailyQuestClean.java

@@ -16,8 +16,6 @@ package com.l2jserver.gameserver.taskmanager.tasks;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.taskmanager.Task;
@@ -25,18 +23,14 @@ import com.l2jserver.gameserver.taskmanager.TaskManager;
 import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
 import com.l2jserver.gameserver.taskmanager.TaskTypes;
 
-
 /**
- ** @author Gnacik
- ** 
+ * @author Gnacik
  */
 public class TaskDailyQuestClean extends Task
 {
-	private static final Logger _log = Logger.getLogger(TaskDailyQuestClean.class.getName());
-	
 	private static final String NAME = "daily_quest_clean";
 	
-	private static final String[] _daily_names = 
+	private static final String[] _daily_names =
 	{
 		"463_IMustBeaGenius",
 		"464_Oath",
@@ -47,20 +41,12 @@ public class TaskDailyQuestClean extends Task
 		"553_OlympiadUndefeated"
 	};
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.taskmanager.Task#getName()
-	 */
 	@Override
 	public String getName()
 	{
 		return NAME;
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.taskmanager.Task#onTimeElapsed(com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask)
-	 */
 	@Override
 	public void onTimeElapsed(ExecutedTask task)
 	{
@@ -68,7 +54,7 @@ public class TaskDailyQuestClean extends Task
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			for(String name : _daily_names)
+			for (String name : _daily_names)
 			{
 				PreparedStatement statement = con.prepareStatement("DELETE FROM character_quests WHERE name=? AND var='<state>' AND value='Completed';");
 				statement.setString(1, name);
@@ -78,24 +64,19 @@ public class TaskDailyQuestClean extends Task
 		}
 		catch (Exception e)
 		{
-			_log.log(Level.SEVERE, "Could not reset daily quests: " + e);
+			_log.severe(getClass().getSimpleName() + ": Could not reset daily quests: " + e);
 		}
 		finally
 		{
 			L2DatabaseFactory.close(con);
 		}
-		_log.config("Daily quests cleared");
+		_log.info("Daily quests cleared");
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.taskmanager.Task#initializate()
-	 */
 	@Override
 	public void initializate()
 	{
 		super.initializate();
 		TaskManager.addUniqueTask(NAME, TaskTypes.TYPE_GLOBAL_TASK, "1", "06:30:00", "");
 	}
-	
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/tasks/TaskDailySkillReuseClean.java

@@ -16,8 +16,6 @@ package com.l2jserver.gameserver.taskmanager.tasks;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.taskmanager.Task;
@@ -27,13 +25,12 @@ import com.l2jserver.gameserver.taskmanager.TaskTypes;
 
 public class TaskDailySkillReuseClean extends Task
 {
-	private static final Logger _log = Logger.getLogger(TaskDailySkillReuseClean.class.getName());
-	
 	private static final String NAME = "daily_skill_clean";
 	
 	private static final int[] _daily_skills =
 	{
-		2510, 22180
+		2510,
+		22180
 	};
 	
 	@Override
@@ -59,13 +56,13 @@ public class TaskDailySkillReuseClean extends Task
 		}
 		catch (Exception e)
 		{
-			_log.log(Level.SEVERE, "Could not reset daily skill reuse: " + e);
+			_log.severe(getClass().getSimpleName() + ": Could not reset daily skill reuse: " + e);
 		}
 		finally
 		{
 			L2DatabaseFactory.close(con);
 		}
-		_log.config("Daily skill reuse cleaned.");
+		_log.info("Daily skill reuse cleaned.");
 	}
 	
 	@Override

L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/tasks/TaskGlobalVariablesSave.java

@@ -14,37 +14,25 @@
  */
 package com.l2jserver.gameserver.taskmanager.tasks;
 
-import java.util.logging.Logger;
-
 import com.l2jserver.gameserver.instancemanager.GlobalVariablesManager;
 import com.l2jserver.gameserver.taskmanager.Task;
 import com.l2jserver.gameserver.taskmanager.TaskManager;
 import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
 import com.l2jserver.gameserver.taskmanager.TaskTypes;
 
-
 /**
  * @author Gigiikun
  */
 public class TaskGlobalVariablesSave extends Task
 {
-	private static final Logger _log = Logger.getLogger(TaskGlobalVariablesSave.class.getName());
 	public static final String NAME = "global_varibales_save";
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.taskmanager.Task#getName()
-	 */
 	@Override
 	public String getName()
 	{
 		return NAME;
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.taskmanager.Task#onTimeElapsed(com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask)
-	 */
 	@Override
 	public void onTimeElapsed(ExecutedTask task)
 	{
@@ -52,10 +40,6 @@ public class TaskGlobalVariablesSave extends Task
 		_log.info("GlobalVariablesManager: Data updated successfully.");
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.taskmanager.Task#initializate()
-	 */
 	@Override
 	public void initializate()
 	{

L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/tasks/TaskJython.java

@@ -14,7 +14,6 @@
  */
 package com.l2jserver.gameserver.taskmanager.tasks;
 
-
 import org.python.util.PythonInterpreter;
 
 import com.l2jserver.gameserver.taskmanager.Task;
@@ -22,27 +21,18 @@ import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
 
 /**
  * @author Layane
- * 
  */
 public class TaskJython extends Task
 {
 	public static final String NAME = "jython";
 	private final PythonInterpreter _python = new PythonInterpreter();
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.taskmanager.Task#getName()
-	 */
 	@Override
 	public String getName()
 	{
 		return NAME;
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.taskmanager.Task#onTimeElapsed(com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask)
-	 */
 	@Override
 	public void onTimeElapsed(ExecutedTask task)
 	{
@@ -50,5 +40,4 @@ public class TaskJython extends Task
 		_python.exec("import sys");
 		_python.execfile("data/scripts/cron/" + task.getParams()[2]);
 	}
-	
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/tasks/TaskOlympiadSave.java

@@ -14,39 +14,26 @@
  */
 package com.l2jserver.gameserver.taskmanager.tasks;
 
-import java.util.logging.Logger;
-
 import com.l2jserver.gameserver.model.olympiad.Olympiad;
 import com.l2jserver.gameserver.taskmanager.Task;
 import com.l2jserver.gameserver.taskmanager.TaskManager;
 import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
 import com.l2jserver.gameserver.taskmanager.TaskTypes;
 
-
 /**
  * Updates all data of Olympiad nobles in db
- * 
  * @author godson
  */
 public class TaskOlympiadSave extends Task
 {
-	private static final Logger _log = Logger.getLogger(TaskOlympiadSave.class.getName());
 	public static final String NAME = "olympiad_save";
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.taskmanager.Task#getName()
-	 */
 	@Override
 	public String getName()
 	{
 		return NAME;
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.taskmanager.Task#onTimeElapsed(com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask)
-	 */
 	@Override
 	public void onTimeElapsed(ExecutedTask task)
 	{
@@ -57,10 +44,6 @@ public class TaskOlympiadSave extends Task
 		}
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.taskmanager.Task#initializate()
-	 */
 	@Override
 	public void initializate()
 	{

L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/tasks/TaskRaidPointsReset.java

@@ -16,7 +16,6 @@ package com.l2jserver.gameserver.taskmanager.tasks;
 
 import java.util.Calendar;
 import java.util.Map;
-import java.util.logging.Logger;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.datatables.ClanTable;
@@ -29,8 +28,7 @@ import com.l2jserver.gameserver.taskmanager.TaskTypes;
 
 public class TaskRaidPointsReset extends Task
 {
-	private static final Logger _log	= Logger.getLogger(TaskRaidPointsReset.class.getName());
-	public static final	String	NAME	= "raid_points_reset";
+	public static final String NAME = "raid_points_reset";
 	
 	@Override
 	public String getName()
@@ -42,7 +40,6 @@ public class TaskRaidPointsReset extends Task
 	public void onTimeElapsed(ExecutedTask task)
 	{
 		Calendar cal = Calendar.getInstance();
-		
 		if (cal.get(Calendar.DAY_OF_WEEK) == Calendar.MONDAY)
 		{
 			// reward clan reputation points
@@ -51,7 +48,7 @@ public class TaskRaidPointsReset extends Task
 			{
 				for (Map.Entry<Integer, Integer> entry : rankList.entrySet())
 				{
-					if (entry.getValue() <= 100 && c.isMember(entry.getKey()))
+					if ((entry.getValue() <= 100) && c.isMember(entry.getKey()))
 					{
 						int reputation = 0;
 						switch (entry.getValue())
@@ -88,9 +85,13 @@ public class TaskRaidPointsReset extends Task
 								break;
 							default:
 								if (entry.getValue() <= 50)
+								{
 									reputation = Config.RAID_RANKING_UP_TO_50TH;
+								}
 								else
+								{
 									reputation = Config.RAID_RANKING_UP_TO_100TH;
+								}
 								break;
 						}
 						c.addReputationScore(reputation, true);

L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/tasks/TaskRecom.java

@@ -16,8 +16,6 @@ package com.l2jserver.gameserver.taskmanager.tasks;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.taskmanager.Task;
@@ -25,30 +23,19 @@ import com.l2jserver.gameserver.taskmanager.TaskManager;
 import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
 import com.l2jserver.gameserver.taskmanager.TaskTypes;
 
-
 /**
  * @author Layane
- * 
  */
 public class TaskRecom extends Task
 {
-	private static final Logger _log = Logger.getLogger(TaskRecom.class.getName());
 	private static final String NAME = "recommendations";
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.taskmanager.Task#getName()
-	 */
 	@Override
 	public String getName()
 	{
 		return NAME;
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.taskmanager.Task#onTimeElapsed(com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask)
-	 */
 	@Override
 	public void onTimeElapsed(ExecutedTask task)
 	{
@@ -58,36 +45,31 @@ public class TaskRecom extends Task
 			con = L2DatabaseFactory.getInstance().getConnection();
 			
 			PreparedStatement statement = con.prepareStatement("UPDATE character_reco_bonus SET rec_left=?, time_left=?, rec_have=0 WHERE rec_have <=  20");
-			statement.setInt(1, 0);	// Rec left = 0
+			statement.setInt(1, 0); // Rec left = 0
 			statement.setInt(2, 3600000); // Timer = 1 hour
 			statement.execute();
 			
 			statement = con.prepareStatement("UPDATE character_reco_bonus SET rec_left=?, time_left=?, rec_have=GREATEST(rec_have-20,0) WHERE rec_have > 20");
-			statement.setInt(1, 0);	// Rec left = 0
+			statement.setInt(1, 0); // Rec left = 0
 			statement.setInt(2, 3600000); // Timer = 1 hour
 			statement.execute();
 			statement.close();
 		}
 		catch (Exception e)
 		{
-			_log.log(Level.SEVERE, "Could not reset Recommendations System: " + e);
+			_log.severe(getClass().getSimpleName() + ": Could not reset Recommendations System: " + e);
 		}
 		finally
 		{
 			L2DatabaseFactory.close(con);
 		}
-		_log.config("Recommendations System reseted");
+		_log.info("Recommendations System reseted");
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.taskmanager.Task#initializate()
-	 */
 	@Override
 	public void initializate()
 	{
 		super.initializate();
 		TaskManager.addUniqueTask(NAME, TaskTypes.TYPE_GLOBAL_TASK, "1", "06:30:00", "");
 	}
-	
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/tasks/TaskRestart.java

@@ -20,31 +20,21 @@ import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
 
 /**
  * @author Layane
- * 
  */
 public final class TaskRestart extends Task
 {
 	public static final String NAME = "restart";
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.taskmanager.Task#getName()
-	 */
 	@Override
 	public String getName()
 	{
 		return NAME;
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.taskmanager.Task#onTimeElapsed(com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask)
-	 */
 	@Override
 	public void onTimeElapsed(ExecutedTask task)
 	{
 		Shutdown handler = new Shutdown(Integer.parseInt(task.getParams()[2]), true);
 		handler.start();
 	}
-	
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/tasks/TaskScript.java

@@ -15,7 +15,6 @@
 package com.l2jserver.gameserver.taskmanager.tasks;
 
 import java.io.File;
-import java.util.logging.Logger;
 
 import javax.script.ScriptException;
 
@@ -25,31 +24,21 @@ import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
 
 /**
  * @author janiii
- *
  */
 public class TaskScript extends Task
 {
-	private static final Logger _log = Logger.getLogger(TaskScript.class.getName());
 	public static final String NAME = "script";
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.taskmanager.Task#getName()
-	 */
 	@Override
 	public String getName()
 	{
 		return NAME;
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.taskmanager.Task#onTimeElapsed(com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask)
-	 */
 	@Override
 	public void onTimeElapsed(ExecutedTask task)
 	{
-		File file = new File(L2ScriptEngineManager.SCRIPT_FOLDER, "cron/" + task.getParams()[2]);
+		final File file = new File(L2ScriptEngineManager.SCRIPT_FOLDER, "cron/" + task.getParams()[2]);
 		if (file.isFile())
 		{
 			try

L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/tasks/TaskSevenSignsUpdate.java

@@ -14,9 +14,6 @@
  */
 package com.l2jserver.gameserver.taskmanager.tasks;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.l2jserver.gameserver.SevenSigns;
 import com.l2jserver.gameserver.SevenSignsFestival;
 import com.l2jserver.gameserver.taskmanager.Task;
@@ -24,54 +21,38 @@ import com.l2jserver.gameserver.taskmanager.TaskManager;
 import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
 import com.l2jserver.gameserver.taskmanager.TaskTypes;
 
-
 /**
- * Updates all data for the Seven Signs and Festival of Darkness engines, when
- * time is elapsed.
- * 
+ * Updates all data for the Seven Signs and Festival of Darkness engines, when time is elapsed.
  * @author Tempy
  */
 public class TaskSevenSignsUpdate extends Task
 {
-	private static final Logger _log = Logger.getLogger(TaskSevenSignsUpdate.class.getName());
-	public static final String NAME = "seven_signs_update";
+	private static final String NAME = "seven_signs_update";
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.taskmanager.Task#getName()
-	 */
 	@Override
 	public String getName()
 	{
 		return NAME;
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.taskmanager.Task#onTimeElapsed(com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask)
-	 */
 	@Override
 	public void onTimeElapsed(ExecutedTask task)
 	{
 		try
 		{
 			SevenSigns.getInstance().saveSevenSignsStatus();
-			
 			if (!SevenSigns.getInstance().isSealValidationPeriod())
+			{
 				SevenSignsFestival.getInstance().saveFestivalData(false);
-			
+			}
 			_log.info("SevenSigns: Data updated successfully.");
 		}
 		catch (Exception e)
 		{
-			_log.log(Level.WARNING, "SevenSigns: Failed to save Seven Signs configuration: " + e.getMessage(), e);
+			_log.warning(getClass().getSimpleName() + ": SevenSigns: Failed to save Seven Signs configuration: " + e.getMessage());
 		}
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.taskmanager.Task#initializate()
-	 */
 	@Override
 	public void initializate()
 	{

L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/tasks/TaskShutdown.java

@@ -20,31 +20,21 @@ import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
 
 /**
  * @author Layane
- * 
  */
 public class TaskShutdown extends Task
 {
 	public static final String NAME = "shutdown";
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.taskmanager.Task#getName()
-	 */
 	@Override
 	public String getName()
 	{
 		return NAME;
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.taskmanager.Task#onTimeElapsed(com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask)
-	 */
 	@Override
 	public void onTimeElapsed(ExecutedTask task)
 	{
 		Shutdown handler = new Shutdown(Integer.parseInt(task.getParams()[2]), false);
 		handler.start();
 	}
-	
 }