Source code cleanup

l2jserver2-common/src/main/java/com/l2jserver/service/cache/SoftCacheService.java

@@ -186,7 +186,8 @@ public class SoftCacheService extends AbstractService implements CacheService {
 			while ((en = (SoftEntry) refQueue.poll()) != null) {
 				K key = en.getKey();
 				if (log.isDebugEnabled())
-					log.debug("{} : cleaned up value for key: {}", cacheName, key);
+					log.debug("{} : cleaned up value for key: {}", cacheName,
+							key);
 				cacheMap.remove(key);
 			}
 		}

l2jserver2-common/src/main/java/com/l2jserver/service/cache/WeakCacheService.java

@@ -185,7 +185,8 @@ public class WeakCacheService extends AbstractService implements CacheService {
 			while ((en = (Entry) refQueue.poll()) != null) {
 				K key = en.getKey();
 				if (log.isDebugEnabled())
-					log.debug("{}: cleaned up value for key: {}", cacheName, key);
+					log.debug("{}: cleaned up value for key: {}", cacheName,
+							key);
 				cacheMap.remove(key);
 			}
 		}

l2jserver2-common/src/main/java/com/l2jserver/service/core/logging/Log4JLoggingService.java

@@ -52,8 +52,7 @@ public class Log4JLoggingService extends
 
 	@Override
 	protected void doStart() throws ServiceStartException {
-		final Layout layout = new PatternLayout(
+		final Layout layout = new PatternLayout("[%p %d] %c{1} - %m%n");
-				"[%p %d] %c{1} - %m%n");
 		rootLogger = Logger.getRootLogger();
 
 		rootLogger.removeAllAppenders();

l2jserver2-common/src/main/java/com/l2jserver/service/core/threading/ThreadPoolPriority.java

@@ -50,7 +50,8 @@ public enum ThreadPoolPriority {
 	public final int threadPriority;
 
 	/**
-	 * @param threadPriority the {@link Thread} priority {@link Integer} index
+	 * @param threadPriority
+	 *            the {@link Thread} priority {@link Integer} index
 	 */
 	ThreadPoolPriority(int threadPriority) {
 		this.threadPriority = threadPriority;

l2jserver2-common/src/main/java/com/l2jserver/service/core/vfs/Java7VFSService.java

@@ -70,7 +70,7 @@ public class Java7VFSService extends
 	public Path resolve(String path) {
 		return resolve(Paths.get(path));
 	}
-	
+
 	@Override
 	public Path resolve(Path path) {
 		log.debug("Resolving file {}", path);
@@ -81,14 +81,13 @@ public class Java7VFSService extends
 	public Path resolveDataFile(String path) {
 		return resolveDataFile(Paths.get(path));
 	}
-	
+
 	@Override
 	public Path resolveDataFile(Path path) {
 		log.debug("Resolving data file {}", path);
 		return dataRoot.resolve(path);
 	}
 
-
 	@Override
 	protected void doStop() throws ServiceStopException {
 		root = null;

l2jserver2-common/src/main/java/com/l2jserver/service/core/vfs/TrueZipVFSService.java

@@ -75,7 +75,7 @@ public class TrueZipVFSService extends
 	public Path resolve(String path) {
 		return resolve(Paths.get(path));
 	}
-	
+
 	@Override
 	public Path resolve(Path path) {
 		log.debug("Resolving file {}", path);
@@ -86,7 +86,7 @@ public class TrueZipVFSService extends
 	public Path resolveDataFile(String path) {
 		return resolveDataFile(Paths.get(path));
 	}
-	
+
 	@Override
 	public Path resolveDataFile(Path path) {
 		log.debug("Resolving data file {}", path);

l2jserver2-common/src/main/java/com/l2jserver/service/core/vfs/VFSService.java

@@ -38,7 +38,7 @@ public interface VFSService extends Service {
 	 * @return the resolved file. Will return null if could not resolve.
 	 */
 	Path resolve(String path);
-	
+
 	/**
 	 * Resolves an file. If the file cannot be resolved, null will be returned.
 	 * <p>
@@ -63,7 +63,7 @@ public interface VFSService extends Service {
 	 * @return the resolved file. Will return null if could not resolve.
 	 */
 	Path resolveDataFile(String path);
-	
+
 	/**
 	 * Resolves an file inside the data storage file system. If the file cannot
 	 * be resolved, null will be returned.

l2jserver2-common/src/main/java/com/l2jserver/service/database/ddl/QueryFactory.java

@@ -19,10 +19,10 @@ package com.l2jserver.service.database.ddl;
 import java.util.List;
 
 import com.l2jserver.service.database.ddl.struct.Column;
+import com.l2jserver.service.database.ddl.struct.Column.ColumnType;
 import com.l2jserver.service.database.ddl.struct.ForeignKey;
 import com.l2jserver.service.database.ddl.struct.PrimaryKey;
 import com.l2jserver.service.database.ddl.struct.Table;
-import com.l2jserver.service.database.ddl.struct.Column.ColumnType;
 import com.l2jserver.util.factory.CollectionFactory;
 
 /**

l2jserver2-common/src/main/java/com/l2jserver/service/database/ddl/struct/Table.java

@@ -47,10 +47,14 @@ public class Table {
 	private final List<ForeignKey> foreignKeys = CollectionFactory.newList();
 
 	/**
-	 * @param name the table name
+	 * @param name
-	 * @param columns the column
+	 *            the table name
-	 * @param primaryKey the primary key
+	 * @param columns
-	 * @param foreignKeys the foreign keys
+	 *            the column
+	 * @param primaryKey
+	 *            the primary key
+	 * @param foreignKeys
+	 *            the foreign keys
 	 */
 	public Table(String name, Map<String, Column> columns,
 			PrimaryKey primaryKey, List<ForeignKey> foreignKeys) {
@@ -62,8 +66,10 @@ public class Table {
 	}
 
 	/**
-	 * @param name the table name
+	 * @param name
-	 * @param primaryKey the primary key
+	 *            the table name
+	 * @param primaryKey
+	 *            the primary key
 	 */
 	public Table(String name, PrimaryKey primaryKey) {
 		this.name = name;
@@ -104,7 +110,8 @@ public class Table {
 	}
 
 	/**
-	 * @param name the column name
+	 * @param name
+	 *            the column name
 	 * @return the column represented by <code>name</code>
 	 */
 	public Column getColumn(String name) {

l2jserver2-common/src/main/java/com/l2jserver/service/database/sql/AbstractSQLDatabaseService.java

@@ -1103,7 +1103,8 @@ public abstract class AbstractSQLDatabaseService extends
 		 * 
 		 * @param q
 		 *            the query clause
-		 * @param e the entity
+		 * @param e
+		 *            the entity
 		 */
 		protected abstract void query(AbstractSQLQuery<?> q, E e);
 	}

l2jserver2-common/src/main/java/com/l2jserver/util/QPathUtils.java

@@ -57,7 +57,8 @@ public class QPathUtils {
 	 * @return the {@link Field} holding <code>path</code>
 	 */
 	public static Field getReflectionField(Path<?> path) {
-		return ClassUtils.getFieldWithValue(path.getMetadata().getParent(), path);
+		return ClassUtils.getFieldWithValue(path.getMetadata().getParent(),
+				path);
 	}
 
 	/**
@@ -81,7 +82,7 @@ public class QPathUtils {
 	 */
 	public static int getColumnSize(Path<?> path) {
 		final Field field = getReflectionField(path);
-		if(field == null)
+		if (field == null)
 			return 0;
 		final ColumnSize size = field.getAnnotation(ColumnSize.class);
 		if (size != null)
@@ -96,7 +97,7 @@ public class QPathUtils {
 	 */
 	public static boolean isAutoIncrementable(Path<?> path) {
 		final Field field = getReflectionField(path);
-		if(field == null)
+		if (field == null)
 			return false;
 		final ColumnAutoIncrement autoInc = field
 				.getAnnotation(ColumnAutoIncrement.class);
@@ -112,7 +113,7 @@ public class QPathUtils {
 	 */
 	public static boolean isNullable(Path<?> path) {
 		final Field field = getReflectionField(path);
-		if(field == null)
+		if (field == null)
 			return false;
 		final ColumnNullable nullable = field
 				.getAnnotation(ColumnNullable.class);
@@ -130,7 +131,7 @@ public class QPathUtils {
 	 */
 	public static boolean hasDefaultValue(Path<?> path) {
 		final Field field = getReflectionField(path);
-		if(field == null)
+		if (field == null)
 			return false;
 		final ColumnDefault def = field.getAnnotation(ColumnDefault.class);
 		if (def == null) {
@@ -147,7 +148,7 @@ public class QPathUtils {
 	 */
 	public static String getDefaultUntransformedValue(Path<?> path) {
 		final Field field = getReflectionField(path);
-		if(field == null)
+		if (field == null)
 			return null;
 		final ColumnDefault def = field.getAnnotation(ColumnDefault.class);
 		if (def != null)

l2jserver2-common/src/main/java/com/l2jserver/util/transformer/TransformerFactory.java

@@ -82,7 +82,7 @@ public class TransformerFactory {
 			return PathTransformer.SHARED_INSTANCE;
 		} else if (type.isEnum()) {
 			return EnumTransformer.SHARED_INSTANCE;
-		} else if(type.isArray()) {
+		} else if (type.isArray()) {
 			return ArrayTransformer.SHARED_INSTANCE;
 		} else if (type == String.class)
 			return StringTransformer.SHARED_INSTANCE;

l2jserver2-common/src/test/java/com/l2jserver/util/ArrayUtilsTest.java

@@ -47,6 +47,7 @@ public class ArrayUtilsTest extends ArrayUtils {
 
 	/**
 	 * Simple test class
+	 * 
 	 * @author <a href="http://www.rogiel.com">Rogiel</a>
 	 */
 	private static class TestClass {
@@ -56,7 +57,8 @@ public class ArrayUtilsTest extends ArrayUtils {
 		private String name;
 
 		/**
-		 * @param string the name
+		 * @param string
+		 *            the name
 		 */
 		public TestClass(String string) {
 			this.name = string;

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/AbstractTemplate.java

@@ -5,7 +5,6 @@
 // Generated on: 2012.03.25 at 01:03:28 PM BRT 
 //
 
-
 package com.l2jserver.model.template;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,13 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for AbstractTemplate complex type.
+ * <p>
+ * Java class for AbstractTemplate complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
  * 
  * <pre>
  * &lt;complexType name="AbstractTemplate">
@@ -34,15 +35,8 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "AbstractTemplate")
-@XmlSeeAlso({
+@XmlSeeAlso({ ItemTemplate.class, ActorTemplate.class, SkillTemplate.class,
-    ItemTemplate.class,
+		com.l2jserver.model.template.Teleports.Teleport.class })
-    ActorTemplate.class,
+public abstract class AbstractTemplate implements Template {
-    SkillTemplate.class,
-    com.l2jserver.model.template.Teleports.Teleport.class
-})
-public abstract class AbstractTemplate
-    implements Template
-{
-
 
 }

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ActorTemplate.java

@@ -5,7 +5,6 @@
 // Generated on: 2012.03.25 at 01:03:28 PM BRT 
 //
 
-
 package com.l2jserver.model.template;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,13 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for ActorTemplate complex type.
+ * <p>
+ * Java class for ActorTemplate complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
  * 
  * <pre>
  * &lt;complexType name="ActorTemplate">
@@ -32,13 +33,7 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "ActorTemplate")
-@XmlSeeAlso({
+@XmlSeeAlso({ CharacterTemplate.class, NPCTemplate.class })
-    CharacterTemplate.class,
+public abstract class ActorTemplate extends AbstractTemplate {
-    NPCTemplate.class
-})
-public abstract class ActorTemplate
-    extends AbstractTemplate
-{
-
 
 }

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunction.java

@@ -5,18 +5,19 @@
 // Generated on: 2012.03.25 at 01:03:28 PM BRT 
 //
 
-
 package com.l2jserver.model.template;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for CalculatorFunction complex type.
+ * <p>
+ * Java class for CalculatorFunction complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
  * 
  * <pre>
  * &lt;complexType name="CalculatorFunction">
@@ -36,113 +37,97 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CalculatorFunction", propOrder = {
+@XmlType(name = "CalculatorFunction", propOrder = { "set", "add", "subtract",
-    "set",
+		"random" })
-    "add",
-    "subtract",
-    "random"
-})
 public class CalculatorFunction {
 
-    protected CalculatorFunctionOperation set;
+	protected CalculatorFunctionOperation set;
-    protected CalculatorFunctionOperation add;
+	protected CalculatorFunctionOperation add;
-    protected CalculatorFunctionOperation subtract;
+	protected CalculatorFunctionOperation subtract;
-    protected CalculatorFunctionOperation random;
+	protected CalculatorFunctionOperation random;
 
-    /**
+	/**
-     * Gets the value of the set property.
+	 * Gets the value of the set property.
-     * 
+	 * 
-     * @return
+	 * @return possible object is {@link CalculatorFunctionOperation }
-     *     possible object is
+	 * 
-     *     {@link CalculatorFunctionOperation }
+	 */
-     *     
+	public CalculatorFunctionOperation getSet() {
-     */
+		return set;
-    public CalculatorFunctionOperation getSet() {
+	}
-        return set;
-    }
 
-    /**
+	/**
-     * Sets the value of the set property.
+	 * Sets the value of the set property.
-     * 
+	 * 
-     * @param value
+	 * @param value
-     *     allowed object is
+	 *            allowed object is {@link CalculatorFunctionOperation }
-     *     {@link CalculatorFunctionOperation }
+	 * 
-     *     
+	 */
-     */
+	public void setSet(CalculatorFunctionOperation value) {
-    public void setSet(CalculatorFunctionOperation value) {
+		this.set = value;
-        this.set = value;
+	}
-    }
 
-    /**
+	/**
-     * Gets the value of the add property.
+	 * Gets the value of the add property.
-     * 
+	 * 
-     * @return
+	 * @return possible object is {@link CalculatorFunctionOperation }
-     *     possible object is
+	 * 
-     *     {@link CalculatorFunctionOperation }
+	 */
-     *     
+	public CalculatorFunctionOperation getAdd() {
-     */
+		return add;
-    public CalculatorFunctionOperation getAdd() {
+	}
-        return add;
-    }
 
-    /**
+	/**
-     * Sets the value of the add property.
+	 * Sets the value of the add property.
-     * 
+	 * 
-     * @param value
+	 * @param value
-     *     allowed object is
+	 *            allowed object is {@link CalculatorFunctionOperation }
-     *     {@link CalculatorFunctionOperation }
+	 * 
-     *     
+	 */
-     */
+	public void setAdd(CalculatorFunctionOperation value) {
-    public void setAdd(CalculatorFunctionOperation value) {
+		this.add = value;
-        this.add = value;
+	}
-    }
 
-    /**
+	/**
-     * Gets the value of the subtract property.
+	 * Gets the value of the subtract property.
-     * 
+	 * 
-     * @return
+	 * @return possible object is {@link CalculatorFunctionOperation }
-     *     possible object is
+	 * 
-     *     {@link CalculatorFunctionOperation }
+	 */
-     *     
+	public CalculatorFunctionOperation getSubtract() {
-     */
+		return subtract;
-    public CalculatorFunctionOperation getSubtract() {
+	}
-        return subtract;
-    }
 
-    /**
+	/**
-     * Sets the value of the subtract property.
+	 * Sets the value of the subtract property.
-     * 
+	 * 
-     * @param value
+	 * @param value
-     *     allowed object is
+	 *            allowed object is {@link CalculatorFunctionOperation }
-     *     {@link CalculatorFunctionOperation }
+	 * 
-     *     
+	 */
-     */
+	public void setSubtract(CalculatorFunctionOperation value) {
-    public void setSubtract(CalculatorFunctionOperation value) {
+		this.subtract = value;
-        this.subtract = value;
+	}
-    }
 
-    /**
+	/**
-     * Gets the value of the random property.
+	 * Gets the value of the random property.
-     * 
+	 * 
-     * @return
+	 * @return possible object is {@link CalculatorFunctionOperation }
-     *     possible object is
+	 * 
-     *     {@link CalculatorFunctionOperation }
+	 */
-     *     
+	public CalculatorFunctionOperation getRandom() {
-     */
+		return random;
-    public CalculatorFunctionOperation getRandom() {
+	}
-        return random;
-    }
 
-    /**
+	/**
-     * Sets the value of the random property.
+	 * Sets the value of the random property.
-     * 
+	 * 
-     * @param value
+	 * @param value
-     *     allowed object is
+	 *            allowed object is {@link CalculatorFunctionOperation }
-     *     {@link CalculatorFunctionOperation }
+	 * 
-     *     
+	 */
-     */
+	public void setRandom(CalculatorFunctionOperation value) {
-    public void setRandom(CalculatorFunctionOperation value) {
+		this.random = value;
-        this.random = value;
+	}
-    }
 
 }

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunctionOperation.java

@@ -5,20 +5,22 @@
 // Generated on: 2012.03.25 at 01:03:28 PM BRT 
 //
 
-
 package com.l2jserver.model.template;
 
 import java.math.BigInteger;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for CalculatorFunctionOperation complex type.
+ * <p>
+ * Java class for CalculatorFunctionOperation complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
  * 
  * <pre>
  * &lt;complexType name="CalculatorFunctionOperation">
@@ -37,49 +39,46 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "CalculatorFunctionOperation")
 public class CalculatorFunctionOperation {
 
-    @XmlAttribute(name = "order", required = true)
+	@XmlAttribute(name = "order", required = true)
-    protected BigInteger order;
+	protected BigInteger order;
-    @XmlAttribute(name = "value", required = true)
+	@XmlAttribute(name = "value", required = true)
-    protected double value;
+	protected double value;
 
-    /**
+	/**
-     * Gets the value of the order property.
+	 * Gets the value of the order property.
-     * 
+	 * 
-     * @return
+	 * @return possible object is {@link BigInteger }
-     *     possible object is
+	 * 
-     *     {@link BigInteger }
+	 */
-     *     
+	public BigInteger getOrder() {
-     */
+		return order;
-    public BigInteger getOrder() {
+	}
-        return order;
-    }
 
-    /**
+	/**
-     * Sets the value of the order property.
+	 * Sets the value of the order property.
-     * 
+	 * 
-     * @param value
+	 * @param value
-     *     allowed object is
+	 *            allowed object is {@link BigInteger }
-     *     {@link BigInteger }
+	 * 
-     *     
+	 */
-     */
+	public void setOrder(BigInteger value) {
-    public void setOrder(BigInteger value) {
+		this.order = value;
-        this.order = value;
+	}
-    }
 
-    /**
+	/**
-     * Gets the value of the value property.
+	 * Gets the value of the value property.
-     * 
+	 * 
-     */
+	 */
-    public double getValue() {
+	public double getValue() {
-        return value;
+		return value;
-    }
+	}
 
-    /**
+	/**
-     * Sets the value of the value property.
+	 * Sets the value of the value property.
-     * 
+	 * 
-     */
+	 */
-    public void setValue(double value) {
+	public void setValue(double value) {
-        this.value = value;
+		this.value = value;
-    }
+	}
 
 }

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Coordinate.java

@@ -5,7 +5,6 @@
 // Generated on: 2012.03.25 at 01:03:28 PM BRT 
 //
 
-
 package com.l2jserver.model.template;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,13 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for Coordinate complex type.
+ * <p>
+ * Java class for Coordinate complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
  * 
  * <pre>
  * &lt;complexType name="Coordinate">
@@ -39,59 +40,59 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "Coordinate")
 public class Coordinate {
 
-    @XmlAttribute(name = "x", required = true)
+	@XmlAttribute(name = "x", required = true)
-    protected int x;
+	protected int x;
-    @XmlAttribute(name = "y", required = true)
+	@XmlAttribute(name = "y", required = true)
-    protected int y;
+	protected int y;
-    @XmlAttribute(name = "z", required = true)
+	@XmlAttribute(name = "z", required = true)
-    protected int z;
+	protected int z;
 
-    /**
+	/**
-     * Gets the value of the x property.
+	 * Gets the value of the x property.
-     * 
+	 * 
-     */
+	 */
-    public int getX() {
+	public int getX() {
-        return x;
+		return x;
-    }
+	}
 
-    /**
+	/**
-     * Sets the value of the x property.
+	 * Sets the value of the x property.
-     * 
+	 * 
-     */
+	 */
-    public void setX(int value) {
+	public void setX(int value) {
-        this.x = value;
+		this.x = value;
-    }
+	}
 
-    /**
+	/**
-     * Gets the value of the y property.
+	 * Gets the value of the y property.
-     * 
+	 * 
-     */
+	 */
-    public int getY() {
+	public int getY() {
-        return y;
+		return y;
-    }
+	}
 
-    /**
+	/**
-     * Sets the value of the y property.
+	 * Sets the value of the y property.
-     * 
+	 * 
-     */
+	 */
-    public void setY(int value) {
+	public void setY(int value) {
-        this.y = value;
+		this.y = value;
-    }
+	}
 
-    /**
+	/**
-     * Gets the value of the z property.
+	 * Gets the value of the z property.
-     * 
+	 * 
-     */
+	 */
-    public int getZ() {
+	public int getZ() {
-        return z;
+		return z;
-    }
+	}
 
-    /**
+	/**
-     * Sets the value of the z property.
+	 * Sets the value of the z property.
-     * 
+	 * 
-     */
+	 */
-    public void setZ(int value) {
+	public void setZ(int value) {
-        this.z = value;
+		this.z = value;
-    }
+	}
 
 }

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ObjectFactory.java

@@ -5,531 +5,526 @@
 // Generated on: 2012.03.25 at 01:03:28 PM BRT 
 //
 
-
 package com.l2jserver.model.template;
 
 import javax.xml.bind.annotation.XmlRegistry;
 
-
 /**
- * This object contains factory methods for each 
+ * This object contains factory methods for each Java content interface and Java
- * Java content interface and Java element interface 
+ * element interface generated in the com.l2jserver.model.template package.
- * generated in the com.l2jserver.model.template package. 
+ * <p>
- * <p>An ObjectFactory allows you to programatically 
+ * An ObjectFactory allows you to programatically construct new instances of the
- * construct new instances of the Java representation 
+ * Java representation for XML content. The Java representation of XML content
- * for XML content. The Java representation of XML 
+ * can consist of schema derived interfaces and classes representing the binding
- * content can consist of schema derived interfaces 
+ * of schema type definitions, element declarations and model groups. Factory
- * and classes representing the binding of schema 
+ * methods for each of these are provided in this class.
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
  * 
  */
 @XmlRegistry
 public class ObjectFactory {
 
+	/**
+	 * Create a new ObjectFactory that can be used to create new instances of
+	 * schema derived classes for package: com.l2jserver.model.template
+	 * 
+	 */
+	public ObjectFactory() {
+	}
 
-    /**
+	/**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.l2jserver.model.template
+	 * Create an instance of {@link NPCTemplate }
-     * 
+	 * 
-     */
+	 */
-    public ObjectFactory() {
+	public NPCTemplate createNPCTemplate() {
-    }
+		return new NPCTemplate();
+	}
 
-    /**
+	/**
-     * Create an instance of {@link NPCTemplate }
+	 * Create an instance of {@link NPCTemplate.Droplist }
-     * 
+	 * 
-     */
+	 */
-    public NPCTemplate createNPCTemplate() {
+	public NPCTemplate.Droplist createNPCTemplateDroplist() {
-        return new NPCTemplate();
+		return new NPCTemplate.Droplist();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link NPCTemplate.Droplist }
+	 * Create an instance of {@link NPCTemplate.Droplist.Item }
-     * 
+	 * 
-     */
+	 */
-    public NPCTemplate.Droplist createNPCTemplateDroplist() {
+	public NPCTemplate.Droplist.Item createNPCTemplateDroplistItem() {
-        return new NPCTemplate.Droplist();
+		return new NPCTemplate.Droplist.Item();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link NPCTemplate.Droplist.Item }
+	 * Create an instance of {@link Teleports }
-     * 
+	 * 
-     */
+	 */
-    public NPCTemplate.Droplist.Item createNPCTemplateDroplistItem() {
+	public Teleports createTeleports() {
-        return new NPCTemplate.Droplist.Item();
+		return new Teleports();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link Teleports }
+	 * Create an instance of {@link Zones }
-     * 
+	 * 
-     */
+	 */
-    public Teleports createTeleports() {
+	public Zones createZones() {
-        return new Teleports();
+		return new Zones();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link Zones }
+	 * Create an instance of {@link ZoneType }
-     * 
+	 * 
-     */
+	 */
-    public Zones createZones() {
+	public ZoneType createZoneType() {
-        return new Zones();
+		return new ZoneType();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link ZoneType }
+	 * Create an instance of {@link Zones.Castle }
-     * 
+	 * 
-     */
+	 */
-    public ZoneType createZoneType() {
+	public Zones.Castle createZonesCastle() {
-        return new ZoneType();
+		return new Zones.Castle();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link Zones.Castle }
+	 * Create an instance of {@link Teleports.Teleport }
-     * 
+	 * 
-     */
+	 */
-    public Zones.Castle createZonesCastle() {
+	public Teleports.Teleport createTeleportsTeleport() {
-        return new Zones.Castle();
+		return new Teleports.Teleport();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link Teleports.Teleport }
+	 * Create an instance of {@link NPCTemplate.Skills }
-     * 
+	 * 
-     */
+	 */
-    public Teleports.Teleport createTeleportsTeleport() {
+	public NPCTemplate.Skills createNPCTemplateSkills() {
-        return new Teleports.Teleport();
+		return new NPCTemplate.Skills();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link NPCTemplate.Skills }
+	 * Create an instance of {@link NPCTemplate.Talk }
-     * 
+	 * 
-     */
+	 */
-    public NPCTemplate.Skills createNPCTemplateSkills() {
+	public NPCTemplate.Talk createNPCTemplateTalk() {
-        return new NPCTemplate.Skills();
+		return new NPCTemplate.Talk();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link NPCTemplate.Talk }
+	 * Create an instance of {@link NPCTemplate.Info }
-     * 
+	 * 
-     */
+	 */
-    public NPCTemplate.Talk createNPCTemplateTalk() {
+	public NPCTemplate.Info createNPCTemplateInfo() {
-        return new NPCTemplate.Talk();
+		return new NPCTemplate.Info();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link NPCTemplate.Info }
+	 * Create an instance of {@link NPCTemplate.Info.Stats }
-     * 
+	 * 
-     */
+	 */
-    public NPCTemplate.Info createNPCTemplateInfo() {
+	public NPCTemplate.Info.Stats createNPCTemplateInfoStats() {
-        return new NPCTemplate.Info();
+		return new NPCTemplate.Info.Stats();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link NPCTemplate.Info.Stats }
+	 * Create an instance of {@link NPCTemplate.Info.Stats.Defense }
-     * 
+	 * 
-     */
+	 */
-    public NPCTemplate.Info.Stats createNPCTemplateInfoStats() {
+	public NPCTemplate.Info.Stats.Defense createNPCTemplateInfoStatsDefense() {
-        return new NPCTemplate.Info.Stats();
+		return new NPCTemplate.Info.Stats.Defense();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link NPCTemplate.Info.Stats.Defense }
+	 * Create an instance of {@link NPCTemplate.Info.Stats.Attack }
-     * 
+	 * 
-     */
+	 */
-    public NPCTemplate.Info.Stats.Defense createNPCTemplateInfoStatsDefense() {
+	public NPCTemplate.Info.Stats.Attack createNPCTemplateInfoStatsAttack() {
-        return new NPCTemplate.Info.Stats.Defense();
+		return new NPCTemplate.Info.Stats.Attack();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link NPCTemplate.Info.Stats.Attack }
+	 * Create an instance of {@link ItemTemplate }
-     * 
+	 * 
-     */
+	 */
-    public NPCTemplate.Info.Stats.Attack createNPCTemplateInfoStatsAttack() {
+	public ItemTemplate createItemTemplate() {
-        return new NPCTemplate.Info.Stats.Attack();
+		return new ItemTemplate();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link ItemTemplate }
+	 * Create an instance of {@link ItemTemplate.Armor }
-     * 
+	 * 
-     */
+	 */
-    public ItemTemplate createItemTemplate() {
+	public ItemTemplate.Armor createItemTemplateArmor() {
-        return new ItemTemplate();
+		return new ItemTemplate.Armor();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link ItemTemplate.Armor }
+	 * Create an instance of {@link ItemTemplate.Attributes }
-     * 
+	 * 
-     */
+	 */
-    public ItemTemplate.Armor createItemTemplateArmor() {
+	public ItemTemplate.Attributes createItemTemplateAttributes() {
-        return new ItemTemplate.Armor();
+		return new ItemTemplate.Attributes();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link ItemTemplate.Attributes }
+	 * Create an instance of {@link CharacterTemplate }
-     * 
+	 * 
-     */
+	 */
-    public ItemTemplate.Attributes createItemTemplateAttributes() {
+	public CharacterTemplate createCharacterTemplate() {
-        return new ItemTemplate.Attributes();
+		return new CharacterTemplate();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link CharacterTemplate }
+	 * Create an instance of {@link CharacterTemplate.Collision }
-     * 
+	 * 
-     */
+	 */
-    public CharacterTemplate createCharacterTemplate() {
+	public CharacterTemplate.Collision createCharacterTemplateCollision() {
-        return new CharacterTemplate();
+		return new CharacterTemplate.Collision();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link CharacterTemplate.Collision }
+	 * Create an instance of {@link CharacterTemplate.Stats }
-     * 
+	 * 
-     */
+	 */
-    public CharacterTemplate.Collision createCharacterTemplateCollision() {
+	public CharacterTemplate.Stats createCharacterTemplateStats() {
-        return new CharacterTemplate.Collision();
+		return new CharacterTemplate.Stats();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link CharacterTemplate.Stats }
+	 * Create an instance of {@link CharacterTemplate.Stats.Defense }
-     * 
+	 * 
-     */
+	 */
-    public CharacterTemplate.Stats createCharacterTemplateStats() {
+	public CharacterTemplate.Stats.Defense createCharacterTemplateStatsDefense() {
-        return new CharacterTemplate.Stats();
+		return new CharacterTemplate.Stats.Defense();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link CharacterTemplate.Stats.Defense }
+	 * Create an instance of {@link CharacterTemplate.Stats.Attack }
-     * 
+	 * 
-     */
+	 */
-    public CharacterTemplate.Stats.Defense createCharacterTemplateStatsDefense() {
+	public CharacterTemplate.Stats.Attack createCharacterTemplateStatsAttack() {
-        return new CharacterTemplate.Stats.Defense();
+		return new CharacterTemplate.Stats.Attack();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link CharacterTemplate.Stats.Attack }
+	 * Create an instance of {@link CalculatorFunction }
-     * 
+	 * 
-     */
+	 */
-    public CharacterTemplate.Stats.Attack createCharacterTemplateStatsAttack() {
+	public CalculatorFunction createCalculatorFunction() {
-        return new CharacterTemplate.Stats.Attack();
+		return new CalculatorFunction();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link CalculatorFunction }
+	 * Create an instance of {@link Coordinate }
-     * 
+	 * 
-     */
+	 */
-    public CalculatorFunction createCalculatorFunction() {
+	public Coordinate createCoordinate() {
-        return new CalculatorFunction();
+		return new Coordinate();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link Coordinate }
+	 * Create an instance of {@link CalculatorFunctionOperation }
-     * 
+	 * 
-     */
+	 */
-    public Coordinate createCoordinate() {
+	public CalculatorFunctionOperation createCalculatorFunctionOperation() {
-        return new Coordinate();
+		return new CalculatorFunctionOperation();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link CalculatorFunctionOperation }
+	 * Create an instance of {@link SkillTemplate }
-     * 
+	 * 
-     */
+	 */
-    public CalculatorFunctionOperation createCalculatorFunctionOperation() {
+	public SkillTemplate createSkillTemplate() {
-        return new CalculatorFunctionOperation();
+		return new SkillTemplate();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link SkillTemplate }
+	 * Create an instance of {@link ZoneType.Point }
-     * 
+	 * 
-     */
+	 */
-    public SkillTemplate createSkillTemplate() {
+	public ZoneType.Point createZoneTypePoint() {
-        return new SkillTemplate();
+		return new ZoneType.Point();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link ZoneType.Point }
+	 * Create an instance of {@link Zones.Castle.Siege }
-     * 
+	 * 
-     */
+	 */
-    public ZoneType.Point createZoneTypePoint() {
+	public Zones.Castle.Siege createZonesCastleSiege() {
-        return new ZoneType.Point();
+		return new Zones.Castle.Siege();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link Zones.Castle.Siege }
+	 * Create an instance of {@link Teleports.Teleport.Restrictions }
-     * 
+	 * 
-     */
+	 */
-    public Zones.Castle.Siege createZonesCastleSiege() {
+	public Teleports.Teleport.Restrictions createTeleportsTeleportRestrictions() {
-        return new Zones.Castle.Siege();
+		return new Teleports.Teleport.Restrictions();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link Teleports.Teleport.Restrictions }
+	 * Create an instance of {@link NPCTemplate.Ai }
-     * 
+	 * 
-     */
+	 */
-    public Teleports.Teleport.Restrictions createTeleportsTeleportRestrictions() {
+	public NPCTemplate.Ai createNPCTemplateAi() {
-        return new Teleports.Teleport.Restrictions();
+		return new NPCTemplate.Ai();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link NPCTemplate.Ai }
+	 * Create an instance of {@link NPCTemplate.Skills.Skill }
-     * 
+	 * 
-     */
+	 */
-    public NPCTemplate.Ai createNPCTemplateAi() {
+	public NPCTemplate.Skills.Skill createNPCTemplateSkillsSkill() {
-        return new NPCTemplate.Ai();
+		return new NPCTemplate.Skills.Skill();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link NPCTemplate.Skills.Skill }
+	 * Create an instance of {@link NPCTemplate.Talk.Chat }
-     * 
+	 * 
-     */
+	 */
-    public NPCTemplate.Skills.Skill createNPCTemplateSkillsSkill() {
+	public NPCTemplate.Talk.Chat createNPCTemplateTalkChat() {
-        return new NPCTemplate.Skills.Skill();
+		return new NPCTemplate.Talk.Chat();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link NPCTemplate.Talk.Chat }
+	 * Create an instance of {@link NPCTemplate.Info.Name }
-     * 
+	 * 
-     */
+	 */
-    public NPCTemplate.Talk.Chat createNPCTemplateTalkChat() {
+	public NPCTemplate.Info.Name createNPCTemplateInfoName() {
-        return new NPCTemplate.Talk.Chat();
+		return new NPCTemplate.Info.Name();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link NPCTemplate.Info.Name }
+	 * Create an instance of {@link NPCTemplate.Info.Title }
-     * 
+	 * 
-     */
+	 */
-    public NPCTemplate.Info.Name createNPCTemplateInfoName() {
+	public NPCTemplate.Info.Title createNPCTemplateInfoTitle() {
-        return new NPCTemplate.Info.Name();
+		return new NPCTemplate.Info.Title();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link NPCTemplate.Info.Title }
+	 * Create an instance of {@link NPCTemplate.Info.Item }
-     * 
+	 * 
-     */
+	 */
-    public NPCTemplate.Info.Title createNPCTemplateInfoTitle() {
+	public NPCTemplate.Info.Item createNPCTemplateInfoItem() {
-        return new NPCTemplate.Info.Title();
+		return new NPCTemplate.Info.Item();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link NPCTemplate.Info.Item }
+	 * Create an instance of {@link NPCTemplate.Info.Collision }
-     * 
+	 * 
-     */
+	 */
-    public NPCTemplate.Info.Item createNPCTemplateInfoItem() {
+	public NPCTemplate.Info.Collision createNPCTemplateInfoCollision() {
-        return new NPCTemplate.Info.Item();
+		return new NPCTemplate.Info.Collision();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link NPCTemplate.Info.Collision }
+	 * Create an instance of {@link NPCTemplate.Info.Stats.Hp }
-     * 
+	 * 
-     */
+	 */
-    public NPCTemplate.Info.Collision createNPCTemplateInfoCollision() {
+	public NPCTemplate.Info.Stats.Hp createNPCTemplateInfoStatsHp() {
-        return new NPCTemplate.Info.Collision();
+		return new NPCTemplate.Info.Stats.Hp();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link NPCTemplate.Info.Stats.Hp }
+	 * Create an instance of {@link NPCTemplate.Info.Stats.Mp }
-     * 
+	 * 
-     */
+	 */
-    public NPCTemplate.Info.Stats.Hp createNPCTemplateInfoStatsHp() {
+	public NPCTemplate.Info.Stats.Mp createNPCTemplateInfoStatsMp() {
-        return new NPCTemplate.Info.Stats.Hp();
+		return new NPCTemplate.Info.Stats.Mp();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link NPCTemplate.Info.Stats.Mp }
+	 * Create an instance of {@link NPCTemplate.Info.Stats.Move }
-     * 
+	 * 
-     */
+	 */
-    public NPCTemplate.Info.Stats.Mp createNPCTemplateInfoStatsMp() {
+	public NPCTemplate.Info.Stats.Move createNPCTemplateInfoStatsMove() {
-        return new NPCTemplate.Info.Stats.Mp();
+		return new NPCTemplate.Info.Stats.Move();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link NPCTemplate.Info.Stats.Move }
+	 * Create an instance of {@link NPCTemplate.Info.Stats.Base }
-     * 
+	 * 
-     */
+	 */
-    public NPCTemplate.Info.Stats.Move createNPCTemplateInfoStatsMove() {
+	public NPCTemplate.Info.Stats.Base createNPCTemplateInfoStatsBase() {
-        return new NPCTemplate.Info.Stats.Move();
+		return new NPCTemplate.Info.Stats.Base();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link NPCTemplate.Info.Stats.Base }
+	 * Create an instance of {@link NPCTemplate.Info.Stats.Defense.Physical }
-     * 
+	 * 
-     */
+	 */
-    public NPCTemplate.Info.Stats.Base createNPCTemplateInfoStatsBase() {
+	public NPCTemplate.Info.Stats.Defense.Physical createNPCTemplateInfoStatsDefensePhysical() {
-        return new NPCTemplate.Info.Stats.Base();
+		return new NPCTemplate.Info.Stats.Defense.Physical();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link NPCTemplate.Info.Stats.Defense.Physical }
+	 * Create an instance of {@link NPCTemplate.Info.Stats.Defense.Magical }
-     * 
+	 * 
-     */
+	 */
-    public NPCTemplate.Info.Stats.Defense.Physical createNPCTemplateInfoStatsDefensePhysical() {
+	public NPCTemplate.Info.Stats.Defense.Magical createNPCTemplateInfoStatsDefenseMagical() {
-        return new NPCTemplate.Info.Stats.Defense.Physical();
+		return new NPCTemplate.Info.Stats.Defense.Magical();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link NPCTemplate.Info.Stats.Defense.Magical }
+	 * Create an instance of {@link NPCTemplate.Info.Stats.Attack.Physical }
-     * 
+	 * 
-     */
+	 */
-    public NPCTemplate.Info.Stats.Defense.Magical createNPCTemplateInfoStatsDefenseMagical() {
+	public NPCTemplate.Info.Stats.Attack.Physical createNPCTemplateInfoStatsAttackPhysical() {
-        return new NPCTemplate.Info.Stats.Defense.Magical();
+		return new NPCTemplate.Info.Stats.Attack.Physical();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link NPCTemplate.Info.Stats.Attack.Physical }
+	 * Create an instance of {@link NPCTemplate.Info.Stats.Attack.Magical }
-     * 
+	 * 
-     */
+	 */
-    public NPCTemplate.Info.Stats.Attack.Physical createNPCTemplateInfoStatsAttackPhysical() {
+	public NPCTemplate.Info.Stats.Attack.Magical createNPCTemplateInfoStatsAttackMagical() {
-        return new NPCTemplate.Info.Stats.Attack.Physical();
+		return new NPCTemplate.Info.Stats.Attack.Magical();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link NPCTemplate.Info.Stats.Attack.Magical }
+	 * Create an instance of {@link ItemTemplate.Controller }
-     * 
+	 * 
-     */
+	 */
-    public NPCTemplate.Info.Stats.Attack.Magical createNPCTemplateInfoStatsAttackMagical() {
+	public ItemTemplate.Controller createItemTemplateController() {
-        return new NPCTemplate.Info.Stats.Attack.Magical();
+		return new ItemTemplate.Controller();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link ItemTemplate.Controller }
+	 * Create an instance of {@link ItemTemplate.Effect }
-     * 
+	 * 
-     */
+	 */
-    public ItemTemplate.Controller createItemTemplateController() {
+	public ItemTemplate.Effect createItemTemplateEffect() {
-        return new ItemTemplate.Controller();
+		return new ItemTemplate.Effect();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link ItemTemplate.Effect }
+	 * Create an instance of {@link ItemTemplate.EtcItem }
-     * 
+	 * 
-     */
+	 */
-    public ItemTemplate.Effect createItemTemplateEffect() {
+	public ItemTemplate.EtcItem createItemTemplateEtcItem() {
-        return new ItemTemplate.Effect();
+		return new ItemTemplate.EtcItem();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link ItemTemplate.EtcItem }
+	 * Create an instance of {@link ItemTemplate.Weapon }
-     * 
+	 * 
-     */
+	 */
-    public ItemTemplate.EtcItem createItemTemplateEtcItem() {
+	public ItemTemplate.Weapon createItemTemplateWeapon() {
-        return new ItemTemplate.EtcItem();
+		return new ItemTemplate.Weapon();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link ItemTemplate.Weapon }
+	 * Create an instance of {@link ItemTemplate.Armor.Cost }
-     * 
+	 * 
-     */
+	 */
-    public ItemTemplate.Weapon createItemTemplateWeapon() {
+	public ItemTemplate.Armor.Cost createItemTemplateArmorCost() {
-        return new ItemTemplate.Weapon();
+		return new ItemTemplate.Armor.Cost();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link ItemTemplate.Armor.Cost }
+	 * Create an instance of {@link ItemTemplate.Armor.Equipment }
-     * 
+	 * 
-     */
+	 */
-    public ItemTemplate.Armor.Cost createItemTemplateArmorCost() {
+	public ItemTemplate.Armor.Equipment createItemTemplateArmorEquipment() {
-        return new ItemTemplate.Armor.Cost();
+		return new ItemTemplate.Armor.Equipment();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link ItemTemplate.Armor.Equipment }
+	 * Create an instance of {@link ItemTemplate.Attributes.Cost }
-     * 
+	 * 
-     */
+	 */
-    public ItemTemplate.Armor.Equipment createItemTemplateArmorEquipment() {
+	public ItemTemplate.Attributes.Cost createItemTemplateAttributesCost() {
-        return new ItemTemplate.Armor.Equipment();
+		return new ItemTemplate.Attributes.Cost();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link ItemTemplate.Attributes.Cost }
+	 * Create an instance of {@link CharacterTemplate.Collision.Male }
-     * 
+	 * 
-     */
+	 */
-    public ItemTemplate.Attributes.Cost createItemTemplateAttributesCost() {
+	public CharacterTemplate.Collision.Male createCharacterTemplateCollisionMale() {
-        return new ItemTemplate.Attributes.Cost();
+		return new CharacterTemplate.Collision.Male();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link CharacterTemplate.Collision.Male }
+	 * Create an instance of {@link CharacterTemplate.Collision.Female }
-     * 
+	 * 
-     */
+	 */
-    public CharacterTemplate.Collision.Male createCharacterTemplateCollisionMale() {
+	public CharacterTemplate.Collision.Female createCharacterTemplateCollisionFemale() {
-        return new CharacterTemplate.Collision.Male();
+		return new CharacterTemplate.Collision.Female();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link CharacterTemplate.Collision.Female }
+	 * Create an instance of {@link CharacterTemplate.Stats.Hp }
-     * 
+	 * 
-     */
+	 */
-    public CharacterTemplate.Collision.Female createCharacterTemplateCollisionFemale() {
+	public CharacterTemplate.Stats.Hp createCharacterTemplateStatsHp() {
-        return new CharacterTemplate.Collision.Female();
+		return new CharacterTemplate.Stats.Hp();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link CharacterTemplate.Stats.Hp }
+	 * Create an instance of {@link CharacterTemplate.Stats.Mp }
-     * 
+	 * 
-     */
+	 */
-    public CharacterTemplate.Stats.Hp createCharacterTemplateStatsHp() {
+	public CharacterTemplate.Stats.Mp createCharacterTemplateStatsMp() {
-        return new CharacterTemplate.Stats.Hp();
+		return new CharacterTemplate.Stats.Mp();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link CharacterTemplate.Stats.Mp }
+	 * Create an instance of {@link CharacterTemplate.Stats.Cp }
-     * 
+	 * 
-     */
+	 */
-    public CharacterTemplate.Stats.Mp createCharacterTemplateStatsMp() {
+	public CharacterTemplate.Stats.Cp createCharacterTemplateStatsCp() {
-        return new CharacterTemplate.Stats.Mp();
+		return new CharacterTemplate.Stats.Cp();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link CharacterTemplate.Stats.Cp }
+	 * Create an instance of {@link CharacterTemplate.Stats.Move }
-     * 
+	 * 
-     */
+	 */
-    public CharacterTemplate.Stats.Cp createCharacterTemplateStatsCp() {
+	public CharacterTemplate.Stats.Move createCharacterTemplateStatsMove() {
-        return new CharacterTemplate.Stats.Cp();
+		return new CharacterTemplate.Stats.Move();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link CharacterTemplate.Stats.Move }
+	 * Create an instance of {@link CharacterTemplate.Stats.Base }
-     * 
+	 * 
-     */
+	 */
-    public CharacterTemplate.Stats.Move createCharacterTemplateStatsMove() {
+	public CharacterTemplate.Stats.Base createCharacterTemplateStatsBase() {
-        return new CharacterTemplate.Stats.Move();
+		return new CharacterTemplate.Stats.Base();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link CharacterTemplate.Stats.Base }
+	 * Create an instance of {@link CharacterTemplate.Stats.Defense.Physical }
-     * 
+	 * 
-     */
+	 */
-    public CharacterTemplate.Stats.Base createCharacterTemplateStatsBase() {
+	public CharacterTemplate.Stats.Defense.Physical createCharacterTemplateStatsDefensePhysical() {
-        return new CharacterTemplate.Stats.Base();
+		return new CharacterTemplate.Stats.Defense.Physical();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link CharacterTemplate.Stats.Defense.Physical }
+	 * Create an instance of {@link CharacterTemplate.Stats.Defense.Magical }
-     * 
+	 * 
-     */
+	 */
-    public CharacterTemplate.Stats.Defense.Physical createCharacterTemplateStatsDefensePhysical() {
+	public CharacterTemplate.Stats.Defense.Magical createCharacterTemplateStatsDefenseMagical() {
-        return new CharacterTemplate.Stats.Defense.Physical();
+		return new CharacterTemplate.Stats.Defense.Magical();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link CharacterTemplate.Stats.Defense.Magical }
+	 * Create an instance of {@link CharacterTemplate.Stats.Attack.Physical }
-     * 
+	 * 
-     */
+	 */
-    public CharacterTemplate.Stats.Defense.Magical createCharacterTemplateStatsDefenseMagical() {
+	public CharacterTemplate.Stats.Attack.Physical createCharacterTemplateStatsAttackPhysical() {
-        return new CharacterTemplate.Stats.Defense.Magical();
+		return new CharacterTemplate.Stats.Attack.Physical();
-    }
+	}
 
-    /**
+	/**
-     * Create an instance of {@link CharacterTemplate.Stats.Attack.Physical }
+	 * Create an instance of {@link CharacterTemplate.Stats.Attack.Magical }
-     * 
+	 * 
-     */
+	 */
-    public CharacterTemplate.Stats.Attack.Physical createCharacterTemplateStatsAttackPhysical() {
+	public CharacterTemplate.Stats.Attack.Magical createCharacterTemplateStatsAttackMagical() {
-        return new CharacterTemplate.Stats.Attack.Physical();
+		return new CharacterTemplate.Stats.Attack.Magical();
-    }
+	}
-
-    /**
-     * Create an instance of {@link CharacterTemplate.Stats.Attack.Magical }
-     * 
-     */
-    public CharacterTemplate.Stats.Attack.Magical createCharacterTemplateStatsAttackMagical() {
-        return new CharacterTemplate.Stats.Attack.Magical();
-    }
 
 }

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/SkillTemplate.java

@@ -5,7 +5,6 @@
 // Generated on: 2012.03.25 at 01:03:28 PM BRT 
 //
 
-
 package com.l2jserver.model.template;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,14 +13,17 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
 import com.l2jserver.model.id.template.SkillTemplateID;
 import com.l2jserver.util.jaxb.SkillTemplateIDAdapter;
 
-
 /**
- * <p>Java class for skill element declaration.
+ * <p>
+ * Java class for skill element declaration.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
  * 
  * <pre>
  * &lt;element name="skill">
@@ -44,119 +46,109 @@ import com.l2jserver.util.jaxb.SkillTemplateIDAdapter;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
+@XmlType(name = "", propOrder = { "maximumLevel" })
-    "maximumLevel"
-})
 @XmlRootElement(name = "skill", namespace = "http://schemas.l2jserver2.com/skill")
-public class SkillTemplate
+public class SkillTemplate extends AbstractTemplate {
-    extends AbstractTemplate
-{
 
-    protected int maximumLevel;
+	protected int maximumLevel;
-    @XmlAttribute(name = "id", required = true)
+	@XmlAttribute(name = "id", required = true)
-    @XmlJavaTypeAdapter(SkillTemplateIDAdapter.class)
+	@XmlJavaTypeAdapter(SkillTemplateIDAdapter.class)
-    protected SkillTemplateID id;
+	protected SkillTemplateID id;
-    @XmlAttribute(name = "name", required = true)
+	@XmlAttribute(name = "name", required = true)
-    protected String name;
+	protected String name;
-    @XmlAttribute(name = "delay", required = true)
+	@XmlAttribute(name = "delay", required = true)
-    protected int delay;
+	protected int delay;
-    @XmlAttribute(name = "cooldown", required = true)
+	@XmlAttribute(name = "cooldown", required = true)
-    protected int cooldown;
+	protected int cooldown;
 
-    /**
+	/**
-     * Gets the value of the maximumLevel property.
+	 * Gets the value of the maximumLevel property.
-     * 
+	 * 
-     */
+	 */
-    public int getMaximumLevel() {
+	public int getMaximumLevel() {
-        return maximumLevel;
+		return maximumLevel;
-    }
+	}
 
-    /**
+	/**
-     * Sets the value of the maximumLevel property.
+	 * Sets the value of the maximumLevel property.
-     * 
+	 * 
-     */
+	 */
-    public void setMaximumLevel(int value) {
+	public void setMaximumLevel(int value) {
-        this.maximumLevel = value;
+		this.maximumLevel = value;
-    }
+	}
 
-    /**
+	/**
-     * Gets the value of the id property.
+	 * Gets the value of the id property.
-     * 
+	 * 
-     * @return
+	 * @return possible object is {@link String }
-     *     possible object is
+	 * 
-     *     {@link String }
+	 */
-     *     
+	public SkillTemplateID getID() {
-     */
+		return id;
-    public SkillTemplateID getID() {
+	}
-        return id;
-    }
 
-    /**
+	/**
-     * Sets the value of the id property.
+	 * Sets the value of the id property.
-     * 
+	 * 
-     * @param value
+	 * @param value
-     *     allowed object is
+	 *            allowed object is {@link String }
-     *     {@link String }
+	 * 
-     *     
+	 */
-     */
+	public void setID(SkillTemplateID value) {
-    public void setID(SkillTemplateID value) {
+		this.id = value;
-        this.id = value;
+	}
-    }
 
-    /**
+	/**
-     * Gets the value of the name property.
+	 * Gets the value of the name property.
-     * 
+	 * 
-     * @return
+	 * @return possible object is {@link String }
-     *     possible object is
+	 * 
-     *     {@link String }
+	 */
-     *     
+	public String getName() {
-     */
+		return name;
-    public String getName() {
+	}
-        return name;
-    }
 
-    /**
+	/**
-     * Sets the value of the name property.
+	 * Sets the value of the name property.
-     * 
+	 * 
-     * @param value
+	 * @param value
-     *     allowed object is
+	 *            allowed object is {@link String }
-     *     {@link String }
+	 * 
-     *     
+	 */
-     */
+	public void setName(String value) {
-    public void setName(String value) {
+		this.name = value;
-        this.name = value;
+	}
-    }
 
-    /**
+	/**
-     * Gets the value of the delay property.
+	 * Gets the value of the delay property.
-     * 
+	 * 
-     */
+	 */
-    public int getDelay() {
+	public int getDelay() {
-        return delay;
+		return delay;
-    }
+	}
 
-    /**
+	/**
-     * Sets the value of the delay property.
+	 * Sets the value of the delay property.
-     * 
+	 * 
-     */
+	 */
-    public void setDelay(int value) {
+	public void setDelay(int value) {
-        this.delay = value;
+		this.delay = value;
-    }
+	}
 
-    /**
+	/**
-     * Gets the value of the cooldown property.
+	 * Gets the value of the cooldown property.
-     * 
+	 * 
-     */
+	 */
-    public int getCooldown() {
+	public int getCooldown() {
-        return cooldown;
+		return cooldown;
-    }
+	}
 
-    /**
+	/**
-     * Sets the value of the cooldown property.
+	 * Sets the value of the cooldown property.
-     * 
+	 * 
-     */
+	 */
-    public void setCooldown(int value) {
+	public void setCooldown(int value) {
-        this.cooldown = value;
+		this.cooldown = value;
-    }
+	}
 
 }

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Teleports.java

@@ -5,11 +5,11 @@
 // Generated on: 2012.03.25 at 01:03:28 PM BRT 
 //
 
-
 package com.l2jserver.model.template;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
@@ -17,14 +17,17 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
 import com.l2jserver.model.id.template.TeleportationTemplateID;
 import com.l2jserver.util.jaxb.TeleportationTemplateIDAdapter;
 
-
 /**
- * <p>Java class for anonymous complex type.
+ * <p>
+ * Java class for anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
  * 
  * <pre>
  * &lt;complexType>
@@ -72,308 +75,290 @@ import com.l2jserver.util.jaxb.TeleportationTemplateIDAdapter;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
+@XmlType(name = "", propOrder = { "teleport" })
-    "teleport"
-})
 @XmlRootElement(name = "teleports", namespace = "http://schemas.l2jserver2.com/teleport")
 public class Teleports {
 
-    @XmlElement(required = true)
+	@XmlElement(required = true)
-    protected List<Teleports.Teleport> teleport;
+	protected List<Teleports.Teleport> teleport;
 
-    /**
+	/**
-     * Gets the value of the teleport property.
+	 * Gets the value of the teleport property.
-     * 
+	 * 
-     * <p>
+	 * <p>
-     * This accessor method returns a reference to the live list,
+	 * This accessor method returns a reference to the live list, not a
-     * not a snapshot. Therefore any modification you make to the
+	 * snapshot. Therefore any modification you make to the returned list will
-     * returned list will be present inside the JAXB object.
+	 * be present inside the JAXB object. This is why there is not a
-     * This is why there is not a <CODE>set</CODE> method for the teleport property.
+	 * <CODE>set</CODE> method for the teleport property.
-     * 
+	 * 
-     * <p>
+	 * <p>
-     * For example, to add a new item, do as follows:
+	 * For example, to add a new item, do as follows:
-     * <pre>
+	 * 
-     *    getTeleport().add(newItem);
+	 * <pre>
-     * </pre>
+	 * getTeleport().add(newItem);
-     * 
+	 * </pre>
-     * 
+	 * 
-     * <p>
+	 * 
-     * Objects of the following type(s) are allowed in the list
+	 * <p>
-     * {@link Teleports.Teleport }
+	 * Objects of the following type(s) are allowed in the list
-     * 
+	 * {@link Teleports.Teleport }
-     * 
+	 * 
-     */
+	 * 
-    public List<Teleports.Teleport> getTeleport() {
+	 */
-        if (teleport == null) {
+	public List<Teleports.Teleport> getTeleport() {
-            teleport = new ArrayList<Teleports.Teleport>();
+		if (teleport == null) {
-        }
+			teleport = new ArrayList<Teleports.Teleport>();
-        return this.teleport;
+		}
-    }
+		return this.teleport;
+	}
 
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained
+	 * within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;complexContent>
+	 *     &lt;extension base="{}AbstractTemplate">
+	 *       &lt;sequence>
+	 *         &lt;element name="point" type="{}Coordinate" minOccurs="0"/>
+	 *         &lt;element name="restrictions" minOccurs="0">
+	 *           &lt;complexType>
+	 *             &lt;complexContent>
+	 *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                 &lt;sequence>
+	 *                   &lt;element name="restriction" maxOccurs="unbounded">
+	 *                     &lt;simpleType>
+	 *                       &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+	 *                         &lt;enumeration value="NOBLE"/>
+	 *                       &lt;/restriction>
+	 *                     &lt;/simpleType>
+	 *                   &lt;/element>
+	 *                 &lt;/sequence>
+	 *               &lt;/restriction>
+	 *             &lt;/complexContent>
+	 *           &lt;/complexType>
+	 *         &lt;/element>
+	 *       &lt;/sequence>
+	 *       &lt;attribute name="id" use="required" type="{http://schemas.l2jserver2.com/teleport}TeleportationTemplateID" />
+	 *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+	 *       &lt;attribute name="item" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *       &lt;attribute name="price" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *     &lt;/extension>
+	 *   &lt;/complexContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "point", "restrictions" })
+	public static class Teleport extends AbstractTemplate {
 
-    /**
+		protected Coordinate point;
-     * <p>Java class for anonymous complex type.
+		protected Teleports.Teleport.Restrictions restrictions;
-     * 
+		@XmlAttribute(name = "id", required = true)
-     * <p>The following schema fragment specifies the expected content contained within this class.
+		@XmlJavaTypeAdapter(TeleportationTemplateIDAdapter.class)
-     * 
+		protected TeleportationTemplateID id;
-     * <pre>
+		@XmlAttribute(name = "name")
-     * &lt;complexType>
+		protected String name;
-     *   &lt;complexContent>
+		@XmlAttribute(name = "item")
-     *     &lt;extension base="{}AbstractTemplate">
+		protected Integer item;
-     *       &lt;sequence>
+		@XmlAttribute(name = "price", required = true)
-     *         &lt;element name="point" type="{}Coordinate" minOccurs="0"/>
+		protected int price;
-     *         &lt;element name="restrictions" minOccurs="0">
-     *           &lt;complexType>
-     *             &lt;complexContent>
-     *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 &lt;sequence>
-     *                   &lt;element name="restriction" maxOccurs="unbounded">
-     *                     &lt;simpleType>
-     *                       &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *                         &lt;enumeration value="NOBLE"/>
-     *                       &lt;/restriction>
-     *                     &lt;/simpleType>
-     *                   &lt;/element>
-     *                 &lt;/sequence>
-     *               &lt;/restriction>
-     *             &lt;/complexContent>
-     *           &lt;/complexType>
-     *         &lt;/element>
-     *       &lt;/sequence>
-     *       &lt;attribute name="id" use="required" type="{http://schemas.l2jserver2.com/teleport}TeleportationTemplateID" />
-     *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       &lt;attribute name="item" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *       &lt;attribute name="price" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *     &lt;/extension>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "point",
-        "restrictions"
-    })
-    public static class Teleport
-        extends AbstractTemplate
-    {
 
-        protected Coordinate point;
+		/**
-        protected Teleports.Teleport.Restrictions restrictions;
+		 * Gets the value of the point property.
-        @XmlAttribute(name = "id", required = true)
+		 * 
-        @XmlJavaTypeAdapter(TeleportationTemplateIDAdapter.class)
+		 * @return possible object is {@link Coordinate }
-        protected TeleportationTemplateID id;
+		 * 
-        @XmlAttribute(name = "name")
+		 */
-        protected String name;
+		public Coordinate getPoint() {
-        @XmlAttribute(name = "item")
+			return point;
-        protected Integer item;
+		}
-        @XmlAttribute(name = "price", required = true)
-        protected int price;
 
-        /**
+		/**
-         * Gets the value of the point property.
+		 * Sets the value of the point property.
-         * 
+		 * 
-         * @return
+		 * @param value
-         *     possible object is
+		 *            allowed object is {@link Coordinate }
-         *     {@link Coordinate }
+		 * 
-         *     
+		 */
-         */
+		public void setPoint(Coordinate value) {
-        public Coordinate getPoint() {
+			this.point = value;
-            return point;
+		}
-        }
 
-        /**
+		/**
-         * Sets the value of the point property.
+		 * Gets the value of the restrictions property.
-         * 
+		 * 
-         * @param value
+		 * @return possible object is {@link Teleports.Teleport.Restrictions }
-         *     allowed object is
+		 * 
-         *     {@link Coordinate }
+		 */
-         *     
+		public Teleports.Teleport.Restrictions getRestrictions() {
-         */
+			return restrictions;
-        public void setPoint(Coordinate value) {
+		}
-            this.point = value;
-        }
 
-        /**
+		/**
-         * Gets the value of the restrictions property.
+		 * Sets the value of the restrictions property.
-         * 
+		 * 
-         * @return
+		 * @param value
-         *     possible object is
+		 *            allowed object is {@link Teleports.Teleport.Restrictions }
-         *     {@link Teleports.Teleport.Restrictions }
+		 * 
-         *     
+		 */
-         */
+		public void setRestrictions(Teleports.Teleport.Restrictions value) {
-        public Teleports.Teleport.Restrictions getRestrictions() {
+			this.restrictions = value;
-            return restrictions;
+		}
-        }
 
-        /**
+		/**
-         * Sets the value of the restrictions property.
+		 * Gets the value of the id property.
-         * 
+		 * 
-         * @param value
+		 * @return possible object is {@link String }
-         *     allowed object is
+		 * 
-         *     {@link Teleports.Teleport.Restrictions }
+		 */
-         *     
+		public TeleportationTemplateID getID() {
-         */
+			return id;
-        public void setRestrictions(Teleports.Teleport.Restrictions value) {
+		}
-            this.restrictions = value;
-        }
 
-        /**
+		/**
-         * Gets the value of the id property.
+		 * Sets the value of the id property.
-         * 
+		 * 
-         * @return
+		 * @param value
-         *     possible object is
+		 *            allowed object is {@link String }
-         *     {@link String }
+		 * 
-         *     
+		 */
-         */
+		public void setID(TeleportationTemplateID value) {
-        public TeleportationTemplateID getID() {
+			this.id = value;
-            return id;
+		}
-        }
 
-        /**
+		/**
-         * Sets the value of the id property.
+		 * Gets the value of the name property.
-         * 
+		 * 
-         * @param value
+		 * @return possible object is {@link String }
-         *     allowed object is
+		 * 
-         *     {@link String }
+		 */
-         *     
+		public String getName() {
-         */
+			return name;
-        public void setID(TeleportationTemplateID value) {
+		}
-            this.id = value;
-        }
 
-        /**
+		/**
-         * Gets the value of the name property.
+		 * Sets the value of the name property.
-         * 
+		 * 
-         * @return
+		 * @param value
-         *     possible object is
+		 *            allowed object is {@link String }
-         *     {@link String }
+		 * 
-         *     
+		 */
-         */
+		public void setName(String value) {
-        public String getName() {
+			this.name = value;
-            return name;
+		}
-        }
 
-        /**
+		/**
-         * Sets the value of the name property.
+		 * Gets the value of the item property.
-         * 
+		 * 
-         * @param value
+		 * @return possible object is {@link Integer }
-         *     allowed object is
+		 * 
-         *     {@link String }
+		 */
-         *     
+		public Integer getItem() {
-         */
+			return item;
-        public void setName(String value) {
+		}
-            this.name = value;
-        }
 
-        /**
+		/**
-         * Gets the value of the item property.
+		 * Sets the value of the item property.
-         * 
+		 * 
-         * @return
+		 * @param value
-         *     possible object is
+		 *            allowed object is {@link Integer }
-         *     {@link Integer }
+		 * 
-         *     
+		 */
-         */
+		public void setItem(Integer value) {
-        public Integer getItem() {
+			this.item = value;
-            return item;
+		}
-        }
 
-        /**
+		/**
-         * Sets the value of the item property.
+		 * Gets the value of the price property.
-         * 
+		 * 
-         * @param value
+		 */
-         *     allowed object is
+		public int getPrice() {
-         *     {@link Integer }
+			return price;
-         *     
+		}
-         */
-        public void setItem(Integer value) {
-            this.item = value;
-        }
 
-        /**
+		/**
-         * Gets the value of the price property.
+		 * Sets the value of the price property.
-         * 
+		 * 
-         */
+		 */
-        public int getPrice() {
+		public void setPrice(int value) {
-            return price;
+			this.price = value;
-        }
+		}
 
-        /**
+		/**
-         * Sets the value of the price property.
+		 * <p>
-         * 
+		 * Java class for anonymous complex type.
-         */
+		 * 
-        public void setPrice(int value) {
+		 * <p>
-            this.price = value;
+		 * The following schema fragment specifies the expected content
-        }
+		 * contained within this class.
+		 * 
+		 * <pre>
+		 * &lt;complexType>
+		 *   &lt;complexContent>
+		 *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *       &lt;sequence>
+		 *         &lt;element name="restriction" maxOccurs="unbounded">
+		 *           &lt;simpleType>
+		 *             &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+		 *               &lt;enumeration value="NOBLE"/>
+		 *             &lt;/restriction>
+		 *           &lt;/simpleType>
+		 *         &lt;/element>
+		 *       &lt;/sequence>
+		 *     &lt;/restriction>
+		 *   &lt;/complexContent>
+		 * &lt;/complexType>
+		 * </pre>
+		 * 
+		 * 
+		 */
+		@XmlAccessorType(XmlAccessType.FIELD)
+		@XmlType(name = "", propOrder = { "restriction" })
+		public static class Restrictions {
 
+			@XmlElement(required = true)
+			protected List<String> restriction;
 
-        /**
+			/**
-         * <p>Java class for anonymous complex type.
+			 * Gets the value of the restriction property.
-         * 
+			 * 
-         * <p>The following schema fragment specifies the expected content contained within this class.
+			 * <p>
-         * 
+			 * This accessor method returns a reference to the live list, not a
-         * <pre>
+			 * snapshot. Therefore any modification you make to the returned
-         * &lt;complexType>
+			 * list will be present inside the JAXB object. This is why there is
-         *   &lt;complexContent>
+			 * not a <CODE>set</CODE> method for the restriction property.
-         *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+			 * 
-         *       &lt;sequence>
+			 * <p>
-         *         &lt;element name="restriction" maxOccurs="unbounded">
+			 * For example, to add a new item, do as follows:
-         *           &lt;simpleType>
+			 * 
-         *             &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+			 * <pre>
-         *               &lt;enumeration value="NOBLE"/>
+			 * getRestriction().add(newItem);
-         *             &lt;/restriction>
+			 * </pre>
-         *           &lt;/simpleType>
+			 * 
-         *         &lt;/element>
+			 * 
-         *       &lt;/sequence>
+			 * <p>
-         *     &lt;/restriction>
+			 * Objects of the following type(s) are allowed in the list
-         *   &lt;/complexContent>
+			 * {@link String }
-         * &lt;/complexType>
+			 * 
-         * </pre>
+			 * 
-         * 
+			 */
-         * 
+			public List<String> getRestriction() {
-         */
+				if (restriction == null) {
-        @XmlAccessorType(XmlAccessType.FIELD)
+					restriction = new ArrayList<String>();
-        @XmlType(name = "", propOrder = {
+				}
-            "restriction"
+				return this.restriction;
-        })
+			}
-        public static class Restrictions {
 
-            @XmlElement(required = true)
+		}
-            protected List<String> restriction;
 
-            /**
+	}
-             * Gets the value of the restriction property.
-             * 
-             * <p>
-             * This accessor method returns a reference to the live list,
-             * not a snapshot. Therefore any modification you make to the
-             * returned list will be present inside the JAXB object.
-             * This is why there is not a <CODE>set</CODE> method for the restriction property.
-             * 
-             * <p>
-             * For example, to add a new item, do as follows:
-             * <pre>
-             *    getRestriction().add(newItem);
-             * </pre>
-             * 
-             * 
-             * <p>
-             * Objects of the following type(s) are allowed in the list
-             * {@link String }
-             * 
-             * 
-             */
-            public List<String> getRestriction() {
-                if (restriction == null) {
-                    restriction = new ArrayList<String>();
-                }
-                return this.restriction;
-            }
-
-        }
-
-    }
 
 }

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ZoneType.java

@@ -5,22 +5,24 @@
 // Generated on: 2012.03.25 at 01:03:28 PM BRT 
 //
 
-
 package com.l2jserver.model.template;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for ZoneType complex type.
+ * <p>
+ * Java class for ZoneType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
  * 
  * <pre>
  * &lt;complexType name="ZoneType">
@@ -49,131 +51,129 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ZoneType", namespace = "zones", propOrder = {
+@XmlType(name = "ZoneType", namespace = "zones", propOrder = { "point" })
-    "point"
-})
 public class ZoneType {
 
-    @XmlElement(required = true)
+	@XmlElement(required = true)
-    protected List<ZoneType.Point> point;
+	protected List<ZoneType.Point> point;
-    @XmlAttribute(name = "id", required = true)
+	@XmlAttribute(name = "id", required = true)
-    protected String id;
+	protected String id;
 
-    /**
+	/**
-     * Gets the value of the point property.
+	 * Gets the value of the point property.
-     * 
+	 * 
-     * <p>
+	 * <p>
-     * This accessor method returns a reference to the live list,
+	 * This accessor method returns a reference to the live list, not a
-     * not a snapshot. Therefore any modification you make to the
+	 * snapshot. Therefore any modification you make to the returned list will
-     * returned list will be present inside the JAXB object.
+	 * be present inside the JAXB object. This is why there is not a
-     * This is why there is not a <CODE>set</CODE> method for the point property.
+	 * <CODE>set</CODE> method for the point property.
-     * 
+	 * 
-     * <p>
+	 * <p>
-     * For example, to add a new item, do as follows:
+	 * For example, to add a new item, do as follows:
-     * <pre>
+	 * 
-     *    getPoint().add(newItem);
+	 * <pre>
-     * </pre>
+	 * getPoint().add(newItem);
-     * 
+	 * </pre>
-     * 
+	 * 
-     * <p>
+	 * 
-     * Objects of the following type(s) are allowed in the list
+	 * <p>
-     * {@link ZoneType.Point }
+	 * Objects of the following type(s) are allowed in the list
-     * 
+	 * {@link ZoneType.Point }
-     * 
+	 * 
-     */
+	 * 
-    public List<ZoneType.Point> getPoint() {
+	 */
-        if (point == null) {
+	public List<ZoneType.Point> getPoint() {
-            point = new ArrayList<ZoneType.Point>();
+		if (point == null) {
-        }
+			point = new ArrayList<ZoneType.Point>();
-        return this.point;
+		}
-    }
+		return this.point;
+	}
 
-    /**
+	/**
-     * Gets the value of the id property.
+	 * Gets the value of the id property.
-     * 
+	 * 
-     * @return
+	 * @return possible object is {@link String }
-     *     possible object is
+	 * 
-     *     {@link String }
+	 */
-     *     
+	public String getId() {
-     */
+		return id;
-    public String getId() {
+	}
-        return id;
-    }
 
-    /**
+	/**
-     * Sets the value of the id property.
+	 * Sets the value of the id property.
-     * 
+	 * 
-     * @param value
+	 * @param value
-     *     allowed object is
+	 *            allowed object is {@link String }
-     *     {@link String }
+	 * 
-     *     
+	 */
-     */
+	public void setId(String value) {
-    public void setId(String value) {
+		this.id = value;
-        this.id = value;
+	}
-    }
 
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained
+	 * within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;complexContent>
+	 *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *       &lt;sequence>
+	 *       &lt;/sequence>
+	 *       &lt;attribute name="x" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *       &lt;attribute name="y" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
+	 *     &lt;/restriction>
+	 *   &lt;/complexContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "")
+	public static class Point {
 
-    /**
+		@XmlAttribute(name = "x", required = true)
-     * <p>Java class for anonymous complex type.
+		protected int x;
-     * 
+		@XmlAttribute(name = "y", required = true)
-     * <p>The following schema fragment specifies the expected content contained within this class.
+		protected int y;
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       &lt;sequence>
-     *       &lt;/sequence>
-     *       &lt;attribute name="x" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *       &lt;attribute name="y" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class Point {
 
-        @XmlAttribute(name = "x", required = true)
+		/**
-        protected int x;
+		 * Gets the value of the x property.
-        @XmlAttribute(name = "y", required = true)
+		 * 
-        protected int y;
+		 */
+		public int getX() {
+			return x;
+		}
 
-        /**
+		/**
-         * Gets the value of the x property.
+		 * Sets the value of the x property.
-         * 
+		 * 
-         */
+		 */
-        public int getX() {
+		public void setX(int value) {
-            return x;
+			this.x = value;
-        }
+		}
 
-        /**
+		/**
-         * Sets the value of the x property.
+		 * Gets the value of the y property.
-         * 
+		 * 
-         */
+		 */
-        public void setX(int value) {
+		public int getY() {
-            this.x = value;
+			return y;
-        }
+		}
 
-        /**
+		/**
-         * Gets the value of the y property.
+		 * Sets the value of the y property.
-         * 
+		 * 
-         */
+		 */
-        public int getY() {
+		public void setY(int value) {
-            return y;
+			this.y = value;
-        }
+		}
 
-        /**
+	}
-         * Sets the value of the y property.
-         * 
-         */
-        public void setY(int value) {
-            this.y = value;
-        }
-
-    }
 
 }

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Zones.java

@@ -5,7 +5,6 @@
 // Generated on: 2012.03.25 at 01:03:28 PM BRT 
 //
 
-
 package com.l2jserver.model.template;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,11 +13,13 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for anonymous complex type.
+ * <p>
+ * Java class for anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within
+ * this class.
  * 
  * <pre>
  * &lt;complexType>
@@ -55,157 +56,146 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
+@XmlType(name = "", propOrder = { "castle" })
-    "castle"
-})
 @XmlRootElement(name = "zones", namespace = "zones")
 public class Zones {
 
-    @XmlElement(required = true)
+	@XmlElement(required = true)
-    protected Zones.Castle castle;
+	protected Zones.Castle castle;
 
-    /**
+	/**
-     * Gets the value of the castle property.
+	 * Gets the value of the castle property.
-     * 
+	 * 
-     * @return
+	 * @return possible object is {@link Zones.Castle }
-     *     possible object is
+	 * 
-     *     {@link Zones.Castle }
+	 */
-     *     
+	public Zones.Castle getCastle() {
-     */
+		return castle;
-    public Zones.Castle getCastle() {
+	}
-        return castle;
-    }
 
-    /**
+	/**
-     * Sets the value of the castle property.
+	 * Sets the value of the castle property.
-     * 
+	 * 
-     * @param value
+	 * @param value
-     *     allowed object is
+	 *            allowed object is {@link Zones.Castle }
-     *     {@link Zones.Castle }
+	 * 
-     *     
+	 */
-     */
+	public void setCastle(Zones.Castle value) {
-    public void setCastle(Zones.Castle value) {
+		this.castle = value;
-        this.castle = value;
+	}
-    }
 
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained
+	 * within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;complexContent>
+	 *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *       &lt;sequence>
+	 *         &lt;element name="siege">
+	 *           &lt;complexType>
+	 *             &lt;complexContent>
+	 *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+	 *                 &lt;sequence>
+	 *                   &lt;element name="zone" type="{zones}ZoneType"/>
+	 *                 &lt;/sequence>
+	 *               &lt;/restriction>
+	 *             &lt;/complexContent>
+	 *           &lt;/complexType>
+	 *         &lt;/element>
+	 *       &lt;/sequence>
+	 *     &lt;/restriction>
+	 *   &lt;/complexContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "siege" })
+	public static class Castle {
 
-    /**
+		@XmlElement(required = true)
-     * <p>Java class for anonymous complex type.
+		protected Zones.Castle.Siege siege;
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       &lt;sequence>
-     *         &lt;element name="siege">
-     *           &lt;complexType>
-     *             &lt;complexContent>
-     *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 &lt;sequence>
-     *                   &lt;element name="zone" type="{zones}ZoneType"/>
-     *                 &lt;/sequence>
-     *               &lt;/restriction>
-     *             &lt;/complexContent>
-     *           &lt;/complexType>
-     *         &lt;/element>
-     *       &lt;/sequence>
-     *     &lt;/restriction>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "siege"
-    })
-    public static class Castle {
 
-        @XmlElement(required = true)
+		/**
-        protected Zones.Castle.Siege siege;
+		 * Gets the value of the siege property.
+		 * 
+		 * @return possible object is {@link Zones.Castle.Siege }
+		 * 
+		 */
+		public Zones.Castle.Siege getSiege() {
+			return siege;
+		}
 
-        /**
+		/**
-         * Gets the value of the siege property.
+		 * Sets the value of the siege property.
-         * 
+		 * 
-         * @return
+		 * @param value
-         *     possible object is
+		 *            allowed object is {@link Zones.Castle.Siege }
-         *     {@link Zones.Castle.Siege }
+		 * 
-         *     
+		 */
-         */
+		public void setSiege(Zones.Castle.Siege value) {
-        public Zones.Castle.Siege getSiege() {
+			this.siege = value;
-            return siege;
+		}
-        }
 
-        /**
+		/**
-         * Sets the value of the siege property.
+		 * <p>
-         * 
+		 * Java class for anonymous complex type.
-         * @param value
+		 * 
-         *     allowed object is
+		 * <p>
-         *     {@link Zones.Castle.Siege }
+		 * The following schema fragment specifies the expected content
-         *     
+		 * contained within this class.
-         */
+		 * 
-        public void setSiege(Zones.Castle.Siege value) {
+		 * <pre>
-            this.siege = value;
+		 * &lt;complexType>
-        }
+		 *   &lt;complexContent>
+		 *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+		 *       &lt;sequence>
+		 *         &lt;element name="zone" type="{zones}ZoneType"/>
+		 *       &lt;/sequence>
+		 *     &lt;/restriction>
+		 *   &lt;/complexContent>
+		 * &lt;/complexType>
+		 * </pre>
+		 * 
+		 * 
+		 */
+		@XmlAccessorType(XmlAccessType.FIELD)
+		@XmlType(name = "", propOrder = { "zone" })
+		public static class Siege {
 
+			@XmlElement(required = true)
+			protected ZoneType zone;
 
-        /**
+			/**
-         * <p>Java class for anonymous complex type.
+			 * Gets the value of the zone property.
-         * 
+			 * 
-         * <p>The following schema fragment specifies the expected content contained within this class.
+			 * @return possible object is {@link ZoneType }
-         * 
+			 * 
-         * <pre>
+			 */
-         * &lt;complexType>
+			public ZoneType getZone() {
-         *   &lt;complexContent>
+				return zone;
-         *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+			}
-         *       &lt;sequence>
-         *         &lt;element name="zone" type="{zones}ZoneType"/>
-         *       &lt;/sequence>
-         *     &lt;/restriction>
-         *   &lt;/complexContent>
-         * &lt;/complexType>
-         * </pre>
-         * 
-         * 
-         */
-        @XmlAccessorType(XmlAccessType.FIELD)
-        @XmlType(name = "", propOrder = {
-            "zone"
-        })
-        public static class Siege {
 
-            @XmlElement(required = true)
+			/**
-            protected ZoneType zone;
+			 * Sets the value of the zone property.
+			 * 
+			 * @param value
+			 *            allowed object is {@link ZoneType }
+			 * 
+			 */
+			public void setZone(ZoneType value) {
+				this.zone = value;
+			}
 
-            /**
+		}
-             * Gets the value of the zone property.
-             * 
-             * @return
-             *     possible object is
-             *     {@link ZoneType }
-             *     
-             */
-            public ZoneType getZone() {
-                return zone;
-            }
 
-            /**
+	}
-             * Sets the value of the zone property.
-             * 
-             * @param value
-             *     allowed object is
-             *     {@link ZoneType }
-             *     
-             */
-            public void setZone(ZoneType value) {
-                this.zone = value;
-            }
-
-        }
-
-    }
 
 }

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/L2JConstant.java

@@ -18,7 +18,6 @@ package com.l2jserver;
 
 import com.l2jserver.service.network.model.ProtocolVersion;
 
-
 /**
  * Constant values for this L2J compilation
  * 

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/L2JGameServerMain.java

@@ -79,7 +79,7 @@ public class L2JGameServerMain {
 	@SuppressWarnings("unchecked")
 	public static void main(String[] args) {
 		BasicConfigurator.configure();
-		
+
 		final ServiceManager serviceManager = new ServiceManager();
 		try {
 			serviceManager.load(Paths.get("services.xml"));

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/id/CharacterShortcutID.java

@@ -36,16 +36,18 @@ public class CharacterShortcutID extends
 	 * The {@link CharacterShortcutDAO} instance
 	 */
 	private final CharacterShortcutDAO shortcutDao;
-	
+
 	/**
 	 * Creates a new instance
 	 * 
 	 * @param id
 	 *            the id
-	 * @param shortcutDao the shortcut DAO
+	 * @param shortcutDao
+	 *            the shortcut DAO
 	 */
 	@Inject
-	public CharacterShortcutID(@Assisted int id, CharacterShortcutDAO shortcutDao) {
+	public CharacterShortcutID(@Assisted int id,
+			CharacterShortcutDAO shortcutDao) {
 		super(id);
 		this.shortcutDao = shortcutDao;
 	}

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/template/AugmentTemplate.java

@@ -16,7 +16,6 @@
  */
 package com.l2jserver.model.template;
 
-
 /**
  * Template for an Aumentation
  * 

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/Actor.java

@@ -95,10 +95,11 @@ public abstract class Actor extends PositionableObject {
 		DEAD;
 	}
 
-//	/**
+	// /**
-//	 * The currently effects active on the actor
+	// * The currently effects active on the actor
-//	 */
+	// */
-//	protected final ActorEffectContainer effects = new ActorEffectContainer(this);
+	// protected final ActorEffectContainer effects = new
+	// ActorEffectContainer(this);
 	/**
 	 * The skills learned by this actor
 	 */
@@ -270,12 +271,12 @@ public abstract class Actor extends PositionableObject {
 		return state == ActorState.ATTACKING;
 	}
 
-//	/**
+	// /**
-//	 * @return the active effects on this actor
+	// * @return the active effects on this actor
-//	 */
+	// */
-//	public ActorEffectContainer getEffects() {
+	// public ActorEffectContainer getEffects() {
-//		return effects;
+	// return effects;
-//	}
+	// }
 
 	/**
 	 * @return the actor skills

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculatorFunction.java

@@ -52,6 +52,5 @@ public abstract class ActorCalculatorFunction extends
 	 *            the original value
 	 * @return the calculated value
 	 */
-	protected abstract double calculate(Actor a, ActorTemplate t,
+	protected abstract double calculate(Actor a, ActorTemplate t, double value);
-			double value);
 }

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/MaximumHPAddCalculator.java

@@ -43,10 +43,10 @@ public class MaximumHPAddCalculator extends CharacterFormula {
 
 	@Override
 	public double calculate(L2Character c, CharacterTemplate t, double value) {
-		int lvl = c.getLevel() -  t.getStats().getLevel();
+		int lvl = c.getLevel() - t.getStats().getLevel();
 		double mod = t.getStats().getHp().getModifier() * lvl;
 		double max = (t.getStats().getHp().getAdd() + mod) * lvl;
-		double min = ( t.getStats().getHp().getAdd() * lvl) + mod;
+		double min = (t.getStats().getHp().getAdd() * lvl) + mod;
 
 		return value + (max + min) / 2;
 	}

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/character/calculator/base/CharacterBasePhysicalCriticalRateCalculator.java

@@ -43,6 +43,6 @@ public class CharacterBasePhysicalCriticalRateCalculator extends
 
 	@Override
 	protected double calculate(L2Character c, CharacterTemplate t, double value) {
-		return  t.getStats().getAttack().getCritical();
+		return t.getStats().getAttack().getCritical();
 	}
 }

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/item/ItemPickEvent.java

@@ -50,7 +50,8 @@ public class ItemPickEvent implements ItemEvent, CharacterEvent {
 	 *            the picking up character
 	 * @param item
 	 *            the picked up item
-	 * @param newItem the new {@link Item}
+	 * @param newItem
+	 *            the new {@link Item}
 	 */
 	public ItemPickEvent(L2Character character, Item item, Item newItem) {
 		this.character = character;

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/BaseNPCController.java

@@ -152,7 +152,7 @@ public abstract class BaseNPCController implements NPCController {
 				break;
 			}
 		}
-		if(html == null)
+		if (html == null)
 			return null;
 
 		// TODO use an decent template engine

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/model/world/npc/controller/impl/NotImplementedNPCController.java

@@ -33,8 +33,8 @@ import com.l2jserver.util.html.markup.MarkupTag;
  */
 public class NotImplementedNPCController extends BaseNPCController {
 	@Override
-	public void interact(NPC npc, L2Character character,
+	public void interact(NPC npc, L2Character character, final String... args)
-			final String... args) throws L2Exception {
+			throws L2Exception {
 		// action not handled
 		final HtmlTemplate template = new HtmlTemplate() {
 			@Override

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/JDBCDAOModule.java

@@ -42,8 +42,7 @@ import com.l2jserver.service.database.dao.sql.SQLNPCDAO;
 public class JDBCDAOModule extends AbstractModule {
 	@Override
 	protected void configure() {
-		bind(CharacterDAO.class).to(SQLCharacterDAO.class)
+		bind(CharacterDAO.class).to(SQLCharacterDAO.class).in(Scopes.SINGLETON);
-				.in(Scopes.SINGLETON);
 		bind(CharacterFriendDAO.class).to(SQLCharacterFriendDAO.class).in(
 				Scopes.SINGLETON);
 		bind(CharacterShortcutDAO.class).to(SQLCharacterShortcutDAO.class).in(

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/orientdb/OrientDBItemDAO.java

@@ -140,7 +140,8 @@ public class OrientDBItemDAO extends AbstractOrientDBDAO<Item, ItemID>
 					@Override
 					protected OQueryContextNative query(
 							OQueryContextNative record, Item o) {
-						return record.field(name(entity.itemId)).eq(o.getID().getID());
+						return record.field(name(entity.itemId)).eq(
+								o.getID().getID());
 					}
 				});
 	}

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/dao/sql/SQLCharacterFriendDAO.java

@@ -126,8 +126,8 @@ public class SQLCharacterFriendDAO extends
 					protected void query(SQLDeleteClause q, CharacterFriend o) {
 						q.where(entity.characterId.eq(
 								o.getID().getCharacterID().getID()).and(
-								entity.characterIdFriend.eq(o.getID().getFriendID()
+								entity.characterIdFriend.eq(o.getID()
-										.getID())));
+										.getFriendID().getID())));
 					}
 				});
 	}

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QCharacterFriend.java

@@ -48,7 +48,9 @@ public class QCharacterFriend extends
 
 	/**
 	 * Creates a new instance
-	 * @param variable the query variable
+	 * 
+	 * @param variable
+	 *            the query variable
 	 */
 	public QCharacterFriend(String variable) {
 		super(FriendID.class, forVariable(variable), "null", "character_friend");

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QCharacterShortcut.java

@@ -23,7 +23,7 @@ public class QCharacterShortcut extends
 	 * The Java Serialization UID
 	 */
 	private static final long serialVersionUID = 1L;
-	
+
 	/**
 	 * Default entity for {@link QCharacterShortcut}
 	 */
@@ -88,7 +88,9 @@ public class QCharacterShortcut extends
 
 	/**
 	 * Creates a new instance
-	 * @param variable the query variable
+	 * 
+	 * @param variable
+	 *            the query variable
 	 */
 	public QCharacterShortcut(String variable) {
 		super(Integer.class, forVariable(variable), "null",

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QClan.java

@@ -18,7 +18,7 @@ public class QClan extends com.mysema.query.sql.RelationalPathBase<Integer> {
 	 * The Java Serialization UID
 	 */
 	private static final long serialVersionUID = 1L;
-	
+
 	/**
 	 * Default entity for {@link QClan}
 	 */
@@ -44,7 +44,9 @@ public class QClan extends com.mysema.query.sql.RelationalPathBase<Integer> {
 
 	/**
 	 * Creates a new instance
-	 * @param variable the query variable
+	 * 
+	 * @param variable
+	 *            the query variable
 	 */
 	public QClan(String variable) {
 		super(Integer.class, forVariable(variable), "null", "clan");

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QItem.java

@@ -23,7 +23,7 @@ public class QItem extends com.mysema.query.sql.RelationalPathBase<Integer> {
 	 * The Java Serialization UID
 	 */
 	private static final long serialVersionUID = 1L;
-	
+
 	/**
 	 * Default entity for {@link QItem}
 	 */
@@ -97,7 +97,9 @@ public class QItem extends com.mysema.query.sql.RelationalPathBase<Integer> {
 
 	/**
 	 * Creates a new instance
-	 * @param variable the query variable
+	 * 
+	 * @param variable
+	 *            the query variable
 	 */
 	public QItem(String variable) {
 		super(Integer.class, forVariable(variable), "null", "item");

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QLogChat.java

@@ -26,7 +26,7 @@ public class QLogChat extends com.mysema.query.sql.RelationalPathBase<Integer> {
 	 * The Java Serialization UID
 	 */
 	private static final long serialVersionUID = 1L;
-	
+
 	/**
 	 * Default entity for {@link QLogChat}
 	 */
@@ -78,7 +78,9 @@ public class QLogChat extends com.mysema.query.sql.RelationalPathBase<Integer> {
 
 	/**
 	 * Creates a new instance
-	 * @param variable the query variable
+	 * 
+	 * @param variable
+	 *            the query variable
 	 */
 	public QLogChat(String variable) {
 		super(Integer.class, forVariable(variable), "null", "log_chat");

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/database/model/QNPC.java

@@ -84,7 +84,9 @@ public class QNPC extends com.mysema.query.sql.RelationalPathBase<Integer> {
 
 	/**
 	 * Creates a new instance
-	 * @param variable the query variable
+	 * 
+	 * @param variable
+	 *            the query variable
 	 */
 	public QNPC(String variable) {
 		super(Integer.class, forVariable(variable), "null", "npc");

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/AttackServiceImpl.java

@@ -64,8 +64,8 @@ public class AttackServiceImpl extends AbstractService implements AttackService
 	private final NPCService npcService;
 
 	/**
-	 * The {@link WorldEventDispatcherService} is used to dispatch attack events to the
+	 * The {@link WorldEventDispatcherService} is used to dispatch attack events
-	 * world
+	 * to the world
 	 */
 	private final WorldEventDispatcherService eventDispatcher;
 

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/ai/AIServiceImpl.java

@@ -79,8 +79,8 @@ public class AIServiceImpl extends AbstractService implements AIService {
 	 */
 	@Inject
 	public AIServiceImpl(WorldService worldService,
-			WorldEventDispatcherService eventDispatcher, ThreadService threadService,
+			WorldEventDispatcherService eventDispatcher,
-			NetworkService networkService) {
+			ThreadService threadService, NetworkService networkService) {
 		this.worldService = worldService;
 		this.eventDispatcher = eventDispatcher;
 		this.threadService = threadService;

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/character/TooManyCharactersException.java

@@ -22,8 +22,7 @@ package com.l2jserver.service.game.character;
  * 
  * @author <a href="http://www.rogiel.com">Rogiel</a>
  */
-public class TooManyCharactersException extends
+public class TooManyCharactersException extends CharacterServiceException {
-		CharacterServiceException {
 	/**
 	 * The Java Serialization API serial
 	 */

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/ChatService.java

@@ -52,8 +52,8 @@ import com.l2jserver.service.Service;
  * {@link ChatBanActiveChatServiceException} will be thrown.
  * 
  * <h1>Packets</h1>
- * Messages are received (from the clients) with <code>CM_CHAR_CHAT</code> and sent (to
+ * Messages are received (from the clients) with <code>CM_CHAR_CHAT</code> and
- * the clients) with <code>SM_ACTOR_CHAT</code>.
+ * sent (to the clients) with <code>SM_ACTOR_CHAT</code>.
  * 
  * @author <a href="http://www.rogiel.com">Rogiel</a>
  */

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/chat/SimpleChatService.java

@@ -55,10 +55,10 @@ public class SimpleChatService extends AbstractService implements ChatService {
 	 * The {@link ChatLoggingService} implementation
 	 */
 	private final ChatLoggingService chatLoggingService;
-//	/**
+	// /**
-//	 * The {@link RegionService}
+	// * The {@link RegionService}
-//	 */
+	// */
-//	private final RegionService regionService;
+	// private final RegionService regionService;
 	/**
 	 * The {@link L2Character} DAO
 	 */
@@ -177,13 +177,13 @@ public class SimpleChatService extends AbstractService implements ChatService {
 	@Override
 	public PublicChatChannel getRegionChannel(L2Character character) {
 		Preconditions.checkNotNull(character, "character");
-//		final Region region = regionService.getRegion(character);
+		// final Region region = regionService.getRegion(character);
-//		RegionChatChannelImpl channel = regionChannels.get(region);
+		// RegionChatChannelImpl channel = regionChannels.get(region);
-//		if (channel == null) {
+		// if (channel == null) {
-//			channel = new RegionChatChannelImpl(region);
+		// channel = new RegionChatChannelImpl(region);
-//			regionChannels.put(region, channel);
+		// regionChannels.put(region, channel);
-//		}
+		// }
-//		return channel;
+		// return channel;
 		return null;
 	}
 

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/item/ItemServiceImpl.java

@@ -149,7 +149,8 @@ public class ItemServiceImpl extends
 
 	@Override
 	public Item split(Item item, long count)
-			throws NotEnoughItemsServiceException, NonStackableItemsServiceException {
+			throws NotEnoughItemsServiceException,
+			NonStackableItemsServiceException {
 		if (item.getCount() < count)
 			throw new NotEnoughItemsServiceException();
 		if (item.getCount() == count)
@@ -187,7 +188,8 @@ public class ItemServiceImpl extends
 
 	@Override
 	public boolean destroy(Item item, long count)
-			throws NotEnoughItemsServiceException, NonStackableItemsServiceException {
+			throws NotEnoughItemsServiceException,
+			NonStackableItemsServiceException {
 		synchronized (item) {
 			Item destroyItem = split(item, count);
 			itemDao.deleteObjectsAsync(destroyItem);
@@ -266,7 +268,8 @@ public class ItemServiceImpl extends
 	public Item drop(Item item, long count, Point3D point, Actor actor)
 			throws SpawnPointNotFoundServiceException,
 			ItemAlreadyOnGroundServiceException,
-			AlreadySpawnedServiceException, NotEnoughItemsServiceException, NonStackableItemsServiceException {
+			AlreadySpawnedServiceException, NotEnoughItemsServiceException,
+			NonStackableItemsServiceException {
 		synchronized (item) {
 			if (item.getLocation() == ItemLocation.GROUND)
 				throw new AlreadySpawnedServiceException();
@@ -320,7 +323,8 @@ public class ItemServiceImpl extends
 	public void drop(Item item, Point3D point, Actor actor)
 			throws SpawnPointNotFoundServiceException,
 			ItemAlreadyOnGroundServiceException,
-			AlreadySpawnedServiceException, NotEnoughItemsServiceException, NonStackableItemsServiceException {
+			AlreadySpawnedServiceException, NotEnoughItemsServiceException,
+			NonStackableItemsServiceException {
 		drop(item, item.getCount(), point, actor);
 	}
 

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/map/pathing/MapperPathingService.java

@@ -90,7 +90,8 @@ public class MapperPathingService extends AbstractService implements
 	 * 
 	 * @param eventDispatcher
 	 *            the world event dispatcher
-	 * @param vfsService the VFS service implementation
+	 * @param vfsService
+	 *            the VFS service implementation
 	 */
 	@Inject
 	public MapperPathingService(WorldEventDispatcherService eventDispatcher,
@@ -117,7 +118,7 @@ public class MapperPathingService extends AbstractService implements
 						.fromCoordinate(point.getCoordinate());
 				try {
 					channel.write(struct.getByteBuffer());
-					//channel.force(true);
+					// channel.force(true);
 				} catch (IOException e1) {
 					log.warn("Error writing pathing file!", e1);
 				}

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerClassFileManager.java

@@ -108,7 +108,8 @@ public class EclipseCompilerClassFileManager extends
 	 * @return classLoader of this ClassFileManager
 	 */
 	@Override
-	public synchronized EclipseCompilerScriptClassLoader getClassLoader(Location location) {
+	public synchronized EclipseCompilerScriptClassLoader getClassLoader(
+			Location location) {
 		if (loader == null) {
 			loader = AccessController
 					.doPrivileged(new PrivilegedAction<EclipseCompilerScriptClassLoader>() {

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerScriptClassLoader.java

@@ -80,7 +80,8 @@ public class EclipseCompilerScriptClassLoader extends ScriptClassLoader {
 	 * @param classFileManager
 	 *            classFileManager of this classLoader
 	 */
-	EclipseCompilerScriptClassLoader(EclipseCompilerClassFileManager classFileManager) {
+	EclipseCompilerScriptClassLoader(
+			EclipseCompilerClassFileManager classFileManager) {
 		super(new URL[] {});
 		this.classFileManager = classFileManager;
 	}
@@ -94,7 +95,8 @@ public class EclipseCompilerScriptClassLoader extends ScriptClassLoader {
 	 * @param parent
 	 *            parent classLoader
 	 */
-	EclipseCompilerScriptClassLoader(EclipseCompilerClassFileManager classFileManager, ClassLoader parent) {
+	EclipseCompilerScriptClassLoader(
+			EclipseCompilerClassFileManager classFileManager, ClassLoader parent) {
 		super(new URL[] {}, parent);
 		this.classFileManager = classFileManager;
 	}
@@ -176,7 +178,8 @@ public class EclipseCompilerScriptClassLoader extends ScriptClassLoader {
 			newName = newName.replace('/', '.');
 			if (classFileManager.getCompiledClasses().containsKey(newName)) {
 				try {
-					return new URL(null,
+					return new URL(
+							null,
 							EclipseCompilerVirtualClassURLStreamHandler.HANDLER_PROTOCOL
 									+ newName, urlStreamHandler);
 				} catch (MalformedURLException e) {

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerVirtualClassURLConnection.java

@@ -48,7 +48,8 @@ public class EclipseCompilerVirtualClassURLConnection extends URLConnection {
 	 * @param cl
 	 *            classloader
 	 */
-	protected EclipseCompilerVirtualClassURLConnection(URL url, EclipseCompilerScriptClassLoader cl) {
+	protected EclipseCompilerVirtualClassURLConnection(URL url,
+			EclipseCompilerScriptClassLoader cl) {
 		super(url);
 		BinaryClass bc = cl.getClassFileManager().getCompiledClasses()
 				.get(url.getHost());

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseCompilerVirtualClassURLStreamHandler.java

@@ -27,7 +27,8 @@ import java.net.URLStreamHandler;
  * 
  * @author <a href="http://www.rogiel.com">Rogiel</a>
  */
-public class EclipseCompilerVirtualClassURLStreamHandler extends URLStreamHandler {
+public class EclipseCompilerVirtualClassURLStreamHandler extends
+		URLStreamHandler {
 
 	/**
 	 * Script Handler protocol for classes compiled from source
@@ -45,7 +46,8 @@ public class EclipseCompilerVirtualClassURLStreamHandler extends URLStreamHandle
 	 * @param cl
 	 *            ScriptClassLoaderImpl that was used to load compiled class
 	 */
-	public EclipseCompilerVirtualClassURLStreamHandler(EclipseCompilerScriptClassLoader cl) {
+	public EclipseCompilerVirtualClassURLStreamHandler(
+			EclipseCompilerScriptClassLoader cl) {
 		this.cl = cl;
 	}
 

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/ecj/EclipseScriptCompiler.java

@@ -190,7 +190,8 @@ public class EclipseScriptCompiler implements ScriptCompiler {
 			Iterable<JavaFileObject> compilationUnits) {
 		List<String> options = Arrays.asList("-encoding", "UTF-8", "-g");
 		DiagnosticListener<JavaFileObject> listener = new ErrorListener();
-		EclipseCompilerClassFileManager manager = new EclipseCompilerClassFileManager(javaCompiler, listener);
+		EclipseCompilerClassFileManager manager = new EclipseCompilerClassFileManager(
+				javaCompiler, listener);
 		manager.setParentClassLoader(parentClassLoader);
 
 		if (libraries != null) {

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKScriptClassLoader.java

@@ -94,7 +94,8 @@ public class JDKScriptClassLoader extends ScriptClassLoader {
 	 * @param parent
 	 *            parent classLoader
 	 */
-	JDKScriptClassLoader(JDKClassFileManager classFileManager, ClassLoader parent) {
+	JDKScriptClassLoader(JDKClassFileManager classFileManager,
+			ClassLoader parent) {
 		super(new URL[] {}, parent);
 		this.classFileManager = classFileManager;
 	}

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/scripting/impl/jdk/JDKScriptCompiler.java

@@ -189,7 +189,8 @@ public class JDKScriptCompiler implements ScriptCompiler {
 			Iterable<JavaFileObject> compilationUnits) {
 		List<String> options = Arrays.asList("-encoding", "UTF-8", "-g");
 		DiagnosticListener<JavaFileObject> listener = new ErrorListener();
-		JDKClassFileManager manager = new JDKClassFileManager(javaCompiler, listener);
+		JDKClassFileManager manager = new JDKClassFileManager(javaCompiler,
+				listener);
 		manager.setParentClassLoader(parentClassLoader);
 
 		if (libraries != null) {

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceImpl.java

@@ -79,7 +79,8 @@ public class SpawnServiceImpl extends AbstractService implements SpawnService {
 	 */
 	@Inject
 	public SpawnServiceImpl(WorldService worldService,
-			WorldEventDispatcherService eventDispatcher, ThreadService threadService) {
+			WorldEventDispatcherService eventDispatcher,
+			ThreadService threadService) {
 		this.worldService = worldService;
 		this.eventDispatcher = eventDispatcher;
 		this.threadService = threadService;

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherService.java

@@ -96,7 +96,7 @@ public interface WorldEventDispatcherService extends Service {
 	 *            the listener
 	 */
 	void removeListener(ObjectID<?> id, WorldListener listener);
-	
+
 	/**
 	 * Removes all listeners from a given object
 	 * 

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/game/world/filter/impl/RangeFilter.java

@@ -56,7 +56,7 @@ public class RangeFilter implements WorldObjectFilter<PositionableObject> {
 	public boolean accept(PositionableObject other) {
 		if (other == null)
 			return false;
-		if(other.getPoint() == null)
+		if (other.getPoint() == null)
 			return false;
 
 		final double dx = FastMath.abs(object.getPoint().getX()

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/NetworkService.java

@@ -16,7 +16,6 @@
  */
 package com.l2jserver.service.network;
 
-
 import com.l2jserver.model.id.object.CharacterID;
 import com.l2jserver.model.world.L2Character;
 import com.l2jserver.service.Service;

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/Lineage2Client.java

@@ -39,16 +39,16 @@ public interface Lineage2Client {
 	 * @return the character
 	 */
 	boolean hasCharacter();
-	
+
 	/**
 	 * @return the character ID
 	 */
 	CharacterID getCharacterID();
-	
+
 	/**
 	 * @return the character
 	 */
-	L2Character getCharacter() ;
+	L2Character getCharacter();
 
 	/**
 	 * @param characterID
@@ -149,7 +149,7 @@ public interface Lineage2Client {
 	 *         has been written.
 	 */
 	ChannelFuture sendSystemMessage(SystemMessage message);
-	
+
 	/**
 	 * Sends a {@link SystemMessage} to this client
 	 * 
@@ -157,15 +157,14 @@ public interface Lineage2Client {
 	 *            the {@link SystemMessage}
 	 * @param args
 	 *            the arguments of the message, they will be automatically
-	 *            detected and inserted. See <code>SM_SYSTEM_MESSAGE</code> for more
+	 *            detected and inserted. See <code>SM_SYSTEM_MESSAGE</code> for
-	 *            about supported formats.
+	 *            more about supported formats.
 	 * @return the {@link ChannelFuture} that will be notified once the packet
 	 *         has been written.
 	 * @see SystemMessage
 	 */
-	ChannelFuture sendSystemMessage(SystemMessage message,
+	ChannelFuture sendSystemMessage(SystemMessage message, Object... args);
-			Object... args);
+
-	
 	/**
 	 * Sends a <code>SM_ACTION_FAILED</code> to the client.
 	 * <p>
@@ -178,9 +177,9 @@ public interface Lineage2Client {
 	ChannelFuture sendActionFailed();
 
 	/**
-	 * Sends a <code>SM_HTML</code> packet to the client. In the packet, the NPC will
+	 * Sends a <code>SM_HTML</code> packet to the client. In the packet, the NPC
-	 * be null. If you wish to send the HTML with an NPC, you should send the
+	 * will be null. If you wish to send the HTML with an NPC, you should send
-	 * packet directly.
+	 * the packet directly.
 	 * <p>
 	 * This is an convenience method for <blockquote><code>
 	 * conn.write(new SM_HTML(null, template));</code></blockquote>
@@ -193,8 +192,9 @@ public interface Lineage2Client {
 	ChannelFuture sendHTML(HtmlTemplate template);
 
 	/**
-	 * Sends a <code>SM_COMMUNITY_HTML</code> packet to the client. HTML code is not
+	 * Sends a <code>SM_COMMUNITY_HTML</code> packet to the client. HTML code is
-	 * displayed in the regular chat window, they will appear in a large one.
+	 * not displayed in the regular chat window, they will appear in a large
+	 * one.
 	 * <p>
 	 * This is an convenience method for <blockquote><code>
 	 * conn.write(new SM_COMMUNITY_HTML(template));</code></blockquote>
@@ -258,7 +258,7 @@ public interface Lineage2Client {
 	 * @return the {@link ChannelFuture}
 	 */
 	ChannelFuture close();
-	
+
 	@Override
 	String toString();
 }

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/model/SystemMessage.java

@@ -16,7 +16,6 @@
  */
 package com.l2jserver.service.network.model;
 
-
 /**
  * @author <a href="http://www.rogiel.com">Rogiel</a>
  * 

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/geometry/Coordinate.java

@@ -18,7 +18,6 @@ package com.l2jserver.util.geometry;
 
 import org.apache.commons.math.geometry.Vector3D;
 
-
 /**
  * Represents an coordinate in the game world.
  * <p>

l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/util/jaxb/CharacterTemplateIDAdapter.java

@@ -34,7 +34,7 @@ public class CharacterTemplateIDAdapter extends
 	 * The character template id provider
 	 */
 	private final CharacterTemplateIDProvider provider;
-	
+
 	/**
 	 * Used for template generator
 	 */

l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/service/game/scripting/ScriptingServiceImplTest.java

@@ -53,6 +53,7 @@ public class ScriptingServiceImplTest {
 
 	/**
 	 * Tests script loading
+	 * 
 	 * @throws Exception
 	 */
 	@Test
@@ -64,6 +65,7 @@ public class ScriptingServiceImplTest {
 
 	/**
 	 * Tests script instantiation
+	 * 
 	 * @throws Exception
 	 */
 	@Test

l2jserver2-gameserver/l2jserver2-gameserver-core/src/test/java/com/l2jserver/service/world/WorldEventDispatcherImplTest.java

@@ -69,6 +69,7 @@ public class WorldEventDispatcherImplTest {
 
 	/**
 	 * Prepares the tests
+	 * 
 	 * @throws ServiceStartException
 	 */
 	@Before
@@ -90,6 +91,7 @@ public class WorldEventDispatcherImplTest {
 
 	/**
 	 * Test listenteners - mode 1
+	 * 
 	 * @throws InterruptedException
 	 */
 	@Test
@@ -135,6 +137,7 @@ public class WorldEventDispatcherImplTest {
 
 	/**
 	 * Test listeners - mode 2
+	 * 
 	 * @throws InterruptedException
 	 */
 	@Test

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/FreyaLineage2Client.java

@@ -409,6 +409,7 @@ public class FreyaLineage2Client implements Lineage2Client {
 		return (Lineage2PacketWriter) channel.getPipeline().get(
 				Lineage2PacketWriter.HANDLER_NAME);
 	}
+
 	@Override
 	public String toString() {
 		return "Lineage2Client [channel=" + channel + ", characterID="

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ACTION.java

@@ -77,9 +77,12 @@ public class CM_CHAR_ACTION extends AbstractClientPacket {
 	private CharacterAction action;
 
 	/**
-	 * @param idResolver the id resolver
+	 * @param idResolver
-	 * @param npcService the npc service
+	 *            the id resolver
-	 * @param itemService the item service
+	 * @param npcService
+	 *            the npc service
+	 * @param itemService
+	 *            the item service
 	 */
 	@Inject
 	public CM_CHAR_ACTION(ObjectIDResolver idResolver, NPCService npcService,

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_APPEARING.java

@@ -42,7 +42,8 @@ public class CM_CHAR_APPEARING extends AbstractClientPacket {
 	private final SpawnService spawnService;
 
 	/**
-	 * @param spawnService the spawn service
+	 * @param spawnService
+	 *            the spawn service
 	 */
 	@Inject
 	public CM_CHAR_APPEARING(SpawnService spawnService) {

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ATTACK.java

@@ -127,7 +127,8 @@ public class CM_CHAR_ATTACK extends AbstractClientPacket {
 	 *            the object id resolver
 	 */
 	@Inject
-	public CM_CHAR_ATTACK(CharacterService charService, ObjectIDResolver idResolver) {
+	public CM_CHAR_ATTACK(CharacterService charService,
+			ObjectIDResolver idResolver) {
 		this.charService = charService;
 		this.idResolver = idResolver;
 	}

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_CHAT.java

@@ -63,7 +63,8 @@ public class CM_CHAR_CHAT extends AbstractClientPacket {
 	private String target;
 
 	/**
-	 * @param chatService the chat service
+	 * @param chatService
+	 *            the chat service
 	 */
 	@Inject
 	public CM_CHAR_CHAT(ChatService chatService) {

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_MOVE.java

@@ -66,6 +66,7 @@ public class CM_CHAR_MOVE extends AbstractClientPacket {
 
 	/**
 	 * Defines the movement action type
+	 * 
 	 * @author <a href="http://www.rogiel.com">Rogiel</a>
 	 */
 	public enum MovementType {
@@ -84,14 +85,16 @@ public class CM_CHAR_MOVE extends AbstractClientPacket {
 		public final int id;
 
 		/**
-		 * @param id the type id
+		 * @param id
+		 *            the type id
 		 */
 		MovementType(int id) {
 			this.id = id;
 		}
 
 		/**
-		 * @param id the type id
+		 * @param id
+		 *            the type id
 		 * @return the {@link MovementType} represented by <code>id</code>
 		 */
 		public static MovementType fromID(int id) {
@@ -104,7 +107,8 @@ public class CM_CHAR_MOVE extends AbstractClientPacket {
 	}
 
 	/**
-	 * @param charService the character service
+	 * @param charService
+	 *            the character service
 	 */
 	@Inject
 	public CM_CHAR_MOVE(CharacterService charService) {

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_POSITION.java

@@ -51,7 +51,8 @@ public class CM_CHAR_POSITION extends AbstractClientPacket {
 	private int extra; // vehicle id
 
 	/**
-	 * @param charService the character service
+	 * @param charService
+	 *            the character service
 	 */
 	@Inject
 	public CM_CHAR_POSITION(CharacterService charService) {

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_SELECT.java

@@ -51,7 +51,8 @@ public class CM_CHAR_SELECT extends AbstractClientPacket {
 	private int slot;
 
 	/**
-	 * @param characterDao the character dao
+	 * @param characterDao
+	 *            the character dao
 	 */
 	@Inject
 	public CM_CHAR_SELECT(CharacterDAO characterDao) {

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ENTER_WORLD.java

@@ -51,7 +51,8 @@ public class CM_ENTER_WORLD extends AbstractClientPacket {
 	private final CharacterService characterService;
 
 	/**
-	 * @param characterService the character service
+	 * @param characterService
+	 *            the character service
 	 */
 	@Inject
 	public CM_ENTER_WORLD(CharacterService characterService) {

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_GG_KEY.java

@@ -53,7 +53,8 @@ public class CM_GG_KEY extends AbstractClientPacket {
 	private byte[] key = new byte[8];
 
 	/**
-	 * @param ggService the gameguard service
+	 * @param ggService
+	 *            the gameguard service
 	 */
 	@Inject
 	public CM_GG_KEY(GameGuardService ggService) {

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java

@@ -49,7 +49,8 @@ public class CM_GOTO_LOBBY extends AbstractClientPacket {
 	private final CharacterDAO characterDao;
 
 	/**
-	 * @param characterDao the character dao
+	 * @param characterDao
+	 *            the character dao
 	 */
 	@Inject
 	public CM_GOTO_LOBBY(CharacterDAO characterDao) {

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ITEM_DESTROY.java

@@ -97,7 +97,8 @@ public class CM_ITEM_DESTROY extends AbstractClientPacket {
 			} else {
 				conn.updateInventoryItems(item);
 			}
-		} catch (NotEnoughItemsServiceException | NonStackableItemsServiceException e) {
+		} catch (NotEnoughItemsServiceException
+				| NonStackableItemsServiceException e) {
 			conn.sendSystemMessage(SystemMessage.CANNOT_DISCARD_THIS_ITEM);
 		}
 	}

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_ITEM_DROP.java

@@ -119,7 +119,8 @@ public class CM_ITEM_DROP extends AbstractClientPacket {
 		} catch (ItemAlreadyOnGroundServiceException
 				| AlreadySpawnedServiceException
 				| SpawnPointNotFoundServiceException
-				| NotEnoughItemsServiceException | NonStackableItemsServiceException e) {
+				| NotEnoughItemsServiceException
+				| NonStackableItemsServiceException e) {
 			conn.sendActionFailed();
 		}
 	}

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_PROTOCOL_VERSION.java

@@ -66,7 +66,8 @@ public class CM_PROTOCOL_VERSION extends AbstractClientPacket {
 	private ProtocolVersion version;
 
 	/**
-	 * @param keygen the keygen service
+	 * @param keygen
+	 *            the keygen service
 	 */
 	@Inject
 	public CM_PROTOCOL_VERSION(BlowfishKeygenService keygen) {
@@ -84,7 +85,7 @@ public class CM_PROTOCOL_VERSION extends AbstractClientPacket {
 		// generate a new key
 		final Lineage2CryptographyKey inKey = new Lineage2CryptographyKey(
 				keygen.generate());
-		
+
 		final FreyaLineage2Client client = (FreyaLineage2Client) conn;
 
 		client.getDecrypter().enable(inKey);

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_REQUEST_CHAR_TEMPLATE.java

@@ -65,7 +65,8 @@ public class CM_REQUEST_CHAR_TEMPLATE extends AbstractClientPacket {
 	private final CharacterTemplateIDProvider idFactory;
 
 	/**
-	 * @param idFactory the character template id provider
+	 * @param idFactory
+	 *            the character template id provider
 	 */
 	@Inject
 	public CM_REQUEST_CHAR_TEMPLATE(CharacterTemplateIDProvider idFactory) {

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/client/CM_RESTART.java

@@ -49,8 +49,10 @@ public class CM_RESTART extends AbstractClientPacket {
 	private final CharacterDAO charDao;
 
 	/**
-	 * @param charService the character service
+	 * @param charService
-	 * @param charDao the character dao
+	 *            the character service
+	 * @param charDao
+	 *            the character dao
 	 */
 	@Inject
 	public CM_RESTART(CharacterService charService, CharacterDAO charDao) {

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_CHAT.java

@@ -55,11 +55,15 @@ public class SM_ACTOR_CHAT extends AbstractServerPacket {
 	private int messageID = 0;
 
 	/**
-	 * @param character the actor
+	 * @param character
-	 * @param destination the destination
+	 *            the actor
-	 * @param message the message
+	 * @param destination
+	 *            the destination
+	 * @param message
+	 *            the message
 	 */
-	public SM_ACTOR_CHAT(Actor character, ChatMessageType destination, String message) {
+	public SM_ACTOR_CHAT(Actor character, ChatMessageType destination,
+			String message) {
 		super(OPCODE);
 		this.actor = character;
 		this.destination = destination;
@@ -67,9 +71,12 @@ public class SM_ACTOR_CHAT extends AbstractServerPacket {
 	}
 
 	/**
-	 * @param actor the actor
+	 * @param actor
-	 * @param destination the destination
+	 *            the actor
-	 * @param messageID the message id
+	 * @param destination
+	 *            the destination
+	 * @param messageID
+	 *            the message id
 	 */
 	public SM_ACTOR_CHAT(Actor actor, ChatMessageType destination, int messageID) {
 		super(OPCODE);

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_MOVE.java

@@ -46,8 +46,10 @@ public class SM_ACTOR_MOVE extends AbstractServerPacket {
 	private Coordinate target;
 
 	/**
-	 * @param actor the actor
+	 * @param actor
-	 * @param target the target
+	 *            the actor
+	 * @param target
+	 *            the target
 	 */
 	public SM_ACTOR_MOVE(Actor actor, Coordinate target) {
 		super(OPCODE);

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ACTOR_POSITION.java

@@ -40,7 +40,8 @@ public class SM_ACTOR_POSITION extends AbstractServerPacket {
 	private final Actor actor;
 
 	/**
-	 * @param actor the actor
+	 * @param actor
+	 *            the actor
 	 */
 	public SM_ACTOR_POSITION(Actor actor) {
 		super(OPCODE);

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO.java

@@ -77,7 +77,8 @@ public class SM_CHAR_INFO extends AbstractServerPacket {
 	private L2Character character;
 
 	/**
-	 * @param character the character
+	 * @param character
+	 *            the character
 	 */
 	public SM_CHAR_INFO(L2Character character) {
 		super(OPCODE);

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INFO_EXTRA.java

@@ -39,7 +39,8 @@ public class SM_CHAR_INFO_EXTRA extends AbstractServerPacket {
 	private L2Character character;
 
 	/**
-	 * @param character the character
+	 * @param character
+	 *            the character
 	 */
 	public SM_CHAR_INFO_EXTRA(L2Character character) {
 		super(OPCODE);

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_INVENTORY.java

@@ -45,7 +45,8 @@ public class SM_CHAR_INVENTORY extends AbstractServerPacket {
 	private boolean showWindow = false;
 
 	/**
-	 * @param inventory the inventory
+	 * @param inventory
+	 *            the inventory
 	 */
 	public SM_CHAR_INVENTORY(CharacterInventory inventory) {
 		super(OPCODE);

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_MOVE_TYPE.java

@@ -39,7 +39,8 @@ public class SM_CHAR_MOVE_TYPE extends AbstractServerPacket {
 	private final L2Character character;
 
 	/**
-	 * @param character the character
+	 * @param character
+	 *            the character
 	 */
 	public SM_CHAR_MOVE_TYPE(L2Character character) {
 		super(OPCODE);

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_OPEN_MAP.java

@@ -38,7 +38,8 @@ public class SM_CHAR_OPEN_MAP extends AbstractServerPacket {
 	private final int mapID;
 
 	/**
-	 * @param mapID the map id
+	 * @param mapID
+	 *            the map id
 	 */
 	public SM_CHAR_OPEN_MAP(int mapID) {
 		super(OPCODE);

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_SELECTED.java

@@ -42,7 +42,8 @@ public class SM_CHAR_SELECTED extends AbstractServerPacket {
 	private final L2Character character;
 
 	/**
-	 * @param character the character
+	 * @param character
+	 *            the character
 	 */
 	public SM_CHAR_SELECTED(L2Character character) {
 		super(OPCODE);

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_STOP.java

@@ -39,7 +39,8 @@ public class SM_CHAR_STOP extends AbstractServerPacket {
 	private L2Character character;
 
 	/**
-	 * @param character the character
+	 * @param character
+	 *            the character
 	 */
 	public SM_CHAR_STOP(L2Character character) {
 		super(OPCODE);

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TARGET_UNSELECT.java

@@ -40,7 +40,8 @@ public class SM_CHAR_TARGET_UNSELECT extends AbstractServerPacket {
 	private final L2Character character;
 
 	/**
-	 * @param character the character
+	 * @param character
+	 *            the character
 	 */
 	public SM_CHAR_TARGET_UNSELECT(L2Character character) {
 		super(OPCODE);

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAR_TELEPORT.java

@@ -45,8 +45,10 @@ public class SM_CHAR_TELEPORT extends AbstractServerPacket {
 	private final Point3D point;
 
 	/**
-	 * @param character the character
+	 * @param character
-	 * @param point the teleport point
+	 *            the character
+	 * @param point
+	 *            the teleport point
 	 */
 	public SM_CHAR_TELEPORT(L2Character character, Point3D point) {
 		super(OPCODE);

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_COMMUNITY_HTML.java

@@ -42,7 +42,8 @@ public class SM_COMMUNITY_HTML extends AbstractServerPacket {
 	private final String html;
 
 	/**
-	 * @param html the html
+	 * @param html
+	 *            the html
 	 */
 	public SM_COMMUNITY_HTML(String html) {
 		super(OPCODE);
@@ -50,7 +51,8 @@ public class SM_COMMUNITY_HTML extends AbstractServerPacket {
 	}
 
 	/**
-	 * @param html the html
+	 * @param html
+	 *            the html
 	 */
 	public SM_COMMUNITY_HTML(Html html) {
 		super(OPCODE);
@@ -58,7 +60,8 @@ public class SM_COMMUNITY_HTML extends AbstractServerPacket {
 	}
 
 	/**
-	 * @param template the html template
+	 * @param template
+	 *            the html template
 	 */
 	public SM_COMMUNITY_HTML(HtmlTemplate template) {
 		super(OPCODE);

l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_ITEM_GROUND.java

@@ -38,7 +38,8 @@ public class SM_ITEM_GROUND extends AbstractServerPacket {
 	private final Item item;
 
 	/**
-	 * @param item the item that is on the ground
+	 * @param item
+	 *            the item that is on the ground
 	 */
 	public SM_ITEM_GROUND(Item item) {
 		super(OPCODE);
@@ -47,7 +48,8 @@ public class SM_ITEM_GROUND extends AbstractServerPacket {
 
 	@Override
 	public void write(Lineage2Client conn, ChannelBuffer buffer) {
-		buffer.writeInt((item.getOwnerID() != null ? item.getOwnerID().getID() : 0)); // char who dropped
+		buffer.writeInt((item.getOwnerID() != null ? item.getOwnerID().getID()
+				: 0)); // char who dropped
 		buffer.writeInt(item.getID().getID()); // item obj id
 		buffer.writeInt(item.getTemplateID().getID()); // item template id