Rogiel/l2jserver2
1
0
Fork 0
mirror of https://github.com/Rogiel/l2jserver2 synced 2025-12-06 07:32:46 +00:00
Code Releases Activity

Source code cleanup

Browse Source
This commit is contained in:
Rogiel Sulzbach
2012-03-25 15:57:51 -03:00
parent 10cb453d4a
commit 1084905350
109 changed files with 6961 additions and 7236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
l2jserver2-common/src/main/java/com/l2jserver/service/cache/SoftCacheService.java vendored
View File

@@ -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);
}
}

3
l2jserver2-common/src/main/java/com/l2jserver/service/cache/WeakCacheService.java vendored
View File

@@ -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);
}
}

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

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

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

@@ -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;

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

@@ -88,7 +88,6 @@ public class Java7VFSService extends
return dataRoot.resolve(path);
}
@Override
protected void doStop() throws ServiceStopException {
root = null;

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

@@ -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;
/**

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

@@ -47,10 +47,14 @@ public class Table {
private final List<ForeignKey> foreignKeys = CollectionFactory.newList();
/**
* @param name the table name
* @param columns the column
* @param primaryKey the primary key
* @param foreignKeys the foreign keys
* @param name
* the table name
* @param columns
* 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 primaryKey the primary key
* @param name
* 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) {

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

@@ -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);
}

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

@@ -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);
}
/**

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

@@ -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;

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

@@ -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({
ItemTemplate.class,
ActorTemplate.class,
SkillTemplate.class,
com.l2jserver.model.template.Teleports.Teleport.class
})
public abstract class AbstractTemplate
implements Template
{
@XmlSeeAlso({ ItemTemplate.class, ActorTemplate.class, SkillTemplate.class,
com.l2jserver.model.template.Teleports.Teleport.class })
public abstract class AbstractTemplate implements Template {
}

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

@@ -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({
CharacterTemplate.class,
NPCTemplate.class
})
public abstract class ActorTemplate
extends AbstractTemplate
{
@XmlSeeAlso({ CharacterTemplate.class, NPCTemplate.class })
public abstract class ActorTemplate extends AbstractTemplate {
}

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

@@ -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,12 +37,8 @@ import javax.xml.bind.annotation.XmlType;
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CalculatorFunction", propOrder = {
"set",
"add",
"subtract",
"random"
})
@XmlType(name = "CalculatorFunction", propOrder = { "set", "add", "subtract",
"random" })
public class CalculatorFunction {
protected CalculatorFunctionOperation set;
@@ -52,9 +49,7 @@ public class CalculatorFunction {
/**
* Gets the value of the set property.
*
* @return
* possible object is
* {@link CalculatorFunctionOperation }
* @return possible object is {@link CalculatorFunctionOperation }
*
*/
public CalculatorFunctionOperation getSet() {
@@ -65,8 +60,7 @@ public class CalculatorFunction {
* Sets the value of the set property.
*
* @param value
* allowed object is
* {@link CalculatorFunctionOperation }
* allowed object is {@link CalculatorFunctionOperation }
*
*/
public void setSet(CalculatorFunctionOperation value) {
@@ -76,9 +70,7 @@ public class CalculatorFunction {
/**
* Gets the value of the add property.
*
* @return
* possible object is
* {@link CalculatorFunctionOperation }
* @return possible object is {@link CalculatorFunctionOperation }
*
*/
public CalculatorFunctionOperation getAdd() {
@@ -89,8 +81,7 @@ public class CalculatorFunction {
* Sets the value of the add property.
*
* @param value
* allowed object is
* {@link CalculatorFunctionOperation }
* allowed object is {@link CalculatorFunctionOperation }
*
*/
public void setAdd(CalculatorFunctionOperation value) {
@@ -100,9 +91,7 @@ public class CalculatorFunction {
/**
* Gets the value of the subtract property.
*
* @return
* possible object is
* {@link CalculatorFunctionOperation }
* @return possible object is {@link CalculatorFunctionOperation }
*
*/
public CalculatorFunctionOperation getSubtract() {
@@ -113,8 +102,7 @@ public class CalculatorFunction {
* Sets the value of the subtract property.
*
* @param value
* allowed object is
* {@link CalculatorFunctionOperation }
* allowed object is {@link CalculatorFunctionOperation }
*
*/
public void setSubtract(CalculatorFunctionOperation value) {
@@ -124,9 +112,7 @@ public class CalculatorFunction {
/**
* Gets the value of the random property.
*
* @return
* possible object is
* {@link CalculatorFunctionOperation }
* @return possible object is {@link CalculatorFunctionOperation }
*
*/
public CalculatorFunctionOperation getRandom() {
@@ -137,8 +123,7 @@ public class CalculatorFunction {
* Sets the value of the random property.
*
* @param value
* allowed object is
* {@link CalculatorFunctionOperation }
* allowed object is {@link CalculatorFunctionOperation }
*
*/
public void setRandom(CalculatorFunctionOperation value) {

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

@@ -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">
@@ -45,9 +47,7 @@ public class CalculatorFunctionOperation {
/**
* Gets the value of the order property.
*
* @return
* possible object is
* {@link BigInteger }
* @return possible object is {@link BigInteger }
*
*/
public BigInteger getOrder() {
@@ -58,8 +58,7 @@ public class CalculatorFunctionOperation {
* Sets the value of the order property.
*
* @param value
* allowed object is
* {@link BigInteger }
* allowed object is {@link BigInteger }
*
*/
public void setOrder(BigInteger value) {

265
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CharacterTemplate.java
View File

@@ -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;
@@ -15,14 +14,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.CharacterTemplateID;
import com.l2jserver.util.jaxb.CharacterTemplateIDAdapter;
/**
* <p>Java class for character element declaration.
* <p>
* Java class for character 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="character">
@@ -224,14 +226,9 @@ import com.l2jserver.util.jaxb.CharacterTemplateIDAdapter;
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"stats",
"collision"
})
@XmlType(name = "", propOrder = { "stats", "collision" })
@XmlRootElement(name = "character", namespace = "http://schemas.l2jserver2.com/character")
public class CharacterTemplate
extends ActorTemplate
{
public class CharacterTemplate extends ActorTemplate {
@XmlElement(required = true)
protected CharacterTemplate.Stats stats;
@@ -244,9 +241,7 @@ public class CharacterTemplate
/**
* Gets the value of the stats property.
*
* @return
* possible object is
* {@link CharacterTemplate.Stats }
* @return possible object is {@link CharacterTemplate.Stats }
*
*/
public CharacterTemplate.Stats getStats() {
@@ -257,8 +252,7 @@ public class CharacterTemplate
* Sets the value of the stats property.
*
* @param value
* allowed object is
* {@link CharacterTemplate.Stats }
* allowed object is {@link CharacterTemplate.Stats }
*
*/
public void setStats(CharacterTemplate.Stats value) {
@@ -268,9 +262,7 @@ public class CharacterTemplate
/**
* Gets the value of the collision property.
*
* @return
* possible object is
* {@link CharacterTemplate.Collision }
* @return possible object is {@link CharacterTemplate.Collision }
*
*/
public CharacterTemplate.Collision getCollision() {
@@ -281,8 +273,7 @@ public class CharacterTemplate
* Sets the value of the collision property.
*
* @param value
* allowed object is
* {@link CharacterTemplate.Collision }
* allowed object is {@link CharacterTemplate.Collision }
*
*/
public void setCollision(CharacterTemplate.Collision value) {
@@ -292,9 +283,7 @@ public class CharacterTemplate
/**
* Gets the value of the id property.
*
* @return
* possible object is
* {@link String }
* @return possible object is {@link String }
*
*/
public CharacterTemplateID getID() {
@@ -305,19 +294,20 @@ public class CharacterTemplate
* Sets the value of the id property.
*
* @param value
* allowed object is
* {@link String }
* allowed object is {@link String }
*
*/
public void setID(CharacterTemplateID value) {
this.id = value;
}
/**
* <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>
@@ -357,10 +347,7 @@ public class CharacterTemplate
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"male",
"female"
})
@XmlType(name = "", propOrder = { "male", "female" })
public static class Collision {
@XmlElement(required = true)
@@ -371,9 +358,7 @@ public class CharacterTemplate
/**
* Gets the value of the male property.
*
* @return
* possible object is
* {@link CharacterTemplate.Collision.Male }
* @return possible object is {@link CharacterTemplate.Collision.Male }
*
*/
public CharacterTemplate.Collision.Male getMale() {
@@ -384,8 +369,7 @@ public class CharacterTemplate
* Sets the value of the male property.
*
* @param value
* allowed object is
* {@link CharacterTemplate.Collision.Male }
* allowed object is {@link CharacterTemplate.Collision.Male }
*
*/
public void setMale(CharacterTemplate.Collision.Male value) {
@@ -395,9 +379,7 @@ public class CharacterTemplate
/**
* Gets the value of the female property.
*
* @return
* possible object is
* {@link CharacterTemplate.Collision.Female }
* @return possible object is {@link CharacterTemplate.Collision.Female }
*
*/
public CharacterTemplate.Collision.Female getFemale() {
@@ -416,11 +398,13 @@ public class CharacterTemplate
this.female = value;
}
/**
* <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>
@@ -480,11 +464,13 @@ public class CharacterTemplate
}
/**
* <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>
@@ -546,11 +532,13 @@ public class CharacterTemplate
}
/**
* <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>
@@ -705,16 +693,8 @@ public class CharacterTemplate
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"hp",
"mp",
"cp",
"attack",
"defense",
"move",
"base",
"maxload"
})
@XmlType(name = "", propOrder = { "hp", "mp", "cp", "attack", "defense",
"move", "base", "maxload" })
public static class Stats {
@XmlElement(required = true)
@@ -740,9 +720,7 @@ public class CharacterTemplate
/**
* Gets the value of the hp property.
*
* @return
* possible object is
* {@link CharacterTemplate.Stats.Hp }
* @return possible object is {@link CharacterTemplate.Stats.Hp }
*
*/
public CharacterTemplate.Stats.Hp getHp() {
@@ -753,8 +731,7 @@ public class CharacterTemplate
* Sets the value of the hp property.
*
* @param value
* allowed object is
* {@link CharacterTemplate.Stats.Hp }
* allowed object is {@link CharacterTemplate.Stats.Hp }
*
*/
public void setHp(CharacterTemplate.Stats.Hp value) {
@@ -764,9 +741,7 @@ public class CharacterTemplate
/**
* Gets the value of the mp property.
*
* @return
* possible object is
* {@link CharacterTemplate.Stats.Mp }
* @return possible object is {@link CharacterTemplate.Stats.Mp }
*
*/
public CharacterTemplate.Stats.Mp getMp() {
@@ -777,8 +752,7 @@ public class CharacterTemplate
* Sets the value of the mp property.
*
* @param value
* allowed object is
* {@link CharacterTemplate.Stats.Mp }
* allowed object is {@link CharacterTemplate.Stats.Mp }
*
*/
public void setMp(CharacterTemplate.Stats.Mp value) {
@@ -788,9 +762,7 @@ public class CharacterTemplate
/**
* Gets the value of the cp property.
*
* @return
* possible object is
* {@link CharacterTemplate.Stats.Cp }
* @return possible object is {@link CharacterTemplate.Stats.Cp }
*
*/
public CharacterTemplate.Stats.Cp getCp() {
@@ -801,8 +773,7 @@ public class CharacterTemplate
* Sets the value of the cp property.
*
* @param value
* allowed object is
* {@link CharacterTemplate.Stats.Cp }
* allowed object is {@link CharacterTemplate.Stats.Cp }
*
*/
public void setCp(CharacterTemplate.Stats.Cp value) {
@@ -812,9 +783,7 @@ public class CharacterTemplate
/**
* Gets the value of the attack property.
*
* @return
* possible object is
* {@link CharacterTemplate.Stats.Attack }
* @return possible object is {@link CharacterTemplate.Stats.Attack }
*
*/
public CharacterTemplate.Stats.Attack getAttack() {
@@ -825,8 +794,7 @@ public class CharacterTemplate
* Sets the value of the attack property.
*
* @param value
* allowed object is
* {@link CharacterTemplate.Stats.Attack }
* allowed object is {@link CharacterTemplate.Stats.Attack }
*
*/
public void setAttack(CharacterTemplate.Stats.Attack value) {
@@ -836,9 +804,7 @@ public class CharacterTemplate
/**
* Gets the value of the defense property.
*
* @return
* possible object is
* {@link CharacterTemplate.Stats.Defense }
* @return possible object is {@link CharacterTemplate.Stats.Defense }
*
*/
public CharacterTemplate.Stats.Defense getDefense() {
@@ -849,8 +815,7 @@ public class CharacterTemplate
* Sets the value of the defense property.
*
* @param value
* allowed object is
* {@link CharacterTemplate.Stats.Defense }
* allowed object is {@link CharacterTemplate.Stats.Defense }
*
*/
public void setDefense(CharacterTemplate.Stats.Defense value) {
@@ -860,9 +825,7 @@ public class CharacterTemplate
/**
* Gets the value of the move property.
*
* @return
* possible object is
* {@link CharacterTemplate.Stats.Move }
* @return possible object is {@link CharacterTemplate.Stats.Move }
*
*/
public CharacterTemplate.Stats.Move getMove() {
@@ -873,8 +836,7 @@ public class CharacterTemplate
* Sets the value of the move property.
*
* @param value
* allowed object is
* {@link CharacterTemplate.Stats.Move }
* allowed object is {@link CharacterTemplate.Stats.Move }
*
*/
public void setMove(CharacterTemplate.Stats.Move value) {
@@ -884,9 +846,7 @@ public class CharacterTemplate
/**
* Gets the value of the base property.
*
* @return
* possible object is
* {@link CharacterTemplate.Stats.Base }
* @return possible object is {@link CharacterTemplate.Stats.Base }
*
*/
public CharacterTemplate.Stats.Base getBase() {
@@ -897,8 +857,7 @@ public class CharacterTemplate
* Sets the value of the base property.
*
* @param value
* allowed object is
* {@link CharacterTemplate.Stats.Base }
* allowed object is {@link CharacterTemplate.Stats.Base }
*
*/
public void setBase(CharacterTemplate.Stats.Base value) {
@@ -953,11 +912,13 @@ public class CharacterTemplate
this.crafter = value;
}
/**
* <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>
@@ -1000,10 +961,7 @@ public class CharacterTemplate
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"physical",
"magical"
})
@XmlType(name = "", propOrder = { "physical", "magical" })
public static class Attack {
@XmlElement(required = true)
@@ -1020,8 +978,7 @@ public class CharacterTemplate
/**
* Gets the value of the physical property.
*
* @return
* possible object is
* @return possible object is
* {@link CharacterTemplate.Stats.Attack.Physical }
*
*/
@@ -1037,15 +994,15 @@ public class CharacterTemplate
* {@link CharacterTemplate.Stats.Attack.Physical }
*
*/
public void setPhysical(CharacterTemplate.Stats.Attack.Physical value) {
public void setPhysical(
CharacterTemplate.Stats.Attack.Physical value) {
this.physical = value;
}
/**
* Gets the value of the magical property.
*
* @return
* possible object is
* @return possible object is
* {@link CharacterTemplate.Stats.Attack.Magical }
*
*/
@@ -1113,11 +1070,13 @@ public class CharacterTemplate
this.accuracy = value;
}
/**
* <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>
@@ -1177,11 +1136,13 @@ public class CharacterTemplate
}
/**
* <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>
@@ -1243,11 +1204,13 @@ public class CharacterTemplate
}
/**
* <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>
@@ -1383,11 +1346,13 @@ public class CharacterTemplate
}
/**
* <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>
@@ -1466,11 +1431,13 @@ public class CharacterTemplate
}
/**
* <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>
@@ -1508,10 +1475,7 @@ public class CharacterTemplate
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"physical",
"magical"
})
@XmlType(name = "", propOrder = { "physical", "magical" })
public static class Defense {
@XmlElement(required = true)
@@ -1522,8 +1486,7 @@ public class CharacterTemplate
/**
* Gets the value of the physical property.
*
* @return
* possible object is
* @return possible object is
* {@link CharacterTemplate.Stats.Defense.Physical }
*
*/
@@ -1539,15 +1502,15 @@ public class CharacterTemplate
* {@link CharacterTemplate.Stats.Defense.Physical }
*
*/
public void setPhysical(CharacterTemplate.Stats.Defense.Physical value) {
public void setPhysical(
CharacterTemplate.Stats.Defense.Physical value) {
this.physical = value;
}
/**
* Gets the value of the magical property.
*
* @return
* possible object is
* @return possible object is
* {@link CharacterTemplate.Stats.Defense.Magical }
*
*/
@@ -1567,11 +1530,13 @@ public class CharacterTemplate
this.magical = value;
}
/**
* <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>
@@ -1612,11 +1577,13 @@ public class CharacterTemplate
}
/**
* <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>
@@ -1659,11 +1626,13 @@ public class CharacterTemplate
}
/**
* <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>
@@ -1742,11 +1711,13 @@ public class CharacterTemplate
}
/**
* <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>
@@ -1806,11 +1777,13 @@ public class CharacterTemplate
}
/**
* <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>

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

@@ -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">

309
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ItemTemplate.java
View File

@@ -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;
@@ -16,6 +15,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import com.l2jserver.model.id.template.ItemTemplateID;
import com.l2jserver.model.template.item.ArmorType;
import com.l2jserver.model.template.item.ItemMaterial;
@@ -27,11 +27,13 @@ import com.l2jserver.util.jaxb.ItemTemplateIDAdapter;
import com.l2jserver.util.jaxb.ItemTypeAdapter;
import com.l2jserver.util.jaxb.WeaponTypeAdapter;
/**
* <p>Java class for item element declaration.
* <p>
* Java class for item 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="item">
@@ -154,18 +156,10 @@ import com.l2jserver.util.jaxb.WeaponTypeAdapter;
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"attributes",
"controller",
"effect",
"etcItem",
"weapon",
"armor"
})
@XmlType(name = "", propOrder = { "attributes", "controller", "effect",
"etcItem", "weapon", "armor" })
@XmlRootElement(name = "item", namespace = "http://schemas.l2jserver2.com/item")
public class ItemTemplate
extends AbstractTemplate
{
public class ItemTemplate extends AbstractTemplate {
@XmlElement(required = true)
protected ItemTemplate.Attributes attributes;
@@ -187,9 +181,7 @@ public class ItemTemplate
/**
* Gets the value of the attributes property.
*
* @return
* possible object is
* {@link ItemTemplate.Attributes }
* @return possible object is {@link ItemTemplate.Attributes }
*
*/
public ItemTemplate.Attributes getAttributes() {
@@ -200,8 +192,7 @@ public class ItemTemplate
* Sets the value of the attributes property.
*
* @param value
* allowed object is
* {@link ItemTemplate.Attributes }
* allowed object is {@link ItemTemplate.Attributes }
*
*/
public void setAttributes(ItemTemplate.Attributes value) {
@@ -211,9 +202,7 @@ public class ItemTemplate
/**
* Gets the value of the controller property.
*
* @return
* possible object is
* {@link ItemTemplate.Controller }
* @return possible object is {@link ItemTemplate.Controller }
*
*/
public ItemTemplate.Controller getController() {
@@ -224,8 +213,7 @@ public class ItemTemplate
* Sets the value of the controller property.
*
* @param value
* allowed object is
* {@link ItemTemplate.Controller }
* allowed object is {@link ItemTemplate.Controller }
*
*/
public void setController(ItemTemplate.Controller value) {
@@ -235,9 +223,7 @@ public class ItemTemplate
/**
* Gets the value of the effect property.
*
* @return
* possible object is
* {@link ItemTemplate.Effect }
* @return possible object is {@link ItemTemplate.Effect }
*
*/
public ItemTemplate.Effect getEffect() {
@@ -248,8 +234,7 @@ public class ItemTemplate
* Sets the value of the effect property.
*
* @param value
* allowed object is
* {@link ItemTemplate.Effect }
* allowed object is {@link ItemTemplate.Effect }
*
*/
public void setEffect(ItemTemplate.Effect value) {
@@ -259,9 +244,7 @@ public class ItemTemplate
/**
* Gets the value of the etcItem property.
*
* @return
* possible object is
* {@link ItemTemplate.EtcItem }
* @return possible object is {@link ItemTemplate.EtcItem }
*
*/
public ItemTemplate.EtcItem getEtcItem() {
@@ -272,8 +255,7 @@ public class ItemTemplate
* Sets the value of the etcItem property.
*
* @param value
* allowed object is
* {@link ItemTemplate.EtcItem }
* allowed object is {@link ItemTemplate.EtcItem }
*
*/
public void setEtcItem(ItemTemplate.EtcItem value) {
@@ -283,9 +265,7 @@ public class ItemTemplate
/**
* Gets the value of the weapon property.
*
* @return
* possible object is
* {@link ItemTemplate.Weapon }
* @return possible object is {@link ItemTemplate.Weapon }
*
*/
public ItemTemplate.Weapon getWeapon() {
@@ -296,8 +276,7 @@ public class ItemTemplate
* Sets the value of the weapon property.
*
* @param value
* allowed object is
* {@link ItemTemplate.Weapon }
* allowed object is {@link ItemTemplate.Weapon }
*
*/
public void setWeapon(ItemTemplate.Weapon value) {
@@ -307,9 +286,7 @@ public class ItemTemplate
/**
* Gets the value of the armor property.
*
* @return
* possible object is
* {@link ItemTemplate.Armor }
* @return possible object is {@link ItemTemplate.Armor }
*
*/
public ItemTemplate.Armor getArmor() {
@@ -320,8 +297,7 @@ public class ItemTemplate
* Sets the value of the armor property.
*
* @param value
* allowed object is
* {@link ItemTemplate.Armor }
* allowed object is {@link ItemTemplate.Armor }
*
*/
public void setArmor(ItemTemplate.Armor value) {
@@ -331,9 +307,7 @@ public class ItemTemplate
/**
* Gets the value of the id property.
*
* @return
* possible object is
* {@link String }
* @return possible object is {@link String }
*
*/
public ItemTemplateID getID() {
@@ -344,8 +318,7 @@ public class ItemTemplate
* Sets the value of the id property.
*
* @param value
* allowed object is
* {@link String }
* allowed object is {@link String }
*
*/
public void setID(ItemTemplateID value) {
@@ -355,9 +328,7 @@ public class ItemTemplate
/**
* Gets the value of the name property.
*
* @return
* possible object is
* {@link String }
* @return possible object is {@link String }
*
*/
public String getName() {
@@ -368,8 +339,7 @@ public class ItemTemplate
* Sets the value of the name property.
*
* @param value
* allowed object is
* {@link String }
* allowed object is {@link String }
*
*/
public void setName(String value) {
@@ -379,9 +349,7 @@ public class ItemTemplate
/**
* Gets the value of the icon property.
*
* @return
* possible object is
* {@link String }
* @return possible object is {@link String }
*
*/
public String getIcon() {
@@ -392,19 +360,20 @@ public class ItemTemplate
* Sets the value of the icon property.
*
* @param value
* allowed object is
* {@link String }
* allowed object is {@link String }
*
*/
public void setIcon(String value) {
this.icon = value;
}
/**
* <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>
@@ -440,10 +409,7 @@ public class ItemTemplate
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"cost",
"equipment"
})
@XmlType(name = "", propOrder = { "cost", "equipment" })
public static class Armor {
@XmlElement(required = true)
@@ -460,9 +426,7 @@ public class ItemTemplate
/**
* Gets the value of the cost property.
*
* @return
* possible object is
* {@link ItemTemplate.Armor.Cost }
* @return possible object is {@link ItemTemplate.Armor.Cost }
*
*/
public ItemTemplate.Armor.Cost getCost() {
@@ -473,8 +437,7 @@ public class ItemTemplate
* Sets the value of the cost property.
*
* @param value
* allowed object is
* {@link ItemTemplate.Armor.Cost }
* allowed object is {@link ItemTemplate.Armor.Cost }
*
*/
public void setCost(ItemTemplate.Armor.Cost value) {
@@ -484,9 +447,7 @@ public class ItemTemplate
/**
* Gets the value of the equipment property.
*
* @return
* possible object is
* {@link ItemTemplate.Armor.Equipment }
* @return possible object is {@link ItemTemplate.Armor.Equipment }
*
*/
public ItemTemplate.Armor.Equipment getEquipment() {
@@ -497,8 +458,7 @@ public class ItemTemplate
* Sets the value of the equipment property.
*
* @param value
* allowed object is
* {@link ItemTemplate.Armor.Equipment }
* allowed object is {@link ItemTemplate.Armor.Equipment }
*
*/
public void setEquipment(ItemTemplate.Armor.Equipment value) {
@@ -508,9 +468,7 @@ public class ItemTemplate
/**
* Gets the value of the weigth property.
*
* @return
* possible object is
* {@link String }
* @return possible object is {@link String }
*
*/
public String getWeigth() {
@@ -521,8 +479,7 @@ public class ItemTemplate
* Sets the value of the weigth property.
*
* @param value
* allowed object is
* {@link String }
* allowed object is {@link String }
*
*/
public void setWeigth(String value) {
@@ -532,9 +489,7 @@ public class ItemTemplate
/**
* Gets the value of the type property.
*
* @return
* possible object is
* {@link String }
* @return possible object is {@link String }
*
*/
public ArmorType getType() {
@@ -545,19 +500,20 @@ public class ItemTemplate
* Sets the value of the type property.
*
* @param value
* allowed object is
* {@link String }
* allowed object is {@link String }
*
*/
public void setType(ArmorType value) {
this.type = value;
}
/**
* <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>
@@ -582,9 +538,7 @@ public class ItemTemplate
/**
* Gets the value of the adena property.
*
* @return
* possible object is
* {@link String }
* @return possible object is {@link String }
*
*/
public String getAdena() {
@@ -595,8 +549,7 @@ public class ItemTemplate
* Sets the value of the adena property.
*
* @param value
* allowed object is
* {@link String }
* allowed object is {@link String }
*
*/
public void setAdena(String value) {
@@ -605,11 +558,13 @@ public class ItemTemplate
}
/**
* <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>
@@ -634,9 +589,7 @@ public class ItemTemplate
/**
* Gets the value of the part property.
*
* @return
* possible object is
* {@link String }
* @return possible object is {@link String }
*
*/
public String getPart() {
@@ -647,8 +600,7 @@ public class ItemTemplate
* Sets the value of the part property.
*
* @param value
* allowed object is
* {@link String }
* allowed object is {@link String }
*
*/
public void setPart(String value) {
@@ -659,11 +611,13 @@ public class ItemTemplate
}
/**
* <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>
@@ -690,9 +644,7 @@ public class ItemTemplate
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"cost"
})
@XmlType(name = "", propOrder = { "cost" })
public static class Attributes {
@XmlElement(required = true)
@@ -706,9 +658,7 @@ public class ItemTemplate
/**
* Gets the value of the cost property.
*
* @return
* possible object is
* {@link ItemTemplate.Attributes.Cost }
* @return possible object is {@link ItemTemplate.Attributes.Cost }
*
*/
public ItemTemplate.Attributes.Cost getCost() {
@@ -719,8 +669,7 @@ public class ItemTemplate
* Sets the value of the cost property.
*
* @param value
* allowed object is
* {@link ItemTemplate.Attributes.Cost }
* allowed object is {@link ItemTemplate.Attributes.Cost }
*
*/
public void setCost(ItemTemplate.Attributes.Cost value) {
@@ -730,9 +679,7 @@ public class ItemTemplate
/**
* Gets the value of the weigth property.
*
* @return
* possible object is
* {@link Integer }
* @return possible object is {@link Integer }
*
*/
public Integer getWeigth() {
@@ -743,8 +690,7 @@ public class ItemTemplate
* Sets the value of the weigth property.
*
* @param value
* allowed object is
* {@link Integer }
* allowed object is {@link Integer }
*
*/
public void setWeigth(Integer value) {
@@ -754,9 +700,7 @@ public class ItemTemplate
/**
* Gets the value of the material property.
*
* @return
* possible object is
* {@link String }
* @return possible object is {@link String }
*
*/
public ItemMaterial getMaterial() {
@@ -767,19 +711,20 @@ public class ItemTemplate
* Sets the value of the material property.
*
* @param value
* allowed object is
* {@link String }
* allowed object is {@link String }
*
*/
public void setMaterial(ItemMaterial value) {
this.material = value;
}
/**
* <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>
@@ -803,9 +748,7 @@ public class ItemTemplate
/**
* Gets the value of the adena property.
*
* @return
* possible object is
* {@link Integer }
* @return possible object is {@link Integer }
*
*/
public Integer getAdena() {
@@ -816,8 +759,7 @@ public class ItemTemplate
* Sets the value of the adena property.
*
* @param value
* allowed object is
* {@link Integer }
* allowed object is {@link Integer }
*
*/
public void setAdena(Integer value) {
@@ -828,11 +770,13 @@ public class ItemTemplate
}
/**
* <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>
@@ -857,9 +801,7 @@ public class ItemTemplate
/**
* Gets the value of the defaultAction property.
*
* @return
* possible object is
* {@link String }
* @return possible object is {@link String }
*
*/
public String getDefaultAction() {
@@ -870,8 +812,7 @@ public class ItemTemplate
* Sets the value of the defaultAction property.
*
* @param value
* allowed object is
* {@link String }
* allowed object is {@link String }
*
*/
public void setDefaultAction(String value) {
@@ -880,11 +821,13 @@ public class ItemTemplate
}
/**
* <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>
@@ -914,9 +857,7 @@ public class ItemTemplate
/**
* Gets the value of the type property.
*
* @return
* possible object is
* {@link String }
* @return possible object is {@link String }
*
*/
public String getType() {
@@ -927,8 +868,7 @@ public class ItemTemplate
* Sets the value of the type property.
*
* @param value
* allowed object is
* {@link String }
* allowed object is {@link String }
*
*/
public void setType(String value) {
@@ -937,11 +877,13 @@ public class ItemTemplate
}
/**
* <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>
@@ -966,9 +908,7 @@ public class ItemTemplate
/**
* Gets the value of the type property.
*
* @return
* possible object is
* {@link String }
* @return possible object is {@link String }
*
*/
public ItemType getType() {
@@ -979,8 +919,7 @@ public class ItemTemplate
* Sets the value of the type property.
*
* @param value
* allowed object is
* {@link String }
* allowed object is {@link String }
*
*/
public void setType(ItemType value) {
@@ -989,11 +928,13 @@ public class ItemTemplate
}
/**
* <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>
@@ -1015,12 +956,8 @@ public class ItemTemplate
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"physicalDamage",
"magicalDamage",
"criticalChance",
"physicalAttackSpeed"
})
@XmlType(name = "", propOrder = { "physicalDamage", "magicalDamage",
"criticalChance", "physicalAttackSpeed" })
public static class Weapon {
@XmlElement(required = true)
@@ -1041,9 +978,7 @@ public class ItemTemplate
/**
* Gets the value of the physicalDamage property.
*
* @return
* possible object is
* {@link CalculatorFunction }
* @return possible object is {@link CalculatorFunction }
*
*/
public CalculatorFunction getPhysicalDamage() {
@@ -1054,8 +989,7 @@ public class ItemTemplate
* Sets the value of the physicalDamage property.
*
* @param value
* allowed object is
* {@link CalculatorFunction }
* allowed object is {@link CalculatorFunction }
*
*/
public void setPhysicalDamage(CalculatorFunction value) {
@@ -1065,9 +999,7 @@ public class ItemTemplate
/**
* Gets the value of the magicalDamage property.
*
* @return
* possible object is
* {@link CalculatorFunction }
* @return possible object is {@link CalculatorFunction }
*
*/
public CalculatorFunction getMagicalDamage() {
@@ -1078,8 +1010,7 @@ public class ItemTemplate
* Sets the value of the magicalDamage property.
*
* @param value
* allowed object is
* {@link CalculatorFunction }
* allowed object is {@link CalculatorFunction }
*
*/
public void setMagicalDamage(CalculatorFunction value) {
@@ -1089,9 +1020,7 @@ public class ItemTemplate
/**
* Gets the value of the criticalChance property.
*
* @return
* possible object is
* {@link CalculatorFunction }
* @return possible object is {@link CalculatorFunction }
*
*/
public CalculatorFunction getCriticalChance() {
@@ -1102,8 +1031,7 @@ public class ItemTemplate
* Sets the value of the criticalChance property.
*
* @param value
* allowed object is
* {@link CalculatorFunction }
* allowed object is {@link CalculatorFunction }
*
*/
public void setCriticalChance(CalculatorFunction value) {
@@ -1113,9 +1041,7 @@ public class ItemTemplate
/**
* Gets the value of the physicalAttackSpeed property.
*
* @return
* possible object is
* {@link CalculatorFunction }
* @return possible object is {@link CalculatorFunction }
*
*/
public CalculatorFunction getPhysicalAttackSpeed() {
@@ -1126,8 +1052,7 @@ public class ItemTemplate
* Sets the value of the physicalAttackSpeed property.
*
* @param value
* allowed object is
* {@link CalculatorFunction }
* allowed object is {@link CalculatorFunction }
*
*/
public void setPhysicalAttackSpeed(CalculatorFunction value) {
@@ -1137,9 +1062,7 @@ public class ItemTemplate
/**
* Gets the value of the part property.
*
* @return
* possible object is
* {@link String }
* @return possible object is {@link String }
*
*/
public String getPart() {
@@ -1150,8 +1073,7 @@ public class ItemTemplate
* Sets the value of the part property.
*
* @param value
* allowed object is
* {@link String }
* allowed object is {@link String }
*
*/
public void setPart(String value) {
@@ -1161,9 +1083,7 @@ public class ItemTemplate
/**
* Gets the value of the type property.
*
* @return
* possible object is
* {@link String }
* @return possible object is {@link String }
*
*/
public WeaponType getType() {
@@ -1174,8 +1094,7 @@ public class ItemTemplate
* Sets the value of the type property.
*
* @param value
* allowed object is
* {@link String }
* allowed object is {@link String }
*
*/
public void setType(WeaponType value) {

601
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/NPCTemplate.java
View File

File diff suppressed because it is too large Load Diff

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

@@ -5,32 +5,27 @@
// 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
* Java content interface and Java element interface
* generated in the com.l2jserver.model.template package.
* <p>An ObjectFactory allows you to programatically
* construct new instances of the Java representation
* for XML content. The Java representation of XML
* content can consist of schema derived interfaces
* and classes representing the binding of schema
* type definitions, element declarations and model
* groups. Factory methods for each of these are
* provided in this class.
* This object contains factory methods for each Java content interface and Java
* element interface generated in the com.l2jserver.model.template package.
* <p>
* An ObjectFactory allows you to programatically construct new instances of the
* Java representation for XML content. The Java representation of XML content
* can consist of schema derived interfaces and classes representing the binding
* of schema 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
* Create a new ObjectFactory that can be used to create new instances of
* schema derived classes for package: com.l2jserver.model.template
*
*/
public ObjectFactory() {

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

@@ -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,13 +46,9 @@ import com.l2jserver.util.jaxb.SkillTemplateIDAdapter;
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"maximumLevel"
})
@XmlType(name = "", propOrder = { "maximumLevel" })
@XmlRootElement(name = "skill", namespace = "http://schemas.l2jserver2.com/skill")
public class SkillTemplate
extends AbstractTemplate
{
public class SkillTemplate extends AbstractTemplate {
protected int maximumLevel;
@XmlAttribute(name = "id", required = true)
@@ -82,9 +80,7 @@ public class SkillTemplate
/**
* Gets the value of the id property.
*
* @return
* possible object is
* {@link String }
* @return possible object is {@link String }
*
*/
public SkillTemplateID getID() {
@@ -95,8 +91,7 @@ public class SkillTemplate
* Sets the value of the id property.
*
* @param value
* allowed object is
* {@link String }
* allowed object is {@link String }
*
*/
public void setID(SkillTemplateID value) {
@@ -106,9 +101,7 @@ public class SkillTemplate
/**
* Gets the value of the name property.
*
* @return
* possible object is
* {@link String }
* @return possible object is {@link String }
*
*/
public String getName() {
@@ -119,8 +112,7 @@ public class SkillTemplate
* Sets the value of the name property.
*
* @param value
* allowed object is
* {@link String }
* allowed object is {@link String }
*
*/
public void setName(String value) {

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

@@ -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,9 +75,7 @@ import com.l2jserver.util.jaxb.TeleportationTemplateIDAdapter;
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"teleport"
})
@XmlType(name = "", propOrder = { "teleport" })
@XmlRootElement(name = "teleports", namespace = "http://schemas.l2jserver2.com/teleport")
public class Teleports {
@@ -85,13 +86,14 @@ public class Teleports {
* Gets the value of the teleport 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 teleport property.
* 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 teleport property.
*
* <p>
* For example, to add a new item, do as follows:
*
* <pre>
* getTeleport().add(newItem);
* </pre>
@@ -110,11 +112,13 @@ public class Teleports {
return this.teleport;
}
/**
* <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>
@@ -152,13 +156,8 @@ public class Teleports {
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"point",
"restrictions"
})
public static class Teleport
extends AbstractTemplate
{
@XmlType(name = "", propOrder = { "point", "restrictions" })
public static class Teleport extends AbstractTemplate {
protected Coordinate point;
protected Teleports.Teleport.Restrictions restrictions;
@@ -175,9 +174,7 @@ public class Teleports {
/**
* Gets the value of the point property.
*
* @return
* possible object is
* {@link Coordinate }
* @return possible object is {@link Coordinate }
*
*/
public Coordinate getPoint() {
@@ -188,8 +185,7 @@ public class Teleports {
* Sets the value of the point property.
*
* @param value
* allowed object is
* {@link Coordinate }
* allowed object is {@link Coordinate }
*
*/
public void setPoint(Coordinate value) {
@@ -199,9 +195,7 @@ public class Teleports {
/**
* Gets the value of the restrictions property.
*
* @return
* possible object is
* {@link Teleports.Teleport.Restrictions }
* @return possible object is {@link Teleports.Teleport.Restrictions }
*
*/
public Teleports.Teleport.Restrictions getRestrictions() {
@@ -212,8 +206,7 @@ public class Teleports {
* Sets the value of the restrictions property.
*
* @param value
* allowed object is
* {@link Teleports.Teleport.Restrictions }
* allowed object is {@link Teleports.Teleport.Restrictions }
*
*/
public void setRestrictions(Teleports.Teleport.Restrictions value) {
@@ -223,9 +216,7 @@ public class Teleports {
/**
* Gets the value of the id property.
*
* @return
* possible object is
* {@link String }
* @return possible object is {@link String }
*
*/
public TeleportationTemplateID getID() {
@@ -236,8 +227,7 @@ public class Teleports {
* Sets the value of the id property.
*
* @param value
* allowed object is
* {@link String }
* allowed object is {@link String }
*
*/
public void setID(TeleportationTemplateID value) {
@@ -247,9 +237,7 @@ public class Teleports {
/**
* Gets the value of the name property.
*
* @return
* possible object is
* {@link String }
* @return possible object is {@link String }
*
*/
public String getName() {
@@ -260,8 +248,7 @@ public class Teleports {
* Sets the value of the name property.
*
* @param value
* allowed object is
* {@link String }
* allowed object is {@link String }
*
*/
public void setName(String value) {
@@ -271,9 +258,7 @@ public class Teleports {
/**
* Gets the value of the item property.
*
* @return
* possible object is
* {@link Integer }
* @return possible object is {@link Integer }
*
*/
public Integer getItem() {
@@ -284,8 +269,7 @@ public class Teleports {
* Sets the value of the item property.
*
* @param value
* allowed object is
* {@link Integer }
* allowed object is {@link Integer }
*
*/
public void setItem(Integer value) {
@@ -308,11 +292,13 @@ public class Teleports {
this.price = value;
}
/**
* <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>
@@ -335,9 +321,7 @@ public class Teleports {
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"restriction"
})
@XmlType(name = "", propOrder = { "restriction" })
public static class Restrictions {
@XmlElement(required = true)
@@ -347,13 +331,14 @@ public class Teleports {
* 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.
* 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>

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

@@ -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,9 +51,7 @@ import javax.xml.bind.annotation.XmlType;
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "ZoneType", namespace = "zones", propOrder = {
"point"
})
@XmlType(name = "ZoneType", namespace = "zones", propOrder = { "point" })
public class ZoneType {
@XmlElement(required = true)
@@ -63,13 +63,14 @@ public class ZoneType {
* Gets the value of the point 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 point property.
* 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 point property.
*
* <p>
* For example, to add a new item, do as follows:
*
* <pre>
* getPoint().add(newItem);
* </pre>
@@ -91,9 +92,7 @@ public class ZoneType {
/**
* Gets the value of the id property.
*
* @return
* possible object is
* {@link String }
* @return possible object is {@link String }
*
*/
public String getId() {
@@ -104,19 +103,20 @@ public class ZoneType {
* Sets the value of the id property.
*
* @param value
* allowed object is
* {@link String }
* allowed object is {@link String }
*
*/
public void setId(String value) {
this.id = value;
}
/**
* <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>

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

@@ -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,9 +56,7 @@ import javax.xml.bind.annotation.XmlType;
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"castle"
})
@XmlType(name = "", propOrder = { "castle" })
@XmlRootElement(name = "zones", namespace = "zones")
public class Zones {
@@ -67,9 +66,7 @@ public class Zones {
/**
* Gets the value of the castle property.
*
* @return
* possible object is
* {@link Zones.Castle }
* @return possible object is {@link Zones.Castle }
*
*/
public Zones.Castle getCastle() {
@@ -80,19 +77,20 @@ public class Zones {
* Sets the value of the castle property.
*
* @param value
* allowed object is
* {@link Zones.Castle }
* allowed object is {@link Zones.Castle }
*
*/
public void setCastle(Zones.Castle value) {
this.castle = value;
}
/**
* <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>
@@ -119,9 +117,7 @@ public class Zones {
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"siege"
})
@XmlType(name = "", propOrder = { "siege" })
public static class Castle {
@XmlElement(required = true)
@@ -130,9 +126,7 @@ public class Zones {
/**
* Gets the value of the siege property.
*
* @return
* possible object is
* {@link Zones.Castle.Siege }
* @return possible object is {@link Zones.Castle.Siege }
*
*/
public Zones.Castle.Siege getSiege() {
@@ -143,19 +137,20 @@ public class Zones {
* Sets the value of the siege property.
*
* @param value
* allowed object is
* {@link Zones.Castle.Siege }
* allowed object is {@link Zones.Castle.Siege }
*
*/
public void setSiege(Zones.Castle.Siege value) {
this.siege = value;
}
/**
* <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>
@@ -172,9 +167,7 @@ public class Zones {
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"zone"
})
@XmlType(name = "", propOrder = { "zone" })
public static class Siege {
@XmlElement(required = true)
@@ -183,9 +176,7 @@ public class Zones {
/**
* Gets the value of the zone property.
*
* @return
* possible object is
* {@link ZoneType }
* @return possible object is {@link ZoneType }
*
*/
public ZoneType getZone() {
@@ -196,8 +187,7 @@ public class Zones {
* Sets the value of the zone property.
*
* @param value
* allowed object is
* {@link ZoneType }
* allowed object is {@link ZoneType }
*
*/
public void setZone(ZoneType value) {

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

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

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

@@ -42,10 +42,12 @@ public class CharacterShortcutID extends
*
* @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;
}

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

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

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

@@ -98,7 +98,8 @@ public abstract class Actor extends PositionableObject {
// /**
// * 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
*/

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

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

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

@@ -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;

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

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

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

@@ -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)
.in(Scopes.SINGLETON);
bind(CharacterDAO.class).to(SQLCharacterDAO.class).in(Scopes.SINGLETON);
bind(CharacterFriendDAO.class).to(SQLCharacterFriendDAO.class).in(
Scopes.SINGLETON);
bind(CharacterShortcutDAO.class).to(SQLCharacterShortcutDAO.class).in(

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

@@ -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());
}
});
}

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

@@ -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()
.getID())));
entity.characterIdFriend.eq(o.getID()
.getFriendID().getID())));
}
});
}

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

@@ -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");

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

@@ -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",

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

@@ -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");

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

@@ -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");

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

@@ -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");

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

@@ -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");

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

@@ -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
* world
* The {@link WorldEventDispatcherService} is used to dispatch attack events
* to the world
*/
private final WorldEventDispatcherService eventDispatcher;

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

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

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

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

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

@@ -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
* the clients) with <code>SM_ACTOR_CHAT</code>.
* Messages are received (from the clients) with <code>CM_CHAR_CHAT</code> and
* sent (to the clients) with <code>SM_ACTOR_CHAT</code>.
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/

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

@@ -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);
}

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

@@ -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,

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

@@ -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>() {

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

@@ -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) {

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

@@ -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());

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

@@ -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;
}

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

@@ -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) {

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

@@ -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;
}

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

@@ -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) {

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

@@ -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;

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

@@ -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;

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

@@ -157,14 +157,13 @@ 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
* about supported formats.
* detected and inserted. See <code>SM_SYSTEM_MESSAGE</code> for
* more about supported formats.
* @return the {@link ChannelFuture} that will be notified once the packet
* has been written.
* @see SystemMessage
*/
ChannelFuture sendSystemMessage(SystemMessage message,
Object... args);
ChannelFuture sendSystemMessage(SystemMessage message, Object... args);
/**
* Sends a <code>SM_ACTION_FAILED</code> to the client.
@@ -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
* be null. If you wish to send the HTML with an NPC, you should send the
* packet directly.
* Sends a <code>SM_HTML</code> packet to the client. In the packet, the NPC
* will be null. If you wish to send the HTML with an NPC, you should send
* 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
* displayed in the regular chat window, they will appear in a large one.
* Sends a <code>SM_COMMUNITY_HTML</code> packet to the client. HTML code is
* 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>

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

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

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

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

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

@@ -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

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

@@ -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

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

@@ -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="

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

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

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

@@ -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) {

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

@@ -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;
}

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

@@ -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) {

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

@@ -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) {

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

@@ -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) {

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

@@ -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) {

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

@@ -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) {

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

@@ -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) {

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

@@ -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) {

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

@@ -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);
}
}

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

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

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

@@ -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) {

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

@@ -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) {

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

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

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

@@ -55,11 +55,15 @@ public class SM_ACTOR_CHAT extends AbstractServerPacket {
private int messageID = 0;
/**
* @param character the actor
* @param destination the destination
* @param message the message
* @param character
* the actor
* @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 destination the destination
* @param messageID the message id
* @param actor
* the actor
* @param destination
* the destination
* @param messageID
* the message id
*/
public SM_ACTOR_CHAT(Actor actor, ChatMessageType destination, int messageID) {
super(OPCODE);

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

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

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

@@ -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);

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

@@ -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);

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

@@ -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);

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

@@ -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);

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

@@ -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);

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

@@ -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);

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

@@ -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);

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

@@ -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);

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

@@ -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);

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

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

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

@@ -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);

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

@@ -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

3
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_MANOR_LIST.java
View File

@@ -39,7 +39,8 @@ public class SM_MANOR_LIST extends AbstractServerPacket {
private String[] manors;
/**
* @param manors the manors
* @param manors
* the manors
*/
public SM_MANOR_LIST(String... manors) {
super(OPCODE);

6
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/game/net/packet/server/SM_SERVER_OBJECT.java
View File

@@ -55,7 +55,8 @@ public class SM_SERVER_OBJECT extends AbstractServerPacket {
buffer.writeInt(npc.getID().getID()); // obj id
buffer.writeInt(npc.getTemplateID().getID() + 1000000); // template id
BufferUtils.writeString(buffer, template.getInfo().getName().getValue()); // name
BufferUtils
.writeString(buffer, template.getInfo().getName().getValue()); // name
buffer.writeInt((template.getInfo().isAttackable() ? 0x01 : 0x00)); // attackable
buffer.writeInt(npc.getPoint().getX()); // x
buffer.writeInt(npc.getPoint().getY()); // y
@@ -65,7 +66,8 @@ public class SM_SERVER_OBJECT extends AbstractServerPacket {
buffer.writeDouble(0x01); // attack spd mult
buffer.writeDouble(template.getInfo().getCollision().getRadius());
buffer.writeDouble(template.getInfo().getCollision().getHeigth());
buffer.writeInt((int) (template.getInfo().isAttackable() ? npc.getHP() : 0x00));
buffer.writeInt((int) (template.getInfo().isAttackable() ? npc.getHP()
: 0x00));
buffer.writeInt((int) (template.getInfo().isAttackable() ? template
.getInfo().getStats().getHp() : 0x00));
buffer.writeInt(0x01); // object type

67
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/java/com/l2jserver/service/network/gameguard/GameGuardService.java
View File

@@ -1,67 +0,0 @@
/*
* This file is part of l2jserver2 <l2jserver2.com>.
*
* l2jserver2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* l2jserver2 is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with l2jserver2. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.service.network.gameguard;
import java.util.concurrent.Future;
import com.l2jserver.model.world.L2Character;
import com.l2jserver.service.Service;
import com.l2jserver.service.network.model.Lineage2Client;
/**
* This service is responsible for querying and validating GameGuard packets
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public interface GameGuardService extends Service {
/**
* Queries the client GameGuard for an response
*
* @param character
* the lineage 2 character
* @return an future that will be used to obtain validation status
*/
Future<GameGuardResponse> query(L2Character character);
/**
* The Game guard key state
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public enum GameGuardResponse {
/**
* Key is valid
*/
VALID,
/**
* Key is not valid
*/
INVALID;
}
/**
* Sets the game guard key for the given connection. Future will be notified
* of the key state (valid or invalid).
*
* @param conn
* the connection
* @param key
* the key
* @return the validation state
*/
GameGuardResponse key(Lineage2Client conn, byte[] key);
}

7
l2jserver2-tools/src/main/java/com/l2jserver/model/template/npc/NPCTemplateConverter.java
View File

@@ -363,7 +363,8 @@ public class NPCTemplateConverter {
return drops;
}
private static Talk fillHtmlChat(final ObjectFactory factory, int npcId) throws IOException {
private static Talk fillHtmlChat(final ObjectFactory factory, int npcId)
throws IOException {
final Talk talk = factory.createNPCTemplateTalk();
talk.setDefault("default");
for (final File file : htmlScannedFiles) {
@@ -389,8 +390,8 @@ public class NPCTemplateConverter {
return talk;
}
private static Skills fillSkillList(final ObjectFactory factory, ResultSet npcRs, int npcId)
throws SQLException {
private static Skills fillSkillList(final ObjectFactory factory,
ResultSet npcRs, int npcId) throws SQLException {
final Connection conn = npcRs.getStatement().getConnection();
final Skills skills = factory.createNPCTemplateSkills();

1
l2jserver2-tools/src/main/java/com/l2jserver/tool/CharacterSQLEnumGenerator.java
View File

@@ -18,7 +18,6 @@ package com.l2jserver.tool;
import com.l2jserver.model.template.character.CharacterClass;
public class CharacterSQLEnumGenerator {
public static void main(String[] args) {
System.out.println("== 'Character' SQL STATEMENT ==");

2
l2jserver2-tools/src/main/java/com/l2jserver/tool/PacketSamuraiCharacterClassEnum.java
View File

@@ -18,8 +18,6 @@ package com.l2jserver.tool;
import com.l2jserver.model.template.character.CharacterClass;
public class PacketSamuraiCharacterClassEnum {
public static void main(String[] args) {
System.out.println(createClassStatement());

3
l2jserver2-tools/src/main/java/com/l2jserver/tool/PacketSamuraiSystemMessageEnumGenerator.java
View File

@@ -25,7 +25,8 @@ import com.l2jserver.service.network.model.SystemMessage;
public class PacketSamuraiSystemMessageEnumGenerator {
public static void main(String[] args) throws IOException {
System.out.println(createClassStatement());
Files.write(Paths.get("generated", "SystemMessageEnum.txt"), createClassStatement().getBytes());
Files.write(Paths.get("generated", "SystemMessageEnum.txt"),
createClassStatement().getBytes());
}
private static String createClassStatement() {

1
l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/XmlNsItemMaterialGenerator.java
View File

@@ -18,7 +18,6 @@ package com.l2jserver.tool.conversor.itemtemplate;
import com.l2jserver.model.template.item.ItemMaterial;
/**
* @author <a href="http://www.rogiel.com">Rogiel</a>
*

1
l2jserver2-tools/src/main/java/com/l2jserver/tool/conversor/itemtemplate/XmlNsItemTypeGenerator.java
View File

@@ -18,7 +18,6 @@ package com.l2jserver.tool.conversor.itemtemplate;
import com.l2jserver.model.template.item.ItemType;
/**
* @author <a href="http://www.rogiel.com">Rogiel</a>
*